From 5b4e2528a3fc1db257b102345cd09305d20dda35 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Tue, 4 Nov 2025 20:51:51 -0700
Subject: [PATCH 001/263] Post-release update of `cargo vet` metadata.

---
 supply-chain/imports.lock | 36 ++++++++++++------------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index 1d5d8b180f..2209481028 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -1,18 +1,6 @@
 
 # cargo-vet imports lock
 
-[[unpublished.pczt]]
-version = "0.5.0"
-audited_as = "0.4.0"
-
-[[unpublished.zcash_client_backend]]
-version = "0.21.0"
-audited_as = "0.20.0"
-
-[[unpublished.zcash_client_sqlite]]
-version = "0.19.0"
-audited_as = "0.18.9"
-
 [[publisher.bumpalo]]
 version = "3.16.0"
 when = "2024-04-08"
@@ -97,11 +85,11 @@ user-login = "nuttycom"
 user-name = "Kris Nuttycombe"
 
 [[publisher.pczt]]
-version = "0.4.0"
-when = "2025-09-25"
-user-id = 6289
-user-login = "str4d"
-user-name = "Jack Grigg"
+version = "0.5.0"
+when = "2025-11-05"
+user-id = 169181
+user-login = "nuttycom"
+user-name = "Kris Nuttycombe"
 
 [[publisher.sapling-crypto]]
 version = "0.5.0"
@@ -453,15 +441,15 @@ user-login = "nuttycom"
 user-name = "Kris Nuttycombe"
 
 [[publisher.zcash_client_backend]]
-version = "0.20.0"
-when = "2025-09-25"
-user-id = 6289
-user-login = "str4d"
-user-name = "Jack Grigg"
+version = "0.21.0"
+when = "2025-11-05"
+user-id = 169181
+user-login = "nuttycom"
+user-name = "Kris Nuttycombe"
 
 [[publisher.zcash_client_sqlite]]
-version = "0.18.9"
-when = "2025-10-23"
+version = "0.19.0"
+when = "2025-11-05"
 user-id = 169181
 user-login = "nuttycom"
 user-name = "Kris Nuttycombe"

From 3639a08c14e3cc1ad441fc6fa8193a4ae6cc9bfe Mon Sep 17 00:00:00 2001
From: Ryan <ryan@deltadevs.xyz>
Date: Thu, 6 Nov 2025 14:09:34 +0100
Subject: [PATCH 002/263] refactor(zcash_encoding): expose a reverse-hex
 decoder

---
 Cargo.lock                            | 1746 ++++++++++++-------------
 components/zcash_encoding/Cargo.toml  |    1 +
 components/zcash_encoding/src/lib.rs  |   12 +
 components/zcash_protocol/Cargo.toml  |    1 +
 components/zcash_protocol/src/txid.rs |    6 +-
 5 files changed, 834 insertions(+), 932 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2c80e6c2e4..ffd9eeb314 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,21 +1,19 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
-
 [[package]]
 name = "addr2line"
-version = "0.21.0"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
 name = "aead"
@@ -41,12 +39,12 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.11"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
 dependencies = [
  "cfg-if",
- "getrandom 0.2.15",
+ "getrandom 0.3.4",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -54,9 +52,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
 dependencies = [
  "memchr",
 ]
@@ -72,9 +70,9 @@ dependencies = [
 
 [[package]]
 name = "ambassador"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b27ba24e4d8a188489d5a03c7fabc167a60809a383cdb4d15feb37479cd2a48"
+checksum = "e68de4cdc6006162265d0957edb4a860fe4e711b1dc17a5746fd95f952f08285"
 dependencies = [
  "itertools 0.10.5",
  "proc-macro2",
@@ -84,21 +82,23 @@ dependencies = [
 
 [[package]]
 name = "amplify"
-version = "4.6.0"
+version = "4.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e711289a6cb28171b4f0e6c8019c69ff9476050508dc082167575d458ff74d0"
+checksum = "3f7fb4ac7c881e54a8e7015e399b6112a2a5bc958b6c89ac510840ff20273b31"
 dependencies = [
  "amplify_derive",
  "amplify_num",
  "ascii",
+ "getrandom 0.2.16",
+ "getrandom 0.3.4",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "amplify_derive"
-version = "4.0.0"
+version = "4.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759dcbfaf94d838367a86d493ec34ccc8aa6fe365cb7880d6bf89006de24d9c1"
+checksum = "2a6309e6b8d89b36b9f959b7a8fa093583b94922a0f6438a24fb08936de4d428"
 dependencies = [
  "amplify_syn",
  "proc-macro2",
@@ -108,9 +108,9 @@ dependencies = [
 
 [[package]]
 name = "amplify_num"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04c009c5c4de814911b177e2ea59e4930bb918978ed3cce4900d846a6ceb0838"
+checksum = "99bcb75a2982047f733547042fc3968c0f460dfcf7d90b90dea3b2744580e9ad"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -126,12 +126,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -149,27 +143,27 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
 
 [[package]]
 name = "anyhow"
-version = "1.0.83"
+version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3"
+checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
 
 [[package]]
 name = "arrayref"
-version = "0.3.7"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "arti-client"
@@ -179,7 +173,7 @@ checksum = "0a79ca5ce63b36033a5ccbfbcc7f919cbd93db61708543aa5e2e4917856205e7"
 dependencies = [
  "async-trait",
  "cfg-if",
- "derive-deftly 1.3.0",
+ "derive-deftly",
  "derive_builder_fork_arti",
  "derive_more",
  "educe",
@@ -194,7 +188,7 @@ dependencies = [
  "rand 0.9.2",
  "safelog",
  "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "time",
  "tor-async-utils",
  "tor-basic-utils",
@@ -238,7 +232,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -249,7 +243,7 @@ checksum = "3109e49b1e4909e9db6515a30c633684d68cdeaa252f215214cb4fa1a5bfee2c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
  "synstructure",
 ]
 
@@ -261,7 +255,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -272,29 +266,26 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
 
 [[package]]
 name = "async-compression"
-version = "0.4.11"
+version = "0.4.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5"
+checksum = "5a89bce6054c720275ac2432fbba080a66a2106a44a1b804553930ca6909f4e0"
 dependencies = [
- "flate2",
+ "compression-codecs",
+ "compression-core",
  "futures-core",
  "futures-io",
- "memchr",
  "pin-project-lite",
- "xz2",
- "zstd",
- "zstd-safe",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.81"
+version = "0.1.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
+checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -333,9 +324,9 @@ checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba"
 
 [[package]]
 name = "atomic"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994"
+checksum = "a89cbf775b137e9b968e67227ef7f775587cde3fd31b0d8599dbd0f598a48340"
 dependencies = [
  "bytemuck",
 ]
@@ -348,23 +339,23 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "backtrace"
-version = "0.3.71"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -431,7 +422,7 @@ dependencies = [
  "hmac 0.12.1",
  "pbkdf2",
  "rand 0.8.5",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "unicode-normalization",
  "zeroize",
 ]
@@ -454,18 +445,18 @@ dependencies = [
 
 [[package]]
 name = "bit-set"
-version = "0.5.3"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
+checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
 dependencies = [
  "bit-vec",
 ]
 
 [[package]]
 name = "bit-vec"
-version = "0.6.3"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
+checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
 
 [[package]]
 name = "bitflags"
@@ -475,9 +466,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.9.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
 
 [[package]]
 name = "bitvec"
@@ -493,9 +484,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",
@@ -504,9 +495,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",
@@ -521,7 +512,7 @@ checksum = "e0b121a9fe0df916e362fb3271088d071159cdf11db0e4182d02152850756eff"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -561,7 +552,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09dc0086e469182132244e9b8d313a0742e1132da43a08c24b9dd3c18e0faf3a"
 dependencies = [
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -570,26 +561,26 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4"
 dependencies = [
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "tinyvec",
 ]
 
 [[package]]
 name = "bstr"
-version = "1.11.3"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0"
+checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab"
 dependencies = [
  "memchr",
- "regex-automata 0.4.9",
+ "regex-automata",
  "serde",
 ]
 
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
 [[package]]
 name = "by_address"
@@ -599,9 +590,9 @@ checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06"
 
 [[package]]
 name = "bytemuck"
-version = "1.16.3"
+version = "1.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83"
+checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4"
 
 [[package]]
 name = "byteorder"
@@ -638,10 +629,11 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.17"
+version = "1.2.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fcb57c740ae1daf453ae85f16e37396f672b039e00d9d866e07ddb24e328e3a"
+checksum = "37521ac7aabe3d13122dc382493e20c9416f299d2ccd5b3a5340a2570cdeb0f3"
 dependencies = [
+ "find-msvc-tools",
  "jobserver",
  "libc",
  "shlex",
@@ -649,9 +641,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "chacha20"
@@ -679,15 +671,14 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
 dependencies = [
- "android-tzdata",
  "iana-time-zone",
  "num-traits",
  "serde",
- "windows-targets 0.52.6",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -730,18 +721,18 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.20"
+version = "4.5.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
+checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.5.20"
+version = "4.5.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
+checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a"
 dependencies = [
  "anstyle",
  "clap_lex",
@@ -749,15 +740,15 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.2"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
 
 [[package]]
 name = "coarsetime"
-version = "0.1.34"
+version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13b3839cf01bb7960114be3ccf2340f541b6d0c81f8690b007b2b39f750f7e5d"
+checksum = "91849686042de1b41cd81490edc83afbcb0abe5a9b6f2c4114f23ce8cca1bcf4"
 dependencies = [
  "libc",
  "wasix",
@@ -766,9 +757,31 @@ dependencies = [
 
 [[package]]
 name = "cobs"
-version = "0.2.3"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa961b519f0b462e3a3b4a34b64d119eeaca1d59af726fe450bbba07a9fc0a1"
+dependencies = [
+ "thiserror 2.0.17",
+]
+
+[[package]]
+name = "compression-codecs"
+version = "0.4.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef8a506ec4b81c460798f572caead636d57d3d7e940f998160f52bd254bf2d23"
+dependencies = [
+ "compression-core",
+ "flate2",
+ "liblzma",
+ "zstd",
+ "zstd-safe",
+]
+
+[[package]]
+name = "compression-core"
+version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15"
+checksum = "e47641d3deaf41fb1538ac1f54735925e275eaf3bf4d55c81b137fba797e5cbb"
 
 [[package]]
 name = "concurrent-queue"
@@ -787,9 +800,9 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
 [[package]]
 name = "constant_time_eq"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
+checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
 
 [[package]]
 name = "convert_case"
@@ -811,9 +824,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "core2"
@@ -826,27 +839,27 @@ dependencies = [
 
 [[package]]
 name = "cpp_demangle"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96e58d342ad113c2b878f16d5d034c03be492ae460cdbc02b7f0f2284d310c7d"
+checksum = "f2bb79cb74d735044c972aae58ed0aaa9a837e85b01106a54c39e42e97f62253"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.12"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "crc32fast"
-version = "1.4.2"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
 dependencies = [
  "cfg-if",
 ]
@@ -941,9 +954,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
 dependencies = [
  "crossbeam-epoch",
  "crossbeam-utils",
@@ -960,25 +973,24 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.3.8"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add"
+checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
 dependencies = [
- "cfg-if",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.20"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "crunchy"
-version = "0.2.2"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 
 [[package]]
 name = "crypto-bigint"
@@ -1045,14 +1057,14 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
 name = "daggy"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91a9304e55e9d601a39ae4deaba85406d5c0980e106f65afcf0460e9af1e7602"
+checksum = "70def8d72740e44d9f676d8dab2c933a236663d86dd24319b57a2bed4d694774"
 dependencies = [
  "petgraph",
 ]
@@ -1069,12 +1081,12 @@ dependencies = [
 
 [[package]]
 name = "darling"
-version = "0.20.10"
+version = "0.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
+checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0"
 dependencies = [
- "darling_core 0.20.10",
- "darling_macro 0.20.10",
+ "darling_core 0.21.3",
+ "darling_macro 0.21.3",
 ]
 
 [[package]]
@@ -1093,16 +1105,16 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.10"
+version = "0.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
+checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -1118,20 +1130,20 @@ dependencies = [
 
 [[package]]
 name = "darling_macro"
-version = "0.20.10"
+version = "0.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
+checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
 dependencies = [
- "darling_core 0.20.10",
+ "darling_core 0.21.3",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.6.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
 
 [[package]]
 name = "debugid"
@@ -1144,9 +1156,9 @@ dependencies = [
 
 [[package]]
 name = "der"
-version = "0.7.9"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
+checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
 dependencies = [
  "const-oid",
  "pem-rfc7468",
@@ -1177,42 +1189,14 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "derive-deftly"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72f9bc3564f74be6c35d49a7efee54380d7946ccc631323067f33fabb9246027"
-dependencies = [
- "derive-deftly-macros 0.14.2",
- "heck",
-]
-
 [[package]]
 name = "derive-deftly"
 version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d308ebe4b10924331bd079044b418da7b227d724d3e2408567a47ad7c3da2a0"
 dependencies = [
- "derive-deftly-macros 1.3.0",
- "heck",
-]
-
-[[package]]
-name = "derive-deftly-macros"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1b84d32b18d9a256d81e4fec2e4cfd0ab6dde5e5ff49be1713ae0adbd0060c2"
-dependencies = [
+ "derive-deftly-macros",
  "heck",
- "indexmap 2.12.0",
- "itertools 0.13.0",
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "sha3",
- "strum 0.26.3",
- "syn 2.0.100",
- "void",
 ]
 
 [[package]]
@@ -1228,8 +1212,8 @@ dependencies = [
  "proc-macro2",
  "quote",
  "sha3",
- "strum 0.27.2",
- "syn 2.0.100",
+ "strum",
+ "syn 2.0.109",
  "void",
 ]
 
@@ -1282,7 +1266,7 @@ dependencies = [
  "convert_case",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
  "unicode-xid",
 ]
 
@@ -1315,16 +1299,7 @@ version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16f5094c54661b38d03bd7e50df373292118db60b585c08a411c6d840017fe7d"
 dependencies = [
- "dirs-sys 0.5.0",
-]
-
-[[package]]
-name = "dirs"
-version = "5.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
-dependencies = [
- "dirs-sys 0.4.1",
+ "dirs-sys",
 ]
 
 [[package]]
@@ -1333,19 +1308,7 @@ version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
 dependencies = [
- "dirs-sys 0.5.0",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
-dependencies = [
- "libc",
- "option-ext",
- "redox_users 0.4.5",
- "windows-sys 0.48.0",
+ "dirs-sys",
 ]
 
 [[package]]
@@ -1356,41 +1319,41 @@ checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
 dependencies = [
  "libc",
  "option-ext",
- "redox_users 0.5.0",
- "windows-sys 0.60.2",
+ "redox_users",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "displaydoc"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
 name = "document-features"
-version = "0.2.8"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef5282ad69563b5fc40319526ba27e0e7363d552a896f0297d54f767717f9b95"
+checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61"
 dependencies = [
  "litrs",
 ]
 
 [[package]]
 name = "downcast-rs"
-version = "2.0.1"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea8a8b81cacc08888170eef4d13b775126db426d0b348bee9d18c2c1eaf123cf"
+checksum = "117240f60069e65410b3ae1bb213295bd828f707b5bec6596a1afc8793ce0cbc"
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.17"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
+checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
 
 [[package]]
 name = "dynosaur"
@@ -1409,7 +1372,7 @@ checksum = "0b0713d5c1d52e774c5cd7bb8b043d7c0fc4f921abfb678556140bfbe6ab2364"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -1447,7 +1410,7 @@ dependencies = [
  "merlin",
  "rand_core 0.6.4",
  "serde",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "subtle",
  "zeroize",
 ]
@@ -1466,9 +1429,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.13.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "elliptic-curve"
@@ -1511,7 +1474,7 @@ dependencies = [
  "num-traits",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -1523,7 +1486,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -1549,7 +1512,7 @@ checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -1565,9 +1528,9 @@ dependencies = [
 
 [[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"
@@ -1576,14 +1539,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "event-listener"
-version = "5.3.1"
+version = "5.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
+checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
 dependencies = [
  "concurrent-queue",
  "parking",
@@ -1613,15 +1576,15 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
 
 [[package]]
 name = "fastrand"
-version = "2.1.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
 [[package]]
 name = "ff"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
+checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393"
 dependencies = [
  "bitvec",
  "rand_core 0.6.4",
@@ -1640,25 +1603,31 @@ version = "0.10.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3"
 dependencies = [
- "atomic 0.6.0",
+ "atomic 0.6.1",
  "serde",
- "toml 0.8.19",
+ "toml 0.8.23",
  "uncased",
  "version_check",
 ]
 
 [[package]]
 name = "filetime"
-version = "0.2.25"
+version = "0.2.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
+checksum = "bc0505cd1b6fa6580283f6bdf70a73fcf4aba1184038c90902b92b3dd0df63ed"
 dependencies = [
  "cfg-if",
  "libc",
  "libredox",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
+
 [[package]]
 name = "findshlibs"
 version = "0.10.2"
@@ -1682,15 +1651,15 @@ dependencies = [
 
 [[package]]
 name = "fixedbitset"
-version = "0.4.2"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
+checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
 
 [[package]]
 name = "flate2"
-version = "1.0.30"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1735,11 +1704,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7a157b06319bb4868718fd20177a0d3373d465e429d89cd0ee493d9f5918902"
 dependencies = [
  "derive_builder_fork_arti",
- "dirs 6.0.0",
+ "dirs",
  "libc",
  "pwd-grp",
  "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "walkdir",
 ]
 
@@ -1761,9 +1730,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1792,9 +1761,9 @@ checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1815,7 +1784,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -1825,7 +1794,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb"
 dependencies = [
  "futures-io",
- "rustls 0.23.25",
+ "rustls 0.23.35",
  "rustls-pki-types",
 ]
 
@@ -1861,9 +1830,9 @@ dependencies = [
 
 [[package]]
 name = "generic-array"
-version = "0.14.7"
+version = "0.14.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2"
 dependencies = [
  "typenum",
  "version_check",
@@ -1872,13 +1841,15 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
  "wasi",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -1888,9 +1859,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
  "r-efi",
  "wasip2",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -1902,14 +1875,14 @@ dependencies = [
  "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
 name = "gimli"
-version = "0.28.1"
+version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
 
 [[package]]
 name = "glob-match"
@@ -1951,9 +1924,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.5"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
+checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -1970,11 +1943,13 @@ dependencies = [
 
 [[package]]
 name = "half"
-version = "2.2.1"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0"
+checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
 dependencies = [
+ "cfg-if",
  "crunchy",
+ "zerocopy",
 ]
 
 [[package]]
@@ -2017,14 +1992,15 @@ dependencies = [
 
 [[package]]
 name = "halo2_proofs"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b867a8d9bbb85fca76fff60652b5cd19b853a1c4d0665cb89bee68b18d2caf0"
+checksum = "019561b5f3be60731e7b72f3f7878c5badb4174362d860b03d3cf64cb47f90db"
 dependencies = [
  "blake2b_simd",
  "ff",
  "group",
  "halo2_legacy_pdqsort",
+ "indexmap 1.9.3",
  "maybe-rayon",
  "pasta_curves",
  "rand_core 0.6.4",
@@ -2039,9 +2015,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.15.2"
+version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
 dependencies = [
  "foldhash",
 ]
@@ -2058,7 +2034,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
 dependencies = [
- "hashbrown 0.15.2",
+ "hashbrown 0.15.5",
 ]
 
 [[package]]
@@ -2069,9 +2045,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.9"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
 
 [[package]]
 name = "hex"
@@ -2108,11 +2084,11 @@ dependencies = [
 
 [[package]]
 name = "home"
-version = "0.5.9"
+version = "0.5.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -2123,9 +2099,9 @@ checksum = "f558a64ac9af88b5ba400d99b579451af0d39c6d360980045b91aac966d705e2"
 
 [[package]]
 name = "http"
-version = "1.1.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
 dependencies = [
  "bytes",
  "fnv",
@@ -2144,12 +2120,12 @@ dependencies = [
 
 [[package]]
 name = "http-body-util"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
 dependencies = [
  "bytes",
- "futures-util",
+ "futures-core",
  "http",
  "http-body",
  "pin-project-lite",
@@ -2169,9 +2145,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "humantime"
-version = "2.1.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424"
 
 [[package]]
 name = "humantime-serde"
@@ -2194,13 +2170,14 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
+checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e"
 dependencies = [
+ "atomic-waker",
  "bytes",
  "futures-channel",
- "futures-util",
+ "futures-core",
  "h2",
  "http",
  "http-body",
@@ -2208,6 +2185,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
+ "pin-utils",
  "smallvec",
  "tokio",
  "want",
@@ -2215,9 +2193,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-timeout"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793"
+checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0"
 dependencies = [
  "hyper",
  "hyper-util",
@@ -2228,19 +2206,20 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.11"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2"
+checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8"
 dependencies = [
  "bytes",
  "futures-channel",
+ "futures-core",
  "futures-util",
  "http",
  "http-body",
  "hyper",
  "libc",
  "pin-project-lite",
- "socket2 0.5.9",
+ "socket2",
  "tokio",
  "tower-service",
  "tracing",
@@ -2248,16 +2227,17 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
+ "log",
  "wasm-bindgen",
- "windows-core 0.52.0",
+ "windows-core 0.62.2",
 ]
 
 [[package]]
@@ -2344,7 +2324,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.10.0",
  "inotify-sys",
  "libc",
 ]
@@ -2360,28 +2340,31 @@ dependencies = [
 
 [[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",
 ]
 
 [[package]]
 name = "inventory"
-version = "0.3.15"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767"
+checksum = "bc61209c082fbeb19919bee74b176221b27223e27b65d781eb91af24eb1fb46e"
+dependencies = [
+ "rustversion",
+]
 
 [[package]]
 name = "is-terminal"
-version = "0.4.12"
+version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
+checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
 dependencies = [
  "hermit-abi",
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -2413,25 +2396,27 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "jobserver"
-version = "0.1.31"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
+checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
 dependencies = [
+ "getrandom 0.3.4",
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.69"
+version = "0.3.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -2451,27 +2436,27 @@ dependencies = [
 
 [[package]]
 name = "keccak"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940"
+checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
 dependencies = [
  "cpufeatures",
 ]
 
 [[package]]
 name = "known-folders"
-version = "1.1.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4397c789f2709d23cfcb703b316e0766a8d4b17db2d47b0ab096ef6047cae1d8"
+checksum = "d463f34ca3c400fde3a054da0e0b8c6ffa21e4590922f3e18281bb5eeef4cbdc"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "kqueue"
-version = "1.0.8"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
+checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a"
 dependencies = [
  "kqueue-sys",
  "libc",
@@ -2502,19 +2487,39 @@ version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
 
+[[package]]
+name = "liblzma"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73c36d08cad03a3fbe2c4e7bb3a9e84c57e4ee4135ed0b065cade3d98480c648"
+dependencies = [
+ "liblzma-sys",
+]
+
+[[package]]
+name = "liblzma-sys"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01b9596486f6d60c3bbe644c0e1be1aa6ccc472ad630fe8927b456973d7cb736"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+]
+
 [[package]]
 name = "libm"
-version = "0.2.8"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
 
 [[package]]
 name = "libredox"
-version = "0.1.3"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.10.0",
  "libc",
  "redox_syscall",
 ]
@@ -2530,12 +2535,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.11.0"
@@ -2544,44 +2543,32 @@ checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
 
 [[package]]
 name = "litrs"
-version = "0.4.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5"
+checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"
 
 [[package]]
 name = "lock_api"
-version = "0.4.12"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
 dependencies = [
- "autocfg",
  "scopeguard",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
-
-[[package]]
-name = "lzma-sys"
-version = "0.1.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
 
 [[package]]
 name = "matchers"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
 dependencies = [
- "regex-automata 0.1.10",
+ "regex-automata",
 ]
 
 [[package]]
@@ -2596,15 +2583,15 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.4"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 
 [[package]]
 name = "memmap2"
-version = "0.9.4"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
+checksum = "744133e4a0e0a658e1374cf3bf8e415c4052a15a111acd372764c55b4177d490"
 dependencies = [
  "libc",
 ]
@@ -2635,21 +2622,20 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.2"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
- "adler",
+ "adler2",
+ "simd-adler32",
 ]
 
 [[package]]
 name = "minreq"
-version = "2.12.0"
+version = "2.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763d142cdff44aaadd9268bebddb156ef6c65a0e13486bb81673cf2d8739f9b0"
+checksum = "05015102dad0f7d61691ca347e9d9d9006685a64aefb3d79eecf62665de2153d"
 dependencies = [
- "log",
- "once_cell",
  "rustls 0.21.12",
  "rustls-webpki 0.101.7",
  "webpki-roots 0.25.4",
@@ -2657,32 +2643,21 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
-dependencies = [
- "libc",
- "wasi",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "mio"
-version = "1.0.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873"
 dependencies = [
  "libc",
  "log",
  "wasi",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "multimap"
-version = "0.8.3"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
+checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084"
 
 [[package]]
 name = "nix"
@@ -2719,20 +2694,19 @@ checksum = "549e471b99ccaf2f89101bec68f4d244457d5a95a9c3d0672e9564124397741d"
 
 [[package]]
 name = "notify"
-version = "8.0.0"
+version = "8.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943"
+checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3"
 dependencies = [
- "bitflags 2.9.0",
- "filetime",
+ "bitflags 2.10.0",
  "inotify",
  "kqueue",
  "libc",
  "log",
- "mio 1.0.3",
+ "mio",
  "notify-types",
  "walkdir",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -2752,19 +2726,18 @@ dependencies = [
 
 [[package]]
 name = "nu-ansi-term"
-version = "0.46.0"
+version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "overload",
- "winapi",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "num-bigint"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
  "num-integer",
  "num-traits",
@@ -2772,11 +2745,10 @@ dependencies = [
 
 [[package]]
 name = "num-bigint-dig"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151"
+checksum = "82c79c15c05d4bf82b6f5ef163104cc81a760d8e874d38ac50ab67c8877b647b"
 dependencies = [
- "byteorder",
  "lazy_static",
  "libm",
  "num-integer",
@@ -2835,9 +2807,9 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b"
 dependencies = [
  "hermit-abi",
  "libc",
@@ -2845,23 +2817,24 @@ dependencies = [
 
 [[package]]
 name = "num_enum"
-version = "0.7.2"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
+checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c"
 dependencies = [
  "num_enum_derive",
+ "rustversion",
 ]
 
 [[package]]
 name = "num_enum_derive"
-version = "0.7.2"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
+checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -2870,7 +2843,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.10.0",
 ]
 
 [[package]]
@@ -2885,18 +2858,18 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.2"
+version = "0.37.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "oneshot-fused-workaround"
@@ -2909,9 +2882,9 @@ dependencies = [
 
 [[package]]
 name = "oorandom"
-version = "11.1.4"
+version = "11.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9"
+checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
 
 [[package]]
 name = "opaque-debug"
@@ -2979,12 +2952,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
 [[package]]
 name = "p256"
 version = "0.13.2"
@@ -2994,19 +2961,19 @@ dependencies = [
  "ecdsa",
  "elliptic-curve",
  "primeorder",
- "sha2 0.10.8",
+ "sha2 0.10.9",
 ]
 
 [[package]]
 name = "p384"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209"
+checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
  "primeorder",
- "sha2 0.10.8",
+ "sha2 0.10.9",
 ]
 
 [[package]]
@@ -3020,7 +2987,7 @@ dependencies = [
  "elliptic-curve",
  "primeorder",
  "rand_core 0.6.4",
- "sha2 0.10.8",
+ "sha2 0.10.9",
 ]
 
 [[package]]
@@ -3034,15 +3001,15 @@ dependencies = [
 
 [[package]]
 name = "parking"
-version = "2.2.0"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.3"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -3050,15 +3017,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.10"
+version = "0.9.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets 0.52.6",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -3125,7 +3092,7 @@ dependencies = [
  "secp256k1",
  "serde",
  "serde_with",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "shardtree",
  "zcash_note_encryption",
  "zcash_primitives",
@@ -3147,15 +3114,15 @@ dependencies = [
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
 name = "petgraph"
-version = "0.6.5"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
+checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772"
 dependencies = [
  "fixedbitset",
  "indexmap 2.12.0",
@@ -3192,7 +3159,7 @@ dependencies = [
  "phf_shared",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -3206,29 +3173,29 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.1.5"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.5"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pin-utils"
@@ -3259,15 +3226,15 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.30"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
 [[package]]
 name = "plotters"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45"
+checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
 dependencies = [
  "num-traits",
  "plotters-backend",
@@ -3278,15 +3245,15 @@ dependencies = [
 
 [[package]]
 name = "plotters-backend"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609"
+checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
 
 [[package]]
 name = "plotters-svg"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab"
+checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
 dependencies = [
  "plotters-backend",
 ]
@@ -3314,14 +3281,14 @@ dependencies = [
  "parking_lot",
  "pin-project",
  "static_assertions",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "postcard"
-version = "1.1.1"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "170a2601f67cc9dba8edd8c4870b15f71a6a2dc196daec8c83f72b59dff628a8"
+checksum = "6764c3b5dd454e283a30e6dfe78e9b31096d9e32036b5d1eaac7a6119ccb9a24"
 dependencies = [
  "cobs",
  "embedded-io 0.4.0",
@@ -3355,23 +3322,26 @@ dependencies = [
  "spin 0.10.0",
  "symbolic-demangle",
  "tempfile",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
 
 [[package]]
 name = "prettyplease"
-version = "0.2.20"
+version = "0.2.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
 dependencies = [
  "proc-macro2",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -3395,23 +3365,22 @@ dependencies = [
 
 [[package]]
 name = "priority-queue"
-version = "2.1.1"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "714c75db297bc88a63783ffc6ab9f830698a6705aa0201416931759ef4c8183d"
+checksum = "93980406f12d9f8140ed5abe7155acb10bb1e69ea55c88960b9c2f117445ef96"
 dependencies = [
- "autocfg",
  "equivalent",
  "indexmap 2.12.0",
+ "serde",
 ]
 
 [[package]]
 name = "proc-macro-crate"
-version = "1.3.1"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
 dependencies = [
- "once_cell",
- "toml_edit 0.19.15",
+ "toml_edit 0.23.7",
 ]
 
 [[package]]
@@ -3433,7 +3402,7 @@ dependencies = [
  "proc-macro-error-attr2",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -3447,19 +3416,19 @@ dependencies = [
 
 [[package]]
 name = "proptest"
-version = "1.4.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf"
+checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50"
 dependencies = [
  "bit-set",
  "bit-vec",
- "bitflags 2.9.0",
+ "bitflags 2.10.0",
  "lazy_static",
  "num-traits",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rand_xorshift",
- "regex-syntax 0.8.5",
+ "regex-syntax",
  "rusty-fork",
  "tempfile",
  "unarray",
@@ -3491,7 +3460,7 @@ dependencies = [
  "prost",
  "prost-types",
  "regex",
- "syn 2.0.100",
+ "syn 2.0.109",
  "tempfile",
 ]
 
@@ -3505,7 +3474,7 @@ dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -3519,14 +3488,14 @@ dependencies = [
 
 [[package]]
 name = "pwd-grp"
-version = "1.0.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b94fdf3867b7f2889a736f0022ea9386766280d2cca4bdbe41629ada9e4f3b8f"
+checksum = "0e2023f41b5fcb7c30eb5300a5733edfaa9e0e0d502d51b586f65633fd39e40c"
 dependencies = [
- "derive-deftly 0.14.2",
+ "derive-deftly",
  "libc",
  "paste",
- "thiserror 1.0.63",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -3546,9 +3515,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
 dependencies = [
  "proc-macro2",
 ]
@@ -3612,7 +3581,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
 ]
 
 [[package]]
@@ -3656,9 +3625,9 @@ dependencies = [
 
 [[package]]
 name = "rayon"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
 dependencies = [
  "either",
  "rayon-core",
@@ -3666,9 +3635,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.12.1"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
 dependencies = [
  "crossbeam-deque",
  "crossbeam-utils",
@@ -3697,7 +3666,7 @@ dependencies = [
  "pasta_curves",
  "rand_core 0.6.4",
  "serde",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "zeroize",
 ]
 
@@ -3709,84 +3678,78 @@ checksum = "89b0ac1bc6bb3696d2c6f52cff8fba57238b81da8c0214ee6cd146eb8fde364e"
 dependencies = [
  "rand_core 0.6.4",
  "reddsa",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "zeroize",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.1"
+version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.10.0",
 ]
 
 [[package]]
 name = "redox_users"
-version = "0.4.5"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
+checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
  "libredox",
- "thiserror 1.0.63",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
-name = "redox_users"
-version = "0.5.0"
+name = "ref-cast"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b"
+checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d"
 dependencies = [
- "getrandom 0.2.15",
- "libredox",
- "thiserror 2.0.12",
+ "ref-cast-impl",
 ]
 
 [[package]]
-name = "regex"
-version = "1.11.1"
+name = "ref-cast-impl"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
 dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata 0.4.9",
- "regex-syntax 0.8.5",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.109",
 ]
 
 [[package]]
-name = "regex-automata"
-version = "0.1.10"
+name = "regex"
+version = "1.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
 dependencies = [
- "regex-syntax 0.6.29",
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.4.9"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.5",
+ "regex-syntax",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.5"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
 
 [[package]]
 name = "retry-error"
@@ -3806,9 +3769,9 @@ dependencies = [
 
 [[package]]
 name = "rgb"
-version = "0.8.50"
+version = "0.8.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a"
+checksum = "0c6a884d2998352bb4daf0183589aec883f16a6da1f4dde84d8e2e9a5409a1ce"
 dependencies = [
  "bytemuck",
 ]
@@ -3821,7 +3784,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
  "libc",
  "untrusted",
  "windows-sys 0.52.0",
@@ -3847,9 +3810,9 @@ dependencies = [
 
 [[package]]
 name = "rsa"
-version = "0.9.6"
+version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc"
+checksum = "78928ac1ed176a5ca1d17e578a1825f3d81ca54cf41053a592584b020cfd691b"
 dependencies = [
  "const-oid",
  "digest 0.10.7",
@@ -3859,7 +3822,7 @@ dependencies = [
  "pkcs1",
  "pkcs8",
  "rand_core 0.6.4",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "signature",
  "spki",
  "subtle",
@@ -3872,7 +3835,7 @@ version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "165ca6e57b20e1351573e3729b958bc62f0e48025386970b6e4d29e7a7e71f3f"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.10.0",
  "fallible-iterator",
  "fallible-streaming-iterator",
  "hashlink",
@@ -3884,9 +3847,9 @@ dependencies = [
 
 [[package]]
 name = "rust_decimal"
-version = "1.35.0"
+version = "1.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a"
+checksum = "35affe401787a9bd846712274d97654355d21b2a2c092a3139aabe31e9022282"
 dependencies = [
  "arrayvec",
  "num-traits",
@@ -3895,15 +3858,15 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.24"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"
 
 [[package]]
 name = "rustc_version"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
  "semver",
 ]
@@ -3917,30 +3880,17 @@ dependencies = [
  "nom",
 ]
 
-[[package]]
-name = "rustix"
-version = "0.38.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
-dependencies = [
- "bitflags 2.9.0",
- "errno",
- "libc",
- "linux-raw-sys 0.4.13",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "rustix"
 version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.10.0",
  "errno",
  "libc",
- "linux-raw-sys 0.11.0",
- "windows-sys 0.60.2",
+ "linux-raw-sys",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -3957,24 +3907,27 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.25"
+version = "0.23.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "822ee9188ac4ec04a2f0531e55d035fb2de73f18b41a63c70c2712503b6fb13c"
+checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f"
 dependencies = [
  "log",
  "once_cell",
  "ring",
  "rustls-pki-types",
- "rustls-webpki 0.103.1",
+ "rustls-webpki 0.103.8",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.11.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
+checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a"
+dependencies = [
+ "zeroize",
+]
 
 [[package]]
 name = "rustls-webpki"
@@ -3988,9 +3941,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.1"
+version = "0.103.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03"
+checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -3999,15 +3952,15 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.17"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
 [[package]]
 name = "rusty-fork"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f"
+checksum = "cc6bf79ff24e648f6da1f8d1f011e9cac26491b619e6b9280f2b47f1774e6ee2"
 dependencies = [
  "fnv",
  "quick-error",
@@ -4017,9 +3970,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "safelog"
@@ -4031,7 +3984,7 @@ dependencies = [
  "educe",
  "either",
  "fluid-let",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -4086,6 +4039,30 @@ dependencies = [
  "zip32",
 ]
 
+[[package]]
+name = "schemars"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f"
+dependencies = [
+ "dyn-clone",
+ "ref-cast",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "schemars"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9558e172d4e8533736ba97870c4b2cd63f84b382a3d6eb063da41b91cce17289"
+dependencies = [
+ "dyn-clone",
+ "ref-cast",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "schemerz"
 version = "0.2.0"
@@ -4095,7 +4072,7 @@ dependencies = [
  "daggy",
  "indexmap 1.9.3",
  "log",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "uuid",
 ]
 
@@ -4170,9 +4147,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.23"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
 
 [[package]]
 name = "serde"
@@ -4211,34 +4188,37 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
 name = "serde_ignored"
-version = "0.1.10"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8e319a36d1b52126a0d608f24e93b2d81297091818cd70625fcf50a15d84ddf"
+checksum = "115dffd5f3853e06e746965a20dcbae6ee747ae30b543d91b0e089668bb07798"
 dependencies = [
  "serde",
+ "serde_core",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.120"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
 dependencies = [
  "itoa",
+ "memchr",
  "ryu",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.8"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
+checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
 dependencies = [
  "serde",
 ]
@@ -4254,17 +4234,18 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.8.1"
+version = "3.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20"
+checksum = "aa66c845eee442168b2c8134fec70ac50dc20e760769c8ba0ad1319ca1959b04"
 dependencies = [
  "base64",
  "chrono",
  "hex",
  "indexmap 1.9.3",
  "indexmap 2.12.0",
- "serde",
- "serde_derive",
+ "schemars 0.9.0",
+ "schemars 1.1.0",
+ "serde_core",
  "serde_json",
  "serde_with_macros",
  "time",
@@ -4272,21 +4253,21 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.8.1"
+version = "3.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2"
+checksum = "b91a903660542fced4e99881aa481bdbaec1634568ee02e0b8bd57c64cb38955"
 dependencies = [
- "darling 0.20.10",
+ "darling 0.21.3",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
 name = "sha1"
-version = "0.10.5"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -4295,9 +4276,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.8"
+version = "0.10.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -4341,7 +4322,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "637e95dcd06bc1bb3f86ed9db1e1832a70125f32daae071ef37dcb7701b7d4fe"
 dependencies = [
  "assert_matches",
- "bitflags 2.9.0",
+ "bitflags 2.10.0",
  "either",
  "incrementalmerkletree",
  "incrementalmerkletree-testing",
@@ -4351,12 +4332,12 @@ dependencies = [
 
 [[package]]
 name = "shellexpand"
-version = "3.1.0"
+version = "3.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b"
+checksum = "8b1fdf65dd6331831494dd616b30351c38e96e45921a27745cf98490458b90bb"
 dependencies = [
  "bstr",
- "dirs 5.0.1",
+ "dirs",
  "os_str_bytes",
 ]
 
@@ -4368,9 +4349,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.1"
+version = "1.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b"
 dependencies = [
  "libc",
 ]
@@ -4385,6 +4366,12 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
 [[package]]
 name = "sinsemilla"
 version = "0.1.0"
@@ -4404,12 +4391,9 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
 [[package]]
 name = "slab"
-version = "0.4.9"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
 
 [[package]]
 name = "slotmap"
@@ -4430,25 +4414,15 @@ dependencies = [
  "paste",
  "serde",
  "slotmap",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "void",
 ]
 
 [[package]]
 name = "smallvec"
-version = "1.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
-
-[[package]]
-name = "socket2"
-version = "0.5.9"
+version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "socket2"
@@ -4503,14 +4477,14 @@ checksum = "eb9242b9ef4108a78e8cd1a2c98e193ef372437f8c22be363075233321dd4a15"
 dependencies = [
  "base64ct",
  "pem-rfc7468",
- "sha2 0.10.8",
+ "sha2 0.10.9",
 ]
 
 [[package]]
 name = "ssh-key"
-version = "0.6.6"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca9b366a80cf18bb6406f4cf4d10aebfb46140a8c0c33f666a144c5c76ecbafc"
+checksum = "3b86f5297f0f04d08cabaa0f6bff7cb6aec4d9c3b49d87990d63da9d9156a8c3"
 dependencies = [
  "num-bigint-dig",
  "p256",
@@ -4519,7 +4493,7 @@ dependencies = [
  "rand_core 0.6.4",
  "rsa",
  "sec1",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "signature",
  "ssh-cipher",
  "ssh-encoding",
@@ -4529,9 +4503,9 @@ dependencies = [
 
 [[package]]
 name = "stable_deref_trait"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 
 [[package]]
 name = "static_assertions"
@@ -4557,35 +4531,13 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
-[[package]]
-name = "strum"
-version = "0.26.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
-dependencies = [
- "strum_macros 0.26.4",
-]
-
 [[package]]
 name = "strum"
 version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
 dependencies = [
- "strum_macros 0.27.2",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 2.0.100",
+ "strum_macros",
 ]
 
 [[package]]
@@ -4597,7 +4549,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -4608,9 +4560,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "symbolic-common"
-version = "12.13.3"
+version = "12.16.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13a4dfe4bbeef59c1f32fc7524ae7c95b9e1de5e79a43ce1604e181081d71b0c"
+checksum = "d03f433c9befeea460a01d750e698aa86caf86dcfbd77d552885cd6c89d52f50"
 dependencies = [
  "debugid",
  "memmap2",
@@ -4620,9 +4572,9 @@ dependencies = [
 
 [[package]]
 name = "symbolic-demangle"
-version = "12.13.3"
+version = "12.16.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cf6a95abff97de4d7ff3473f33cacd38f1ddccad5c1feab435d6760300e3b6"
+checksum = "13d359ef6192db1760a34321ec4f089245ede4342c27e59be99642f12a859de8"
 dependencies = [
  "cpp_demangle",
  "rustc-demangle",
@@ -4642,9 +4594,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.100"
+version = "2.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
+checksum = "2f17c7e013e88258aa9543dcbe81aca68a667a9ac37cd69c9fbc07858bfe0e2f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4659,13 +4611,13 @@ checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
 
 [[package]]
 name = "synstructure"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -4690,71 +4642,71 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tempfile"
-version = "3.10.1"
+version = "3.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
 dependencies = [
- "cfg-if",
  "fastrand",
- "rustix 0.38.34",
- "windows-sys 0.52.0",
+ "getrandom 0.3.4",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
- "thiserror-impl 1.0.63",
+ "thiserror-impl 1.0.69",
 ]
 
 [[package]]
 name = "thiserror"
-version = "2.0.12"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
 dependencies = [
- "thiserror-impl 2.0.12",
+ "thiserror-impl 2.0.17",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.12"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.8"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
 dependencies = [
  "cfg-if",
- "once_cell",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.36"
+version = "0.3.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
 dependencies = [
  "deranged",
  "itoa",
@@ -4773,9 +4725,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
 dependencies = [
  "num-conv",
  "time-core",
@@ -4783,11 +4735,12 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
+checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
 dependencies = [
  "displaydoc",
+ "serde_core",
  "zerovec",
 ]
 
@@ -4803,9 +4756,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.8.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -4818,40 +4771,38 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.37.0"
+version = "1.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
 dependencies = [
- "backtrace",
  "bytes",
  "libc",
- "mio 0.8.11",
- "num_cpus",
+ "mio",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.5.9",
+ "socket2",
  "tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.2.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.2"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
+checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
 dependencies = [
- "rustls 0.23.25",
+ "rustls 0.23.35",
  "tokio",
 ]
 
@@ -4868,9 +4819,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.11"
+version = "0.7.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594"
 dependencies = [
  "bytes",
  "futures-core",
@@ -4882,14 +4833,14 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.19"
+version = "0.8.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
 dependencies = [
  "serde",
- "serde_spanned 0.6.8",
- "toml_datetime 0.6.8",
- "toml_edit 0.22.22",
+ "serde_spanned 0.6.9",
+ "toml_datetime 0.6.11",
+ "toml_edit 0.22.27",
 ]
 
 [[package]]
@@ -4904,14 +4855,14 @@ dependencies = [
  "toml_datetime 0.7.3",
  "toml_parser",
  "toml_writer",
- "winnow 0.7.13",
+ "winnow",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.8"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
 dependencies = [
  "serde",
 ]
@@ -4927,26 +4878,28 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.19.15"
+version = "0.22.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
  "indexmap 2.12.0",
- "toml_datetime 0.6.8",
- "winnow 0.5.40",
+ "serde",
+ "serde_spanned 0.6.9",
+ "toml_datetime 0.6.11",
+ "toml_write",
+ "winnow",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.22"
+version = "0.23.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
+checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d"
 dependencies = [
  "indexmap 2.12.0",
- "serde",
- "serde_spanned 0.6.8",
- "toml_datetime 0.6.8",
- "winnow 0.6.20",
+ "toml_datetime 0.7.3",
+ "toml_parser",
+ "winnow",
 ]
 
 [[package]]
@@ -4955,9 +4908,15 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
 dependencies = [
- "winnow 0.7.13",
+ "winnow",
 ]
 
+[[package]]
+name = "toml_write"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
+
 [[package]]
 name = "toml_writer"
 version = "1.0.4"
@@ -4982,7 +4941,7 @@ dependencies = [
  "hyper-util",
  "percent-encoding",
  "pin-project",
- "socket2 0.6.1",
+ "socket2",
  "sync_wrapper",
  "tokio",
  "tokio-rustls",
@@ -4991,7 +4950,7 @@ dependencies = [
  "tower-layer",
  "tower-service",
  "tracing",
- "webpki-roots 1.0.3",
+ "webpki-roots 1.0.4",
 ]
 
 [[package]]
@@ -5003,7 +4962,7 @@ dependencies = [
  "prettyplease",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -5028,7 +4987,7 @@ dependencies = [
  "prost-build",
  "prost-types",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
  "tempfile",
  "tonic-build",
 ]
@@ -5039,13 +4998,13 @@ version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cad5e568ad4e025a68aa0395a146247609dd5b6d8c2141255f5e4f367e7fda8a"
 dependencies = [
- "derive-deftly 1.3.0",
+ "derive-deftly",
  "educe",
  "futures",
  "oneshot-fused-workaround",
  "pin-project",
  "postage",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "void",
 ]
 
@@ -5065,7 +5024,7 @@ dependencies = [
  "serde",
  "slab",
  "smallvec",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -5075,12 +5034,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fc7fb465ba671ee1486d8bd1e0a8f546887c2ce034004c4c9b03a6227e1c381"
 dependencies = [
  "bytes",
- "derive-deftly 1.3.0",
+ "derive-deftly",
  "digest 0.10.7",
  "educe",
  "getrandom 0.3.4",
  "safelog",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tor-error",
  "tor-llcrypto",
  "zeroize",
@@ -5093,17 +5052,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79ba1b43f22fab2daee3e0c902f1455b3aed8e086b2d83d8c60b36523b173d25"
 dependencies = [
  "amplify",
- "bitflags 2.9.0",
+ "bitflags 2.10.0",
  "bytes",
  "caret",
- "derive-deftly 1.3.0",
+ "derive-deftly",
  "derive_more",
  "educe",
  "itertools 0.14.0",
  "paste",
  "rand 0.9.2",
  "smallvec",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tor-basic-utils",
  "tor-bytes",
  "tor-cert",
@@ -5126,7 +5085,7 @@ dependencies = [
  "derive_builder_fork_arti",
  "derive_more",
  "digest 0.10.7",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tor-bytes",
  "tor-checkable",
  "tor-llcrypto",
@@ -5149,7 +5108,7 @@ dependencies = [
  "rand 0.9.2",
  "safelog",
  "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tor-async-utils",
  "tor-basic-utils",
  "tor-cell",
@@ -5176,7 +5135,7 @@ checksum = "7c9839e9bb302f17447c350e290bb107084aca86c640882a91522f2059f6a686"
 dependencies = [
  "humantime",
  "signature",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tor-llcrypto",
 ]
 
@@ -5189,7 +5148,7 @@ dependencies = [
  "amplify",
  "async-trait",
  "cfg-if",
- "derive-deftly 1.3.0",
+ "derive-deftly",
  "derive_builder_fork_arti",
  "derive_more",
  "downcast-rs",
@@ -5205,7 +5164,7 @@ dependencies = [
  "retry-error",
  "safelog",
  "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tor-async-utils",
  "tor-basic-utils",
  "tor-cell",
@@ -5237,7 +5196,7 @@ checksum = "cb15df773842025010d885fbe862062ebaa342b799f9716273eaf733b92f2f45"
 dependencies = [
  "amplify",
  "cfg-if",
- "derive-deftly 1.3.0",
+ "derive-deftly",
  "derive_builder_fork_arti",
  "educe",
  "either",
@@ -5252,8 +5211,8 @@ dependencies = [
  "serde",
  "serde-value",
  "serde_ignored",
- "strum 0.27.2",
- "thiserror 2.0.12",
+ "strum",
+ "thiserror 2.0.17",
  "toml 0.9.8",
  "tor-basic-utils",
  "tor-error",
@@ -5271,7 +5230,7 @@ dependencies = [
  "directories",
  "serde",
  "shellexpand",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tor-error",
  "tor-general-addr",
 ]
@@ -5284,7 +5243,7 @@ checksum = "c1690438c1fc778fc7c89c132e529365b1430d6afe03aeecbc2508324807bf0b"
 dependencies = [
  "digest 0.10.7",
  "hex",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tor-llcrypto",
 ]
 
@@ -5304,7 +5263,7 @@ dependencies = [
  "httpdate",
  "itertools 0.14.0",
  "memchr",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tor-circmgr",
  "tor-error",
  "tor-linkspec",
@@ -5368,8 +5327,8 @@ dependencies = [
  "serde_json",
  "signature",
  "static_assertions",
- "strum 0.27.2",
- "thiserror 2.0.12",
+ "strum",
+ "thiserror 2.0.17",
  "time",
  "tor-async-utils",
  "tor-basic-utils",
@@ -5402,8 +5361,8 @@ dependencies = [
  "paste",
  "retry-error",
  "static_assertions",
- "strum 0.27.2",
- "thiserror 2.0.12",
+ "strum",
+ "thiserror 2.0.17",
  "tracing",
  "void",
 ]
@@ -5415,7 +5374,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c42cb5b5aec0584db2fba4a88c4e08fb09535ef61e4ef5674315a89e69ec31a2"
 dependencies = [
  "derive_more",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "void",
 ]
 
@@ -5427,7 +5386,7 @@ checksum = "0585a83a4c56b4f31f6fa2965e2f9c490c9f4d29fba2fedb5a9ee71009f793c0"
 dependencies = [
  "amplify",
  "base64ct",
- "derive-deftly 1.3.0",
+ "derive-deftly",
  "derive_builder_fork_arti",
  "derive_more",
  "dyn-clone",
@@ -5443,8 +5402,8 @@ dependencies = [
  "rand 0.9.2",
  "safelog",
  "serde",
- "strum 0.27.2",
- "thiserror 2.0.12",
+ "strum",
+ "thiserror 2.0.17",
  "tor-async-utils",
  "tor-basic-utils",
  "tor-config",
@@ -5469,7 +5428,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf9ee6e0dbec9ba11c3d046181a42dd4759e108de38e2b5927689edbdc458a51"
 dependencies = [
  "data-encoding",
- "derive-deftly 1.3.0",
+ "derive-deftly",
  "derive_more",
  "digest 0.10.7",
  "hex",
@@ -5481,7 +5440,7 @@ dependencies = [
  "serde",
  "signature",
  "subtle",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tor-basic-utils",
  "tor-bytes",
  "tor-error",
@@ -5497,7 +5456,7 @@ version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5aa30066b80ade55a1b88a82b5320dfc50d1724918ad614ded8ecb4820c32062"
 dependencies = [
- "derive-deftly 1.3.0",
+ "derive-deftly",
  "derive_more",
  "downcast-rs",
  "paste",
@@ -5505,7 +5464,7 @@ dependencies = [
  "rsa",
  "signature",
  "ssh-key",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tor-bytes",
  "tor-cert",
  "tor-checkable",
@@ -5522,7 +5481,7 @@ dependencies = [
  "amplify",
  "arrayvec",
  "cfg-if",
- "derive-deftly 1.3.0",
+ "derive-deftly",
  "derive_builder_fork_arti",
  "derive_more",
  "downcast-rs",
@@ -5537,7 +5496,7 @@ dependencies = [
  "serde",
  "signature",
  "ssh-key",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tor-basic-utils",
  "tor-bytes",
  "tor-config",
@@ -5562,7 +5521,7 @@ dependencies = [
  "base64ct",
  "by_address",
  "caret",
- "derive-deftly 1.3.0",
+ "derive-deftly",
  "derive_builder_fork_arti",
  "derive_more",
  "hex",
@@ -5570,8 +5529,8 @@ dependencies = [
  "safelog",
  "serde",
  "serde_with",
- "strum 0.27.2",
- "thiserror 2.0.12",
+ "strum",
+ "thiserror 2.0.17",
  "tor-basic-utils",
  "tor-bytes",
  "tor-config",
@@ -5591,7 +5550,7 @@ dependencies = [
  "ctr",
  "curve25519-dalek",
  "der-parser",
- "derive-deftly 1.3.0",
+ "derive-deftly",
  "derive_more",
  "digest 0.10.7",
  "ed25519-dalek",
@@ -5608,11 +5567,11 @@ dependencies = [
  "safelog",
  "serde",
  "sha1",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "sha3",
  "signature",
  "subtle",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tor-error",
  "tor-memquota",
  "visibility",
@@ -5628,7 +5587,7 @@ checksum = "845d65304be6a614198027c4b2d1b35aaf073335c26df619d17e5f4027f2657f"
 dependencies = [
  "futures",
  "humantime",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tor-error",
  "tor-rtcompat",
  "tracing",
@@ -5642,7 +5601,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef375c3442a4ea74f0b6bf91a3eed660d55301b2e2f59b366aba4849b2321a6f"
 dependencies = [
  "cfg-if",
- "derive-deftly 1.3.0",
+ "derive-deftly",
  "derive_more",
  "dyn-clone",
  "educe",
@@ -5654,7 +5613,7 @@ dependencies = [
  "slotmap-careful",
  "static_assertions",
  "sysinfo",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tor-async-utils",
  "tor-basic-utils",
  "tor-config",
@@ -5672,7 +5631,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "638b4e6507e3786488859d3c463fa73addbad4f788806c6972603727e527672e"
 dependencies = [
  "async-trait",
- "bitflags 2.9.0",
+ "bitflags 2.10.0",
  "derive_more",
  "futures",
  "humantime",
@@ -5680,8 +5639,8 @@ dependencies = [
  "num_enum",
  "rand 0.9.2",
  "serde",
- "strum 0.27.2",
- "thiserror 2.0.12",
+ "strum",
+ "thiserror 2.0.17",
  "tor-basic-utils",
  "tor-error",
  "tor-linkspec",
@@ -5701,9 +5660,9 @@ checksum = "1dbc32d89e7ea2e2799168d0c453061647a727e39fc66f52e1bcb4c38c8dc433"
 dependencies = [
  "amplify",
  "base64ct",
- "bitflags 2.9.0",
+ "bitflags 2.10.0",
  "cipher",
- "derive-deftly 1.3.0",
+ "derive-deftly",
  "derive_builder_fork_arti",
  "derive_more",
  "digest 0.10.7",
@@ -5718,9 +5677,9 @@ dependencies = [
  "serde_with",
  "signature",
  "smallvec",
- "strum 0.27.2",
+ "strum",
  "subtle",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "time",
  "tinystr",
  "tor-basic-utils",
@@ -5742,7 +5701,7 @@ version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59e41aea027686b05f21e0ad75aa2c0c9681a87f2f3130b6d6f7a7a8c06edd7b"
 dependencies = [
- "derive-deftly 1.3.0",
+ "derive-deftly",
  "derive_more",
  "filetime",
  "fs-mistrust",
@@ -5754,7 +5713,7 @@ dependencies = [
  "sanitize-filename",
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "time",
  "tor-async-utils",
  "tor-basic-utils",
@@ -5778,7 +5737,7 @@ dependencies = [
  "cipher",
  "coarsetime",
  "criterion-cycles-per-byte",
- "derive-deftly 1.3.0",
+ "derive-deftly",
  "derive_builder_fork_arti",
  "derive_more",
  "digest 0.10.7",
@@ -5801,7 +5760,7 @@ dependencies = [
  "static_assertions",
  "subtle",
  "sync_wrapper",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tokio",
  "tokio-util",
  "tor-async-utils",
@@ -5836,7 +5795,7 @@ dependencies = [
  "caret",
  "paste",
  "serde_with",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tor-bytes",
 ]
 
@@ -5874,8 +5833,8 @@ dependencies = [
  "paste",
  "pin-project",
  "rustls-pki-types",
- "rustls-webpki 0.103.1",
- "thiserror 2.0.12",
+ "rustls-webpki 0.103.8",
+ "thiserror 2.0.17",
  "tokio",
  "tokio-util",
  "tor-error",
@@ -5893,7 +5852,7 @@ dependencies = [
  "amplify",
  "assert_matches",
  "async-trait",
- "derive-deftly 1.3.0",
+ "derive-deftly",
  "derive_more",
  "educe",
  "futures",
@@ -5903,8 +5862,8 @@ dependencies = [
  "pin-project",
  "priority-queue",
  "slotmap-careful",
- "strum 0.27.2",
- "thiserror 2.0.12",
+ "strum",
+ "thiserror 2.0.17",
  "tor-error",
  "tor-general-addr",
  "tor-rtcompat",
@@ -5921,11 +5880,11 @@ checksum = "0dbb9b68d9cf8e07eeafbca91ac11b7d9c4be1e674cb59830edfbac153333e7f"
 dependencies = [
  "amplify",
  "caret",
- "derive-deftly 1.3.0",
+ "derive-deftly",
  "educe",
  "safelog",
  "subtle",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tor-bytes",
  "tor-error",
 ]
@@ -5936,10 +5895,10 @@ version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48139f001dd6f409325b7c190ebcea1033b27f09042543946ab7aa4ad286257b"
 dependencies = [
- "derive-deftly 1.3.0",
+ "derive-deftly",
  "derive_more",
  "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tor-memquota",
 ]
 
@@ -5993,7 +5952,7 @@ checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -6019,14 +5978,14 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.18"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
 dependencies = [
  "matchers",
  "nu-ansi-term",
  "once_cell",
- "regex",
+ "regex-automata",
  "sharded-slab",
  "smallvec",
  "thread_local",
@@ -6053,7 +6012,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568"
 dependencies = [
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -6064,7 +6023,7 @@ checksum = "70977707304198400eb4835a78f6a9f928bf41bba420deb8fdb175cd965d77a7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -6085,9 +6044,9 @@ dependencies = [
 
 [[package]]
 name = "typenum"
-version = "1.17.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
 
 [[package]]
 name = "uint"
@@ -6118,15 +6077,15 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.24"
+version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
+checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8"
 dependencies = [
  "tinyvec",
 ]
@@ -6167,19 +6126,21 @@ checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae"
 
 [[package]]
 name = "uuid"
-version = "1.8.0"
+version = "1.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
+checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.3.4",
+ "js-sys",
  "serde",
+ "wasm-bindgen",
 ]
 
 [[package]]
 name = "valuable"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
 
 [[package]]
 name = "vcpkg"
@@ -6189,9 +6150,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "visibility"
@@ -6201,7 +6162,7 @@ checksum = "d674d135b4a8c1d7e813e2f8d1c9a58308aee4a680323066025e53132218bd91"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -6262,9 +6223,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",
 ]
@@ -6290,9 +6251,9 @@ dependencies = [
 
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasip2"
@@ -6314,34 +6275,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60"
 dependencies = [
  "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
-dependencies = [
- "bumpalo",
- "log",
  "once_cell",
- "proc-macro2",
- "quote",
- "syn 2.0.100",
+ "rustversion",
+ "wasm-bindgen-macro",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -6349,22 +6298,25 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc"
 dependencies = [
+ "bumpalo",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
- "wasm-bindgen-backend",
+ "syn 2.0.109",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76"
+dependencies = [
+ "unicode-ident",
+]
 
 [[package]]
 name = "wasm_sync"
@@ -6385,9 +6337,9 @@ checksum = "323f4da9523e9a669e1eaf9c6e763892769b1d38c623913647bfdc1532fe4549"
 
 [[package]]
 name = "web-sys"
-version = "0.3.69"
+version = "0.3.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -6401,9 +6353,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
 [[package]]
 name = "webpki-roots"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b130c0d2d49f8b6889abc456e795e82525204f27c42cf767cf0d7734e089b8"
+checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -6415,7 +6367,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3fabb953106c3c8eea8306e4393700d7657561cb43122571b172bbfb7c7ba1d"
 dependencies = [
  "env_home",
- "rustix 1.1.2",
+ "rustix",
  "winsafe",
 ]
 
@@ -6437,11 +6389,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.8"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -6474,24 +6426,28 @@ dependencies = [
 
 [[package]]
 name = "windows-core"
-version = "0.52.0"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-implement",
+ "windows-interface",
+ "windows-link 0.1.3",
+ "windows-result 0.3.4",
+ "windows-strings 0.4.2",
 ]
 
 [[package]]
 name = "windows-core"
-version = "0.61.2"
+version = "0.62.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
+checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
 dependencies = [
  "windows-implement",
  "windows-interface",
- "windows-link 0.1.3",
- "windows-result",
- "windows-strings",
+ "windows-link 0.2.1",
+ "windows-result 0.4.1",
+ "windows-strings 0.5.1",
 ]
 
 [[package]]
@@ -6513,7 +6469,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -6524,7 +6480,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -6558,6 +6514,15 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
+[[package]]
+name = "windows-result"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
 [[package]]
 name = "windows-strings"
 version = "0.4.2"
@@ -6568,12 +6533,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "windows-sys"
-version = "0.48.0"
+name = "windows-strings"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
 dependencies = [
- "windows-targets 0.48.5",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -6585,15 +6550,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.59.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.60.2"
@@ -6604,18 +6560,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "windows-targets"
-version = "0.48.5"
+name = "windows-sys"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
 dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -6660,12 +6610,6 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.52.6"
@@ -6678,12 +6622,6 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
@@ -6696,12 +6634,6 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
@@ -6726,12 +6658,6 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
@@ -6744,12 +6670,6 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
@@ -6762,12 +6682,6 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
@@ -6780,12 +6694,6 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"
@@ -6800,28 +6708,13 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 
 [[package]]
 name = "winnow"
-version = "0.5.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "winnow"
-version = "0.6.20"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
 dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "winnow"
-version = "0.7.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
-
 [[package]]
 name = "winsafe"
 version = "0.0.19"
@@ -6861,15 +6754,6 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2fb433233f2df9344722454bc7e96465c9d03bff9d77c248f9e7523fe79585b5"
 
-[[package]]
-name = "xz2"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2"
-dependencies = [
- "lzma-sys",
-]
-
 [[package]]
 name = "zcash"
 version = "0.1.0"
@@ -6953,7 +6837,7 @@ dependencies = [
  "tower",
  "tracing",
  "trait-variant",
- "webpki-roots 1.0.3",
+ "webpki-roots 1.0.4",
  "which",
  "zcash_address",
  "zcash_encoding",
@@ -6996,7 +6880,7 @@ dependencies = [
  "shardtree",
  "static_assertions",
  "subtle",
- "thiserror 1.0.63",
+ "thiserror 1.0.69",
  "time",
  "tokio",
  "tracing",
@@ -7020,7 +6904,7 @@ dependencies = [
  "ambassador",
  "assert_matches",
  "bip32",
- "bitflags 2.9.0",
+ "bitflags 2.10.0",
  "bls12_381",
  "bs58",
  "byteorder",
@@ -7074,6 +6958,7 @@ name = "zcash_encoding"
 version = "0.3.0"
 dependencies = [
  "core2",
+ "hex",
  "nonempty",
 ]
 
@@ -7191,7 +7076,7 @@ dependencies = [
  "ripemd 0.1.3",
  "sapling-crypto",
  "secp256k1",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "subtle",
  "tracing",
  "zcash_address",
@@ -7238,6 +7123,7 @@ dependencies = [
  "incrementalmerkletree-testing",
  "memuse",
  "proptest",
+ "zcash_encoding",
 ]
 
 [[package]]
@@ -7247,14 +7133,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9bed6cf5b2b4361105d4ea06b2752f0c8af4641756c7fbc9858a80af186c234f"
 dependencies = [
  "bip32",
- "bitflags 2.9.0",
+ "bitflags 2.10.0",
  "bounded-vec",
  "hex",
  "ripemd 0.1.3",
  "secp256k1",
  "sha1",
- "sha2 0.10.8",
- "thiserror 2.0.12",
+ "sha2 0.10.9",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -7280,7 +7166,7 @@ dependencies = [
  "proptest",
  "ripemd 0.1.3",
  "secp256k1",
- "sha2 0.10.8",
+ "sha2 0.10.9",
  "subtle",
  "zcash_address",
  "zcash_encoding",
@@ -7292,22 +7178,22 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.7.34"
+version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
+checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.34"
+version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -7318,9 +7204,9 @@ checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
 
 [[package]]
 name = "zeroize"
-version = "1.7.0"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
 dependencies = [
  "zeroize_derive",
 ]
@@ -7333,24 +7219,26 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.109",
 ]
 
 [[package]]
 name = "zerovec"
-version = "0.11.1"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94e62113720e311984f461c56b00457ae9981c0bc7859d22306cc2ae2f95571c"
+checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
 dependencies = [
+ "serde",
  "zerofrom",
 ]
 
 [[package]]
 name = "zip32"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13ff9ea444cdbce820211f91e6aa3d3a56bde7202d3c0961b7c38f793abf5637"
+checksum = "b64bf5186a8916f7a48f2a98ef599bf9c099e2458b36b819e393db1c0e768c4b"
 dependencies = [
+ "bech32",
  "blake2b_simd",
  "memuse",
  "subtle",
@@ -7371,27 +7259,27 @@ dependencies = [
 
 [[package]]
 name = "zstd"
-version = "0.13.1"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a"
+checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a"
 dependencies = [
  "zstd-safe",
 ]
 
 [[package]]
 name = "zstd-safe"
-version = "7.1.0"
+version = "7.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a"
+checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d"
 dependencies = [
  "zstd-sys",
 ]
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.10+zstd.1.5.6"
+version = "2.0.16+zstd.1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa"
+checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748"
 dependencies = [
  "cc",
  "pkg-config",
diff --git a/components/zcash_encoding/Cargo.toml b/components/zcash_encoding/Cargo.toml
index caa88dfe13..4ba7fcfb1a 100644
--- a/components/zcash_encoding/Cargo.toml
+++ b/components/zcash_encoding/Cargo.toml
@@ -17,6 +17,7 @@ keywords = ["zcash"]
 
 [dependencies]
 core2.workspace = true
+hex.workspace = true
 nonempty.workspace = true
 
 [features]
diff --git a/components/zcash_encoding/src/lib.rs b/components/zcash_encoding/src/lib.rs
index 4e611e25a6..7077b381e0 100644
--- a/components/zcash_encoding/src/lib.rs
+++ b/components/zcash_encoding/src/lib.rs
@@ -300,6 +300,18 @@ impl Optional {
     }
 }
 
+/// Decodes a reversed-hex string into a byte array.
+///
+/// This handles the legacy format from Bitcoin Core's `uint256::GetHex`, which reverses
+/// bytes before hex encoding. `zcashd` applied this to all 32-byte JSON-RPC values
+/// (transaction IDs, block hashes, Sprout field elements, etc.), though non-32-byte
+/// hex values are not reversed.
+pub fn decode_reverse_hex(bytes: &[u8; 32]) -> alloc::string::String {
+    let mut reversed = *bytes;
+    reversed.reverse();
+    hex::encode(reversed)
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/components/zcash_protocol/Cargo.toml b/components/zcash_protocol/Cargo.toml
index 22761e0959..1f2c763b8c 100644
--- a/components/zcash_protocol/Cargo.toml
+++ b/components/zcash_protocol/Cargo.toml
@@ -29,6 +29,7 @@ memuse = { workspace = true, optional = true }
 document-features = { workspace = true, optional = true }
 
 # - Encodings
+zcash_encoding.workspace = true
 core2.workspace = true
 hex.workspace = true
 
diff --git a/components/zcash_protocol/src/txid.rs b/components/zcash_protocol/src/txid.rs
index ddbbfefd9f..54fa34e21f 100644
--- a/components/zcash_protocol/src/txid.rs
+++ b/components/zcash_protocol/src/txid.rs
@@ -2,6 +2,8 @@ use alloc::string::ToString;
 use core::fmt;
 use core2::io::{self, Read, Write};
 
+use zcash_encoding::decode_reverse_hex;
+
 #[cfg(feature = "std")]
 use memuse::DynamicUsage;
 
@@ -29,9 +31,7 @@ impl fmt::Debug for TxId {
 
 impl fmt::Display for TxId {
     fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let mut data = self.0;
-        data.reverse();
-        formatter.write_str(&hex::encode(data))
+        formatter.write_str(&decode_reverse_hex(&self.0))
     }
 }
 

From 7dc33d78580380199453d4dc9f17b9b6da79d766 Mon Sep 17 00:00:00 2001
From: Ryan <ryan@deltadevs.xyz>
Date: Thu, 6 Nov 2025 14:50:54 +0100
Subject: [PATCH 003/263] feat(zcash_protocol): Adding TxId::from_reverse_hex

---
 components/zcash_protocol/src/txid.rs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/components/zcash_protocol/src/txid.rs b/components/zcash_protocol/src/txid.rs
index 54fa34e21f..a52e1bfc8e 100644
--- a/components/zcash_protocol/src/txid.rs
+++ b/components/zcash_protocol/src/txid.rs
@@ -48,6 +48,17 @@ impl From<TxId> for [u8; 32] {
 }
 
 impl TxId {
+    /// Creates a TxId from a reverse hex string
+    ///
+    /// See `zcash_encoding::decode_reverse_hex` for more context.
+    pub const fn from_reverse_hex(hex_str: &str) -> RpcResult<Self> {
+        let mut bytes = [0; 32];
+        hex::decode_to_slice(hex_str, &mut bytes)
+            .map_err(|_| RpcError::ParseError("Invalid hex string".to_string()))?;
+        bytes.reverse();
+        Ok(TxId(bytes))
+    }
+
     /// Wraps the given byte array as a TxId value
     pub const fn from_bytes(bytes: [u8; 32]) -> Self {
         TxId(bytes)

From 5337df6943cf209e0075f4efdc6569ddb9d4965a Mon Sep 17 00:00:00 2001
From: Ryan <ryan@deltadevs.xyz>
Date: Thu, 6 Nov 2025 15:12:36 +0100
Subject: [PATCH 004/263] refactor: adding namespace to method

---
 components/zcash_encoding/src/lib.rs  | 15 +++++++++------
 components/zcash_protocol/src/txid.rs |  4 ++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/components/zcash_encoding/src/lib.rs b/components/zcash_encoding/src/lib.rs
index 7077b381e0..e43f291c63 100644
--- a/components/zcash_encoding/src/lib.rs
+++ b/components/zcash_encoding/src/lib.rs
@@ -300,16 +300,19 @@ impl Optional {
     }
 }
 
-/// Decodes a reversed-hex string into a byte array.
-///
 /// This handles the legacy format from Bitcoin Core's `uint256::GetHex`, which reverses
 /// bytes before hex encoding. `zcashd` applied this to all 32-byte JSON-RPC values
 /// (transaction IDs, block hashes, Sprout field elements, etc.), though non-32-byte
 /// hex values are not reversed.
-pub fn decode_reverse_hex(bytes: &[u8; 32]) -> alloc::string::String {
-    let mut reversed = *bytes;
-    reversed.reverse();
-    hex::encode(reversed)
+pub struct ReverseHex;
+
+impl ReverseHex {
+    /// Decodes a reversed-hex string into a byte array.
+    pub fn decode(bytes: &[u8; 32]) -> alloc::string::String {
+        let mut reversed = *bytes;
+        reversed.reverse();
+        hex::encode(reversed)
+    }
 }
 
 #[cfg(test)]
diff --git a/components/zcash_protocol/src/txid.rs b/components/zcash_protocol/src/txid.rs
index a52e1bfc8e..bc804b4fe3 100644
--- a/components/zcash_protocol/src/txid.rs
+++ b/components/zcash_protocol/src/txid.rs
@@ -2,7 +2,7 @@ use alloc::string::ToString;
 use core::fmt;
 use core2::io::{self, Read, Write};
 
-use zcash_encoding::decode_reverse_hex;
+use zcash_encoding::ReverseHex;
 
 #[cfg(feature = "std")]
 use memuse::DynamicUsage;
@@ -31,7 +31,7 @@ impl fmt::Debug for TxId {
 
 impl fmt::Display for TxId {
     fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
-        formatter.write_str(&decode_reverse_hex(&self.0))
+        formatter.write_str(&ReverseHex::decode(&self.0))
     }
 }
 

From a6144b71bc6a758a9004db567d36f103d5c25055 Mon Sep 17 00:00:00 2001
From: replicationlag <replicationlag@protonmail.com>
Date: Sun, 9 Nov 2025 01:00:47 -0500
Subject: [PATCH 005/263] Prevent usage of unrecognized required params in test
 payment generation

---
 components/zip321/src/lib.rs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/components/zip321/src/lib.rs b/components/zip321/src/lib.rs
index c59695b5e3..3f1e77bcd9 100644
--- a/components/zip321/src/lib.rs
+++ b/components/zip321/src/lib.rs
@@ -810,13 +810,17 @@ pub mod testing {
             other_params in btree_map(VALID_PARAMNAME, any::<String>(), 0..3),
         ) -> Payment {
             let memo = memo.filter(|_| recipient_address.can_receive_memo());
+            let other_params = other_params
+                .into_iter()
+                .filter(|(name, _)| !name.starts_with("req-"))
+                .collect();
             Payment {
                 recipient_address,
                 amount,
                 memo,
                 label,
                 message,
-                other_params: other_params.into_iter().collect(),
+                other_params,
             }
         }
     }
@@ -1109,6 +1113,12 @@ mod tests {
         let invalid_11 = "zcash:?address=tmEZhbWHTpdKMw5it8YDspUXSMGQyFwovpU&amount=123.";
         let i11r = TransactionRequest::from_uri(invalid_11);
         assert!(i11r.is_err());
+
+        // invalid: unrecognized required parameters are not allowed
+        let invalid_12 =
+            "zcash:?address=tmEZhbWHTpdKMw5it8YDspUXSMGQyFwovpU&amount=123.45&req-unknown=x";
+        let i12r = TransactionRequest::from_uri(invalid_12);
+        assert!(i12r.is_err());
     }
 
     proptest! {

From cf39300ffa47aca9f2dec1f55727d17a5301f2fe Mon Sep 17 00:00:00 2001
From: Ryan Quinn Ford <ryan@deltadevs.xyz>
Date: Mon, 10 Nov 2025 09:11:57 +0100
Subject: [PATCH 006/263] fix: adding decoder and proptest

---
 Cargo.lock                            | 1745 +++++++++++++------------
 components/zcash_encoding/Cargo.toml  |    3 +
 components/zcash_encoding/src/lib.rs  |   27 +-
 components/zcash_protocol/src/txid.rs |   13 +-
 4 files changed, 959 insertions(+), 829 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ffd9eeb314..91ab47adcc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,19 +1,21 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "addr2line"
-version = "0.25.1"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
-name = "adler2"
-version = "2.0.1"
+name = "adler"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "aead"
@@ -39,12 +41,12 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.12"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
- "getrandom 0.3.4",
+ "getrandom 0.2.15",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -52,9 +54,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.4"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
@@ -70,9 +72,9 @@ dependencies = [
 
 [[package]]
 name = "ambassador"
-version = "0.4.2"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e68de4cdc6006162265d0957edb4a860fe4e711b1dc17a5746fd95f952f08285"
+checksum = "6b27ba24e4d8a188489d5a03c7fabc167a60809a383cdb4d15feb37479cd2a48"
 dependencies = [
  "itertools 0.10.5",
  "proc-macro2",
@@ -82,23 +84,21 @@ dependencies = [
 
 [[package]]
 name = "amplify"
-version = "4.9.0"
+version = "4.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f7fb4ac7c881e54a8e7015e399b6112a2a5bc958b6c89ac510840ff20273b31"
+checksum = "9e711289a6cb28171b4f0e6c8019c69ff9476050508dc082167575d458ff74d0"
 dependencies = [
  "amplify_derive",
  "amplify_num",
  "ascii",
- "getrandom 0.2.16",
- "getrandom 0.3.4",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "amplify_derive"
-version = "4.0.1"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a6309e6b8d89b36b9f959b7a8fa093583b94922a0f6438a24fb08936de4d428"
+checksum = "759dcbfaf94d838367a86d493ec34ccc8aa6fe365cb7880d6bf89006de24d9c1"
 dependencies = [
  "amplify_syn",
  "proc-macro2",
@@ -108,9 +108,9 @@ dependencies = [
 
 [[package]]
 name = "amplify_num"
-version = "0.5.3"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99bcb75a2982047f733547042fc3968c0f460dfcf7d90b90dea3b2744580e9ad"
+checksum = "04c009c5c4de814911b177e2ea59e4930bb918978ed3cce4900d846a6ceb0838"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -126,6 +126,12 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -143,27 +149,27 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
 [[package]]
 name = "anstyle"
-version = "1.0.13"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
 
 [[package]]
 name = "anyhow"
-version = "1.0.100"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
+checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3"
 
 [[package]]
 name = "arrayref"
-version = "0.3.9"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
+checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.6"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "arti-client"
@@ -173,7 +179,7 @@ checksum = "0a79ca5ce63b36033a5ccbfbcc7f919cbd93db61708543aa5e2e4917856205e7"
 dependencies = [
  "async-trait",
  "cfg-if",
- "derive-deftly",
+ "derive-deftly 1.3.0",
  "derive_builder_fork_arti",
  "derive_more",
  "educe",
@@ -188,7 +194,7 @@ dependencies = [
  "rand 0.9.2",
  "safelog",
  "serde",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "time",
  "tor-async-utils",
  "tor-basic-utils",
@@ -232,7 +238,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -243,7 +249,7 @@ checksum = "3109e49b1e4909e9db6515a30c633684d68cdeaa252f215214cb4fa1a5bfee2c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
  "synstructure",
 ]
 
@@ -255,7 +261,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -266,26 +272,29 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
 
 [[package]]
 name = "async-compression"
-version = "0.4.32"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a89bce6054c720275ac2432fbba080a66a2106a44a1b804553930ca6909f4e0"
+checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5"
 dependencies = [
- "compression-codecs",
- "compression-core",
+ "flate2",
  "futures-core",
  "futures-io",
+ "memchr",
  "pin-project-lite",
+ "xz2",
+ "zstd",
+ "zstd-safe",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.89"
+version = "0.1.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
+checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -324,9 +333,9 @@ checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba"
 
 [[package]]
 name = "atomic"
-version = "0.6.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a89cbf775b137e9b968e67227ef7f775587cde3fd31b0d8599dbd0f598a48340"
+checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994"
 dependencies = [
  "bytemuck",
 ]
@@ -339,23 +348,23 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.5.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "backtrace"
-version = "0.3.76"
+version = "0.3.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6"
+checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
 dependencies = [
  "addr2line",
+ "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
  "rustc-demangle",
- "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -422,7 +431,7 @@ dependencies = [
  "hmac 0.12.1",
  "pbkdf2",
  "rand 0.8.5",
- "sha2 0.10.9",
+ "sha2 0.10.8",
  "unicode-normalization",
  "zeroize",
 ]
@@ -445,18 +454,18 @@ dependencies = [
 
 [[package]]
 name = "bit-set"
-version = "0.8.0"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
+checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
 dependencies = [
  "bit-vec",
 ]
 
 [[package]]
 name = "bit-vec"
-version = "0.8.0"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
 
 [[package]]
 name = "bitflags"
@@ -466,9 +475,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.10.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
+checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
 
 [[package]]
 name = "bitvec"
@@ -484,9 +493,9 @@ dependencies = [
 
 [[package]]
 name = "blake2b_simd"
-version = "1.0.3"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06e903a20b159e944f91ec8499fe1e55651480c541ea0a584f5d967c49ad9d99"
+checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780"
 dependencies = [
  "arrayref",
  "arrayvec",
@@ -495,9 +504,9 @@ dependencies = [
 
 [[package]]
 name = "blake2s_simd"
-version = "1.0.3"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e90f7deecfac93095eb874a40febd69427776e24e1bd7f87f33ac62d6f0174df"
+checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae"
 dependencies = [
  "arrayref",
  "arrayvec",
@@ -512,7 +521,7 @@ checksum = "e0b121a9fe0df916e362fb3271088d071159cdf11db0e4182d02152850756eff"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -552,7 +561,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09dc0086e469182132244e9b8d313a0742e1132da43a08c24b9dd3c18e0faf3a"
 dependencies = [
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -561,26 +570,26 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4"
 dependencies = [
- "sha2 0.10.9",
+ "sha2 0.10.8",
  "tinyvec",
 ]
 
 [[package]]
 name = "bstr"
-version = "1.12.1"
+version = "1.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab"
+checksum = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0"
 dependencies = [
  "memchr",
- "regex-automata",
+ "regex-automata 0.4.9",
  "serde",
 ]
 
 [[package]]
 name = "bumpalo"
-version = "3.19.0"
+version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "by_address"
@@ -590,9 +599,9 @@ checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06"
 
 [[package]]
 name = "bytemuck"
-version = "1.24.0"
+version = "1.16.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4"
+checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83"
 
 [[package]]
 name = "byteorder"
@@ -629,11 +638,10 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.44"
+version = "1.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37521ac7aabe3d13122dc382493e20c9416f299d2ccd5b3a5340a2570cdeb0f3"
+checksum = "1fcb57c740ae1daf453ae85f16e37396f672b039e00d9d866e07ddb24e328e3a"
 dependencies = [
- "find-msvc-tools",
  "jobserver",
  "libc",
  "shlex",
@@ -641,9 +649,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-if"
-version = "1.0.4"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chacha20"
@@ -671,14 +679,15 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.42"
+version = "0.4.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
 dependencies = [
+ "android-tzdata",
  "iana-time-zone",
  "num-traits",
  "serde",
- "windows-link 0.2.1",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -721,18 +730,18 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.51"
+version = "4.5.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5"
+checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.5.51"
+version = "4.5.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a"
+checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
 dependencies = [
  "anstyle",
  "clap_lex",
@@ -740,15 +749,15 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.6"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
 
 [[package]]
 name = "coarsetime"
-version = "0.1.36"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91849686042de1b41cd81490edc83afbcb0abe5a9b6f2c4114f23ce8cca1bcf4"
+checksum = "13b3839cf01bb7960114be3ccf2340f541b6d0c81f8690b007b2b39f750f7e5d"
 dependencies = [
  "libc",
  "wasix",
@@ -757,31 +766,9 @@ dependencies = [
 
 [[package]]
 name = "cobs"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa961b519f0b462e3a3b4a34b64d119eeaca1d59af726fe450bbba07a9fc0a1"
-dependencies = [
- "thiserror 2.0.17",
-]
-
-[[package]]
-name = "compression-codecs"
-version = "0.4.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef8a506ec4b81c460798f572caead636d57d3d7e940f998160f52bd254bf2d23"
-dependencies = [
- "compression-core",
- "flate2",
- "liblzma",
- "zstd",
- "zstd-safe",
-]
-
-[[package]]
-name = "compression-core"
-version = "0.4.29"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e47641d3deaf41fb1538ac1f54735925e275eaf3bf4d55c81b137fba797e5cbb"
+checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15"
 
 [[package]]
 name = "concurrent-queue"
@@ -800,9 +787,9 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
 [[package]]
 name = "constant_time_eq"
-version = "0.3.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
+checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
 
 [[package]]
 name = "convert_case"
@@ -824,9 +811,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.7"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
 [[package]]
 name = "core2"
@@ -839,27 +826,27 @@ dependencies = [
 
 [[package]]
 name = "cpp_demangle"
-version = "0.4.5"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2bb79cb74d735044c972aae58ed0aaa9a837e85b01106a54c39e42e97f62253"
+checksum = "96e58d342ad113c2b878f16d5d034c03be492ae460cdbc02b7f0f2284d310c7d"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.17"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "crc32fast"
-version = "1.5.0"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
  "cfg-if",
 ]
@@ -954,9 +941,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.6"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
 dependencies = [
  "crossbeam-epoch",
  "crossbeam-utils",
@@ -973,24 +960,25 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.3.12"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
+checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add"
 dependencies = [
+ "cfg-if",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.21"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
 [[package]]
 name = "crunchy"
-version = "0.2.4"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
 [[package]]
 name = "crypto-bigint"
@@ -1057,14 +1045,14 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
 name = "daggy"
-version = "0.8.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70def8d72740e44d9f676d8dab2c933a236663d86dd24319b57a2bed4d694774"
+checksum = "91a9304e55e9d601a39ae4deaba85406d5c0980e106f65afcf0460e9af1e7602"
 dependencies = [
  "petgraph",
 ]
@@ -1081,12 +1069,12 @@ dependencies = [
 
 [[package]]
 name = "darling"
-version = "0.21.3"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
 dependencies = [
- "darling_core 0.21.3",
- "darling_macro 0.21.3",
+ "darling_core 0.20.10",
+ "darling_macro 0.20.10",
 ]
 
 [[package]]
@@ -1105,16 +1093,16 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.21.3"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4"
+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -1130,20 +1118,20 @@ dependencies = [
 
 [[package]]
 name = "darling_macro"
-version = "0.21.3"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
- "darling_core 0.21.3",
+ "darling_core 0.20.10",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.9.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
+checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
 
 [[package]]
 name = "debugid"
@@ -1156,9 +1144,9 @@ dependencies = [
 
 [[package]]
 name = "der"
-version = "0.7.10"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
+checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
 dependencies = [
  "const-oid",
  "pem-rfc7468",
@@ -1189,14 +1177,42 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "derive-deftly"
+version = "0.14.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72f9bc3564f74be6c35d49a7efee54380d7946ccc631323067f33fabb9246027"
+dependencies = [
+ "derive-deftly-macros 0.14.2",
+ "heck",
+]
+
 [[package]]
 name = "derive-deftly"
 version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d308ebe4b10924331bd079044b418da7b227d724d3e2408567a47ad7c3da2a0"
 dependencies = [
- "derive-deftly-macros",
+ "derive-deftly-macros 1.3.0",
+ "heck",
+]
+
+[[package]]
+name = "derive-deftly-macros"
+version = "0.14.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1b84d32b18d9a256d81e4fec2e4cfd0ab6dde5e5ff49be1713ae0adbd0060c2"
+dependencies = [
  "heck",
+ "indexmap 2.12.0",
+ "itertools 0.13.0",
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "sha3",
+ "strum 0.26.3",
+ "syn 2.0.100",
+ "void",
 ]
 
 [[package]]
@@ -1212,8 +1228,8 @@ dependencies = [
  "proc-macro2",
  "quote",
  "sha3",
- "strum",
- "syn 2.0.109",
+ "strum 0.27.2",
+ "syn 2.0.100",
  "void",
 ]
 
@@ -1266,7 +1282,7 @@ dependencies = [
  "convert_case",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
  "unicode-xid",
 ]
 
@@ -1299,7 +1315,16 @@ version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16f5094c54661b38d03bd7e50df373292118db60b585c08a411c6d840017fe7d"
 dependencies = [
- "dirs-sys",
+ "dirs-sys 0.5.0",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys 0.4.1",
 ]
 
 [[package]]
@@ -1308,7 +1333,19 @@ version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
 dependencies = [
- "dirs-sys",
+ "dirs-sys 0.5.0",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users 0.4.5",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -1319,41 +1356,41 @@ checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
 dependencies = [
  "libc",
  "option-ext",
- "redox_users",
- "windows-sys 0.61.2",
+ "redox_users 0.5.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "displaydoc"
-version = "0.2.5"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
 name = "document-features"
-version = "0.2.12"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61"
+checksum = "ef5282ad69563b5fc40319526ba27e0e7363d552a896f0297d54f767717f9b95"
 dependencies = [
  "litrs",
 ]
 
 [[package]]
 name = "downcast-rs"
-version = "2.0.2"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "117240f60069e65410b3ae1bb213295bd828f707b5bec6596a1afc8793ce0cbc"
+checksum = "ea8a8b81cacc08888170eef4d13b775126db426d0b348bee9d18c2c1eaf123cf"
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.20"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
+checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
 [[package]]
 name = "dynosaur"
@@ -1372,7 +1409,7 @@ checksum = "0b0713d5c1d52e774c5cd7bb8b043d7c0fc4f921abfb678556140bfbe6ab2364"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -1410,7 +1447,7 @@ dependencies = [
  "merlin",
  "rand_core 0.6.4",
  "serde",
- "sha2 0.10.9",
+ "sha2 0.10.8",
  "subtle",
  "zeroize",
 ]
@@ -1429,9 +1466,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.15.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "elliptic-curve"
@@ -1474,7 +1511,7 @@ dependencies = [
  "num-traits",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -1486,7 +1523,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -1512,7 +1549,7 @@ checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -1528,9 +1565,9 @@ dependencies = [
 
 [[package]]
 name = "equivalent"
-version = "1.0.2"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
@@ -1539,14 +1576,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "event-listener"
-version = "5.4.1"
+version = "5.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
 dependencies = [
  "concurrent-queue",
  "parking",
@@ -1576,15 +1613,15 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
 
 [[package]]
 name = "fastrand"
-version = "2.3.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
 
 [[package]]
 name = "ff"
-version = "0.13.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
 dependencies = [
  "bitvec",
  "rand_core 0.6.4",
@@ -1603,31 +1640,25 @@ version = "0.10.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3"
 dependencies = [
- "atomic 0.6.1",
+ "atomic 0.6.0",
  "serde",
- "toml 0.8.23",
+ "toml 0.8.19",
  "uncased",
  "version_check",
 ]
 
 [[package]]
 name = "filetime"
-version = "0.2.26"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc0505cd1b6fa6580283f6bdf70a73fcf4aba1184038c90902b92b3dd0df63ed"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
 dependencies = [
  "cfg-if",
  "libc",
  "libredox",
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "find-msvc-tools"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
-
 [[package]]
 name = "findshlibs"
 version = "0.10.2"
@@ -1651,15 +1682,15 @@ dependencies = [
 
 [[package]]
 name = "fixedbitset"
-version = "0.5.7"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.1.5"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
+checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1704,11 +1735,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7a157b06319bb4868718fd20177a0d3373d465e429d89cd0ee493d9f5918902"
 dependencies = [
  "derive_builder_fork_arti",
- "dirs",
+ "dirs 6.0.0",
  "libc",
  "pwd-grp",
  "serde",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "walkdir",
 ]
 
@@ -1730,9 +1761,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1761,9 +1792,9 @@ checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1784,7 +1815,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -1794,7 +1825,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb"
 dependencies = [
  "futures-io",
- "rustls 0.23.35",
+ "rustls 0.23.25",
  "rustls-pki-types",
 ]
 
@@ -1830,9 +1861,9 @@ dependencies = [
 
 [[package]]
 name = "generic-array"
-version = "0.14.9"
+version = "0.14.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
  "typenum",
  "version_check",
@@ -1841,15 +1872,13 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.16"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
- "js-sys",
  "libc",
  "wasi",
- "wasm-bindgen",
 ]
 
 [[package]]
@@ -1859,11 +1888,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if",
- "js-sys",
  "libc",
  "r-efi",
  "wasip2",
- "wasm-bindgen",
 ]
 
 [[package]]
@@ -1875,14 +1902,14 @@ dependencies = [
  "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
 name = "gimli"
-version = "0.32.3"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
 [[package]]
 name = "glob-match"
@@ -1924,9 +1951,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.12"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386"
+checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -1943,13 +1970,11 @@ dependencies = [
 
 [[package]]
 name = "half"
-version = "2.7.1"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
+checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0"
 dependencies = [
- "cfg-if",
  "crunchy",
- "zerocopy",
 ]
 
 [[package]]
@@ -1992,15 +2017,14 @@ dependencies = [
 
 [[package]]
 name = "halo2_proofs"
-version = "0.3.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "019561b5f3be60731e7b72f3f7878c5badb4174362d860b03d3cf64cb47f90db"
+checksum = "7b867a8d9bbb85fca76fff60652b5cd19b853a1c4d0665cb89bee68b18d2caf0"
 dependencies = [
  "blake2b_simd",
  "ff",
  "group",
  "halo2_legacy_pdqsort",
- "indexmap 1.9.3",
  "maybe-rayon",
  "pasta_curves",
  "rand_core 0.6.4",
@@ -2015,9 +2039,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.15.5"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 dependencies = [
  "foldhash",
 ]
@@ -2034,7 +2058,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
 dependencies = [
- "hashbrown 0.15.5",
+ "hashbrown 0.15.2",
 ]
 
 [[package]]
@@ -2045,9 +2069,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hermit-abi"
-version = "0.5.2"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "hex"
@@ -2084,11 +2108,11 @@ dependencies = [
 
 [[package]]
 name = "home"
-version = "0.5.12"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2099,9 +2123,9 @@ checksum = "f558a64ac9af88b5ba400d99b579451af0d39c6d360980045b91aac966d705e2"
 
 [[package]]
 name = "http"
-version = "1.3.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
 dependencies = [
  "bytes",
  "fnv",
@@ -2120,12 +2144,12 @@ dependencies = [
 
 [[package]]
 name = "http-body-util"
-version = "0.1.3"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
 dependencies = [
  "bytes",
- "futures-core",
+ "futures-util",
  "http",
  "http-body",
  "pin-project-lite",
@@ -2145,9 +2169,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "humantime"
-version = "2.3.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "humantime-serde"
@@ -2170,14 +2194,13 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.7.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e"
+checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
 dependencies = [
- "atomic-waker",
  "bytes",
  "futures-channel",
- "futures-core",
+ "futures-util",
  "h2",
  "http",
  "http-body",
@@ -2185,7 +2208,6 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "pin-utils",
  "smallvec",
  "tokio",
  "want",
@@ -2193,9 +2215,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-timeout"
-version = "0.5.2"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0"
+checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793"
 dependencies = [
  "hyper",
  "hyper-util",
@@ -2206,20 +2228,19 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.17"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8"
+checksum = "497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2"
 dependencies = [
  "bytes",
  "futures-channel",
- "futures-core",
  "futures-util",
  "http",
  "http-body",
  "hyper",
  "libc",
  "pin-project-lite",
- "socket2",
+ "socket2 0.5.9",
  "tokio",
  "tower-service",
  "tracing",
@@ -2227,17 +2248,16 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.64"
+version = "0.1.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
- "log",
  "wasm-bindgen",
- "windows-core 0.62.2",
+ "windows-core 0.52.0",
 ]
 
 [[package]]
@@ -2324,7 +2344,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.9.0",
  "inotify-sys",
  "libc",
 ]
@@ -2340,31 +2360,28 @@ dependencies = [
 
 [[package]]
 name = "inout"
-version = "0.1.4"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
+checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
 dependencies = [
  "generic-array",
 ]
 
 [[package]]
 name = "inventory"
-version = "0.3.21"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc61209c082fbeb19919bee74b176221b27223e27b65d781eb91af24eb1fb46e"
-dependencies = [
- "rustversion",
-]
+checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767"
 
 [[package]]
 name = "is-terminal"
-version = "0.4.17"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
+checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
 dependencies = [
  "hermit-abi",
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2396,27 +2413,25 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.15"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "jobserver"
-version = "0.1.34"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
+checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
 dependencies = [
- "getrandom 0.3.4",
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.82"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
 dependencies = [
- "once_cell",
  "wasm-bindgen",
 ]
 
@@ -2436,27 +2451,27 @@ dependencies = [
 
 [[package]]
 name = "keccak"
-version = "0.1.5"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
+checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940"
 dependencies = [
  "cpufeatures",
 ]
 
 [[package]]
 name = "known-folders"
-version = "1.4.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d463f34ca3c400fde3a054da0e0b8c6ffa21e4590922f3e18281bb5eeef4cbdc"
+checksum = "4397c789f2709d23cfcb703b316e0766a8d4b17db2d47b0ab096ef6047cae1d8"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "kqueue"
-version = "1.1.1"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a"
+checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
 dependencies = [
  "kqueue-sys",
  "libc",
@@ -2487,39 +2502,19 @@ version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
 
-[[package]]
-name = "liblzma"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73c36d08cad03a3fbe2c4e7bb3a9e84c57e4ee4135ed0b065cade3d98480c648"
-dependencies = [
- "liblzma-sys",
-]
-
-[[package]]
-name = "liblzma-sys"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01b9596486f6d60c3bbe644c0e1be1aa6ccc472ad630fe8927b456973d7cb736"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
-
 [[package]]
 name = "libm"
-version = "0.2.15"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 
 [[package]]
 name = "libredox"
-version = "0.1.10"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.9.0",
  "libc",
  "redox_syscall",
 ]
@@ -2535,6 +2530,12 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.11.0"
@@ -2543,32 +2544,44 @@ checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
 
 [[package]]
 name = "litrs"
-version = "1.0.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"
+checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5"
 
 [[package]]
 name = "lock_api"
-version = "0.4.14"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
+ "autocfg",
  "scopeguard",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.28"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+
+[[package]]
+name = "lzma-sys"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+]
 
 [[package]]
 name = "matchers"
-version = "0.2.0"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
 dependencies = [
- "regex-automata",
+ "regex-automata 0.1.10",
 ]
 
 [[package]]
@@ -2583,15 +2596,15 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.6"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memmap2"
-version = "0.9.9"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "744133e4a0e0a658e1374cf3bf8e415c4052a15a111acd372764c55b4177d490"
+checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
 dependencies = [
  "libc",
 ]
@@ -2622,20 +2635,21 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.9"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
 dependencies = [
- "adler2",
- "simd-adler32",
+ "adler",
 ]
 
 [[package]]
 name = "minreq"
-version = "2.14.1"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05015102dad0f7d61691ca347e9d9d9006685a64aefb3d79eecf62665de2153d"
+checksum = "763d142cdff44aaadd9268bebddb156ef6c65a0e13486bb81673cf2d8739f9b0"
 dependencies = [
+ "log",
+ "once_cell",
  "rustls 0.21.12",
  "rustls-webpki 0.101.7",
  "webpki-roots 0.25.4",
@@ -2643,21 +2657,32 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.1.0"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "mio"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
  "libc",
  "log",
  "wasi",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "multimap"
-version = "0.10.1"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084"
+checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
 
 [[package]]
 name = "nix"
@@ -2694,19 +2719,20 @@ checksum = "549e471b99ccaf2f89101bec68f4d244457d5a95a9c3d0672e9564124397741d"
 
 [[package]]
 name = "notify"
-version = "8.2.0"
+version = "8.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3"
+checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.9.0",
+ "filetime",
  "inotify",
  "kqueue",
  "libc",
  "log",
- "mio",
+ "mio 1.0.3",
  "notify-types",
  "walkdir",
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2726,18 +2752,19 @@ dependencies = [
 
 [[package]]
 name = "nu-ansi-term"
-version = "0.50.3"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
 dependencies = [
- "windows-sys 0.61.2",
+ "overload",
+ "winapi",
 ]
 
 [[package]]
 name = "num-bigint"
-version = "0.4.6"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7"
 dependencies = [
  "num-integer",
  "num-traits",
@@ -2745,10 +2772,11 @@ dependencies = [
 
 [[package]]
 name = "num-bigint-dig"
-version = "0.8.5"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82c79c15c05d4bf82b6f5ef163104cc81a760d8e874d38ac50ab67c8877b647b"
+checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151"
 dependencies = [
+ "byteorder",
  "lazy_static",
  "libm",
  "num-integer",
@@ -2807,9 +2835,9 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.17.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
  "hermit-abi",
  "libc",
@@ -2817,24 +2845,23 @@ dependencies = [
 
 [[package]]
 name = "num_enum"
-version = "0.7.5"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c"
+checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
 dependencies = [
  "num_enum_derive",
- "rustversion",
 ]
 
 [[package]]
 name = "num_enum_derive"
-version = "0.7.5"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7"
+checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -2843,7 +2870,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.9.0",
 ]
 
 [[package]]
@@ -2858,18 +2885,18 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.37.3"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.21.3"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "oneshot-fused-workaround"
@@ -2882,9 +2909,9 @@ dependencies = [
 
 [[package]]
 name = "oorandom"
-version = "11.1.5"
+version = "11.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
+checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9"
 
 [[package]]
 name = "opaque-debug"
@@ -2952,6 +2979,12 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
 [[package]]
 name = "p256"
 version = "0.13.2"
@@ -2961,19 +2994,19 @@ dependencies = [
  "ecdsa",
  "elliptic-curve",
  "primeorder",
- "sha2 0.10.9",
+ "sha2 0.10.8",
 ]
 
 [[package]]
 name = "p384"
-version = "0.13.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6"
+checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
  "primeorder",
- "sha2 0.10.9",
+ "sha2 0.10.8",
 ]
 
 [[package]]
@@ -2987,7 +3020,7 @@ dependencies = [
  "elliptic-curve",
  "primeorder",
  "rand_core 0.6.4",
- "sha2 0.10.9",
+ "sha2 0.10.8",
 ]
 
 [[package]]
@@ -3001,15 +3034,15 @@ dependencies = [
 
 [[package]]
 name = "parking"
-version = "2.2.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.5"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -3017,15 +3050,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.12"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-link 0.2.1",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -3092,7 +3125,7 @@ dependencies = [
  "secp256k1",
  "serde",
  "serde_with",
- "sha2 0.10.9",
+ "sha2 0.10.8",
  "shardtree",
  "zcash_note_encryption",
  "zcash_primitives",
@@ -3114,15 +3147,15 @@ dependencies = [
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.2"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "petgraph"
-version = "0.7.1"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772"
+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
  "indexmap 2.12.0",
@@ -3159,7 +3192,7 @@ dependencies = [
  "phf_shared",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -3173,29 +3206,29 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.1.10"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
+checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.10"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
+checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.16"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 
 [[package]]
 name = "pin-utils"
@@ -3226,15 +3259,15 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.32"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "plotters"
-version = "0.3.7"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
+checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45"
 dependencies = [
  "num-traits",
  "plotters-backend",
@@ -3245,15 +3278,15 @@ dependencies = [
 
 [[package]]
 name = "plotters-backend"
-version = "0.3.7"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
+checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609"
 
 [[package]]
 name = "plotters-svg"
-version = "0.3.7"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
+checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab"
 dependencies = [
  "plotters-backend",
 ]
@@ -3281,14 +3314,14 @@ dependencies = [
  "parking_lot",
  "pin-project",
  "static_assertions",
- "thiserror 1.0.69",
+ "thiserror 1.0.63",
 ]
 
 [[package]]
 name = "postcard"
-version = "1.1.3"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6764c3b5dd454e283a30e6dfe78e9b31096d9e32036b5d1eaac7a6119ccb9a24"
+checksum = "170a2601f67cc9dba8edd8c4870b15f71a6a2dc196daec8c83f72b59dff628a8"
 dependencies = [
  "cobs",
  "embedded-io 0.4.0",
@@ -3322,26 +3355,23 @@ dependencies = [
  "spin 0.10.0",
  "symbolic-demangle",
  "tempfile",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.21"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
-dependencies = [
- "zerocopy",
-]
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "prettyplease"
-version = "0.2.37"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
+checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
 dependencies = [
  "proc-macro2",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -3365,22 +3395,23 @@ dependencies = [
 
 [[package]]
 name = "priority-queue"
-version = "2.7.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93980406f12d9f8140ed5abe7155acb10bb1e69ea55c88960b9c2f117445ef96"
+checksum = "714c75db297bc88a63783ffc6ab9f830698a6705aa0201416931759ef4c8183d"
 dependencies = [
+ "autocfg",
  "equivalent",
  "indexmap 2.12.0",
- "serde",
 ]
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.4.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
 dependencies = [
- "toml_edit 0.23.7",
+ "once_cell",
+ "toml_edit 0.19.15",
 ]
 
 [[package]]
@@ -3402,7 +3433,7 @@ dependencies = [
  "proc-macro-error-attr2",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -3416,19 +3447,19 @@ dependencies = [
 
 [[package]]
 name = "proptest"
-version = "1.6.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50"
+checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf"
 dependencies = [
  "bit-set",
  "bit-vec",
- "bitflags 2.10.0",
+ "bitflags 2.9.0",
  "lazy_static",
  "num-traits",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rand_xorshift",
- "regex-syntax",
+ "regex-syntax 0.8.5",
  "rusty-fork",
  "tempfile",
  "unarray",
@@ -3460,7 +3491,7 @@ dependencies = [
  "prost",
  "prost-types",
  "regex",
- "syn 2.0.109",
+ "syn 2.0.100",
  "tempfile",
 ]
 
@@ -3474,7 +3505,7 @@ dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -3488,14 +3519,14 @@ dependencies = [
 
 [[package]]
 name = "pwd-grp"
-version = "1.0.2"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e2023f41b5fcb7c30eb5300a5733edfaa9e0e0d502d51b586f65633fd39e40c"
+checksum = "b94fdf3867b7f2889a736f0022ea9386766280d2cca4bdbe41629ada9e4f3b8f"
 dependencies = [
- "derive-deftly",
+ "derive-deftly 0.14.2",
  "libc",
  "paste",
- "thiserror 2.0.17",
+ "thiserror 1.0.63",
 ]
 
 [[package]]
@@ -3515,9 +3546,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.41"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -3581,7 +3612,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.16",
+ "getrandom 0.2.15",
 ]
 
 [[package]]
@@ -3625,9 +3656,9 @@ dependencies = [
 
 [[package]]
 name = "rayon"
-version = "1.11.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
 dependencies = [
  "either",
  "rayon-core",
@@ -3635,9 +3666,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.13.0"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
 dependencies = [
  "crossbeam-deque",
  "crossbeam-utils",
@@ -3666,7 +3697,7 @@ dependencies = [
  "pasta_curves",
  "rand_core 0.6.4",
  "serde",
- "thiserror 1.0.69",
+ "thiserror 1.0.63",
  "zeroize",
 ]
 
@@ -3678,78 +3709,84 @@ checksum = "89b0ac1bc6bb3696d2c6f52cff8fba57238b81da8c0214ee6cd146eb8fde364e"
 dependencies = [
  "rand_core 0.6.4",
  "reddsa",
- "thiserror 1.0.69",
+ "thiserror 1.0.63",
  "zeroize",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.18"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
+checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.9.0",
 ]
 
 [[package]]
 name = "redox_users"
-version = "0.5.2"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
+checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
 dependencies = [
- "getrandom 0.2.16",
+ "getrandom 0.2.15",
  "libredox",
- "thiserror 2.0.17",
+ "thiserror 1.0.63",
 ]
 
 [[package]]
-name = "ref-cast"
-version = "1.0.25"
+name = "redox_users"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d"
+checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b"
 dependencies = [
- "ref-cast-impl",
+ "getrandom 0.2.15",
+ "libredox",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
-name = "ref-cast-impl"
-version = "1.0.25"
+name = "regex"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.109",
+ "aho-corasick",
+ "memchr",
+ "regex-automata 0.4.9",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
-name = "regex"
-version = "1.12.2"
+name = "regex-automata"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
 dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata",
- "regex-syntax",
+ "regex-syntax 0.6.29",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.4.13"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.8"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "retry-error"
@@ -3769,9 +3806,9 @@ dependencies = [
 
 [[package]]
 name = "rgb"
-version = "0.8.52"
+version = "0.8.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c6a884d2998352bb4daf0183589aec883f16a6da1f4dde84d8e2e9a5409a1ce"
+checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a"
 dependencies = [
  "bytemuck",
 ]
@@ -3784,7 +3821,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom 0.2.16",
+ "getrandom 0.2.15",
  "libc",
  "untrusted",
  "windows-sys 0.52.0",
@@ -3810,9 +3847,9 @@ dependencies = [
 
 [[package]]
 name = "rsa"
-version = "0.9.8"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78928ac1ed176a5ca1d17e578a1825f3d81ca54cf41053a592584b020cfd691b"
+checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc"
 dependencies = [
  "const-oid",
  "digest 0.10.7",
@@ -3822,7 +3859,7 @@ dependencies = [
  "pkcs1",
  "pkcs8",
  "rand_core 0.6.4",
- "sha2 0.10.9",
+ "sha2 0.10.8",
  "signature",
  "spki",
  "subtle",
@@ -3835,7 +3872,7 @@ version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "165ca6e57b20e1351573e3729b958bc62f0e48025386970b6e4d29e7a7e71f3f"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.9.0",
  "fallible-iterator",
  "fallible-streaming-iterator",
  "hashlink",
@@ -3847,9 +3884,9 @@ dependencies = [
 
 [[package]]
 name = "rust_decimal"
-version = "1.39.0"
+version = "1.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35affe401787a9bd846712274d97654355d21b2a2c092a3139aabe31e9022282"
+checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a"
 dependencies = [
  "arrayvec",
  "num-traits",
@@ -3858,15 +3895,15 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.26"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc_version"
-version = "0.4.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
  "semver",
 ]
@@ -3880,17 +3917,30 @@ dependencies = [
  "nom",
 ]
 
+[[package]]
+name = "rustix"
+version = "0.38.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+dependencies = [
+ "bitflags 2.9.0",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.4.13",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "rustix"
 version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.9.0",
  "errno",
  "libc",
- "linux-raw-sys",
- "windows-sys 0.61.2",
+ "linux-raw-sys 0.11.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -3907,27 +3957,24 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.35"
+version = "0.23.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f"
+checksum = "822ee9188ac4ec04a2f0531e55d035fb2de73f18b41a63c70c2712503b6fb13c"
 dependencies = [
  "log",
  "once_cell",
  "ring",
  "rustls-pki-types",
- "rustls-webpki 0.103.8",
+ "rustls-webpki 0.103.1",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.13.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a"
-dependencies = [
- "zeroize",
-]
+checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
 
 [[package]]
 name = "rustls-webpki"
@@ -3941,9 +3988,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.8"
+version = "0.103.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52"
+checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -3952,15 +3999,15 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.22"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
 
 [[package]]
 name = "rusty-fork"
-version = "0.3.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc6bf79ff24e648f6da1f8d1f011e9cac26491b619e6b9280f2b47f1774e6ee2"
+checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f"
 dependencies = [
  "fnv",
  "quick-error",
@@ -3970,9 +4017,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.20"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "safelog"
@@ -3984,7 +4031,7 @@ dependencies = [
  "educe",
  "either",
  "fluid-let",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -4039,30 +4086,6 @@ dependencies = [
  "zip32",
 ]
 
-[[package]]
-name = "schemars"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f"
-dependencies = [
- "dyn-clone",
- "ref-cast",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "schemars"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9558e172d4e8533736ba97870c4b2cd63f84b382a3d6eb063da41b91cce17289"
-dependencies = [
- "dyn-clone",
- "ref-cast",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "schemerz"
 version = "0.2.0"
@@ -4072,7 +4095,7 @@ dependencies = [
  "daggy",
  "indexmap 1.9.3",
  "log",
- "thiserror 1.0.69",
+ "thiserror 1.0.63",
  "uuid",
 ]
 
@@ -4147,9 +4170,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.27"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
@@ -4188,37 +4211,34 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
 name = "serde_ignored"
-version = "0.1.14"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "115dffd5f3853e06e746965a20dcbae6ee747ae30b543d91b0e089668bb07798"
+checksum = "a8e319a36d1b52126a0d608f24e93b2d81297091818cd70625fcf50a15d84ddf"
 dependencies = [
  "serde",
- "serde_core",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.145"
+version = "1.0.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
+checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
 dependencies = [
  "itoa",
- "memchr",
  "ryu",
  "serde",
- "serde_core",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.9"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -4234,18 +4254,17 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.15.1"
+version = "3.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa66c845eee442168b2c8134fec70ac50dc20e760769c8ba0ad1319ca1959b04"
+checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20"
 dependencies = [
  "base64",
  "chrono",
  "hex",
  "indexmap 1.9.3",
  "indexmap 2.12.0",
- "schemars 0.9.0",
- "schemars 1.1.0",
- "serde_core",
+ "serde",
+ "serde_derive",
  "serde_json",
  "serde_with_macros",
  "time",
@@ -4253,21 +4272,21 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.15.1"
+version = "3.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91a903660542fced4e99881aa481bdbaec1634568ee02e0b8bd57c64cb38955"
+checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2"
 dependencies = [
- "darling 0.21.3",
+ "darling 0.20.10",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
 name = "sha1"
-version = "0.10.6"
+version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -4276,9 +4295,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.9"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -4322,7 +4341,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "637e95dcd06bc1bb3f86ed9db1e1832a70125f32daae071ef37dcb7701b7d4fe"
 dependencies = [
  "assert_matches",
- "bitflags 2.10.0",
+ "bitflags 2.9.0",
  "either",
  "incrementalmerkletree",
  "incrementalmerkletree-testing",
@@ -4332,12 +4351,12 @@ dependencies = [
 
 [[package]]
 name = "shellexpand"
-version = "3.1.1"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b1fdf65dd6331831494dd616b30351c38e96e45921a27745cf98490458b90bb"
+checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b"
 dependencies = [
  "bstr",
- "dirs",
+ "dirs 5.0.1",
  "os_str_bytes",
 ]
 
@@ -4349,9 +4368,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.6"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
 dependencies = [
  "libc",
 ]
@@ -4366,12 +4385,6 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
-[[package]]
-name = "simd-adler32"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
-
 [[package]]
 name = "sinsemilla"
 version = "0.1.0"
@@ -4391,9 +4404,12 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
 [[package]]
 name = "slab"
-version = "0.4.11"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
 
 [[package]]
 name = "slotmap"
@@ -4414,15 +4430,25 @@ dependencies = [
  "paste",
  "serde",
  "slotmap",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "void",
 ]
 
 [[package]]
 name = "smallvec"
-version = "1.15.1"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "socket2"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
 
 [[package]]
 name = "socket2"
@@ -4477,14 +4503,14 @@ checksum = "eb9242b9ef4108a78e8cd1a2c98e193ef372437f8c22be363075233321dd4a15"
 dependencies = [
  "base64ct",
  "pem-rfc7468",
- "sha2 0.10.9",
+ "sha2 0.10.8",
 ]
 
 [[package]]
 name = "ssh-key"
-version = "0.6.7"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b86f5297f0f04d08cabaa0f6bff7cb6aec4d9c3b49d87990d63da9d9156a8c3"
+checksum = "ca9b366a80cf18bb6406f4cf4d10aebfb46140a8c0c33f666a144c5c76ecbafc"
 dependencies = [
  "num-bigint-dig",
  "p256",
@@ -4493,7 +4519,7 @@ dependencies = [
  "rand_core 0.6.4",
  "rsa",
  "sec1",
- "sha2 0.10.9",
+ "sha2 0.10.8",
  "signature",
  "ssh-cipher",
  "ssh-encoding",
@@ -4503,9 +4529,9 @@ dependencies = [
 
 [[package]]
 name = "stable_deref_trait"
-version = "1.2.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
 name = "static_assertions"
@@ -4531,13 +4557,35 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
+[[package]]
+name = "strum"
+version = "0.26.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
+dependencies = [
+ "strum_macros 0.26.4",
+]
+
 [[package]]
 name = "strum"
 version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
 dependencies = [
- "strum_macros",
+ "strum_macros 0.27.2",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -4549,7 +4597,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -4560,9 +4608,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "symbolic-common"
-version = "12.16.3"
+version = "12.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d03f433c9befeea460a01d750e698aa86caf86dcfbd77d552885cd6c89d52f50"
+checksum = "13a4dfe4bbeef59c1f32fc7524ae7c95b9e1de5e79a43ce1604e181081d71b0c"
 dependencies = [
  "debugid",
  "memmap2",
@@ -4572,9 +4620,9 @@ dependencies = [
 
 [[package]]
 name = "symbolic-demangle"
-version = "12.16.3"
+version = "12.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13d359ef6192db1760a34321ec4f089245ede4342c27e59be99642f12a859de8"
+checksum = "98cf6a95abff97de4d7ff3473f33cacd38f1ddccad5c1feab435d6760300e3b6"
 dependencies = [
  "cpp_demangle",
  "rustc-demangle",
@@ -4594,9 +4642,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.109"
+version = "2.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f17c7e013e88258aa9543dcbe81aca68a667a9ac37cd69c9fbc07858bfe0e2f"
+checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4611,13 +4659,13 @@ checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
 
 [[package]]
 name = "synstructure"
-version = "0.13.2"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -4642,71 +4690,71 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tempfile"
-version = "3.23.0"
+version = "3.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
+ "cfg-if",
  "fastrand",
- "getrandom 0.3.4",
- "once_cell",
- "rustix",
- "windows-sys 0.61.2",
+ "rustix 0.38.34",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.69"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
 dependencies = [
- "thiserror-impl 1.0.69",
+ "thiserror-impl 1.0.63",
 ]
 
 [[package]]
 name = "thiserror"
-version = "2.0.17"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
 dependencies = [
- "thiserror-impl 2.0.17",
+ "thiserror-impl 2.0.12",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.69"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.17"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.9"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
  "cfg-if",
+ "once_cell",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.37"
+version = "0.3.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
 dependencies = [
  "deranged",
  "itoa",
@@ -4725,9 +4773,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.19"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
 dependencies = [
  "num-conv",
  "time-core",
@@ -4735,12 +4783,11 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.8.2"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
+checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
 dependencies = [
  "displaydoc",
- "serde_core",
  "zerovec",
 ]
 
@@ -4756,9 +4803,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.10.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -4771,38 +4818,40 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.48.0"
+version = "1.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
+checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
 dependencies = [
+ "backtrace",
  "bytes",
  "libc",
- "mio",
+ "mio 0.8.11",
+ "num_cpus",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2",
+ "socket2 0.5.9",
  "tokio-macros",
- "windows-sys 0.61.2",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.6.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.4"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
+checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
 dependencies = [
- "rustls 0.23.35",
+ "rustls 0.23.25",
  "tokio",
 ]
 
@@ -4819,9 +4868,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.17"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594"
+checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
 dependencies = [
  "bytes",
  "futures-core",
@@ -4833,14 +4882,14 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.23"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
 dependencies = [
  "serde",
- "serde_spanned 0.6.9",
- "toml_datetime 0.6.11",
- "toml_edit 0.22.27",
+ "serde_spanned 0.6.8",
+ "toml_datetime 0.6.8",
+ "toml_edit 0.22.22",
 ]
 
 [[package]]
@@ -4855,14 +4904,14 @@ dependencies = [
  "toml_datetime 0.7.3",
  "toml_parser",
  "toml_writer",
- "winnow",
+ "winnow 0.7.13",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.11"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 dependencies = [
  "serde",
 ]
@@ -4878,28 +4927,26 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.27"
+version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
  "indexmap 2.12.0",
- "serde",
- "serde_spanned 0.6.9",
- "toml_datetime 0.6.11",
- "toml_write",
- "winnow",
+ "toml_datetime 0.6.8",
+ "winnow 0.5.40",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.23.7"
+version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
  "indexmap 2.12.0",
- "toml_datetime 0.7.3",
- "toml_parser",
- "winnow",
+ "serde",
+ "serde_spanned 0.6.8",
+ "toml_datetime 0.6.8",
+ "winnow 0.6.20",
 ]
 
 [[package]]
@@ -4908,15 +4955,9 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
 dependencies = [
- "winnow",
+ "winnow 0.7.13",
 ]
 
-[[package]]
-name = "toml_write"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
-
 [[package]]
 name = "toml_writer"
 version = "1.0.4"
@@ -4941,7 +4982,7 @@ dependencies = [
  "hyper-util",
  "percent-encoding",
  "pin-project",
- "socket2",
+ "socket2 0.6.1",
  "sync_wrapper",
  "tokio",
  "tokio-rustls",
@@ -4950,7 +4991,7 @@ dependencies = [
  "tower-layer",
  "tower-service",
  "tracing",
- "webpki-roots 1.0.4",
+ "webpki-roots 1.0.3",
 ]
 
 [[package]]
@@ -4962,7 +5003,7 @@ dependencies = [
  "prettyplease",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -4987,7 +5028,7 @@ dependencies = [
  "prost-build",
  "prost-types",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
  "tempfile",
  "tonic-build",
 ]
@@ -4998,13 +5039,13 @@ version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cad5e568ad4e025a68aa0395a146247609dd5b6d8c2141255f5e4f367e7fda8a"
 dependencies = [
- "derive-deftly",
+ "derive-deftly 1.3.0",
  "educe",
  "futures",
  "oneshot-fused-workaround",
  "pin-project",
  "postage",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "void",
 ]
 
@@ -5024,7 +5065,7 @@ dependencies = [
  "serde",
  "slab",
  "smallvec",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -5034,12 +5075,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fc7fb465ba671ee1486d8bd1e0a8f546887c2ce034004c4c9b03a6227e1c381"
 dependencies = [
  "bytes",
- "derive-deftly",
+ "derive-deftly 1.3.0",
  "digest 0.10.7",
  "educe",
  "getrandom 0.3.4",
  "safelog",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tor-error",
  "tor-llcrypto",
  "zeroize",
@@ -5052,17 +5093,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79ba1b43f22fab2daee3e0c902f1455b3aed8e086b2d83d8c60b36523b173d25"
 dependencies = [
  "amplify",
- "bitflags 2.10.0",
+ "bitflags 2.9.0",
  "bytes",
  "caret",
- "derive-deftly",
+ "derive-deftly 1.3.0",
  "derive_more",
  "educe",
  "itertools 0.14.0",
  "paste",
  "rand 0.9.2",
  "smallvec",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tor-basic-utils",
  "tor-bytes",
  "tor-cert",
@@ -5085,7 +5126,7 @@ dependencies = [
  "derive_builder_fork_arti",
  "derive_more",
  "digest 0.10.7",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tor-bytes",
  "tor-checkable",
  "tor-llcrypto",
@@ -5108,7 +5149,7 @@ dependencies = [
  "rand 0.9.2",
  "safelog",
  "serde",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tor-async-utils",
  "tor-basic-utils",
  "tor-cell",
@@ -5135,7 +5176,7 @@ checksum = "7c9839e9bb302f17447c350e290bb107084aca86c640882a91522f2059f6a686"
 dependencies = [
  "humantime",
  "signature",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tor-llcrypto",
 ]
 
@@ -5148,7 +5189,7 @@ dependencies = [
  "amplify",
  "async-trait",
  "cfg-if",
- "derive-deftly",
+ "derive-deftly 1.3.0",
  "derive_builder_fork_arti",
  "derive_more",
  "downcast-rs",
@@ -5164,7 +5205,7 @@ dependencies = [
  "retry-error",
  "safelog",
  "serde",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tor-async-utils",
  "tor-basic-utils",
  "tor-cell",
@@ -5196,7 +5237,7 @@ checksum = "cb15df773842025010d885fbe862062ebaa342b799f9716273eaf733b92f2f45"
 dependencies = [
  "amplify",
  "cfg-if",
- "derive-deftly",
+ "derive-deftly 1.3.0",
  "derive_builder_fork_arti",
  "educe",
  "either",
@@ -5211,8 +5252,8 @@ dependencies = [
  "serde",
  "serde-value",
  "serde_ignored",
- "strum",
- "thiserror 2.0.17",
+ "strum 0.27.2",
+ "thiserror 2.0.12",
  "toml 0.9.8",
  "tor-basic-utils",
  "tor-error",
@@ -5230,7 +5271,7 @@ dependencies = [
  "directories",
  "serde",
  "shellexpand",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tor-error",
  "tor-general-addr",
 ]
@@ -5243,7 +5284,7 @@ checksum = "c1690438c1fc778fc7c89c132e529365b1430d6afe03aeecbc2508324807bf0b"
 dependencies = [
  "digest 0.10.7",
  "hex",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tor-llcrypto",
 ]
 
@@ -5263,7 +5304,7 @@ dependencies = [
  "httpdate",
  "itertools 0.14.0",
  "memchr",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tor-circmgr",
  "tor-error",
  "tor-linkspec",
@@ -5327,8 +5368,8 @@ dependencies = [
  "serde_json",
  "signature",
  "static_assertions",
- "strum",
- "thiserror 2.0.17",
+ "strum 0.27.2",
+ "thiserror 2.0.12",
  "time",
  "tor-async-utils",
  "tor-basic-utils",
@@ -5361,8 +5402,8 @@ dependencies = [
  "paste",
  "retry-error",
  "static_assertions",
- "strum",
- "thiserror 2.0.17",
+ "strum 0.27.2",
+ "thiserror 2.0.12",
  "tracing",
  "void",
 ]
@@ -5374,7 +5415,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c42cb5b5aec0584db2fba4a88c4e08fb09535ef61e4ef5674315a89e69ec31a2"
 dependencies = [
  "derive_more",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "void",
 ]
 
@@ -5386,7 +5427,7 @@ checksum = "0585a83a4c56b4f31f6fa2965e2f9c490c9f4d29fba2fedb5a9ee71009f793c0"
 dependencies = [
  "amplify",
  "base64ct",
- "derive-deftly",
+ "derive-deftly 1.3.0",
  "derive_builder_fork_arti",
  "derive_more",
  "dyn-clone",
@@ -5402,8 +5443,8 @@ dependencies = [
  "rand 0.9.2",
  "safelog",
  "serde",
- "strum",
- "thiserror 2.0.17",
+ "strum 0.27.2",
+ "thiserror 2.0.12",
  "tor-async-utils",
  "tor-basic-utils",
  "tor-config",
@@ -5428,7 +5469,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf9ee6e0dbec9ba11c3d046181a42dd4759e108de38e2b5927689edbdc458a51"
 dependencies = [
  "data-encoding",
- "derive-deftly",
+ "derive-deftly 1.3.0",
  "derive_more",
  "digest 0.10.7",
  "hex",
@@ -5440,7 +5481,7 @@ dependencies = [
  "serde",
  "signature",
  "subtle",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tor-basic-utils",
  "tor-bytes",
  "tor-error",
@@ -5456,7 +5497,7 @@ version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5aa30066b80ade55a1b88a82b5320dfc50d1724918ad614ded8ecb4820c32062"
 dependencies = [
- "derive-deftly",
+ "derive-deftly 1.3.0",
  "derive_more",
  "downcast-rs",
  "paste",
@@ -5464,7 +5505,7 @@ dependencies = [
  "rsa",
  "signature",
  "ssh-key",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tor-bytes",
  "tor-cert",
  "tor-checkable",
@@ -5481,7 +5522,7 @@ dependencies = [
  "amplify",
  "arrayvec",
  "cfg-if",
- "derive-deftly",
+ "derive-deftly 1.3.0",
  "derive_builder_fork_arti",
  "derive_more",
  "downcast-rs",
@@ -5496,7 +5537,7 @@ dependencies = [
  "serde",
  "signature",
  "ssh-key",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tor-basic-utils",
  "tor-bytes",
  "tor-config",
@@ -5521,7 +5562,7 @@ dependencies = [
  "base64ct",
  "by_address",
  "caret",
- "derive-deftly",
+ "derive-deftly 1.3.0",
  "derive_builder_fork_arti",
  "derive_more",
  "hex",
@@ -5529,8 +5570,8 @@ dependencies = [
  "safelog",
  "serde",
  "serde_with",
- "strum",
- "thiserror 2.0.17",
+ "strum 0.27.2",
+ "thiserror 2.0.12",
  "tor-basic-utils",
  "tor-bytes",
  "tor-config",
@@ -5550,7 +5591,7 @@ dependencies = [
  "ctr",
  "curve25519-dalek",
  "der-parser",
- "derive-deftly",
+ "derive-deftly 1.3.0",
  "derive_more",
  "digest 0.10.7",
  "ed25519-dalek",
@@ -5567,11 +5608,11 @@ dependencies = [
  "safelog",
  "serde",
  "sha1",
- "sha2 0.10.9",
+ "sha2 0.10.8",
  "sha3",
  "signature",
  "subtle",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tor-error",
  "tor-memquota",
  "visibility",
@@ -5587,7 +5628,7 @@ checksum = "845d65304be6a614198027c4b2d1b35aaf073335c26df619d17e5f4027f2657f"
 dependencies = [
  "futures",
  "humantime",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tor-error",
  "tor-rtcompat",
  "tracing",
@@ -5601,7 +5642,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef375c3442a4ea74f0b6bf91a3eed660d55301b2e2f59b366aba4849b2321a6f"
 dependencies = [
  "cfg-if",
- "derive-deftly",
+ "derive-deftly 1.3.0",
  "derive_more",
  "dyn-clone",
  "educe",
@@ -5613,7 +5654,7 @@ dependencies = [
  "slotmap-careful",
  "static_assertions",
  "sysinfo",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tor-async-utils",
  "tor-basic-utils",
  "tor-config",
@@ -5631,7 +5672,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "638b4e6507e3786488859d3c463fa73addbad4f788806c6972603727e527672e"
 dependencies = [
  "async-trait",
- "bitflags 2.10.0",
+ "bitflags 2.9.0",
  "derive_more",
  "futures",
  "humantime",
@@ -5639,8 +5680,8 @@ dependencies = [
  "num_enum",
  "rand 0.9.2",
  "serde",
- "strum",
- "thiserror 2.0.17",
+ "strum 0.27.2",
+ "thiserror 2.0.12",
  "tor-basic-utils",
  "tor-error",
  "tor-linkspec",
@@ -5660,9 +5701,9 @@ checksum = "1dbc32d89e7ea2e2799168d0c453061647a727e39fc66f52e1bcb4c38c8dc433"
 dependencies = [
  "amplify",
  "base64ct",
- "bitflags 2.10.0",
+ "bitflags 2.9.0",
  "cipher",
- "derive-deftly",
+ "derive-deftly 1.3.0",
  "derive_builder_fork_arti",
  "derive_more",
  "digest 0.10.7",
@@ -5677,9 +5718,9 @@ dependencies = [
  "serde_with",
  "signature",
  "smallvec",
- "strum",
+ "strum 0.27.2",
  "subtle",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "time",
  "tinystr",
  "tor-basic-utils",
@@ -5701,7 +5742,7 @@ version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59e41aea027686b05f21e0ad75aa2c0c9681a87f2f3130b6d6f7a7a8c06edd7b"
 dependencies = [
- "derive-deftly",
+ "derive-deftly 1.3.0",
  "derive_more",
  "filetime",
  "fs-mistrust",
@@ -5713,7 +5754,7 @@ dependencies = [
  "sanitize-filename",
  "serde",
  "serde_json",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "time",
  "tor-async-utils",
  "tor-basic-utils",
@@ -5737,7 +5778,7 @@ dependencies = [
  "cipher",
  "coarsetime",
  "criterion-cycles-per-byte",
- "derive-deftly",
+ "derive-deftly 1.3.0",
  "derive_builder_fork_arti",
  "derive_more",
  "digest 0.10.7",
@@ -5760,7 +5801,7 @@ dependencies = [
  "static_assertions",
  "subtle",
  "sync_wrapper",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tokio",
  "tokio-util",
  "tor-async-utils",
@@ -5795,7 +5836,7 @@ dependencies = [
  "caret",
  "paste",
  "serde_with",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tor-bytes",
 ]
 
@@ -5833,8 +5874,8 @@ dependencies = [
  "paste",
  "pin-project",
  "rustls-pki-types",
- "rustls-webpki 0.103.8",
- "thiserror 2.0.17",
+ "rustls-webpki 0.103.1",
+ "thiserror 2.0.12",
  "tokio",
  "tokio-util",
  "tor-error",
@@ -5852,7 +5893,7 @@ dependencies = [
  "amplify",
  "assert_matches",
  "async-trait",
- "derive-deftly",
+ "derive-deftly 1.3.0",
  "derive_more",
  "educe",
  "futures",
@@ -5862,8 +5903,8 @@ dependencies = [
  "pin-project",
  "priority-queue",
  "slotmap-careful",
- "strum",
- "thiserror 2.0.17",
+ "strum 0.27.2",
+ "thiserror 2.0.12",
  "tor-error",
  "tor-general-addr",
  "tor-rtcompat",
@@ -5880,11 +5921,11 @@ checksum = "0dbb9b68d9cf8e07eeafbca91ac11b7d9c4be1e674cb59830edfbac153333e7f"
 dependencies = [
  "amplify",
  "caret",
- "derive-deftly",
+ "derive-deftly 1.3.0",
  "educe",
  "safelog",
  "subtle",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tor-bytes",
  "tor-error",
 ]
@@ -5895,10 +5936,10 @@ version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48139f001dd6f409325b7c190ebcea1033b27f09042543946ab7aa4ad286257b"
 dependencies = [
- "derive-deftly",
+ "derive-deftly 1.3.0",
  "derive_more",
  "serde",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tor-memquota",
 ]
 
@@ -5952,7 +5993,7 @@ checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -5978,14 +6019,14 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.20"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
 dependencies = [
  "matchers",
  "nu-ansi-term",
  "once_cell",
- "regex-automata",
+ "regex",
  "sharded-slab",
  "smallvec",
  "thread_local",
@@ -6012,7 +6053,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568"
 dependencies = [
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -6023,7 +6064,7 @@ checksum = "70977707304198400eb4835a78f6a9f928bf41bba420deb8fdb175cd965d77a7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -6044,9 +6085,9 @@ dependencies = [
 
 [[package]]
 name = "typenum"
-version = "1.19.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "uint"
@@ -6077,15 +6118,15 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.22"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.25"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
 dependencies = [
  "tinyvec",
 ]
@@ -6126,21 +6167,19 @@ checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae"
 
 [[package]]
 name = "uuid"
-version = "1.18.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
+checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
 dependencies = [
- "getrandom 0.3.4",
- "js-sys",
+ "getrandom 0.2.15",
  "serde",
- "wasm-bindgen",
 ]
 
 [[package]]
 name = "valuable"
-version = "0.1.1"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
 [[package]]
 name = "vcpkg"
@@ -6150,9 +6189,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
 name = "version_check"
-version = "0.9.5"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "visibility"
@@ -6162,7 +6201,7 @@ checksum = "d674d135b4a8c1d7e813e2f8d1c9a58308aee4a680323066025e53132218bd91"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -6223,9 +6262,9 @@ checksum = "a7b6d5a78adc3e8f198e9cd730f219a695431467f7ec29dcfc63ade885feebe1"
 
 [[package]]
 name = "wait-timeout"
-version = "0.2.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11"
+checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
 dependencies = [
  "libc",
 ]
@@ -6251,9 +6290,9 @@ dependencies = [
 
 [[package]]
 name = "wasi"
-version = "0.11.1+wasi-snapshot-preview1"
+version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasip2"
@@ -6275,22 +6314,34 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.105"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
  "cfg-if",
- "once_cell",
- "rustversion",
  "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.100",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.105"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -6298,25 +6349,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.105"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
- "bumpalo",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
+ "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.105"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76"
-dependencies = [
- "unicode-ident",
-]
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "wasm_sync"
@@ -6337,9 +6385,9 @@ checksum = "323f4da9523e9a669e1eaf9c6e763892769b1d38c623913647bfdc1532fe4549"
 
 [[package]]
 name = "web-sys"
-version = "0.3.82"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1"
+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -6353,9 +6401,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
 [[package]]
 name = "webpki-roots"
-version = "1.0.4"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e"
+checksum = "32b130c0d2d49f8b6889abc456e795e82525204f27c42cf767cf0d7734e089b8"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -6367,7 +6415,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3fabb953106c3c8eea8306e4393700d7657561cb43122571b172bbfb7c7ba1d"
 dependencies = [
  "env_home",
- "rustix",
+ "rustix 1.1.2",
  "winsafe",
 ]
 
@@ -6389,11 +6437,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.11"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -6426,28 +6474,24 @@ dependencies = [
 
 [[package]]
 name = "windows-core"
-version = "0.61.2"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-implement",
- "windows-interface",
- "windows-link 0.1.3",
- "windows-result 0.3.4",
- "windows-strings 0.4.2",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-core"
-version = "0.62.2"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
+checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
 dependencies = [
  "windows-implement",
  "windows-interface",
- "windows-link 0.2.1",
- "windows-result 0.4.1",
- "windows-strings 0.5.1",
+ "windows-link 0.1.3",
+ "windows-result",
+ "windows-strings",
 ]
 
 [[package]]
@@ -6469,7 +6513,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -6480,7 +6524,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -6514,15 +6558,6 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
-[[package]]
-name = "windows-result"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
-dependencies = [
- "windows-link 0.2.1",
-]
-
 [[package]]
 name = "windows-strings"
 version = "0.4.2"
@@ -6533,12 +6568,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "windows-strings"
-version = "0.5.1"
+name = "windows-sys"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows-link 0.2.1",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -6550,6 +6585,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.60.2"
@@ -6560,12 +6604,18 @@ dependencies = [
 ]
 
 [[package]]
-name = "windows-sys"
-version = "0.61.2"
+name = "windows-targets"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
- "windows-link 0.2.1",
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
 ]
 
 [[package]]
@@ -6610,6 +6660,12 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.52.6"
@@ -6622,6 +6678,12 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
@@ -6634,6 +6696,12 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
@@ -6658,6 +6726,12 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
@@ -6670,6 +6744,12 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
@@ -6682,6 +6762,12 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
@@ -6694,6 +6780,12 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"
@@ -6708,13 +6800,28 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 
 [[package]]
 name = "winnow"
-version = "0.7.13"
+version = "0.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winnow"
+version = "0.6.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
 dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "winnow"
+version = "0.7.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
+
 [[package]]
 name = "winsafe"
 version = "0.0.19"
@@ -6754,6 +6861,15 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2fb433233f2df9344722454bc7e96465c9d03bff9d77c248f9e7523fe79585b5"
 
+[[package]]
+name = "xz2"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2"
+dependencies = [
+ "lzma-sys",
+]
+
 [[package]]
 name = "zcash"
 version = "0.1.0"
@@ -6837,7 +6953,7 @@ dependencies = [
  "tower",
  "tracing",
  "trait-variant",
- "webpki-roots 1.0.4",
+ "webpki-roots 1.0.3",
  "which",
  "zcash_address",
  "zcash_encoding",
@@ -6880,7 +6996,7 @@ dependencies = [
  "shardtree",
  "static_assertions",
  "subtle",
- "thiserror 1.0.69",
+ "thiserror 1.0.63",
  "time",
  "tokio",
  "tracing",
@@ -6904,7 +7020,7 @@ dependencies = [
  "ambassador",
  "assert_matches",
  "bip32",
- "bitflags 2.10.0",
+ "bitflags 2.9.0",
  "bls12_381",
  "bs58",
  "byteorder",
@@ -6960,6 +7076,7 @@ dependencies = [
  "core2",
  "hex",
  "nonempty",
+ "proptest",
 ]
 
 [[package]]
@@ -7076,7 +7193,7 @@ dependencies = [
  "ripemd 0.1.3",
  "sapling-crypto",
  "secp256k1",
- "sha2 0.10.9",
+ "sha2 0.10.8",
  "subtle",
  "tracing",
  "zcash_address",
@@ -7133,14 +7250,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9bed6cf5b2b4361105d4ea06b2752f0c8af4641756c7fbc9858a80af186c234f"
 dependencies = [
  "bip32",
- "bitflags 2.10.0",
+ "bitflags 2.9.0",
  "bounded-vec",
  "hex",
  "ripemd 0.1.3",
  "secp256k1",
  "sha1",
- "sha2 0.10.9",
- "thiserror 2.0.17",
+ "sha2 0.10.8",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -7166,7 +7283,7 @@ dependencies = [
  "proptest",
  "ripemd 0.1.3",
  "secp256k1",
- "sha2 0.10.9",
+ "sha2 0.10.8",
  "subtle",
  "zcash_address",
  "zcash_encoding",
@@ -7178,22 +7295,22 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.27"
+version = "0.7.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
+checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.27"
+version = "0.7.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
+checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -7204,9 +7321,9 @@ checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
 
 [[package]]
 name = "zeroize"
-version = "1.8.2"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
+checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
 dependencies = [
  "zeroize_derive",
 ]
@@ -7219,26 +7336,24 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.100",
 ]
 
 [[package]]
 name = "zerovec"
-version = "0.11.5"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
+checksum = "94e62113720e311984f461c56b00457ae9981c0bc7859d22306cc2ae2f95571c"
 dependencies = [
- "serde",
  "zerofrom",
 ]
 
 [[package]]
 name = "zip32"
-version = "0.2.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b64bf5186a8916f7a48f2a98ef599bf9c099e2458b36b819e393db1c0e768c4b"
+checksum = "13ff9ea444cdbce820211f91e6aa3d3a56bde7202d3c0961b7c38f793abf5637"
 dependencies = [
- "bech32",
  "blake2b_simd",
  "memuse",
  "subtle",
@@ -7259,27 +7374,27 @@ dependencies = [
 
 [[package]]
 name = "zstd"
-version = "0.13.3"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a"
+checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a"
 dependencies = [
  "zstd-safe",
 ]
 
 [[package]]
 name = "zstd-safe"
-version = "7.2.4"
+version = "7.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d"
+checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a"
 dependencies = [
  "zstd-sys",
 ]
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.16+zstd.1.5.7"
+version = "2.0.10+zstd.1.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748"
+checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa"
 dependencies = [
  "cc",
  "pkg-config",
diff --git a/components/zcash_encoding/Cargo.toml b/components/zcash_encoding/Cargo.toml
index 4ba7fcfb1a..a657d9a3a9 100644
--- a/components/zcash_encoding/Cargo.toml
+++ b/components/zcash_encoding/Cargo.toml
@@ -20,6 +20,9 @@ core2.workspace = true
 hex.workspace = true
 nonempty.workspace = true
 
+[dev-dependencies]
+proptest.workspace = true
+
 [features]
 default = ["std"]
 std = ["core2/std"]
diff --git a/components/zcash_encoding/src/lib.rs b/components/zcash_encoding/src/lib.rs
index e43f291c63..4c3c32ab8b 100644
--- a/components/zcash_encoding/src/lib.rs
+++ b/components/zcash_encoding/src/lib.rs
@@ -307,18 +307,41 @@ impl Optional {
 pub struct ReverseHex;
 
 impl ReverseHex {
-    /// Decodes a reversed-hex string into a byte array.
-    pub fn decode(bytes: &[u8; 32]) -> alloc::string::String {
+    /// Encodes a byte array by reversing the order of the bytes and then hex encoding
+    pub fn encode(bytes: &[u8; 32]) -> alloc::string::String {
         let mut reversed = *bytes;
         reversed.reverse();
         hex::encode(reversed)
     }
+
+    /// Decodes a reversed-hex string into a byte array by decoding the hex and
+    /// reversing the order of the bytes.
+    pub fn decode(hex_str: &str) -> Option<[u8; 32]> {
+        let mut bytes = [0; 32];
+        let res = hex::decode_to_slice(hex_str, &mut bytes);
+        if res.is_err() {
+            return None;
+        }
+
+        bytes.reverse();
+        Some(bytes)
+    }
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
     use core::fmt::Debug;
+    use proptest::prelude::*;
+
+    proptest! {
+        #[test]
+        fn reverse_hex_roundtrip(bytes in prop::array::uniform32(any::<u8>())) {
+            let encoded = ReverseHex::encode(&bytes);
+            let decoded = ReverseHex::decode(&encoded);
+            prop_assert_eq!(decoded, Some(bytes));
+        }
+    }
 
     #[test]
     fn compact_size() {
diff --git a/components/zcash_protocol/src/txid.rs b/components/zcash_protocol/src/txid.rs
index bc804b4fe3..02769b7fde 100644
--- a/components/zcash_protocol/src/txid.rs
+++ b/components/zcash_protocol/src/txid.rs
@@ -31,7 +31,7 @@ impl fmt::Debug for TxId {
 
 impl fmt::Display for TxId {
     fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
-        formatter.write_str(&ReverseHex::decode(&self.0))
+        formatter.write_str(&ReverseHex::encode(&self.0))
     }
 }
 
@@ -48,17 +48,6 @@ impl From<TxId> for [u8; 32] {
 }
 
 impl TxId {
-    /// Creates a TxId from a reverse hex string
-    ///
-    /// See `zcash_encoding::decode_reverse_hex` for more context.
-    pub const fn from_reverse_hex(hex_str: &str) -> RpcResult<Self> {
-        let mut bytes = [0; 32];
-        hex::decode_to_slice(hex_str, &mut bytes)
-            .map_err(|_| RpcError::ParseError("Invalid hex string".to_string()))?;
-        bytes.reverse();
-        Ok(TxId(bytes))
-    }
-
     /// Wraps the given byte array as a TxId value
     pub const fn from_bytes(bytes: [u8; 32]) -> Self {
         TxId(bytes)

From b664dbd5693d7fe12dbc8f51d40ed2c42416d571 Mon Sep 17 00:00:00 2001
From: Ryan Quinn Ford <ryan@deltadevs.xyz>
Date: Tue, 11 Nov 2025 08:03:24 +0100
Subject: [PATCH 007/263] fix(zcash_encoding): CHANGELOG + rustdoc

---
 components/zcash_encoding/CHANGELOG.md | 2 ++
 components/zcash_encoding/src/lib.rs   | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/components/zcash_encoding/CHANGELOG.md b/components/zcash_encoding/CHANGELOG.md
index 85367fb7f1..61cce2c082 100644
--- a/components/zcash_encoding/CHANGELOG.md
+++ b/components/zcash_encoding/CHANGELOG.md
@@ -6,6 +6,8 @@ and this library adheres to Rust's notion of
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- `zcash_encoding::ReverseHex::{encode, decode}`
 
 ## [0.3.0] - 2025-02-21
 ### Changed
diff --git a/components/zcash_encoding/src/lib.rs b/components/zcash_encoding/src/lib.rs
index 4c3c32ab8b..51d79d16de 100644
--- a/components/zcash_encoding/src/lib.rs
+++ b/components/zcash_encoding/src/lib.rs
@@ -316,6 +316,9 @@ impl ReverseHex {
 
     /// Decodes a reversed-hex string into a byte array by decoding the hex and
     /// reversing the order of the bytes.
+    ///
+    /// Returns `None` if the hex decoding fails or if the output is the wrong
+    /// size.
     pub fn decode(hex_str: &str) -> Option<[u8; 32]> {
         let mut bytes = [0; 32];
         let res = hex::decode_to_slice(hex_str, &mut bytes);

From 75337cd455016f6f5285a4c07ec5990e602447cd Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Wed, 22 Oct 2025 16:41:58 +1300
Subject: [PATCH 008/263] added TestBuilder::with_standard_sapling_account,
 style nit DSF -> Dsf

---
 zcash_client_backend/src/data_api/testing.rs  |  23 +-
 .../src/data_api/testing/pool.rs              | 405 +++++++-----------
 2 files changed, 182 insertions(+), 246 deletions(-)

diff --git a/zcash_client_backend/src/data_api/testing.rs b/zcash_client_backend/src/data_api/testing.rs
index eaa5c9289d..4f4486d0ed 100644
--- a/zcash_client_backend/src/data_api/testing.rs
+++ b/zcash_client_backend/src/data_api/testing.rs
@@ -1468,6 +1468,27 @@ impl TestBuilder<(), ()> {
             gap_limits: None,
         }
     }
+
+    /// Equip the builder with the provided [`DataStoreFactory`] and [`TestCache`],
+    /// as well as an account that has a birthday at Sapling activation.
+    ///
+    /// Shorthand for the following:
+    /// ```rust,ignore
+    /// let mut st = TestBuilder::new()
+    ///     .with_data_store_factory(dsf)
+    ///     .with_block_cache(tc)
+    ///     .with_account_from_sapling_activation(BlockHash([0; 32]))
+    ///     .build();
+    /// ```
+    pub fn with_standard_sapling_account<Dsf: DataStoreFactory, Tc>(
+        self,
+        dsf: Dsf,
+        tc: Tc,
+    ) -> TestBuilder<Tc, Dsf> {
+        self.with_data_store_factory(dsf)
+            .with_block_cache(tc)
+            .with_account_from_sapling_activation(BlockHash([0; 32]))
+    }
 }
 
 impl Default for TestBuilder<(), ()> {
@@ -1478,7 +1499,7 @@ impl Default for TestBuilder<(), ()> {
 
 impl<A> TestBuilder<(), A> {
     /// Adds a block cache to the test environment.
-    pub fn with_block_cache<C: TestCache>(self, cache: C) -> TestBuilder<C, A> {
+    pub fn with_block_cache<C>(self, cache: C) -> TestBuilder<C, A> {
         TestBuilder {
             rng: self.rng,
             network: self.network,
diff --git a/zcash_client_backend/src/data_api/testing/pool.rs b/zcash_client_backend/src/data_api/testing/pool.rs
index 908c66375a..acbe57a447 100644
--- a/zcash_client_backend/src/data_api/testing/pool.rs
+++ b/zcash_client_backend/src/data_api/testing/pool.rs
@@ -2,11 +2,11 @@ use std::{
     cmp::Eq,
     convert::Infallible,
     hash::Hash,
-    num::{NonZeroU8, NonZeroU32, NonZeroU64, NonZeroUsize},
+    num::{NonZeroU32, NonZeroU64, NonZeroU8, NonZeroUsize},
 };
 
 use assert_matches::assert_matches;
-use incrementalmerkletree::{Level, Position, frontier::Frontier};
+use incrementalmerkletree::{frontier::Frontier, Level, Position};
 use rand::{Rng, RngCore};
 use secrecy::Secret;
 use shardtree::error::ShardTreeError;
@@ -16,40 +16,42 @@ use zcash_keys::{address::Address, keys::UnifiedSpendingKey};
 use zcash_primitives::{
     block::BlockHash,
     transaction::{
-        Transaction,
         fees::zip317::{FeeRule as Zip317FeeRule, MARGINAL_FEE, MINIMUM_FEE},
+        Transaction,
     },
 };
 use zcash_protocol::{
-    ShieldedProtocol,
     consensus::{self, BlockHeight, NetworkUpgrade, Parameters},
     local_consensus::LocalNetwork,
     memo::{Memo, MemoBytes},
     value::Zatoshis,
+    ShieldedProtocol,
 };
 use zip32::Scope;
 use zip321::{Payment, TransactionRequest};
 
 use crate::{
     data_api::{
-        self, Account as _, AccountBirthday, BoundedU8, DecryptedTransaction, InputSource,
-        MaxSpendMode, NoteFilter, Ratio, TargetValue, WalletCommitmentTrees, WalletRead,
-        WalletSummary, WalletTest, WalletWrite,
+        self,
         chain::{self, ChainState, CommitmentTreeRoot, ScanSummary},
         error::Error,
         testing::{
-            AddressType, CacheInsertionResult, CachedBlock, FakeCompactOutput, InitialChainState,
-            TestBuilder, single_output_change_strategy,
+            single_output_change_strategy, AddressType, CacheInsertionResult, CachedBlock,
+            FakeCompactOutput, InitialChainState, TestBuilder,
         },
         wallet::{
-            ConfirmationsPolicy, TargetHeight, TransferErrT, decrypt_and_store_transaction,
-            input_selection::GreedyInputSelector,
+            decrypt_and_store_transaction, input_selection::GreedyInputSelector,
+            ConfirmationsPolicy, TargetHeight, TransferErrT,
         },
+        Account as _, AccountBirthday, BoundedU8, DecryptedTransaction, InputSource, MaxSpendMode,
+        NoteFilter, Ratio, TargetValue, WalletCommitmentTrees, WalletRead, WalletSummary,
+        WalletTest, WalletWrite,
     },
     decrypt_transaction,
     fees::{
-        self, DustOutputPolicy, SplitPolicy, StandardFeeRule,
+        self,
         standard::{self, SingleOutputChangeStrategy},
+        DustOutputPolicy, SplitPolicy, StandardFeeRule,
     },
     scanning::ScanError,
     wallet::{Note, NoteId, OvkPolicy, ReceivedNote},
@@ -72,7 +74,7 @@ use {
         keys::{NonHardenedChildIndex, TransparentKeyScope},
     },
     zcash_primitives::transaction::fees::zip317,
-    zcash_protocol::{TxId, value::ZatBalance},
+    zcash_protocol::{value::ZatBalance, TxId},
 };
 
 #[cfg(feature = "orchard")]
@@ -202,9 +204,7 @@ pub fn send_single_step_proposed_transfer<T: ShieldedPoolTester>(
     cache: impl TestCache,
 ) {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(dsf)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(dsf, cache)
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -388,9 +388,7 @@ pub fn zip_315_confirmations_test_steps<T: ShieldedPoolTester>(
     input_trust: InputTrust,
 ) {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(dsf)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(dsf, cache)
         .build();
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -489,9 +487,7 @@ pub fn spend_max_spendable_single_step_proposed_transfer<T: ShieldedPoolTester>(
     cache: impl TestCache,
 ) {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(dsf)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(dsf, cache)
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -655,9 +651,7 @@ pub fn spend_everything_single_step_proposed_transfer<T: ShieldedPoolTester>(
     cache: impl TestCache,
 ) {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(dsf)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(dsf, cache)
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -811,9 +805,7 @@ pub fn fails_to_send_max_spendable_to_transparent_with_memo<T: ShieldedPoolTeste
     use crate::data_api::MaxSpendMode;
 
     let mut st = TestBuilder::new()
-        .with_data_store_factory(dsf)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(dsf, cache)
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -879,9 +871,7 @@ pub fn spend_everything_proposal_fails_when_unconfirmed_funds_present<T: Shielde
     cache: impl TestCache,
 ) {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(dsf)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(dsf, cache)
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -961,9 +951,7 @@ pub fn send_max_spendable_proposal_succeeds_when_unconfirmed_funds_present<
     cache: impl TestCache,
 ) {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(dsf)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(dsf, cache)
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -1119,20 +1107,18 @@ pub fn send_max_spendable_proposal_succeeds_when_unconfirmed_funds_present<
 /// This test attempts to send the max spendable funds to a TEX address recipient
 /// checks that the transactions were stored and that the amounts involved are correct
 #[cfg(feature = "transparent-inputs")]
-pub fn spend_everything_multi_step_single_note_proposed_transfer<T: ShieldedPoolTester, DSF>(
-    ds_factory: DSF,
+pub fn spend_everything_multi_step_single_note_proposed_transfer<T: ShieldedPoolTester, Dsf>(
+    ds_factory: Dsf,
     cache: impl TestCache,
 ) where
-    DSF: DataStoreFactory,
-    <DSF as DataStoreFactory>::AccountId: std::fmt::Debug,
+    Dsf: DataStoreFactory,
+    <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    use crate::data_api::{MaxSpendMode, OutputOfSentTx, testing::transparent::GapLimits};
+    use crate::data_api::{testing::transparent::GapLimits, MaxSpendMode, OutputOfSentTx};
 
     let gap_limits = GapLimits::new(10, 5, 3);
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(ds_factory, cache)
         .with_gap_limits(gap_limits)
         .build();
 
@@ -1140,7 +1126,7 @@ pub fn spend_everything_multi_step_single_note_proposed_transfer<T: ShieldedPool
     let account_id = account.id();
     let dfvk = T::test_account_fvk(&st);
 
-    let add_funds = |st: &mut TestState<_, DSF::DataStore, _>, value| {
+    let add_funds = |st: &mut TestState<_, Dsf::DataStore, _>, value| {
         let (h, _, _) = st.generate_next_block(&dfvk, AddressType::DefaultExternal, value);
         st.scan_cached_blocks(h, 1);
 
@@ -1295,20 +1281,18 @@ pub fn spend_everything_multi_step_single_note_proposed_transfer<T: ShieldedPool
 /// This test attempts to send the max spendable funds to a TEX address recipient
 /// checks that the transactions were stored and that the amounts involved are correct
 #[cfg(feature = "transparent-inputs")]
-pub fn spend_everything_multi_step_many_notes_proposed_transfer<T: ShieldedPoolTester, DSF>(
-    ds_factory: DSF,
+pub fn spend_everything_multi_step_many_notes_proposed_transfer<T: ShieldedPoolTester, Dsf>(
+    ds_factory: Dsf,
     cache: impl TestCache,
 ) where
-    DSF: DataStoreFactory,
-    <DSF as DataStoreFactory>::AccountId: std::fmt::Debug,
+    Dsf: DataStoreFactory,
+    <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    use crate::data_api::{OutputOfSentTx, testing::transparent::GapLimits};
+    use crate::data_api::{testing::transparent::GapLimits, OutputOfSentTx};
 
     let gap_limits = GapLimits::new(10, 5, 3);
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(ds_factory, cache)
         .with_gap_limits(gap_limits)
         .build();
 
@@ -1316,7 +1300,7 @@ pub fn spend_everything_multi_step_many_notes_proposed_transfer<T: ShieldedPoolT
     let account_id = account.id();
     let dfvk = T::test_account_fvk(&st);
 
-    let add_funds = |st: &mut TestState<_, DSF::DataStore, _>, value| {
+    let add_funds = |st: &mut TestState<_, Dsf::DataStore, _>, value| {
         let (h, _, _) = st.generate_next_block(&dfvk, AddressType::DefaultExternal, value);
         st.scan_cached_blocks(h, 1);
 
@@ -1468,21 +1452,19 @@ pub fn spend_everything_multi_step_many_notes_proposed_transfer<T: ShieldedPoolT
 #[cfg(feature = "transparent-inputs")]
 pub fn spend_everything_multi_step_with_marginal_notes_proposed_transfer<
     T: ShieldedPoolTester,
-    DSF,
+    Dsf,
 >(
-    ds_factory: DSF,
+    ds_factory: Dsf,
     cache: impl TestCache,
 ) where
-    DSF: DataStoreFactory,
-    <DSF as DataStoreFactory>::AccountId: std::fmt::Debug,
+    Dsf: DataStoreFactory,
+    <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    use crate::data_api::{MaxSpendMode, OutputOfSentTx, testing::transparent::GapLimits};
+    use crate::data_api::{testing::transparent::GapLimits, MaxSpendMode, OutputOfSentTx};
 
     let gap_limits = GapLimits::new(10, 5, 3);
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(ds_factory, cache)
         .with_gap_limits(gap_limits)
         .build();
 
@@ -1490,7 +1472,7 @@ pub fn spend_everything_multi_step_with_marginal_notes_proposed_transfer<
     let account_id = account.id();
     let dfvk = T::test_account_fvk(&st);
 
-    let add_funds = |st: &mut TestState<_, DSF::DataStore, _>, value| {
+    let add_funds = |st: &mut TestState<_, Dsf::DataStore, _>, value| {
         let (h, _, _) = st.generate_next_block(&dfvk, AddressType::DefaultExternal, value);
         st.scan_cached_blocks(h, 1);
 
@@ -1647,9 +1629,7 @@ pub fn send_with_multiple_change_outputs<T: ShieldedPoolTester>(
     cache: impl TestCache,
 ) {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(dsf)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(dsf, cache)
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -1827,24 +1807,21 @@ pub fn send_with_multiple_change_outputs<T: ShieldedPoolTester>(
 }
 
 #[cfg(feature = "transparent-inputs")]
-pub fn send_multi_step_proposed_transfer<T: ShieldedPoolTester, DSF>(
-    ds_factory: DSF,
+pub fn send_multi_step_proposed_transfer<T: ShieldedPoolTester, Dsf>(
+    ds_factory: Dsf,
     cache: impl TestCache,
-    is_reached_gap_limit: impl Fn(&<DSF::DataStore as WalletRead>::Error, DSF::AccountId, u32) -> bool,
+    is_reached_gap_limit: impl Fn(&<Dsf::DataStore as WalletRead>::Error, Dsf::AccountId, u32) -> bool,
 ) where
-    DSF: DataStoreFactory,
-    <DSF as DataStoreFactory>::AccountId: std::fmt::Debug,
+    Dsf: DataStoreFactory,
 {
     use crate::{
-        data_api::{OutputOfSentTx, TransactionStatus, testing::transparent::GapLimits},
+        data_api::{testing::transparent::GapLimits, OutputOfSentTx, TransactionStatus},
         wallet::{Exposure, TransparentAddressSource},
     };
 
     let gap_limits = GapLimits::new(10, 5, 3);
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(ds_factory, cache)
         .with_gap_limits(gap_limits)
         .build();
 
@@ -1853,7 +1830,7 @@ pub fn send_multi_step_proposed_transfer<T: ShieldedPoolTester, DSF>(
     let dfvk = T::test_account_fvk(&st);
     let tex_addr = Address::Tex([0x4; 20]);
 
-    let add_funds = |st: &mut TestState<_, DSF::DataStore, _>, value| {
+    let add_funds = |st: &mut TestState<_, Dsf::DataStore, _>, value| {
         let (h, _, _) = st.generate_next_block(&dfvk, AddressType::DefaultExternal, value);
         st.scan_cached_blocks(h, 1);
 
@@ -1871,7 +1848,7 @@ pub fn send_multi_step_proposed_transfer<T: ShieldedPoolTester, DSF>(
     let value = Zatoshis::const_from_u64(100000);
     let transfer_amount = Zatoshis::const_from_u64(50000);
 
-    let run_test = |st: &mut TestState<_, DSF::DataStore, _>, expected_index, prior_balance| {
+    let run_test = |st: &mut TestState<_, Dsf::DataStore, _>, expected_index, prior_balance| {
         // Add funds to the wallet.
         add_funds(st, value);
         let initial_balance: Option<Zatoshis> = prior_balance + value;
@@ -2127,7 +2104,7 @@ pub fn send_multi_step_proposed_transfer<T: ShieldedPoolTester, DSF>(
         "new_known_addrs must have known_addrs as its prefix"
     );
 
-    let reservation_should_succeed = |st: &mut TestState<_, DSF::DataStore, _>, n: u32| {
+    let reservation_should_succeed = |st: &mut TestState<_, Dsf::DataStore, _>, n: u32| {
         let reserved = st
             .wallet_mut()
             .reserve_next_n_ephemeral_addresses(account_id, n.try_into().unwrap())
@@ -2136,7 +2113,7 @@ pub fn send_multi_step_proposed_transfer<T: ShieldedPoolTester, DSF>(
         reserved
     };
     let reservation_should_fail =
-        |st: &mut TestState<_, DSF::DataStore, _>, n: u32, expected_bad_index| {
+        |st: &mut TestState<_, Dsf::DataStore, _>, n: u32, expected_bad_index| {
             assert_matches!(st
             .wallet_mut()
             .reserve_next_n_ephemeral_addresses(account_id, n.try_into().unwrap()),
@@ -2195,9 +2172,7 @@ pub fn spend_all_funds_single_step_proposed_transfer<T: ShieldedPoolTester>(
     cache: impl TestCache,
 ) {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(dsf)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(dsf, cache)
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -2360,20 +2335,18 @@ pub fn spend_all_funds_single_step_proposed_transfer<T: ShieldedPoolTester>(
 /// - all funds are spent
 /// - Fees are the least possible: in this case 15000 for tr0 and 10000 Zats for tr1
 #[cfg(feature = "transparent-inputs")]
-pub fn spend_all_funds_multi_step_proposed_transfer<T: ShieldedPoolTester, DSF>(
-    ds_factory: DSF,
+pub fn spend_all_funds_multi_step_proposed_transfer<T: ShieldedPoolTester, Dsf>(
+    ds_factory: Dsf,
     cache: impl TestCache,
 ) where
-    DSF: DataStoreFactory,
-    <DSF as DataStoreFactory>::AccountId: std::fmt::Debug,
+    Dsf: DataStoreFactory,
+    <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    use crate::data_api::{OutputOfSentTx, testing::transparent::GapLimits};
+    use crate::data_api::{testing::transparent::GapLimits, OutputOfSentTx};
 
     let gap_limits = GapLimits::new(10, 5, 3);
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(ds_factory, cache)
         .with_gap_limits(gap_limits)
         .build();
 
@@ -2523,23 +2496,21 @@ pub fn spend_all_funds_multi_step_proposed_transfer<T: ShieldedPoolTester, DSF>(
 }
 
 #[cfg(feature = "transparent-inputs")]
-pub fn proposal_fails_if_not_all_ephemeral_outputs_consumed<T: ShieldedPoolTester, DSF>(
-    ds_factory: DSF,
+pub fn proposal_fails_if_not_all_ephemeral_outputs_consumed<T: ShieldedPoolTester, Dsf>(
+    ds_factory: Dsf,
     cache: impl TestCache,
 ) where
-    DSF: DataStoreFactory,
+    Dsf: DataStoreFactory,
 {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(ds_factory, cache)
         .build();
 
     let account = st.test_account().cloned().unwrap();
     let account_id = account.id();
     let dfvk = T::test_account_fvk(&st);
 
-    let add_funds = |st: &mut TestState<_, DSF::DataStore, _>, value| {
+    let add_funds = |st: &mut TestState<_, Dsf::DataStore, _>, value| {
         let (h, _, _) = st.generate_next_block(&dfvk, AddressType::DefaultExternal, value);
         st.scan_cached_blocks(h, 1);
 
@@ -2609,12 +2580,11 @@ pub fn proposal_fails_if_not_all_ephemeral_outputs_consumed<T: ShieldedPoolTeste
     );
 }
 
-pub fn create_to_address_fails_on_incorrect_usk<T: ShieldedPoolTester, DSF: DataStoreFactory>(
-    ds_factory: DSF,
+pub fn create_to_address_fails_on_incorrect_usk<T: ShieldedPoolTester, Dsf: DataStoreFactory>(
+    ds_factory: Dsf,
 ) {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(ds_factory, ())
         .build();
     let dfvk = T::test_account_fvk(&st);
     let to = T::fvk_default_address(&dfvk);
@@ -2623,7 +2593,7 @@ pub fn create_to_address_fails_on_incorrect_usk<T: ShieldedPoolTester, DSF: Data
     let acct1 = zip32::AccountId::try_from(1).unwrap();
     let usk1 = UnifiedSpendingKey::from_seed(st.network(), &[1u8; 32], acct1).unwrap();
 
-    let input_selector = GreedyInputSelector::<DSF::DataStore>::new();
+    let input_selector = GreedyInputSelector::<Dsf::DataStore>::new();
     let change_strategy =
         single_output_change_strategy(StandardFeeRule::Zip317, None, T::SHIELDED_PROTOCOL);
 
@@ -2647,14 +2617,13 @@ pub fn create_to_address_fails_on_incorrect_usk<T: ShieldedPoolTester, DSF: Data
     );
 }
 
-pub fn proposal_fails_with_no_blocks<T: ShieldedPoolTester, DSF>(ds_factory: DSF)
+pub fn proposal_fails_with_no_blocks<T: ShieldedPoolTester, Dsf>(ds_factory: Dsf)
 where
-    DSF: DataStoreFactory,
-    <DSF as DataStoreFactory>::AccountId: std::fmt::Debug,
+    Dsf: DataStoreFactory,
+    <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(ds_factory, ())
         .build();
 
     let account_id = st.test_account().unwrap().id();
@@ -2685,9 +2654,7 @@ pub fn spend_fails_on_unverified_notes<T: ShieldedPoolTester>(
     cache: impl TestCache,
 ) {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(ds_factory, cache)
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -2879,9 +2846,7 @@ pub fn spend_fails_on_locked_notes<T: ShieldedPoolTester>(
     cache: impl TestCache,
 ) {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(ds_factory, cache)
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -3021,16 +2986,14 @@ pub fn spend_fails_on_locked_notes<T: ShieldedPoolTester>(
     );
 }
 
-pub fn ovk_policy_prevents_recovery_from_chain<T: ShieldedPoolTester, DSF>(
-    ds_factory: DSF,
+pub fn ovk_policy_prevents_recovery_from_chain<T: ShieldedPoolTester, Dsf>(
+    ds_factory: Dsf,
     cache: impl TestCache,
 ) where
-    DSF: DataStoreFactory,
+    Dsf: DataStoreFactory,
 {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(ds_factory, cache)
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -3055,14 +3018,14 @@ pub fn ovk_policy_prevents_recovery_from_chain<T: ShieldedPoolTester, DSF>(
     let fee_rule = StandardFeeRule::Zip317;
 
     #[allow(clippy::type_complexity)]
-    let send_and_recover_with_policy = |st: &mut TestState<_, DSF::DataStore, _>,
+    let send_and_recover_with_policy = |st: &mut TestState<_, Dsf::DataStore, _>,
                                         ovk_policy|
      -> Result<
         Option<(Note, Address, MemoBytes)>,
         TransferErrT<
-            DSF::DataStore,
-            GreedyInputSelector<DSF::DataStore>,
-            SingleOutputChangeStrategy<DSF::DataStore>,
+            Dsf::DataStore,
+            GreedyInputSelector<Dsf::DataStore>,
+            SingleOutputChangeStrategy<Dsf::DataStore>,
         >,
     > {
         let proposal = st.propose_standard_transfer(
@@ -3120,9 +3083,7 @@ pub fn spend_succeeds_to_t_addr_zero_change<T: ShieldedPoolTester>(
     cache: impl TestCache,
 ) {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(ds_factory, cache)
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -3170,9 +3131,7 @@ pub fn change_note_spends_succeed<T: ShieldedPoolTester>(
     cache: impl TestCache,
 ) {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(ds_factory, cache)
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -3403,12 +3362,12 @@ where
     );
 }
 
-pub fn external_address_change_spends_detected_in_restore_from_seed<T: ShieldedPoolTester, DSF>(
-    ds_factory: DSF,
+pub fn external_address_change_spends_detected_in_restore_from_seed<T: ShieldedPoolTester, Dsf>(
+    ds_factory: Dsf,
     cache: impl TestCache,
 ) where
-    DSF: DataStoreFactory,
-    <DSF as DataStoreFactory>::DataStore: Reset,
+    Dsf: DataStoreFactory,
+    <Dsf as DataStoreFactory>::DataStore: Reset,
 {
     let mut st = TestBuilder::new()
         .with_data_store_factory(ds_factory)
@@ -3519,14 +3478,12 @@ pub fn external_address_change_spends_detected_in_restore_from_seed<T: ShieldedP
 }
 
 #[allow(dead_code)]
-pub fn zip317_spend<T: ShieldedPoolTester, DSF: DataStoreFactory>(
-    ds_factory: DSF,
+pub fn zip317_spend<T: ShieldedPoolTester, Dsf: DataStoreFactory>(
+    ds_factory: Dsf,
     cache: impl TestCache,
 ) {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(ds_factory, cache)
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -3559,7 +3516,7 @@ pub fn zip317_spend<T: ShieldedPoolTester, DSF: DataStoreFactory>(
         total
     );
 
-    let input_selector = GreedyInputSelector::<DSF::DataStore>::new();
+    let input_selector = GreedyInputSelector::<Dsf::DataStore>::new();
     let change_strategy =
         single_output_change_strategy(StandardFeeRule::Zip317, None, T::SHIELDED_PROTOCOL);
 
@@ -3616,18 +3573,16 @@ pub fn zip317_spend<T: ShieldedPoolTester, DSF: DataStoreFactory>(
 }
 
 #[cfg(feature = "transparent-inputs")]
-pub fn shield_transparent<T: ShieldedPoolTester, DSF>(ds_factory: DSF, cache: impl TestCache)
+pub fn shield_transparent<T: ShieldedPoolTester, Dsf>(ds_factory: Dsf, cache: impl TestCache)
 where
-    DSF: DataStoreFactory,
-    <<DSF as DataStoreFactory>::DataStore as WalletWrite>::UtxoRef: std::fmt::Debug,
+    Dsf: DataStoreFactory,
+    <<Dsf as DataStoreFactory>::DataStore as WalletWrite>::UtxoRef: std::fmt::Debug,
 {
     use zcash_keys::keys::UnifiedAddressRequest;
     use zcash_primitives::transaction::builder::DEFAULT_TX_EXPIRY_DELTA;
 
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(ds_factory, cache)
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -3698,11 +3653,9 @@ where
     // Verify that a transaction enhancement request for the transaction containing the spent
     // outpoint does not yet exist.
     let requests = st.wallet().transaction_data_requests().unwrap();
-    assert!(
-        !requests
-            .iter()
-            .any(|req| req == &TransactionDataRequest::Enhancement(*spent_outpoint.txid()))
-    );
+    assert!(!requests
+        .iter()
+        .any(|req| req == &TransactionDataRequest::Enhancement(*spent_outpoint.txid())));
 
     // Use `decrypt_and_store_transaction` for the side effect of creating enhancement requests for
     // the transparent inputs of the transaction.
@@ -3716,11 +3669,9 @@ where
 
     // Verify that a transaction enhancement request for the received transaction was created
     let requests = st.wallet().transaction_data_requests().unwrap();
-    assert!(
-        requests
-            .iter()
-            .any(|req| req == &TransactionDataRequest::Enhancement(*spent_outpoint.txid()))
-    );
+    assert!(requests
+        .iter()
+        .any(|req| req == &TransactionDataRequest::Enhancement(*spent_outpoint.txid())));
 
     // Now advance the chain by 40 blocks; even though a record for the transaction that created
     // `spent_outpoint` exists in the wallet database, the transaction can't be enhanced because
@@ -3747,11 +3698,9 @@ where
 
     // Verify that the transaction enhancement request for the invalid txid has been deleted.
     let requests = st.wallet().transaction_data_requests().unwrap();
-    assert!(
-        !requests
-            .iter()
-            .any(|req| req == &TransactionDataRequest::Enhancement(*spent_outpoint.txid()))
-    );
+    assert!(!requests
+        .iter()
+        .any(|req| req == &TransactionDataRequest::Enhancement(*spent_outpoint.txid())));
 }
 
 // FIXME: This requires fixes to the test framework.
@@ -3875,14 +3824,12 @@ pub fn birthday_in_anchor_shard<T: ShieldedPoolTester>(
     assert_eq!(spendable.len(), 1);
 }
 
-pub fn checkpoint_gaps<T: ShieldedPoolTester, DSF: DataStoreFactory>(
-    ds_factory: DSF,
+pub fn checkpoint_gaps<T: ShieldedPoolTester, Dsf: DataStoreFactory>(
+    ds_factory: Dsf,
     cache: impl TestCache,
 ) {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(ds_factory, cache)
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -3933,7 +3880,7 @@ pub fn checkpoint_gaps<T: ShieldedPoolTester, DSF: DataStoreFactory>(
     .unwrap();
     assert_eq!(spendable.len(), 1);
 
-    let input_selector = GreedyInputSelector::<DSF::DataStore>::new();
+    let input_selector = GreedyInputSelector::<Dsf::DataStore>::new();
     let change_strategy =
         single_output_change_strategy(StandardFeeRule::Zip317, None, T::SHIELDED_PROTOCOL);
 
@@ -3968,10 +3915,8 @@ pub fn pool_crossing_required<P0: ShieldedPoolTester, P1: ShieldedPoolTester>(
     cache: impl TestCache,
 ) {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32])) // TODO: Allow for Orchard
-        // activation after Sapling
+        .with_standard_sapling_account(ds_factory, cache)
+        // TODO: Allow for Orchard activation after Sapling
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -4060,10 +4005,8 @@ pub fn fully_funded_fully_private<P0: ShieldedPoolTester, P1: ShieldedPoolTester
     cache: impl TestCache,
 ) {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32])) // TODO: Allow for Orchard
-        // activation after Sapling
+        .with_standard_sapling_account(ds_factory, cache)
+        // TODO: Allow for Orchard activation after Sapling
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -4154,10 +4097,8 @@ pub fn fully_funded_send_to_t<P0: ShieldedPoolTester, P1: ShieldedPoolTester>(
     cache: impl TestCache,
 ) {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32])) // TODO: Allow for Orchard
-        // activation after Sapling
+        .with_standard_sapling_account(ds_factory, cache)
+        // TODO: Allow for Orchard activation after Sapling
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -4248,10 +4189,8 @@ pub fn multi_pool_checkpoint<P0: ShieldedPoolTester, P1: ShieldedPoolTester>(
     cache: impl TestCache,
 ) {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32])) // TODO: Allow for Orchard
-        // activation after Sapling
+        .with_standard_sapling_account(ds_factory, cache)
+        // TODO: Allow for Orchard activation after Sapling
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -4421,10 +4360,8 @@ pub fn multi_pool_checkpoints_with_pruning<P0: ShieldedPoolTester, P1: ShieldedP
     cache: impl TestCache,
 ) {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32])) // TODO: Allow for Orchard
-        // activation after Sapling
+        .with_standard_sapling_account(ds_factory, cache)
+        // TODO: Allow for Orchard activation after Sapling
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -4455,9 +4392,7 @@ pub fn valid_chain_states<T: ShieldedPoolTester>(
     cache: impl TestCache,
 ) {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(ds_factory, cache)
         .build();
 
     let dfvk = T::test_account_fvk(&st);
@@ -4493,9 +4428,7 @@ pub fn invalid_chain_cache_disconnected<T: ShieldedPoolTester>(
     cache: impl TestCache,
 ) {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(ds_factory, cache)
         .build();
 
     let dfvk = T::test_account_fvk(&st);
@@ -4546,15 +4479,13 @@ pub fn invalid_chain_cache_disconnected<T: ShieldedPoolTester>(
     );
 }
 
-pub fn data_db_truncation<T: ShieldedPoolTester, DSF>(ds_factory: DSF, cache: impl TestCache)
+pub fn data_db_truncation<T: ShieldedPoolTester, Dsf>(ds_factory: Dsf, cache: impl TestCache)
 where
-    DSF: DataStoreFactory,
-    <DSF as DataStoreFactory>::AccountId: std::fmt::Debug,
+    Dsf: DataStoreFactory,
+    <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(ds_factory, cache)
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -4611,23 +4542,21 @@ where
     );
 }
 
-pub fn reorg_to_checkpoint<T: ShieldedPoolTester, DSF, C>(ds_factory: DSF, cache: C)
+pub fn reorg_to_checkpoint<T: ShieldedPoolTester, Dsf, C>(ds_factory: Dsf, cache: C)
 where
-    DSF: DataStoreFactory,
-    <DSF as DataStoreFactory>::AccountId: std::fmt::Debug,
+    Dsf: DataStoreFactory,
+    <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
     C: TestCache,
 {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(ds_factory, cache)
         .build();
 
     let account = st.test_account().cloned().unwrap();
 
     // Create a sequence of blocks to serve as the foundation of our chain state.
     let p0_fvk = T::random_fvk(st.rng_mut());
-    let gen_random_block = |st: &mut TestState<C, DSF::DataStore, LocalNetwork>,
+    let gen_random_block = |st: &mut TestState<C, Dsf::DataStore, LocalNetwork>,
                             output_count: usize| {
         let fake_outputs =
             std::iter::repeat_with(|| FakeCompactOutput::random(st.rng_mut(), p0_fvk.clone()))
@@ -4756,9 +4685,7 @@ pub fn scan_cached_blocks_allows_blocks_out_of_order<T: ShieldedPoolTester>(
     cache: impl TestCache,
 ) {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(ds_factory, cache)
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -4807,17 +4734,15 @@ pub fn scan_cached_blocks_allows_blocks_out_of_order<T: ShieldedPoolTester>(
     );
 }
 
-pub fn scan_cached_blocks_finds_received_notes<T: ShieldedPoolTester, DSF>(
-    ds_factory: DSF,
+pub fn scan_cached_blocks_finds_received_notes<T: ShieldedPoolTester, Dsf>(
+    ds_factory: Dsf,
     cache: impl TestCache,
 ) where
-    DSF: DataStoreFactory,
-    <DSF as DataStoreFactory>::AccountId: std::fmt::Debug,
+    Dsf: DataStoreFactory,
+    <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(ds_factory, cache)
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -4857,17 +4782,15 @@ pub fn scan_cached_blocks_finds_received_notes<T: ShieldedPoolTester, DSF>(
 }
 
 // TODO: This test can probably be entirely removed, as the following test duplicates it entirely.
-pub fn scan_cached_blocks_finds_change_notes<T: ShieldedPoolTester, DSF>(
-    ds_factory: DSF,
+pub fn scan_cached_blocks_finds_change_notes<T: ShieldedPoolTester, Dsf>(
+    ds_factory: Dsf,
     cache: impl TestCache,
 ) where
-    DSF: DataStoreFactory,
-    <DSF as DataStoreFactory>::AccountId: std::fmt::Debug,
+    Dsf: DataStoreFactory,
+    <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(ds_factory, cache)
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -4903,17 +4826,15 @@ pub fn scan_cached_blocks_finds_change_notes<T: ShieldedPoolTester, DSF>(
     );
 }
 
-pub fn scan_cached_blocks_detects_spends_out_of_order<T: ShieldedPoolTester, DSF>(
-    ds_factory: DSF,
+pub fn scan_cached_blocks_detects_spends_out_of_order<T: ShieldedPoolTester, Dsf>(
+    ds_factory: Dsf,
     cache: impl TestCache,
 ) where
-    DSF: DataStoreFactory,
-    <DSF as DataStoreFactory>::AccountId: std::fmt::Debug,
+    Dsf: DataStoreFactory,
+    <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(ds_factory, cache)
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -4952,18 +4873,16 @@ pub fn scan_cached_blocks_detects_spends_out_of_order<T: ShieldedPoolTester, DSF
     );
 }
 
-pub fn metadata_queries_exclude_unwanted_notes<T: ShieldedPoolTester, DSF, TC>(
-    ds_factory: DSF,
+pub fn metadata_queries_exclude_unwanted_notes<T: ShieldedPoolTester, Dsf, TC>(
+    ds_factory: Dsf,
     cache: TC,
 ) where
-    DSF: DataStoreFactory,
-    <DSF as DataStoreFactory>::AccountId: std::fmt::Debug,
+    Dsf: DataStoreFactory,
+    <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
     TC: TestCache,
 {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(ds_factory, cache)
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -4981,7 +4900,7 @@ pub fn metadata_queries_exclude_unwanted_notes<T: ShieldedPoolTester, DSF, TC>(
     st.scan_cached_blocks(h0, 10);
     let target_height = TargetHeight::from(h0 + 10);
 
-    let test_meta = |st: &TestState<TC, DSF::DataStore, LocalNetwork>, query, expected_count| {
+    let test_meta = |st: &TestState<TC, Dsf::DataStore, LocalNetwork>, query, expected_count| {
         let metadata = st
             .wallet()
             .get_account_metadata(account.id(), &query, target_height, &[])
@@ -5040,12 +4959,12 @@ pub fn metadata_queries_exclude_unwanted_notes<T: ShieldedPoolTester, DSF, TC>(
 }
 
 #[cfg(feature = "pczt")]
-pub fn pczt_single_step<P0: ShieldedPoolTester, P1: ShieldedPoolTester, DSF>(
-    ds_factory: DSF,
+pub fn pczt_single_step<P0: ShieldedPoolTester, P1: ShieldedPoolTester, Dsf>(
+    ds_factory: Dsf,
     cache: impl TestCache,
 ) where
-    DSF: DataStoreFactory,
-    <DSF as DataStoreFactory>::AccountId: serde::Serialize + serde::de::DeserializeOwned,
+    Dsf: DataStoreFactory,
+    <Dsf as DataStoreFactory>::AccountId: serde::Serialize + serde::de::DeserializeOwned,
 {
     use zcash_protocol::consensus::ZIP212_GRACE_PERIOD;
 
@@ -5171,9 +5090,7 @@ pub fn wallet_recovery_computes_fees<T: ShieldedPoolTester, DsF: DataStoreFactor
     use secrecy::ExposeSecret;
 
     let mut st = TestBuilder::new()
-        .with_data_store_factory(ds_factory)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(ds_factory, cache)
         .build();
 
     let seed = Secret::new(st.test_seed().unwrap().expose_secret().clone());
@@ -5324,9 +5241,7 @@ pub fn receive_two_notes_with_same_value<T: ShieldedPoolTester>(
     cache: impl TestCache,
 ) {
     let mut st = TestBuilder::new()
-        .with_data_store_factory(dsf)
-        .with_block_cache(cache)
-        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .with_standard_sapling_account(dsf, cache)
         .build();
 
     let account = st.test_account().cloned().unwrap();

From a3f5457c76d8ef56dea164760365ae71d562d818 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Fri, 24 Oct 2025 12:53:02 +1300
Subject: [PATCH 009/263] Added TestDsl, moved TestBuilder convenience methods
 there

---
 zcash_client_backend/src/data_api/testing.rs  |  21 --
 .../src/data_api/testing/pool.rs              | 221 +++++++-----------
 .../src/data_api/testing/pool/dsl.rs          |  84 +++++++
 3 files changed, 162 insertions(+), 164 deletions(-)
 create mode 100644 zcash_client_backend/src/data_api/testing/pool/dsl.rs

diff --git a/zcash_client_backend/src/data_api/testing.rs b/zcash_client_backend/src/data_api/testing.rs
index 4f4486d0ed..0c4cb097d4 100644
--- a/zcash_client_backend/src/data_api/testing.rs
+++ b/zcash_client_backend/src/data_api/testing.rs
@@ -1468,27 +1468,6 @@ impl TestBuilder<(), ()> {
             gap_limits: None,
         }
     }
-
-    /// Equip the builder with the provided [`DataStoreFactory`] and [`TestCache`],
-    /// as well as an account that has a birthday at Sapling activation.
-    ///
-    /// Shorthand for the following:
-    /// ```rust,ignore
-    /// let mut st = TestBuilder::new()
-    ///     .with_data_store_factory(dsf)
-    ///     .with_block_cache(tc)
-    ///     .with_account_from_sapling_activation(BlockHash([0; 32]))
-    ///     .build();
-    /// ```
-    pub fn with_standard_sapling_account<Dsf: DataStoreFactory, Tc>(
-        self,
-        dsf: Dsf,
-        tc: Tc,
-    ) -> TestBuilder<Tc, Dsf> {
-        self.with_data_store_factory(dsf)
-            .with_block_cache(tc)
-            .with_account_from_sapling_activation(BlockHash([0; 32]))
-    }
 }
 
 impl Default for TestBuilder<(), ()> {
diff --git a/zcash_client_backend/src/data_api/testing/pool.rs b/zcash_client_backend/src/data_api/testing/pool.rs
index acbe57a447..77d2f8bb9e 100644
--- a/zcash_client_backend/src/data_api/testing/pool.rs
+++ b/zcash_client_backend/src/data_api/testing/pool.rs
@@ -86,6 +86,9 @@ use {
     zcash_proofs::prover::LocalTxProver,
 };
 
+pub mod dsl;
+use dsl::TestDsl;
+
 /// Trait that exposes the pool-specific types and operations necessary to run the
 /// single-shielded-pool tests on a given pool.
 ///
@@ -203,9 +206,7 @@ pub fn send_single_step_proposed_transfer<T: ShieldedPoolTester>(
     dsf: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(dsf, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -387,9 +388,7 @@ pub fn zip_315_confirmations_test_steps<T: ShieldedPoolTester>(
     cache: impl TestCache,
     input_trust: InputTrust,
 ) {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(dsf, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build();
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
     let starting_balance = Zatoshis::const_from_u64(60_000);
@@ -486,9 +485,7 @@ pub fn spend_max_spendable_single_step_proposed_transfer<T: ShieldedPoolTester>(
     dsf: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(dsf, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -527,11 +524,12 @@ pub fn spend_max_spendable_single_step_proposed_transfer<T: ShieldedPoolTester>(
 
     let send_max_memo = "Test Send Max memo".parse::<Memo>().unwrap();
 
+    let addy = to.to_zcash_address(st.network());
     let proposal = st
         .propose_send_max_transfer(
             account.id(),
             &fee_rule,
-            to.to_zcash_address(st.network()),
+            addy,
             Some(MemoBytes::from(send_max_memo.clone())),
             MaxSpendMode::MaxSpendable,
             confirmation_policy,
@@ -650,9 +648,7 @@ pub fn spend_everything_single_step_proposed_transfer<T: ShieldedPoolTester>(
     dsf: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(dsf, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -685,11 +681,12 @@ pub fn spend_everything_single_step_proposed_transfer<T: ShieldedPoolTester>(
 
     let send_max_memo = "Test Send Max memo".parse::<Memo>().unwrap();
 
+    let addy = to.to_zcash_address(st.network());
     let proposal = st
         .propose_send_max_transfer(
             account.id(),
             &fee_rule,
-            to.to_zcash_address(st.network()),
+            addy,
             Some(MemoBytes::from(send_max_memo.clone())),
             MaxSpendMode::Everything,
             ConfirmationsPolicy::MIN,
@@ -804,9 +801,7 @@ pub fn fails_to_send_max_spendable_to_transparent_with_memo<T: ShieldedPoolTeste
 ) {
     use crate::data_api::MaxSpendMode;
 
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(dsf, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -841,11 +836,12 @@ pub fn fails_to_send_max_spendable_to_transparent_with_memo<T: ShieldedPoolTeste
 
     let send_max_memo = "Test Send Max memo".parse::<Memo>().unwrap();
 
+    let addy = to.to_zcash_address(st.network());
     assert_matches!(
         st.propose_send_max_transfer(
             account.id(),
             &fee_rule,
-            to.to_zcash_address(st.network()),
+            addy,
             Some(MemoBytes::from(send_max_memo.clone())),
             MaxSpendMode::Everything,
             ConfirmationsPolicy::MIN
@@ -870,9 +866,7 @@ pub fn spend_everything_proposal_fails_when_unconfirmed_funds_present<T: Shielde
     dsf: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(dsf, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -916,11 +910,12 @@ pub fn spend_everything_proposal_fails_when_unconfirmed_funds_present<T: Shielde
 
     let send_max_memo = "Test Send Max memo".parse::<Memo>().unwrap();
 
+    let addy = to.to_zcash_address(st.network());
     assert_matches!(
         st.propose_send_max_transfer(
             account.id(),
             &fee_rule,
-            to.to_zcash_address(st.network()),
+            addy,
             Some(MemoBytes::from(send_max_memo.clone())),
             MaxSpendMode::Everything,
             ConfirmationsPolicy::new_symmetrical_unchecked(
@@ -950,9 +945,7 @@ pub fn send_max_spendable_proposal_succeeds_when_unconfirmed_funds_present<
     dsf: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(dsf, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -996,11 +989,12 @@ pub fn send_max_spendable_proposal_succeeds_when_unconfirmed_funds_present<
 
     let send_max_memo = "Test Send Max memo".parse::<Memo>().unwrap();
 
+    let addy = to.to_zcash_address(st.network());
     let proposal = st
         .propose_send_max_transfer(
             account.id(),
             &fee_rule,
-            to.to_zcash_address(st.network()),
+            addy,
             Some(MemoBytes::from(send_max_memo.clone())),
             MaxSpendMode::MaxSpendable,
             ConfirmationsPolicy::new_symmetrical_unchecked(
@@ -1116,10 +1110,8 @@ pub fn spend_everything_multi_step_single_note_proposed_transfer<T: ShieldedPool
 {
     use crate::data_api::{testing::transparent::GapLimits, MaxSpendMode, OutputOfSentTx};
 
-    let gap_limits = GapLimits::new(10, 5, 3);
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        .with_gap_limits(gap_limits)
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache)
+        .map(|builder| builder.with_gap_limits(GapLimits::new(10, 5, 3)))
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -1172,11 +1164,12 @@ pub fn spend_everything_multi_step_single_note_proposed_transfer<T: ShieldedPool
 
     // We use `st.propose_standard_transfer` here in order to also test round-trip
     // serialization of the proposal.
+    let addy = tex_addr.to_zcash_address(st.network());
     let proposal = st
         .propose_send_max_transfer(
             account_id,
             &fee_rule,
-            tex_addr.to_zcash_address(st.network()),
+            addy,
             None,
             MaxSpendMode::Everything,
             ConfirmationsPolicy::MIN,
@@ -1290,10 +1283,8 @@ pub fn spend_everything_multi_step_many_notes_proposed_transfer<T: ShieldedPoolT
 {
     use crate::data_api::{testing::transparent::GapLimits, OutputOfSentTx};
 
-    let gap_limits = GapLimits::new(10, 5, 3);
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        .with_gap_limits(gap_limits)
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache)
+        .map(|builder| builder.with_gap_limits(GapLimits::new(10, 5, 3)))
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -1348,11 +1339,12 @@ pub fn spend_everything_multi_step_many_notes_proposed_transfer<T: ShieldedPoolT
 
     // We use `st.propose_standard_transfer` here in order to also test round-trip
     // serialization of the proposal.
+    let addy = tex_addr.to_zcash_address(st.network());
     let proposal = st
         .propose_send_max_transfer(
             account_id,
             &fee_rule,
-            tex_addr.to_zcash_address(st.network()),
+            addy,
             None,
             MaxSpendMode::Everything,
             ConfirmationsPolicy::MIN,
@@ -1462,10 +1454,8 @@ pub fn spend_everything_multi_step_with_marginal_notes_proposed_transfer<
 {
     use crate::data_api::{testing::transparent::GapLimits, MaxSpendMode, OutputOfSentTx};
 
-    let gap_limits = GapLimits::new(10, 5, 3);
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        .with_gap_limits(gap_limits)
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache)
+        .map(|builder| builder.with_gap_limits(GapLimits::new(10, 5, 3)))
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -1522,11 +1512,12 @@ pub fn spend_everything_multi_step_with_marginal_notes_proposed_transfer<
 
     // We use `st.propose_standard_transfer` here in order to also test round-trip
     // serialization of the proposal.
+    let addy = tex_addr.to_zcash_address(st.network());
     let proposal = st
         .propose_send_max_transfer(
             account_id,
             &fee_rule,
-            tex_addr.to_zcash_address(st.network()),
+            addy,
             None,
             MaxSpendMode::Everything,
             ConfirmationsPolicy::MIN,
@@ -1628,9 +1619,7 @@ pub fn send_with_multiple_change_outputs<T: ShieldedPoolTester>(
     dsf: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(dsf, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -1820,9 +1809,8 @@ pub fn send_multi_step_proposed_transfer<T: ShieldedPoolTester, Dsf>(
     };
 
     let gap_limits = GapLimits::new(10, 5, 3);
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        .with_gap_limits(gap_limits)
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache)
+        .map(|builder| builder.with_gap_limits(gap_limits))
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -2171,9 +2159,7 @@ pub fn spend_all_funds_single_step_proposed_transfer<T: ShieldedPoolTester>(
     dsf: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(dsf, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -2344,10 +2330,8 @@ pub fn spend_all_funds_multi_step_proposed_transfer<T: ShieldedPoolTester, Dsf>(
 {
     use crate::data_api::{testing::transparent::GapLimits, OutputOfSentTx};
 
-    let gap_limits = GapLimits::new(10, 5, 3);
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        .with_gap_limits(gap_limits)
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache)
+        .map(|builder| builder.with_gap_limits(GapLimits::new(10, 5, 3)))
         .build();
 
     let account = st.test_account().cloned().unwrap();
@@ -2502,9 +2486,7 @@ pub fn proposal_fails_if_not_all_ephemeral_outputs_consumed<T: ShieldedPoolTeste
 ) where
     Dsf: DataStoreFactory,
 {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
 
     let account = st.test_account().cloned().unwrap();
     let account_id = account.id();
@@ -2583,9 +2565,7 @@ pub fn proposal_fails_if_not_all_ephemeral_outputs_consumed<T: ShieldedPoolTeste
 pub fn create_to_address_fails_on_incorrect_usk<T: ShieldedPoolTester, Dsf: DataStoreFactory>(
     ds_factory: Dsf,
 ) {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, ())
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, ()).build();
     let dfvk = T::test_account_fvk(&st);
     let to = T::fvk_default_address(&dfvk);
 
@@ -2622,9 +2602,7 @@ where
     Dsf: DataStoreFactory,
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, ())
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, ()).build();
 
     let account_id = st.test_account().unwrap().id();
     let dfvk = T::test_account_fvk(&st);
@@ -2653,9 +2631,7 @@ pub fn spend_fails_on_unverified_notes<T: ShieldedPoolTester>(
     ds_factory: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
 
     let account = st.test_account().cloned().unwrap();
     let account_id = account.id();
@@ -2845,9 +2821,7 @@ pub fn spend_fails_on_locked_notes<T: ShieldedPoolTester>(
     ds_factory: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
 
     let account = st.test_account().cloned().unwrap();
     let account_id = account.id();
@@ -2992,9 +2966,7 @@ pub fn ovk_policy_prevents_recovery_from_chain<T: ShieldedPoolTester, Dsf>(
 ) where
     Dsf: DataStoreFactory,
 {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
 
     let account = st.test_account().cloned().unwrap();
     let account_id = account.id();
@@ -3082,9 +3054,7 @@ pub fn spend_succeeds_to_t_addr_zero_change<T: ShieldedPoolTester>(
     ds_factory: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
 
     let account = st.test_account().cloned().unwrap();
     let account_id = account.id();
@@ -3130,9 +3100,7 @@ pub fn change_note_spends_succeed<T: ShieldedPoolTester>(
     ds_factory: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
 
     let account = st.test_account().cloned().unwrap();
     let account_id = account.id();
@@ -3482,9 +3450,7 @@ pub fn zip317_spend<T: ShieldedPoolTester, Dsf: DataStoreFactory>(
     ds_factory: Dsf,
     cache: impl TestCache,
 ) {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
 
     let account = st.test_account().cloned().unwrap();
     let account_id = account.id();
@@ -3581,9 +3547,7 @@ where
     use zcash_keys::keys::UnifiedAddressRequest;
     use zcash_primitives::transaction::builder::DEFAULT_TX_EXPIRY_DELTA;
 
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -3828,9 +3792,7 @@ pub fn checkpoint_gaps<T: ShieldedPoolTester, Dsf: DataStoreFactory>(
     ds_factory: Dsf,
     cache: impl TestCache,
 ) {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -3847,6 +3809,8 @@ pub fn checkpoint_gaps<T: ShieldedPoolTester, Dsf: DataStoreFactory>(
     // belong to us so that we can get a checkpoint in the tree.
     let not_our_key = T::sk_to_fvk(&T::sk(&[0xf5; 32]));
     let not_our_value = Zatoshis::const_from_u64(10000);
+    let sapling_end_size = st.latest_cached_block().unwrap().sapling_end_size();
+    let orchard_end_size = st.latest_cached_block().unwrap().orchard_end_size();
     st.generate_block_at(
         account.birthday().height() + 10,
         BlockHash([0; 32]),
@@ -3855,8 +3819,8 @@ pub fn checkpoint_gaps<T: ShieldedPoolTester, Dsf: DataStoreFactory>(
             AddressType::DefaultExternal,
             not_our_value,
         )],
-        st.latest_cached_block().unwrap().sapling_end_size(),
-        st.latest_cached_block().unwrap().orchard_end_size(),
+        sapling_end_size,
+        orchard_end_size,
         false,
     );
 
@@ -3914,10 +3878,8 @@ pub fn pool_crossing_required<P0: ShieldedPoolTester, P1: ShieldedPoolTester>(
     ds_factory: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        // TODO: Allow for Orchard activation after Sapling
-        .build();
+    // TODO: Allow for Orchard activation after Sapling
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
 
     let account = st.test_account().cloned().unwrap();
 
@@ -4004,10 +3966,8 @@ pub fn fully_funded_fully_private<P0: ShieldedPoolTester, P1: ShieldedPoolTester
     ds_factory: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        // TODO: Allow for Orchard activation after Sapling
-        .build();
+    // TODO: Allow for Orchard activation after Sapling
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
 
     let account = st.test_account().cloned().unwrap();
 
@@ -4096,10 +4056,8 @@ pub fn fully_funded_send_to_t<P0: ShieldedPoolTester, P1: ShieldedPoolTester>(
     ds_factory: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        // TODO: Allow for Orchard activation after Sapling
-        .build();
+    // TODO: Allow for Orchard activation after Sapling
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
 
     let account = st.test_account().cloned().unwrap();
 
@@ -4188,10 +4146,8 @@ pub fn multi_pool_checkpoint<P0: ShieldedPoolTester, P1: ShieldedPoolTester>(
     ds_factory: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        // TODO: Allow for Orchard activation after Sapling
-        .build();
+    // TODO: Allow for Orchard activation after Sapling
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
 
     let account = st.test_account().cloned().unwrap();
     let acct_id = account.id();
@@ -4359,10 +4315,8 @@ pub fn multi_pool_checkpoints_with_pruning<P0: ShieldedPoolTester, P1: ShieldedP
     ds_factory: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        // TODO: Allow for Orchard activation after Sapling
-        .build();
+    // TODO: Allow for Orchard activation after Sapling
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
 
     let account = st.test_account().cloned().unwrap();
 
@@ -4391,9 +4345,7 @@ pub fn valid_chain_states<T: ShieldedPoolTester>(
     ds_factory: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
 
     let dfvk = T::test_account_fvk(&st);
 
@@ -4427,9 +4379,7 @@ pub fn invalid_chain_cache_disconnected<T: ShieldedPoolTester>(
     ds_factory: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
 
     let dfvk = T::test_account_fvk(&st);
 
@@ -4484,9 +4434,7 @@ where
     Dsf: DataStoreFactory,
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -4548,9 +4496,7 @@ where
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
     C: TestCache,
 {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
 
     let account = st.test_account().cloned().unwrap();
 
@@ -4684,9 +4630,7 @@ pub fn scan_cached_blocks_allows_blocks_out_of_order<T: ShieldedPoolTester>(
     ds_factory: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -4741,9 +4685,7 @@ pub fn scan_cached_blocks_finds_received_notes<T: ShieldedPoolTester, Dsf>(
     Dsf: DataStoreFactory,
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -4789,9 +4731,7 @@ pub fn scan_cached_blocks_finds_change_notes<T: ShieldedPoolTester, Dsf>(
     Dsf: DataStoreFactory,
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -4833,9 +4773,7 @@ pub fn scan_cached_blocks_detects_spends_out_of_order<T: ShieldedPoolTester, Dsf
     Dsf: DataStoreFactory,
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -4881,9 +4819,7 @@ pub fn metadata_queries_exclude_unwanted_notes<T: ShieldedPoolTester, Dsf, TC>(
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
     TC: TestCache,
 {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -5089,9 +5025,7 @@ pub fn wallet_recovery_computes_fees<T: ShieldedPoolTester, DsF: DataStoreFactor
 ) {
     use secrecy::ExposeSecret;
 
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(ds_factory, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
 
     let seed = Secret::new(st.test_seed().unwrap().expose_secret().clone());
     let source_account = st.test_account().cloned().unwrap();
@@ -5240,9 +5174,7 @@ pub fn receive_two_notes_with_same_value<T: ShieldedPoolTester>(
     dsf: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestBuilder::new()
-        .with_standard_sapling_account(dsf, cache)
-        .build();
+    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -5257,7 +5189,10 @@ pub fn receive_two_notes_with_same_value<T: ShieldedPoolTester>(
 
     // `st.generate_next_block` with multiple outputs.
     let pre_activation_block = CachedBlock::none(st.sapling_activation_height() - 1);
-    let prior_cached_block = st.latest_cached_block().unwrap_or(&pre_activation_block);
+    let prior_cached_block = st
+        .latest_cached_block()
+        .unwrap_or(&pre_activation_block)
+        .clone();
     let h = prior_cached_block.height() + 1;
     st.generate_block_at(
         h,
diff --git a/zcash_client_backend/src/data_api/testing/pool/dsl.rs b/zcash_client_backend/src/data_api/testing/pool/dsl.rs
new file mode 100644
index 0000000000..622e715bc5
--- /dev/null
+++ b/zcash_client_backend/src/data_api/testing/pool/dsl.rs
@@ -0,0 +1,84 @@
+//! A convenient DSL for writing wallet tests.
+
+use std::ops::{Deref, DerefMut};
+
+use zcash_primitives::block::BlockHash;
+use zcash_protocol::local_consensus::LocalNetwork;
+
+use crate::data_api::{
+    testing::{DataStoreFactory, TestBuilder, TestCache, TestState},
+    WalletTest,
+};
+
+/// A type-state wrapper struct that provides convenience methods.
+pub struct TestDsl<T> {
+    /// Either a `TestBuilder<Cache, DataStoreFactory>` or
+    /// `TestState<Cache, DataStore, LocalNetwork>`.
+    inner: T,
+}
+
+impl<T> Deref for TestDsl<T> {
+    type Target = T;
+
+    fn deref(&self) -> &Self::Target {
+        &self.inner
+    }
+}
+
+impl<T> DerefMut for TestDsl<T> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.inner
+    }
+}
+
+impl<T> From<T> for TestDsl<T> {
+    fn from(inner: T) -> Self {
+        Self { inner }
+    }
+}
+
+impl<T> TestDsl<T> {
+    /// Perform a state transition that may change the inner type.
+    pub fn map<X>(self, f: impl FnOnce(T) -> X) -> TestDsl<X> {
+        f(self.inner).into()
+    }
+}
+
+/// [`TestDsl`] provides convenience methods for common [`TestBuilder`] scenarios.
+impl<Cache, Dsf> TestDsl<TestBuilder<Cache, Dsf>>
+where
+    Dsf: DataStoreFactory,
+{
+    /// Equip the inner [`TestBuilder`] with the provided [`DataStoreFactory`]
+    /// and [`TestCache`], as well as an account that has a birthday at Sapling
+    /// activation.
+    ///
+    /// Shorthand for the following:
+    /// ```rust,ignore
+    /// let dsl: TestDsl<TestBuilder<_, _>> = TestBuilder::new()
+    ///     .with_data_store_factory(dsf)
+    ///     .with_block_cache(tc)
+    ///     .with_account_from_sapling_activation(BlockHash([0; 32]))
+    ///     .into();
+    /// ```
+    pub fn with_standard_sapling_account(dsf: Dsf, tc: Cache) -> Self {
+        TestBuilder::new()
+            .with_data_store_factory(dsf)
+            .with_block_cache(tc)
+            .with_account_from_sapling_activation(BlockHash([0; 32]))
+            .into()
+    }
+
+    /// Build the builder, wrapping the resulting [`TestState`] in a [`TestDsl`].
+    pub fn build(self) -> TestDsl<TestState<Cache, Dsf::DataStore, LocalNetwork>> {
+        self.map(TestBuilder::build)
+    }
+}
+
+/// [`TestDsl`] provides convenience methods for common [`TestState`] operations.
+impl<Cache, DataStore> TestDsl<TestState<Cache, DataStore, LocalNetwork>>
+where
+    DataStore: WalletTest,
+    Cache: TestCache,
+{
+}

From 339e6b6489ed77f90075c1742cc589925b963cee Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Tue, 28 Oct 2025 11:24:07 +1300
Subject: [PATCH 010/263] Add funds API

refactored TestState::generate_next_block in terms of TestState::generate_next_block_multi
TestDsl::add_notes_to now takes a generic iterator of notes
---
 zcash_client_backend/src/data_api/chain.rs    |   5 +-
 zcash_client_backend/src/data_api/testing.rs  |  29 +-
 .../src/data_api/testing/pool.rs              | 589 +++++-------------
 .../src/data_api/testing/pool/dsl.rs          | 309 ++++++++-
 4 files changed, 459 insertions(+), 473 deletions(-)

diff --git a/zcash_client_backend/src/data_api/chain.rs b/zcash_client_backend/src/data_api/chain.rs
index 031d7cf026..5fcbd09eb3 100644
--- a/zcash_client_backend/src/data_api/chain.rs
+++ b/zcash_client_backend/src/data_api/chain.rs
@@ -569,12 +569,11 @@ impl ChainState {
     }
 }
 
-/// Scans at most `limit` blocks from the provided block source for in order to find transactions
+/// Scans at most `limit` blocks from the provided block source in order to find transactions
 /// received by the accounts tracked in the provided wallet database.
 ///
 /// This function will return after scanning at most `limit` new blocks, to enable the caller to
-/// update their UI with scanning progress. Repeatedly calling this function with `from_height ==
-/// None` will process sequential ranges of blocks.
+/// update their UI with scanning progress.
 ///
 /// ## Panics
 ///
diff --git a/zcash_client_backend/src/data_api/testing.rs b/zcash_client_backend/src/data_api/testing.rs
index 0c4cb097d4..4a850a5573 100644
--- a/zcash_client_backend/src/data_api/testing.rs
+++ b/zcash_client_backend/src/data_api/testing.rs
@@ -541,35 +541,25 @@ where
 
     /// Creates a fake block at the expected next height containing a single output of the
     /// given value, and inserts it into the cache.
+    ///
+    /// This is a proxy for `generate_next_block_multi`.
     pub fn generate_next_block<Fvk: TestFvk>(
         &mut self,
         recipient_fvk: &Fvk,
         recipient_address_type: AddressType,
         value: Zatoshis,
     ) -> (BlockHeight, Cache::InsertResult, Fvk::Nullifier) {
-        let pre_activation_block = CachedBlock::none(self.sapling_activation_height() - 1);
-        let prior_cached_block = self.latest_cached_block().unwrap_or(&pre_activation_block);
-        let height = prior_cached_block.height() + 1;
-
-        let (res, nfs) = self.generate_block_at(
-            height,
-            prior_cached_block.chain_state.block_hash(),
-            &[FakeCompactOutput::new(
-                recipient_fvk,
-                recipient_address_type,
-                value,
-            )],
-            prior_cached_block.sapling_end_size,
-            prior_cached_block.orchard_end_size,
-            false,
-        );
+        let (height, res, nfs) = self.generate_next_block_multi(&[FakeCompactOutput::new(
+            recipient_fvk,
+            recipient_address_type,
+            value,
+        )]);
 
         (height, res, nfs[0])
     }
 
     /// Creates a fake block at the expected next height containing multiple outputs
     /// and inserts it into the cache.
-    #[allow(dead_code)]
     pub fn generate_next_block_multi<Fvk: TestFvk>(
         &mut self,
         outputs: &[FakeCompactOutput<Fvk>],
@@ -591,7 +581,6 @@ where
     }
 
     /// Adds an empty block to the cache, advancing the simulated chain height.
-    #[allow(dead_code)] // used only for tests that are flagged off by default
     pub fn generate_empty_block(&mut self) -> (BlockHeight, Cache::InsertResult) {
         let new_hash = {
             let mut hash = vec![0; 32];
@@ -2121,9 +2110,10 @@ impl TestFvk for ::orchard::keys::FullViewingKey {
 /// Configures how a [`TestFvk`] receives a particular output.
 ///
 /// Used with [`TestFvk::add_output`] and [`TestFvk::add_logical_action`].
-#[derive(Clone, Copy)]
+#[derive(Clone, Copy, Default, Debug)]
 pub enum AddressType {
     /// The output will be sent to the default address of the full viewing key.
+    #[default]
     DefaultExternal,
     /// The output will be sent to the specified diversified address of the full viewing
     /// key.
@@ -2292,6 +2282,7 @@ fn fake_compact_block<P: consensus::Parameters, Fvk: TestFvk>(
 }
 
 /// Create a fake CompactBlock at the given height containing only the given transaction.
+// TODO: `tx` could be a slice and we could add multiple transactions here
 fn fake_compact_block_from_tx(
     height: BlockHeight,
     prev_hash: BlockHash,
diff --git a/zcash_client_backend/src/data_api/testing/pool.rs b/zcash_client_backend/src/data_api/testing/pool.rs
index 77d2f8bb9e..5c9039a8bf 100644
--- a/zcash_client_backend/src/data_api/testing/pool.rs
+++ b/zcash_client_backend/src/data_api/testing/pool.rs
@@ -2,11 +2,11 @@ use std::{
     cmp::Eq,
     convert::Infallible,
     hash::Hash,
-    num::{NonZeroU32, NonZeroU64, NonZeroU8, NonZeroUsize},
+    num::{NonZeroU8, NonZeroU32, NonZeroU64, NonZeroUsize},
 };
 
 use assert_matches::assert_matches;
-use incrementalmerkletree::{frontier::Frontier, Level, Position};
+use incrementalmerkletree::{Level, Position, frontier::Frontier};
 use rand::{Rng, RngCore};
 use secrecy::Secret;
 use shardtree::error::ShardTreeError;
@@ -16,42 +16,40 @@ use zcash_keys::{address::Address, keys::UnifiedSpendingKey};
 use zcash_primitives::{
     block::BlockHash,
     transaction::{
-        fees::zip317::{FeeRule as Zip317FeeRule, MARGINAL_FEE, MINIMUM_FEE},
         Transaction,
+        fees::zip317::{FeeRule as Zip317FeeRule, MARGINAL_FEE, MINIMUM_FEE},
     },
 };
 use zcash_protocol::{
+    ShieldedProtocol,
     consensus::{self, BlockHeight, NetworkUpgrade, Parameters},
     local_consensus::LocalNetwork,
     memo::{Memo, MemoBytes},
     value::Zatoshis,
-    ShieldedProtocol,
 };
 use zip32::Scope;
 use zip321::{Payment, TransactionRequest};
 
 use crate::{
     data_api::{
-        self,
+        self, Account as _, AccountBirthday, BoundedU8, DecryptedTransaction, InputSource,
+        MaxSpendMode, NoteFilter, Ratio, TargetValue, WalletCommitmentTrees, WalletRead,
+        WalletSummary, WalletTest, WalletWrite,
         chain::{self, ChainState, CommitmentTreeRoot, ScanSummary},
         error::Error,
         testing::{
-            single_output_change_strategy, AddressType, CacheInsertionResult, CachedBlock,
-            FakeCompactOutput, InitialChainState, TestBuilder,
+            AddressType, CacheInsertionResult, FakeCompactOutput, InitialChainState, TestBuilder,
+            single_output_change_strategy,
         },
         wallet::{
-            decrypt_and_store_transaction, input_selection::GreedyInputSelector,
-            ConfirmationsPolicy, TargetHeight, TransferErrT,
+            ConfirmationsPolicy, TargetHeight, TransferErrT, decrypt_and_store_transaction,
+            input_selection::GreedyInputSelector,
         },
-        Account as _, AccountBirthday, BoundedU8, DecryptedTransaction, InputSource, MaxSpendMode,
-        NoteFilter, Ratio, TargetValue, WalletCommitmentTrees, WalletRead, WalletSummary,
-        WalletTest, WalletWrite,
     },
     decrypt_transaction,
     fees::{
-        self,
+        self, DustOutputPolicy, SplitPolicy, StandardFeeRule,
         standard::{self, SingleOutputChangeStrategy},
-        DustOutputPolicy, SplitPolicy, StandardFeeRule,
     },
     scanning::ScanError,
     wallet::{Note, NoteId, OvkPolicy, ReceivedNote},
@@ -74,7 +72,7 @@ use {
         keys::{NonHardenedChildIndex, TransparentKeyScope},
     },
     zcash_primitives::transaction::fees::zip317,
-    zcash_protocol::{value::ZatBalance, TxId},
+    zcash_protocol::{TxId, value::ZatBalance},
 };
 
 #[cfg(feature = "orchard")]
@@ -87,7 +85,7 @@ use {
 };
 
 pub mod dsl;
-use dsl::TestDsl;
+use dsl::{TestDsl, TestNoteConfig};
 
 /// Trait that exposes the pool-specific types and operations necessary to run the
 /// single-shielded-pool tests on a given pool.
@@ -206,31 +204,10 @@ pub fn send_single_step_proposed_transfer<T: ShieldedPoolTester>(
     dsf: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build();
-
-    let account = st.test_account().cloned().unwrap();
-    let dfvk = T::test_account_fvk(&st);
+    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build::<T>();
 
     // Add funds to the wallet in a single note
-    let value = Zatoshis::const_from_u64(60000);
-    let (h, _, _) = st.generate_next_block(&dfvk, AddressType::DefaultExternal, value);
-    st.scan_cached_blocks(h, 1);
-
-    // Spendable balance matches total balance
-    assert_eq!(st.get_total_balance(account.id()), value);
-    assert_eq!(
-        st.get_spendable_balance(account.id(), ConfirmationsPolicy::MIN),
-        value
-    );
-
-    assert_eq!(
-        st.wallet()
-            .block_max_scanned()
-            .unwrap()
-            .unwrap()
-            .block_height(),
-        h
-    );
+    let (h, _, _) = st.add_a_single_note(Zatoshis::const_from_u64(60000));
 
     let to_extsk = T::sk(&[0xf5; 32]);
     let to: Address = T::sk_default_address(&to_extsk);
@@ -251,6 +228,7 @@ pub fn send_single_step_proposed_transfer<T: ShieldedPoolTester>(
     );
     let input_selector = GreedyInputSelector::new();
 
+    let account = st.get_account();
     let proposal = st
         .propose_transfer(
             account.id(),
@@ -388,9 +366,8 @@ pub fn zip_315_confirmations_test_steps<T: ShieldedPoolTester>(
     cache: impl TestCache,
     input_trust: InputTrust,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build();
+    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build::<T>();
     let account = st.test_account().cloned().unwrap();
-    let dfvk = T::test_account_fvk(&st);
     let starting_balance = Zatoshis::const_from_u64(60_000);
 
     // Add funds to the wallet in a single note, owned by the internal spending key,
@@ -408,17 +385,9 @@ pub fn zip_315_confirmations_test_steps<T: ShieldedPoolTester>(
     };
     let min_confirmations = u32::from(min_confirmations);
 
-    // Generate a block to create the inputs that we will spend.
-    let (h, r, _) = st.generate_next_block(&dfvk, address_type, starting_balance);
+    let (_, r, _) = st
+        .add_a_single_note(TestNoteConfig::from(starting_balance).with_address_type(address_type));
     let txid = r.txids()[0];
-    st.scan_cached_blocks(h, 1);
-
-    // Spendable balance matches total balance at 1 confirmation.
-    assert_eq!(st.get_total_balance(account.id()), starting_balance);
-    assert_eq!(
-        st.get_spendable_balance(account.id(), ConfirmationsPolicy::MIN),
-        starting_balance
-    );
 
     // Mark the external input as explicitly trusted, if so requested
     if input_trust == InputTrust::ExternalTrusted {
@@ -438,7 +407,7 @@ pub fn zip_315_confirmations_test_steps<T: ShieldedPoolTester>(
         }
     };
 
-    // Generate `min_confirmations` confirmations by mining blocks
+    // Generate N confirmations by mining blocks
     let steps = (1u32..min_confirmations)
         .map(add_confirmation)
         .collect::<Vec<_>>();
@@ -485,33 +454,21 @@ pub fn spend_max_spendable_single_step_proposed_transfer<T: ShieldedPoolTester>(
     dsf: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build();
-
-    let account = st.test_account().cloned().unwrap();
-    let dfvk = T::test_account_fvk(&st);
+    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build::<T>();
 
-    // Add funds to the wallet in a single note
+    // Add funds to the wallet in two notes over 5 blocks
     let value = Zatoshis::const_from_u64(60000);
-    let (h, _, _) = st.generate_next_block(&dfvk, AddressType::DefaultExternal, value);
+    let h = st
+        .add_notes([Some(value), None, None, None, Some(value)])
+        .block_height();
 
+    // Spendable balance matches total balance
+    let account = st.test_account().cloned().unwrap();
     let confirmation_policy = ConfirmationsPolicy::new_symmetrical(
         NonZeroU32::new(2).expect("2 is not zero"),
         #[cfg(feature = "transparent-inputs")]
         false,
     );
-    st.generate_empty_block();
-    st.generate_empty_block();
-    st.generate_empty_block();
-
-    st.generate_next_block(&dfvk, AddressType::DefaultExternal, value);
-
-    st.scan_cached_blocks(h, 5);
-
-    // Spendable balance matches total balance
-    assert_eq!(
-        st.get_total_balance(account.id()),
-        Zatoshis::const_from_u64(120_000)
-    );
     assert_eq!(
         st.get_spendable_balance(account.id(), confirmation_policy),
         value
@@ -648,31 +605,12 @@ pub fn spend_everything_single_step_proposed_transfer<T: ShieldedPoolTester>(
     dsf: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build();
+    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
-    let dfvk = T::test_account_fvk(&st);
 
     // Add funds to the wallet in a single note
-    let value = Zatoshis::const_from_u64(60000);
-    let (h, _, _) = st.generate_next_block(&dfvk, AddressType::DefaultExternal, value);
-    st.scan_cached_blocks(h, 1);
-
-    // Spendable balance matches total balance
-    assert_eq!(st.get_total_balance(account.id()), value);
-    assert_eq!(
-        st.get_spendable_balance(account.id(), ConfirmationsPolicy::MIN),
-        value
-    );
-
-    assert_eq!(
-        st.wallet()
-            .block_max_scanned()
-            .unwrap()
-            .unwrap()
-            .block_height(),
-        h
-    );
+    let (h, _, _) = st.add_a_single_note(Zatoshis::const_from_u64(60000));
 
     let to_extsk = T::sk(&[0xf5; 32]);
     let to: Address = T::sk_default_address(&to_extsk);
@@ -801,31 +739,10 @@ pub fn fails_to_send_max_spendable_to_transparent_with_memo<T: ShieldedPoolTeste
 ) {
     use crate::data_api::MaxSpendMode;
 
-    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build();
-
-    let account = st.test_account().cloned().unwrap();
-    let dfvk = T::test_account_fvk(&st);
+    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build::<T>();
 
     // Add funds to the wallet in a single note
-    let value = Zatoshis::const_from_u64(60000);
-    let (h, _, _) = st.generate_next_block(&dfvk, AddressType::DefaultExternal, value);
-    st.scan_cached_blocks(h, 1);
-
-    // Spendable balance matches total balance
-    assert_eq!(st.get_total_balance(account.id()), value);
-    assert_eq!(
-        st.get_spendable_balance(account.id(), ConfirmationsPolicy::MIN),
-        value
-    );
-
-    assert_eq!(
-        st.wallet()
-            .block_max_scanned()
-            .unwrap()
-            .unwrap()
-            .block_height(),
-        h
-    );
+    st.add_a_single_note(Zatoshis::const_from_u64(60000));
 
     let account = st.test_account().cloned().unwrap();
     let (default_addr, _) = account.usk().default_transparent_address();
@@ -866,32 +783,16 @@ pub fn spend_everything_proposal_fails_when_unconfirmed_funds_present<T: Shielde
     dsf: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build();
-
-    let account = st.test_account().cloned().unwrap();
-    let dfvk = T::test_account_fvk(&st);
-
-    // Add funds to the wallet in a single note
-    let value = Zatoshis::const_from_u64(60000);
-
-    let (h1, _, _) = st.generate_next_block(&dfvk, AddressType::DefaultExternal, value);
-
-    st.generate_empty_block();
-    st.generate_empty_block();
-    let later_on_value = Zatoshis::const_from_u64(123456);
-    let (h, _, _) = st.generate_next_block(&dfvk, AddressType::DefaultExternal, later_on_value);
-    st.scan_cached_blocks(h1, 4);
-
-    assert_eq!(
-        st.wallet()
-            .block_max_scanned()
-            .unwrap()
-            .unwrap()
-            .block_height(),
-        h
-    );
+    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build::<T>();
+    st.add_notes([
+        Some(Zatoshis::const_from_u64(60000)),
+        None,
+        None,
+        Some(Zatoshis::const_from_u64(123456)),
+    ]);
 
     // Spendable balance doesn't match total balance
+    let account = st.test_account().cloned().unwrap();
     let total_balance = st.get_total_balance(account.id());
     let spendable_balance = st.get_spendable_balance(
         account.id(),
@@ -939,38 +840,25 @@ pub fn spend_everything_proposal_fails_when_unconfirmed_funds_present<T: Shielde
 /// - Attempts to construct a request to spend the whole balance to an external address in the
 ///   same pool.
 /// - succeds at doing so
+// TODO(schell): as far as I can tell this function is unused in our test suite
 pub fn send_max_spendable_proposal_succeeds_when_unconfirmed_funds_present<
     T: ShieldedPoolTester,
 >(
     dsf: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build();
-
-    let account = st.test_account().cloned().unwrap();
-    let dfvk = T::test_account_fvk(&st);
-
-    // Add funds to the wallet in a single note
-    let value = Zatoshis::const_from_u64(60000);
-
-    let (h1, _, _) = st.generate_next_block(&dfvk, AddressType::DefaultExternal, value);
-
-    st.generate_empty_block();
-    st.generate_empty_block();
-    let later_on_value = Zatoshis::const_from_u64(123456);
-    let (h, _, _) = st.generate_next_block(&dfvk, AddressType::DefaultExternal, later_on_value);
-    st.scan_cached_blocks(h1, 4);
-
-    assert_eq!(
-        st.wallet()
-            .block_max_scanned()
-            .unwrap()
-            .unwrap()
-            .block_height(),
-        h
-    );
+    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build::<T>();
+    let h = st
+        .add_notes([
+            Some(Zatoshis::const_from_u64(60000)),
+            None,
+            None,
+            Some(Zatoshis::const_from_u64(123456)),
+        ])
+        .block_height();
 
     // Spendable balance doesn't match total balance
+    let account = st.test_account().cloned().unwrap();
     let total_balance = st.get_total_balance(account.id());
     let spendable_balance = st.get_spendable_balance(
         account.id(),
@@ -1108,35 +996,19 @@ pub fn spend_everything_multi_step_single_note_proposed_transfer<T: ShieldedPool
     Dsf: DataStoreFactory,
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    use crate::data_api::{testing::transparent::GapLimits, MaxSpendMode, OutputOfSentTx};
+    use crate::data_api::{MaxSpendMode, OutputOfSentTx, testing::transparent::GapLimits};
 
     let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache)
         .map(|builder| builder.with_gap_limits(GapLimits::new(10, 5, 3)))
-        .build();
+        .build::<T>();
 
     let account = st.test_account().cloned().unwrap();
     let account_id = account.id();
-    let dfvk = T::test_account_fvk(&st);
-
-    let add_funds = |st: &mut TestState<_, Dsf::DataStore, _>, value| {
-        let (h, _, _) = st.generate_next_block(&dfvk, AddressType::DefaultExternal, value);
-        st.scan_cached_blocks(h, 1);
-
-        assert_eq!(
-            st.wallet()
-                .block_max_scanned()
-                .unwrap()
-                .unwrap()
-                .block_height(),
-            h
-        );
-        h
-    };
 
     let value = Zatoshis::const_from_u64(100000);
 
     // Add funds to the wallet.
-    add_funds(&mut st, value);
+    st.add_a_single_note(value);
     let initial_balance = value;
     assert_eq!(
         st.get_spendable_balance(account_id, ConfirmationsPolicy::MIN),
@@ -1281,30 +1153,11 @@ pub fn spend_everything_multi_step_many_notes_proposed_transfer<T: ShieldedPoolT
     Dsf: DataStoreFactory,
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    use crate::data_api::{testing::transparent::GapLimits, OutputOfSentTx};
+    use crate::data_api::{OutputOfSentTx, testing::transparent::GapLimits};
 
     let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache)
         .map(|builder| builder.with_gap_limits(GapLimits::new(10, 5, 3)))
-        .build();
-
-    let account = st.test_account().cloned().unwrap();
-    let account_id = account.id();
-    let dfvk = T::test_account_fvk(&st);
-
-    let add_funds = |st: &mut TestState<_, Dsf::DataStore, _>, value| {
-        let (h, _, _) = st.generate_next_block(&dfvk, AddressType::DefaultExternal, value);
-        st.scan_cached_blocks(h, 1);
-
-        assert_eq!(
-            st.wallet()
-                .block_max_scanned()
-                .unwrap()
-                .unwrap()
-                .block_height(),
-            h
-        );
-        h
-    };
+        .build::<T>();
 
     let number_of_notes = 3u64;
     let note_value = Zatoshis::const_from_u64(100000);
@@ -1312,10 +1165,12 @@ pub fn spend_everything_multi_step_many_notes_proposed_transfer<T: ShieldedPoolT
 
     // Add funds to the wallet.
     for _ in 0..number_of_notes {
-        add_funds(&mut st, note_value);
+        st.add_a_single_note(note_value);
     }
 
     let initial_balance = value;
+    let account = st.test_account().cloned().unwrap();
+    let account_id = account.id();
     assert_eq!(
         st.get_spendable_balance(account_id, ConfirmationsPolicy::MIN),
         initial_balance
@@ -1452,30 +1307,11 @@ pub fn spend_everything_multi_step_with_marginal_notes_proposed_transfer<
     Dsf: DataStoreFactory,
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    use crate::data_api::{testing::transparent::GapLimits, MaxSpendMode, OutputOfSentTx};
+    use crate::data_api::{MaxSpendMode, OutputOfSentTx, testing::transparent::GapLimits};
 
     let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache)
         .map(|builder| builder.with_gap_limits(GapLimits::new(10, 5, 3)))
-        .build();
-
-    let account = st.test_account().cloned().unwrap();
-    let account_id = account.id();
-    let dfvk = T::test_account_fvk(&st);
-
-    let add_funds = |st: &mut TestState<_, Dsf::DataStore, _>, value| {
-        let (h, _, _) = st.generate_next_block(&dfvk, AddressType::DefaultExternal, value);
-        st.scan_cached_blocks(h, 1);
-
-        assert_eq!(
-            st.wallet()
-                .block_max_scanned()
-                .unwrap()
-                .unwrap()
-                .block_height(),
-            h
-        );
-        h
-    };
+        .build::<T>();
 
     let number_of_notes = 10u64;
     let note_value = Zatoshis::const_from_u64(100000);
@@ -1483,10 +1319,12 @@ pub fn spend_everything_multi_step_with_marginal_notes_proposed_transfer<
         (note_value * number_of_notes).expect("sum of notes should not fail.");
 
     for _ in 0..number_of_notes {
-        add_funds(&mut st, note_value);
-        add_funds(&mut st, zip317::MARGINAL_FEE);
+        st.add_a_single_note(note_value);
+        st.add_a_single_note(zip317::MARGINAL_FEE);
     }
 
+    let account = st.test_account().cloned().unwrap();
+    let account_id = account.id();
     assert_eq!(
         st.get_spendable_balance(account_id, ConfirmationsPolicy::MIN),
         non_marginal_notes_value
@@ -1619,31 +1457,14 @@ pub fn send_with_multiple_change_outputs<T: ShieldedPoolTester>(
     dsf: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build();
+    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
 
     // Add funds to the wallet in a single note
     let value = Zatoshis::const_from_u64(650_0000);
-    let (h, _, _) = st.generate_next_block(&dfvk, AddressType::DefaultExternal, value);
-    st.scan_cached_blocks(h, 1);
-
-    // Spendable balance matches total balance
-    assert_eq!(st.get_total_balance(account.id()), value);
-    assert_eq!(
-        st.get_spendable_balance(account.id(), ConfirmationsPolicy::MIN),
-        value
-    );
-
-    assert_eq!(
-        st.wallet()
-            .block_max_scanned()
-            .unwrap()
-            .unwrap()
-            .block_height(),
-        h
-    );
+    let (h, _, _) = st.add_a_single_note(value);
 
     let to_extsk = T::sk(&[0xf5; 32]);
     let to: Address = T::sk_default_address(&to_extsk);
@@ -1804,14 +1625,14 @@ pub fn send_multi_step_proposed_transfer<T: ShieldedPoolTester, Dsf>(
     Dsf: DataStoreFactory,
 {
     use crate::{
-        data_api::{testing::transparent::GapLimits, OutputOfSentTx, TransactionStatus},
+        data_api::{OutputOfSentTx, TransactionStatus, testing::transparent::GapLimits},
         wallet::{Exposure, TransparentAddressSource},
     };
 
     let gap_limits = GapLimits::new(10, 5, 3);
     let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache)
         .map(|builder| builder.with_gap_limits(gap_limits))
-        .build();
+        .build::<T>();
 
     let account = st.test_account().cloned().unwrap();
     let account_id = account.id();
@@ -2159,31 +1980,14 @@ pub fn spend_all_funds_single_step_proposed_transfer<T: ShieldedPoolTester>(
     dsf: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build();
+    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
 
     // Add funds to the wallet in a single note
     let value = Zatoshis::const_from_u64(60000);
-    let (h, _, _) = st.generate_next_block(&dfvk, AddressType::DefaultExternal, value);
-    st.scan_cached_blocks(h, 1);
-
-    // Spendable balance matches total balance
-    assert_eq!(st.get_total_balance(account.id()), value);
-    assert_eq!(
-        st.get_spendable_balance(account.id(), ConfirmationsPolicy::MIN),
-        value
-    );
-
-    assert_eq!(
-        st.wallet()
-            .block_max_scanned()
-            .unwrap()
-            .unwrap()
-            .block_height(),
-        h
-    );
+    let (h, _, _) = st.add_a_single_note(value);
 
     let spend_amount = Zatoshis::const_from_u64(50000);
     let to_extsk = T::sk(&[0xf5; 32]);
@@ -2328,11 +2132,11 @@ pub fn spend_all_funds_multi_step_proposed_transfer<T: ShieldedPoolTester, Dsf>(
     Dsf: DataStoreFactory,
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    use crate::data_api::{testing::transparent::GapLimits, OutputOfSentTx};
+    use crate::data_api::{OutputOfSentTx, testing::transparent::GapLimits};
 
     let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache)
         .map(|builder| builder.with_gap_limits(GapLimits::new(10, 5, 3)))
-        .build();
+        .build::<T>();
 
     let account = st.test_account().cloned().unwrap();
     let account_id = account.id();
@@ -2345,15 +2149,6 @@ pub fn spend_all_funds_multi_step_proposed_transfer<T: ShieldedPoolTester, Dsf>(
     let (h, _, _) = st.generate_next_block(&dfvk, AddressType::DefaultExternal, value);
     st.scan_cached_blocks(h, 1);
 
-    assert_eq!(
-        st.wallet()
-            .block_max_scanned()
-            .unwrap()
-            .unwrap()
-            .block_height(),
-        h
-    );
-
     let initial_balance = value;
     assert_eq!(
         st.get_spendable_balance(account_id, ConfirmationsPolicy::MIN),
@@ -2486,7 +2281,7 @@ pub fn proposal_fails_if_not_all_ephemeral_outputs_consumed<T: ShieldedPoolTeste
 ) where
     Dsf: DataStoreFactory,
 {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
     let account_id = account.id();
@@ -2565,7 +2360,7 @@ pub fn proposal_fails_if_not_all_ephemeral_outputs_consumed<T: ShieldedPoolTeste
 pub fn create_to_address_fails_on_incorrect_usk<T: ShieldedPoolTester, Dsf: DataStoreFactory>(
     ds_factory: Dsf,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, ()).build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, ()).build::<T>();
     let dfvk = T::test_account_fvk(&st);
     let to = T::fvk_default_address(&dfvk);
 
@@ -2602,7 +2397,7 @@ where
     Dsf: DataStoreFactory,
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, ()).build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, ()).build::<T>();
 
     let account_id = st.test_account().unwrap().id();
     let dfvk = T::test_account_fvk(&st);
@@ -2631,7 +2426,7 @@ pub fn spend_fails_on_unverified_notes<T: ShieldedPoolTester>(
     ds_factory: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
     let account_id = account.id();
@@ -2639,15 +2434,7 @@ pub fn spend_fails_on_unverified_notes<T: ShieldedPoolTester>(
 
     // Add funds to the wallet in a single note
     let value = Zatoshis::const_from_u64(50000);
-    let (h1, _, _) = st.generate_next_block(&dfvk, AddressType::DefaultExternal, value);
-    st.scan_cached_blocks(h1, 1);
-
-    // Spendable balance matches total balance at 1 confirmation.
-    assert_eq!(st.get_total_balance(account_id), value);
-    assert_eq!(
-        st.get_spendable_balance(account_id, ConfirmationsPolicy::MIN),
-        value
-    );
+    st.add_a_single_note(value);
 
     // Value is considered pending at 10 confirmations.
     assert_eq!(
@@ -2673,8 +2460,7 @@ pub fn spend_fails_on_unverified_notes<T: ShieldedPoolTester>(
     assert_eq!(summary.map(|s| s.progress().scan()), Some(Ratio::new(1, 1)));
 
     // Add more funds to the wallet in a second note
-    let (h2, _, _) = st.generate_next_block(&dfvk, AddressType::DefaultExternal, value);
-    st.scan_cached_blocks(h2, 1);
+    let (h2, _, _) = st.add_a_single_note(value);
 
     // Verified balance does not include the second note
     let total = (value + value).unwrap();
@@ -2821,7 +2607,7 @@ pub fn spend_fails_on_locked_notes<T: ShieldedPoolTester>(
     ds_factory: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
     let account_id = account.id();
@@ -2831,15 +2617,7 @@ pub fn spend_fails_on_locked_notes<T: ShieldedPoolTester>(
 
     // Add funds to the wallet in a single note
     let value = Zatoshis::const_from_u64(50000);
-    let (h1, _, _) = st.generate_next_block(&dfvk, AddressType::DefaultExternal, value);
-    st.scan_cached_blocks(h1, 1);
-
-    // Spendable balance matches total balance at 1 confirmation.
-    assert_eq!(st.get_total_balance(account_id), value);
-    assert_eq!(
-        st.get_spendable_balance(account_id, ConfirmationsPolicy::MIN),
-        value
-    );
+    let (h1, _, _) = st.add_a_single_note(value);
 
     // Send some of the funds to another address, but don't mine the tx.
     let extsk2 = T::sk(&[0xf5; 32]);
@@ -2966,7 +2744,7 @@ pub fn ovk_policy_prevents_recovery_from_chain<T: ShieldedPoolTester, Dsf>(
 ) where
     Dsf: DataStoreFactory,
 {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
     let account_id = account.id();
@@ -2974,15 +2752,7 @@ pub fn ovk_policy_prevents_recovery_from_chain<T: ShieldedPoolTester, Dsf>(
 
     // Add funds to the wallet in a single note
     let value = Zatoshis::const_from_u64(50000);
-    let (h1, _, _) = st.generate_next_block(&dfvk, AddressType::DefaultExternal, value);
-    st.scan_cached_blocks(h1, 1);
-
-    // Spendable balance matches total balance at 1 confirmation.
-    assert_eq!(st.get_total_balance(account_id), value);
-    assert_eq!(
-        st.get_spendable_balance(account_id, ConfirmationsPolicy::MIN),
-        value
-    );
+    let (h1, _, _) = st.add_a_single_note(value);
 
     let extsk2 = T::sk(&[0xf5; 32]);
     let addr2 = T::sk_default_address(&extsk2);
@@ -3054,7 +2824,7 @@ pub fn spend_succeeds_to_t_addr_zero_change<T: ShieldedPoolTester>(
     ds_factory: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
     let account_id = account.id();
@@ -3062,15 +2832,7 @@ pub fn spend_succeeds_to_t_addr_zero_change<T: ShieldedPoolTester>(
 
     // Add funds to the wallet in a single note
     let value = Zatoshis::const_from_u64(70000);
-    let (h, _, _) = st.generate_next_block(&dfvk, AddressType::DefaultExternal, value);
-    st.scan_cached_blocks(h, 1);
-
-    // Spendable balance matches total balance at 1 confirmation.
-    assert_eq!(st.get_total_balance(account_id), value);
-    assert_eq!(
-        st.get_spendable_balance(account_id, ConfirmationsPolicy::MIN),
-        value
-    );
+    st.add_a_single_note(value);
 
     let fee_rule = StandardFeeRule::Zip317;
 
@@ -3100,25 +2862,15 @@ pub fn change_note_spends_succeed<T: ShieldedPoolTester>(
     ds_factory: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
-
-    let account = st.test_account().cloned().unwrap();
-    let account_id = account.id();
-    let dfvk = T::test_account_fvk(&st);
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
 
     // Add funds to the wallet in a single note owned by the internal spending key
     let value = Zatoshis::const_from_u64(70000);
-    let (h, _, _) = st.generate_next_block(&dfvk, AddressType::Internal, value);
-    st.scan_cached_blocks(h, 1);
-
-    // Spendable balance matches total balance at 1 confirmation.
-    assert_eq!(st.get_total_balance(account_id), value);
-    assert_eq!(
-        st.get_spendable_balance(account_id, ConfirmationsPolicy::MIN),
-        value
-    );
+    st.add_a_single_note(TestNoteConfig::from(value).with_address_type(AddressType::Internal));
 
     // Value is considered pending at 10 confirmations.
+    let account = st.test_account().cloned().unwrap();
+    let account_id = account.id();
     assert_eq!(
         st.get_pending_shielded_balance(account_id, ConfirmationsPolicy::default()),
         value
@@ -3450,30 +3202,20 @@ pub fn zip317_spend<T: ShieldedPoolTester, Dsf: DataStoreFactory>(
     ds_factory: Dsf,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
     let account_id = account.id();
     let dfvk = T::test_account_fvk(&st);
 
     // Add funds to the wallet
-    let (h1, _, _) = st.generate_next_block(
-        &dfvk,
-        AddressType::Internal,
-        Zatoshis::const_from_u64(50000),
-    );
+    st.add_notes([Some(Zatoshis::const_from_u64(50000))]);
 
     // Add 10 dust notes to the wallet
     for _ in 1..=10 {
-        st.generate_next_block(
-            &dfvk,
-            AddressType::DefaultExternal,
-            Zatoshis::const_from_u64(1000),
-        );
+        st.add_notes([Some(Zatoshis::const_from_u64(1000))]);
     }
 
-    st.scan_cached_blocks(h1, 11);
-
     // Spendable balance matches total balance
     let total = Zatoshis::const_from_u64(60000);
     assert_eq!(st.get_total_balance(account_id), total);
@@ -3547,7 +3289,7 @@ where
     use zcash_keys::keys::UnifiedAddressRequest;
     use zcash_primitives::transaction::builder::DEFAULT_TX_EXPIRY_DELTA;
 
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -3617,9 +3359,11 @@ where
     // Verify that a transaction enhancement request for the transaction containing the spent
     // outpoint does not yet exist.
     let requests = st.wallet().transaction_data_requests().unwrap();
-    assert!(!requests
-        .iter()
-        .any(|req| req == &TransactionDataRequest::Enhancement(*spent_outpoint.txid())));
+    assert!(
+        !requests
+            .iter()
+            .any(|req| req == &TransactionDataRequest::Enhancement(*spent_outpoint.txid()))
+    );
 
     // Use `decrypt_and_store_transaction` for the side effect of creating enhancement requests for
     // the transparent inputs of the transaction.
@@ -3633,9 +3377,11 @@ where
 
     // Verify that a transaction enhancement request for the received transaction was created
     let requests = st.wallet().transaction_data_requests().unwrap();
-    assert!(requests
-        .iter()
-        .any(|req| req == &TransactionDataRequest::Enhancement(*spent_outpoint.txid())));
+    assert!(
+        requests
+            .iter()
+            .any(|req| req == &TransactionDataRequest::Enhancement(*spent_outpoint.txid()))
+    );
 
     // Now advance the chain by 40 blocks; even though a record for the transaction that created
     // `spent_outpoint` exists in the wallet database, the transaction can't be enhanced because
@@ -3662,9 +3408,11 @@ where
 
     // Verify that the transaction enhancement request for the invalid txid has been deleted.
     let requests = st.wallet().transaction_data_requests().unwrap();
-    assert!(!requests
-        .iter()
-        .any(|req| req == &TransactionDataRequest::Enhancement(*spent_outpoint.txid())));
+    assert!(
+        !requests
+            .iter()
+            .any(|req| req == &TransactionDataRequest::Enhancement(*spent_outpoint.txid()))
+    );
 }
 
 // FIXME: This requires fixes to the test framework.
@@ -3792,18 +3540,13 @@ pub fn checkpoint_gaps<T: ShieldedPoolTester, Dsf: DataStoreFactory>(
     ds_factory: Dsf,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
 
     // Generate a block with funds belonging to our wallet.
-    st.generate_next_block(
-        &dfvk,
-        AddressType::DefaultExternal,
-        Zatoshis::const_from_u64(500000),
-    );
-    st.scan_cached_blocks(account.birthday().height(), 1);
+    st.add_a_single_note(Zatoshis::const_from_u64(500000));
 
     // Create a gap of 10 blocks having no shielded outputs, then add a block that doesn't
     // belong to us so that we can get a checkpoint in the tree.
@@ -3879,7 +3622,9 @@ pub fn pool_crossing_required<P0: ShieldedPoolTester, P1: ShieldedPoolTester>(
     cache: impl TestCache,
 ) {
     // TODO: Allow for Orchard activation after Sapling
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
+    // Here we choose P0, but this has no effect since we supply the viewing keys
+    // and generate the blocks directly on the state.
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<P0>();
 
     let account = st.test_account().cloned().unwrap();
 
@@ -3967,7 +3712,7 @@ pub fn fully_funded_fully_private<P0: ShieldedPoolTester, P1: ShieldedPoolTester
     cache: impl TestCache,
 ) {
     // TODO: Allow for Orchard activation after Sapling
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<P0>();
 
     let account = st.test_account().cloned().unwrap();
 
@@ -4057,7 +3802,7 @@ pub fn fully_funded_send_to_t<P0: ShieldedPoolTester, P1: ShieldedPoolTester>(
     cache: impl TestCache,
 ) {
     // TODO: Allow for Orchard activation after Sapling
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<P0>();
 
     let account = st.test_account().cloned().unwrap();
 
@@ -4147,7 +3892,7 @@ pub fn multi_pool_checkpoint<P0: ShieldedPoolTester, P1: ShieldedPoolTester>(
     cache: impl TestCache,
 ) {
     // TODO: Allow for Orchard activation after Sapling
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<P0>();
 
     let account = st.test_account().cloned().unwrap();
     let acct_id = account.id();
@@ -4316,7 +4061,7 @@ pub fn multi_pool_checkpoints_with_pruning<P0: ShieldedPoolTester, P1: ShieldedP
     cache: impl TestCache,
 ) {
     // TODO: Allow for Orchard activation after Sapling
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<P0>();
 
     let account = st.test_account().cloned().unwrap();
 
@@ -4345,7 +4090,7 @@ pub fn valid_chain_states<T: ShieldedPoolTester>(
     ds_factory: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
 
     let dfvk = T::test_account_fvk(&st);
 
@@ -4379,7 +4124,7 @@ pub fn invalid_chain_cache_disconnected<T: ShieldedPoolTester>(
     ds_factory: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
 
     let dfvk = T::test_account_fvk(&st);
 
@@ -4434,7 +4179,7 @@ where
     Dsf: DataStoreFactory,
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -4496,7 +4241,7 @@ where
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
     C: TestCache,
 {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
 
@@ -4630,7 +4375,7 @@ pub fn scan_cached_blocks_allows_blocks_out_of_order<T: ShieldedPoolTester>(
     ds_factory: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -4685,7 +4430,7 @@ pub fn scan_cached_blocks_finds_received_notes<T: ShieldedPoolTester, Dsf>(
     Dsf: DataStoreFactory,
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -4724,6 +4469,7 @@ pub fn scan_cached_blocks_finds_received_notes<T: ShieldedPoolTester, Dsf>(
 }
 
 // TODO: This test can probably be entirely removed, as the following test duplicates it entirely.
+// TODO(schell): ^still a valid todo?
 pub fn scan_cached_blocks_finds_change_notes<T: ShieldedPoolTester, Dsf>(
     ds_factory: Dsf,
     cache: impl TestCache,
@@ -4731,7 +4477,7 @@ pub fn scan_cached_blocks_finds_change_notes<T: ShieldedPoolTester, Dsf>(
     Dsf: DataStoreFactory,
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -4741,14 +4487,15 @@ pub fn scan_cached_blocks_finds_change_notes<T: ShieldedPoolTester, Dsf>(
 
     // Create a fake CompactBlock sending value to the address
     let value = Zatoshis::const_from_u64(50000);
-    let (received_height, _, nf) =
-        st.generate_next_block(&dfvk, AddressType::DefaultExternal, value);
+    let (_, _, nf) = st.add_a_single_note(value);
+    // let (received_height, _, nf) =
+    //     st.generate_next_block(&dfvk, AddressType::DefaultExternal, value);
 
-    // Scan the cache
-    st.scan_cached_blocks(received_height, 1);
+    // // Scan the cache
+    // st.scan_cached_blocks(received_height, 1);
 
-    // Account balance should reflect the received note
-    assert_eq!(st.get_total_balance(account.id()), value);
+    // // Account balance should reflect the received note
+    // assert_eq!(st.get_total_balance(account.id()), value);
 
     // Create a second fake CompactBlock spending value from the address
     let not_our_key = T::sk_to_fvk(&T::sk(&[0xf5; 32]));
@@ -4773,7 +4520,7 @@ pub fn scan_cached_blocks_detects_spends_out_of_order<T: ShieldedPoolTester, Dsf
     Dsf: DataStoreFactory,
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -4819,23 +4566,18 @@ pub fn metadata_queries_exclude_unwanted_notes<T: ShieldedPoolTester, Dsf, TC>(
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
     TC: TestCache,
 {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
-
-    let account = st.test_account().cloned().unwrap();
-    let dfvk = T::test_account_fvk(&st);
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
 
     // Create 10 blocks with successively increasing value
-    let value = Zatoshis::const_from_u64(100_0000);
-    let (h0, _, _) = st.generate_next_block(&dfvk, AddressType::DefaultExternal, value);
-    let mut note_values = vec![value];
-    for i in 2..=10 {
-        let value = Zatoshis::const_from_u64(i * 100_0000);
-        st.generate_next_block(&dfvk, AddressType::DefaultExternal, value);
-        note_values.push(value);
-    }
-    st.scan_cached_blocks(h0, 10);
-    let target_height = TargetHeight::from(h0 + 10);
+    let note_values = (1..=10)
+        .map(|i| Zatoshis::const_from_u64(i * 100_0000))
+        .collect::<Vec<_>>();
+    let h0 = st
+        .add_notes(note_values.clone().into_iter().map(|z| Some(z)))
+        .first_block_height();
 
+    let target_height = TargetHeight::from(h0 + 10);
+    let account = st.test_account().cloned().unwrap();
     let test_meta = |st: &TestState<TC, Dsf::DataStore, LocalNetwork>, query, expected_count| {
         let metadata = st
             .wallet()
@@ -5025,7 +4767,7 @@ pub fn wallet_recovery_computes_fees<T: ShieldedPoolTester, DsF: DataStoreFactor
 ) {
     use secrecy::ExposeSecret;
 
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build();
+    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
 
     let seed = Secret::new(st.test_seed().unwrap().expose_secret().clone());
     let source_account = st.test_account().cloned().unwrap();
@@ -5034,14 +4776,11 @@ pub fn wallet_recovery_computes_fees<T: ShieldedPoolTester, DsF: DataStoreFactor
         .create_account("dest", &seed, source_account.birthday(), None)
         .unwrap();
 
-    let from = T::test_account_fvk(&st);
     let (to, _) = dest_usk.default_transparent_address();
 
     // Get some funds in the source account
     let note_value = Zatoshis::const_from_u64(350000);
-    st.generate_next_block(&from, AddressType::DefaultExternal, note_value);
-    st.generate_next_block(&from, AddressType::DefaultExternal, note_value);
-    st.scan_cached_blocks(source_account.birthday().height(), 2);
+    let _summary = st.add_notes([Some(note_value), Some(note_value)]);
 
     // Create two transactions sending from the source account to a transparent address in the
     // destination account.
@@ -5174,47 +4913,15 @@ pub fn receive_two_notes_with_same_value<T: ShieldedPoolTester>(
     dsf: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build();
-
-    let account = st.test_account().cloned().unwrap();
-    let dfvk = T::test_account_fvk(&st);
+    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build::<T>();
 
     // Add funds to the wallet in two identical notes
     let value = Zatoshis::const_from_u64(60000);
-    let outputs = [
-        FakeCompactOutput::new(&dfvk, AddressType::DefaultExternal, value),
-        FakeCompactOutput::new(&dfvk, AddressType::DefaultExternal, value),
-    ];
-    let total_value = (value + value).unwrap();
-
-    // `st.generate_next_block` with multiple outputs.
-    let pre_activation_block = CachedBlock::none(st.sapling_activation_height() - 1);
-    let prior_cached_block = st
-        .latest_cached_block()
-        .unwrap_or(&pre_activation_block)
-        .clone();
-    let h = prior_cached_block.height() + 1;
-    st.generate_block_at(
-        h,
-        prior_cached_block.chain_state.block_hash(),
-        &outputs,
-        prior_cached_block.sapling_end_size,
-        prior_cached_block.orchard_end_size,
-        false,
-    );
-
-    st.scan_cached_blocks(h, 1);
-    assert_eq!(
-        st.wallet()
-            .block_max_scanned()
-            .unwrap()
-            .unwrap()
-            .block_height(),
-        h
-    );
+    let h = st.add_notes([[value, value]]).block_height();
 
     // Spendable balance matches total balance.
-    assert_eq!(st.get_total_balance(account.id()), total_value);
+    let account = st.test_account().cloned().unwrap();
+    let total_value = (value + value).unwrap();
     assert_eq!(
         st.get_spendable_balance(account.id(), ConfirmationsPolicy::MIN),
         total_value
diff --git a/zcash_client_backend/src/data_api/testing/pool/dsl.rs b/zcash_client_backend/src/data_api/testing/pool/dsl.rs
index 622e715bc5..ae0c0e7a78 100644
--- a/zcash_client_backend/src/data_api/testing/pool/dsl.rs
+++ b/zcash_client_backend/src/data_api/testing/pool/dsl.rs
@@ -1,15 +1,25 @@
 //! A convenient DSL for writing wallet tests.
 
-use std::ops::{Deref, DerefMut};
+use std::{
+    marker::PhantomData,
+    ops::{Deref, DerefMut},
+};
 
 use zcash_primitives::block::BlockHash;
-use zcash_protocol::local_consensus::LocalNetwork;
+use zcash_protocol::{consensus::BlockHeight, local_consensus::LocalNetwork, value::Zatoshis};
 
 use crate::data_api::{
-    testing::{DataStoreFactory, TestBuilder, TestCache, TestState},
-    WalletTest,
+    Account, AccountBalance, WalletRead,
+    chain::ScanSummary,
+    testing::{
+        AddressType, DataStoreFactory, FakeCompactOutput, TestAccount, TestBuilder, TestCache,
+        TestFvk, TestState,
+    },
+    wallet::ConfirmationsPolicy,
 };
 
+use super::ShieldedPoolTester;
+
 /// A type-state wrapper struct that provides convenience methods.
 pub struct TestDsl<T> {
     /// Either a `TestBuilder<Cache, DataStoreFactory>` or
@@ -69,16 +79,295 @@ where
             .into()
     }
 
-    /// Build the builder, wrapping the resulting [`TestState`] in a [`TestDsl`].
-    pub fn build(self) -> TestDsl<TestState<Cache, Dsf::DataStore, LocalNetwork>> {
-        self.map(TestBuilder::build)
+    /// Build the builder, wrapping the resulting [`TestState`] in a [`TestDsl`] and [`TestScenario`].
+    pub fn build<T: ShieldedPoolTester>(self) -> TestDsl<TestScenario<T, Cache, Dsf>> {
+        let state = self.inner.build();
+        TestScenario {
+            state,
+            _phantom: PhantomData,
+        }
+        .into()
     }
 }
 
-/// [`TestDsl`] provides convenience methods for common [`TestState`] operations.
-impl<Cache, DataStore> TestDsl<TestState<Cache, DataStore, LocalNetwork>>
+/// A proxy for `FakeCompactOutput` that allows test code to omit the `fvk` and
+/// `address_type` fields, which can be derived from the `TestState` in most cases.
+pub struct TestNoteConfig<T: ShieldedPoolTester> {
+    pub value: Zatoshis,
+    /// Diversifiable full viewing key of
+    pub fvk: Option<T::Fvk>,
+    pub address_type: Option<AddressType>,
+}
+
+impl<T: ShieldedPoolTester> From<Zatoshis> for TestNoteConfig<T> {
+    fn from(value: Zatoshis) -> Self {
+        TestNoteConfig {
+            value,
+            fvk: None,
+            address_type: None,
+        }
+    }
+}
+
+impl<T: ShieldedPoolTester> TestNoteConfig<T> {
+    pub fn with_address_type(mut self, address_type: AddressType) -> Self {
+        self.address_type = Some(address_type);
+        self
+    }
+
+    pub fn with_fvk(mut self, fvk: T::Fvk) -> Self {
+        self.fvk = Some(fvk);
+        self
+    }
+}
+
+pub struct AddFundsStepResult<T: ShieldedPoolTester, C: TestCache> {
+    pub block_height: BlockHeight,
+    pub insert_result: C::InsertResult,
+    /// Empty when the step was to generate an empty block
+    pub nullifiers: Vec<<T::Fvk as TestFvk>::Nullifier>,
+}
+
+/// The input and output of one "add funds" step.
+pub struct AddFundsStep<T: ShieldedPoolTester, C: TestCache> {
+    pub notes: Vec<TestNoteConfig<T>>,
+    pub results: AddFundsStepResult<T, C>,
+}
+
+/// A collection of results from adding funds to a `TestState`.
+pub struct AddFundsSummary<T: ShieldedPoolTester, C: TestCache> {
+    pub steps: Vec<AddFundsStep<T, C>>,
+    pub scan_summary: Option<ScanSummary>,
+}
+
+impl<T: ShieldedPoolTester, C: TestCache> Default for AddFundsSummary<T, C> {
+    fn default() -> Self {
+        Self {
+            steps: Default::default(),
+            scan_summary: None,
+        }
+    }
+}
+
+impl<T: ShieldedPoolTester, C: TestCache> AddFundsSummary<T, C> {
+    /// Return the first block height.
+    pub fn first_block_height(&self) -> BlockHeight {
+        if let Some(step) = self.steps.first() {
+            step.results.block_height
+        } else {
+            BlockHeight::from_u32(0)
+        }
+    }
+
+    /// Return the latest block height after generating the blocks
+    /// that added funds.
+    pub fn block_height(&self) -> BlockHeight {
+        if let Some(step) = self.steps.last() {
+            step.results.block_height
+        } else {
+            BlockHeight::from_u32(0)
+        }
+    }
+}
+
+#[repr(transparent)]
+pub struct TestScenario<T: ShieldedPoolTester, Cache, Dsf: DataStoreFactory> {
+    /// The current scenario state.
+    state: TestState<Cache, Dsf::DataStore, LocalNetwork>,
+    _phantom: PhantomData<T>,
+}
+
+impl<T, C, D> Deref for TestScenario<T, C, D>
 where
-    DataStore: WalletTest,
+    T: ShieldedPoolTester,
+    D: DataStoreFactory,
+{
+    type Target = TestState<C, D::DataStore, LocalNetwork>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.state
+    }
+}
+
+impl<T, C, D> DerefMut for TestScenario<T, C, D>
+where
+    T: ShieldedPoolTester,
+    D: DataStoreFactory,
+{
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.state
+    }
+}
+
+/// Add funds scenarios.
+impl<Cache, Dsf, T> TestScenario<T, Cache, Dsf>
+where
+    T: ShieldedPoolTester,
     Cache: TestCache,
+    Dsf: DataStoreFactory,
 {
+    /// Return the current test account balance, if possible.
+    ///
+    /// Returns `None` when no account summary data is available, which is
+    /// the case before the wallet has scanned any blocks.
+    pub fn get_account_balance(
+        &self,
+        confirmations_policy: ConfirmationsPolicy,
+    ) -> Option<AccountBalance> {
+        let account = self.get_account();
+        let binding = self
+            .wallet()
+            .get_wallet_summary(confirmations_policy)
+            .unwrap()?;
+        let balance = binding.account_balances().get(&account.id())?;
+        Some(balance.clone())
+    }
+
+    /// Adds funds from a single note from an address of the given type.
+    ///
+    /// Returns the current block height, cache insert result and test viewing key nullifier.
+    ///
+    /// This is shorthand for:
+    /// ```rust,ignore
+    /// {
+    ///     let dfvk = T::test_account_fvk(&st);
+    ///     let output@(h, _, _) = st.generate_next_block(&dfvk, address_type, zatoshis);
+    ///     st.scan_cached_blocks(h, 1);
+    ///     output
+    /// }
+    /// ```
+    ///
+    /// This also verifies that the test account contains the expected funds as
+    /// part of the _total_, and that the funds are spendable with the minimum number
+    /// of confirmations.
+    pub fn add_a_single_note(
+        &mut self,
+        note: impl Into<TestNoteConfig<T>>,
+    ) -> (
+        BlockHeight,
+        Cache::InsertResult,
+        <T::Fvk as TestFvk>::Nullifier,
+    ) {
+        let mut summary = self.add_notes([[note]]);
+        let res = summary.steps.pop().unwrap().results;
+        (res.block_height, res.insert_result, res.nullifiers[0])
+    }
+
+    /// Generates `N` empty blocks.
+    ///
+    /// Returns the current block height.
+    pub fn add_empty_blocks(&mut self, n: usize) -> BlockHeight {
+        let mut out_height = BlockHeight::from_u32(0);
+        for _ in 0..n {
+            let (h, _) = self.generate_empty_block();
+            out_height = h;
+        }
+        out_height
+    }
+
+    /// Returns the test account.
+    pub fn get_account(&self) -> TestAccount<Dsf::Account> {
+        self.test_account().expect("not configured").clone()
+    }
+
+    /// Creates a `FakeCompactOutput` from the given `TestNoteConfig`.
+    fn make_fake_output(&self, note_config: &TestNoteConfig<T>) -> FakeCompactOutput<T::Fvk> {
+        let TestNoteConfig {
+            value,
+            fvk,
+            address_type,
+        } = note_config;
+        FakeCompactOutput::new(
+            fvk.clone().unwrap_or_else(|| T::test_account_fvk(self)),
+            address_type.unwrap_or(AddressType::DefaultExternal),
+            *value,
+        )
+    }
+
+    /// Add funds from multiple notes in one or more blocks, or generate empty blocks.
+    ///
+    /// This step also verifies that the test account contains the expected
+    /// funds as part of the _total_. Keep in mind that these funds may not yet
+    /// be _spendable_ due to the number confirmations required.
+    ///
+    /// Returns a summary of steps.
+    ///
+    /// ## Note
+    /// Keep in mind:
+    /// * Each block coalesces these notes into a single transaction.
+    /// * Funds are added to the default test account.
+    pub fn add_notes(
+        &mut self,
+        blocks: impl IntoIterator<Item = impl IntoIterator<Item = impl Into<TestNoteConfig<T>>>>,
+    ) -> AddFundsSummary<T, Cache> {
+        let mut from_height = None;
+        let mut current_height = BlockHeight::from_u32(0);
+        let mut limit = 0;
+        let account = self.get_account();
+        let starting_balance = self
+            .get_account_balance(ConfirmationsPolicy::MIN)
+            .map(|b| b.total())
+            .unwrap_or(Zatoshis::ZERO);
+        let mut expected_total = starting_balance;
+        let mut summary = AddFundsSummary::default();
+        for notes in blocks.into_iter() {
+            // Collect the notes while also counting their value.
+            let (fake_outputs, note_configs): (Vec<_>, Vec<_>) = notes
+                .into_iter()
+                .map(|into_note_config| {
+                    let note_config = into_note_config.into();
+                    expected_total = (expected_total + note_config.value).unwrap();
+                    (self.make_fake_output(&note_config), note_config)
+                })
+                .unzip();
+            let step_result = if fake_outputs.is_empty() {
+                let (h, r) = self.generate_empty_block();
+                AddFundsStepResult {
+                    block_height: h,
+                    insert_result: r,
+                    nullifiers: vec![],
+                }
+            } else {
+                let (h, r, n) = self.generate_next_block_multi(&fake_outputs);
+                AddFundsStepResult {
+                    block_height: h,
+                    insert_result: r,
+                    nullifiers: n,
+                }
+            };
+            current_height = step_result.block_height;
+            if from_height.is_none() {
+                from_height = Some(current_height);
+            }
+            summary.steps.push(AddFundsStep {
+                notes: note_configs,
+                results: step_result,
+            });
+            limit += 1;
+        }
+        if let Some(from_height) = from_height {
+            summary.scan_summary = Some(self.scan_cached_blocks(from_height, limit));
+        }
+
+        // Do most of the assertions that we care about at the "add funds" callsites
+        assert_eq!(
+            self.get_total_balance(account.id()),
+            expected_total,
+            "Unexpected total balance"
+        );
+        assert_eq!(
+            self.wallet()
+                .block_max_scanned()
+                .unwrap()
+                .unwrap()
+                .block_height(),
+            current_height
+        );
+        assert_eq!(
+            self.get_spendable_balance(account.id(), ConfirmationsPolicy::MIN),
+            expected_total
+        );
+
+        summary
+    }
 }

From 9bf627a37916aab42945f68d94de23f1a6c5e769 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Wed, 5 Nov 2025 13:52:03 +1300
Subject: [PATCH 011/263] clean up unused dfvk binding warnings

---
 .../src/data_api/testing/pool.rs              | 24 ++++++-------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/zcash_client_backend/src/data_api/testing/pool.rs b/zcash_client_backend/src/data_api/testing/pool.rs
index 5c9039a8bf..c818ac5da8 100644
--- a/zcash_client_backend/src/data_api/testing/pool.rs
+++ b/zcash_client_backend/src/data_api/testing/pool.rs
@@ -1459,9 +1459,6 @@ pub fn send_with_multiple_change_outputs<T: ShieldedPoolTester>(
 ) {
     let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build::<T>();
 
-    let account = st.test_account().cloned().unwrap();
-    let dfvk = T::test_account_fvk(&st);
-
     // Add funds to the wallet in a single note
     let value = Zatoshis::const_from_u64(650_0000);
     let (h, _, _) = st.add_a_single_note(value);
@@ -1487,6 +1484,7 @@ pub fn send_with_multiple_change_outputs<T: ShieldedPoolTester>(
         ),
     );
 
+    let account = st.test_account().cloned().unwrap();
     let proposal = st
         .propose_transfer(
             account.id(),
@@ -1982,9 +1980,6 @@ pub fn spend_all_funds_single_step_proposed_transfer<T: ShieldedPoolTester>(
 ) {
     let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build::<T>();
 
-    let account = st.test_account().cloned().unwrap();
-    let dfvk = T::test_account_fvk(&st);
-
     // Add funds to the wallet in a single note
     let value = Zatoshis::const_from_u64(60000);
     let (h, _, _) = st.add_a_single_note(value);
@@ -2009,6 +2004,7 @@ pub fn spend_all_funds_single_step_proposed_transfer<T: ShieldedPoolTester>(
     );
     let input_selector = GreedyInputSelector::new();
 
+    let account = st.test_account().cloned().unwrap();
     let proposal = st
         .propose_transfer(
             account.id(),
@@ -2609,10 +2605,6 @@ pub fn spend_fails_on_locked_notes<T: ShieldedPoolTester>(
 ) {
     let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
 
-    let account = st.test_account().cloned().unwrap();
-    let account_id = account.id();
-    let dfvk = T::test_account_fvk(&st);
-
     let fee_rule = StandardFeeRule::Zip317;
 
     // Add funds to the wallet in a single note
@@ -2622,6 +2614,8 @@ pub fn spend_fails_on_locked_notes<T: ShieldedPoolTester>(
     // Send some of the funds to another address, but don't mine the tx.
     let extsk2 = T::sk(&[0xf5; 32]);
     let to = T::sk_default_address(&extsk2);
+    let account = st.test_account().cloned().unwrap();
+    let account_id = account.id();
     let proposal = st
         .propose_standard_transfer::<Infallible>(
             account_id,
@@ -2826,10 +2820,6 @@ pub fn spend_succeeds_to_t_addr_zero_change<T: ShieldedPoolTester>(
 ) {
     let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
 
-    let account = st.test_account().cloned().unwrap();
-    let account_id = account.id();
-    let dfvk = T::test_account_fvk(&st);
-
     // Add funds to the wallet in a single note
     let value = Zatoshis::const_from_u64(70000);
     st.add_a_single_note(value);
@@ -2838,6 +2828,8 @@ pub fn spend_succeeds_to_t_addr_zero_change<T: ShieldedPoolTester>(
 
     // TODO: generate_next_block_from_tx does not currently support transparent outputs.
     let to = TransparentAddress::PublicKeyHash([7; 20]).into();
+    let account = st.test_account().cloned().unwrap();
+    let account_id = account.id();
     let proposal = st
         .propose_standard_transfer::<Infallible>(
             account_id,
@@ -3542,14 +3534,12 @@ pub fn checkpoint_gaps<T: ShieldedPoolTester, Dsf: DataStoreFactory>(
 ) {
     let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
 
-    let account = st.test_account().cloned().unwrap();
-    let dfvk = T::test_account_fvk(&st);
-
     // Generate a block with funds belonging to our wallet.
     st.add_a_single_note(Zatoshis::const_from_u64(500000));
 
     // Create a gap of 10 blocks having no shielded outputs, then add a block that doesn't
     // belong to us so that we can get a checkpoint in the tree.
+    let account = st.test_account().cloned().unwrap();
     let not_our_key = T::sk_to_fvk(&T::sk(&[0xf5; 32]));
     let not_our_value = Zatoshis::const_from_u64(10000);
     let sapling_end_size = st.latest_cached_block().unwrap().sapling_end_size();

From eda4fdab517e63de7f69557abc6a2786651f20ac Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Wed, 5 Nov 2025 14:32:35 +1300
Subject: [PATCH 012/263] test DSL - don't count dust notes in expected total

---
 zcash_client_backend/src/data_api/testing/pool/dsl.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/zcash_client_backend/src/data_api/testing/pool/dsl.rs b/zcash_client_backend/src/data_api/testing/pool/dsl.rs
index ae0c0e7a78..43d5d13cb6 100644
--- a/zcash_client_backend/src/data_api/testing/pool/dsl.rs
+++ b/zcash_client_backend/src/data_api/testing/pool/dsl.rs
@@ -5,7 +5,7 @@ use std::{
     ops::{Deref, DerefMut},
 };
 
-use zcash_primitives::block::BlockHash;
+use zcash_primitives::{block::BlockHash, transaction::fees::zip317};
 use zcash_protocol::{consensus::BlockHeight, local_consensus::LocalNetwork, value::Zatoshis};
 
 use crate::data_api::{
@@ -316,7 +316,11 @@ where
                 .into_iter()
                 .map(|into_note_config| {
                     let note_config = into_note_config.into();
-                    expected_total = (expected_total + note_config.value).unwrap();
+                    if note_config.value > zip317::MARGINAL_FEE {
+                        // Don't include dust in the expected total, as the balance
+                        // won't include it.
+                        expected_total = (expected_total + note_config.value).unwrap();
+                    }
                     (self.make_fake_output(&note_config), note_config)
                 })
                 .unzip();

From fa285cfbe0195b55602f0377a3476b540102a03f Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Wed, 5 Nov 2025 14:49:24 +1300
Subject: [PATCH 013/263] fix clippys

---
 zcash_client_backend/src/data_api/testing/pool.rs     | 2 +-
 zcash_client_backend/src/data_api/testing/pool/dsl.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zcash_client_backend/src/data_api/testing/pool.rs b/zcash_client_backend/src/data_api/testing/pool.rs
index c818ac5da8..1836ea73f5 100644
--- a/zcash_client_backend/src/data_api/testing/pool.rs
+++ b/zcash_client_backend/src/data_api/testing/pool.rs
@@ -4563,7 +4563,7 @@ pub fn metadata_queries_exclude_unwanted_notes<T: ShieldedPoolTester, Dsf, TC>(
         .map(|i| Zatoshis::const_from_u64(i * 100_0000))
         .collect::<Vec<_>>();
     let h0 = st
-        .add_notes(note_values.clone().into_iter().map(|z| Some(z)))
+        .add_notes(note_values.clone().into_iter().map(Some))
         .first_block_height();
 
     let target_height = TargetHeight::from(h0 + 10);
diff --git a/zcash_client_backend/src/data_api/testing/pool/dsl.rs b/zcash_client_backend/src/data_api/testing/pool/dsl.rs
index 43d5d13cb6..b6025428a4 100644
--- a/zcash_client_backend/src/data_api/testing/pool/dsl.rs
+++ b/zcash_client_backend/src/data_api/testing/pool/dsl.rs
@@ -220,7 +220,7 @@ where
             .get_wallet_summary(confirmations_policy)
             .unwrap()?;
         let balance = binding.account_balances().get(&account.id())?;
-        Some(balance.clone())
+        Some(*balance)
     }
 
     /// Adds funds from a single note from an address of the given type.

From 1c0710ea21671542243fccb632138548f08d11b3 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Thu, 13 Nov 2025 07:07:11 +1300
Subject: [PATCH 014/263] AddressType does not need Default

---
 zcash_client_backend/src/data_api/testing.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/zcash_client_backend/src/data_api/testing.rs b/zcash_client_backend/src/data_api/testing.rs
index 4a850a5573..6f34c5bc24 100644
--- a/zcash_client_backend/src/data_api/testing.rs
+++ b/zcash_client_backend/src/data_api/testing.rs
@@ -2110,10 +2110,9 @@ impl TestFvk for ::orchard::keys::FullViewingKey {
 /// Configures how a [`TestFvk`] receives a particular output.
 ///
 /// Used with [`TestFvk::add_output`] and [`TestFvk::add_logical_action`].
-#[derive(Clone, Copy, Default, Debug)]
+#[derive(Clone, Copy, Debug)]
 pub enum AddressType {
     /// The output will be sent to the default address of the full viewing key.
-    #[default]
     DefaultExternal,
     /// The output will be sent to the specified diversified address of the full viewing
     /// key.

From 424034cb62837447d5609f2a1b277e0ef27eef4b Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Mon, 17 Nov 2025 09:56:00 +1300
Subject: [PATCH 015/263] better docs, fixed typos

---
 zcash_client_backend/src/data_api/testing/pool.rs    | 12 +-----------
 .../src/data_api/testing/pool/dsl.rs                 | 10 ++++++----
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/zcash_client_backend/src/data_api/testing/pool.rs b/zcash_client_backend/src/data_api/testing/pool.rs
index 1836ea73f5..5b6cd7a705 100644
--- a/zcash_client_backend/src/data_api/testing/pool.rs
+++ b/zcash_client_backend/src/data_api/testing/pool.rs
@@ -3203,7 +3203,7 @@ pub fn zip317_spend<T: ShieldedPoolTester, Dsf: DataStoreFactory>(
     // Add funds to the wallet
     st.add_notes([Some(Zatoshis::const_from_u64(50000))]);
 
-    // Add 10 dust notes to the wallet
+    // Add 10 uneconomic (dust) notes to the wallet
     for _ in 1..=10 {
         st.add_notes([Some(Zatoshis::const_from_u64(1000))]);
     }
@@ -4458,8 +4458,6 @@ pub fn scan_cached_blocks_finds_received_notes<T: ShieldedPoolTester, Dsf>(
     );
 }
 
-// TODO: This test can probably be entirely removed, as the following test duplicates it entirely.
-// TODO(schell): ^still a valid todo?
 pub fn scan_cached_blocks_finds_change_notes<T: ShieldedPoolTester, Dsf>(
     ds_factory: Dsf,
     cache: impl TestCache,
@@ -4478,14 +4476,6 @@ pub fn scan_cached_blocks_finds_change_notes<T: ShieldedPoolTester, Dsf>(
     // Create a fake CompactBlock sending value to the address
     let value = Zatoshis::const_from_u64(50000);
     let (_, _, nf) = st.add_a_single_note(value);
-    // let (received_height, _, nf) =
-    //     st.generate_next_block(&dfvk, AddressType::DefaultExternal, value);
-
-    // // Scan the cache
-    // st.scan_cached_blocks(received_height, 1);
-
-    // // Account balance should reflect the received note
-    // assert_eq!(st.get_total_balance(account.id()), value);
 
     // Create a second fake CompactBlock spending value from the address
     let not_our_key = T::sk_to_fvk(&T::sk(&[0xf5; 32]));
diff --git a/zcash_client_backend/src/data_api/testing/pool/dsl.rs b/zcash_client_backend/src/data_api/testing/pool/dsl.rs
index b6025428a4..82155657df 100644
--- a/zcash_client_backend/src/data_api/testing/pool/dsl.rs
+++ b/zcash_client_backend/src/data_api/testing/pool/dsl.rs
@@ -93,9 +93,11 @@ where
 /// A proxy for `FakeCompactOutput` that allows test code to omit the `fvk` and
 /// `address_type` fields, which can be derived from the `TestState` in most cases.
 pub struct TestNoteConfig<T: ShieldedPoolTester> {
+    /// The amount of the note.
     pub value: Zatoshis,
-    /// Diversifiable full viewing key of
+    /// Diversifiable full viewing key of the recipient.
     pub fvk: Option<T::Fvk>,
+    /// Address type of the recipient.
     pub address_type: Option<AddressType>,
 }
 
@@ -288,7 +290,7 @@ where
     ///
     /// This step also verifies that the test account contains the expected
     /// funds as part of the _total_. Keep in mind that these funds may not yet
-    /// be _spendable_ due to the number confirmations required.
+    /// be _spendable_ due to the number of confirmations required.
     ///
     /// Returns a summary of steps.
     ///
@@ -317,8 +319,8 @@ where
                 .map(|into_note_config| {
                     let note_config = into_note_config.into();
                     if note_config.value > zip317::MARGINAL_FEE {
-                        // Don't include dust in the expected total, as the balance
-                        // won't include it.
+                        // Don't include uneconomic (dust) notes in the expected
+                        // total, as the balance won't include them.
                         expected_total = (expected_total + note_config.value).unwrap();
                     }
                     (self.make_fake_output(&note_config), note_config)

From 4fc0574a645b5ce5728c3134a33a91fccc6c9170 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Thu, 13 Nov 2025 14:53:48 +1300
Subject: [PATCH 016/263] Remove deprecations from zcash_primitives and
 zcash_address

---
 components/zcash_address/CHANGELOG.md         |  4 ++
 components/zcash_address/src/lib.rs           |  3 --
 zcash_client_backend/src/data_api/chain.rs    |  4 +-
 zcash_primitives/CHANGELOG.md                 | 25 +++++++++-
 .../src/transaction/components.rs             | 47 -------------------
 .../src/transaction/components/tze.rs         |  5 +-
 zcash_primitives/src/transaction/sighash.rs   | 14 ------
 7 files changed, 32 insertions(+), 70 deletions(-)

diff --git a/components/zcash_address/CHANGELOG.md b/components/zcash_address/CHANGELOG.md
index fd011857f1..c46fa40eb3 100644
--- a/components/zcash_address/CHANGELOG.md
+++ b/components/zcash_address/CHANGELOG.md
@@ -10,6 +10,10 @@ workspace.
 
 ## [Unreleased]
 
+### Removed
+
+- Removed deprecated `zcash_address::Network`, use `zcash_protocol::consensus::Network` instead.
+
 ## [0.10.1] - 2025-10-18
 
 ### Fixed
diff --git a/components/zcash_address/src/lib.rs b/components/zcash_address/src/lib.rs
index 713f24b157..27e99421b7 100644
--- a/components/zcash_address/src/lib.rs
+++ b/components/zcash_address/src/lib.rs
@@ -152,9 +152,6 @@ pub use encoding::ParseError;
 pub use kind::unified;
 use kind::unified::Receiver;
 
-#[deprecated(note = "use ::zcash_protocol::consensus::NetworkType instead")]
-pub type Network = zcash_protocol::consensus::NetworkType;
-
 use zcash_protocol::{consensus::NetworkType, PoolType};
 
 /// A Zcash address.
diff --git a/zcash_client_backend/src/data_api/chain.rs b/zcash_client_backend/src/data_api/chain.rs
index 031d7cf026..5b53ad09a1 100644
--- a/zcash_client_backend/src/data_api/chain.rs
+++ b/zcash_client_backend/src/data_api/chain.rs
@@ -331,7 +331,7 @@ pub trait BlockSource {
 /// #        zcash_primitives::block::BlockHash([0; 32]),
 /// #        sapling::Nullifier([0; 32]),
 /// #        &dfvk,
-/// #        zcash_primitives::transaction::components::amount::NonNegativeAmount::const_from_u64(5),
+/// #        zcash_protocol::value::Zatoshis::const_from_u64(5),
 /// #        false,
 /// #        None,
 /// #    );
@@ -340,7 +340,7 @@ pub trait BlockSource {
 /// #        zcash_primitives::block::BlockHash([0; 32]),
 /// #        sapling::Nullifier([0; 32]),
 /// #        &dfvk,
-/// #        zcash_primitives::transaction::components::amount::NonNegativeAmount::const_from_u64(5),
+/// #        zcash_protocol::value::Zatoshis::const_from_u64(5),
 /// #        false,
 /// #        None,
 /// #    );
diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md
index 91d92b2bfa..a7c18ba526 100644
--- a/zcash_primitives/CHANGELOG.md
+++ b/zcash_primitives/CHANGELOG.md
@@ -14,7 +14,30 @@ workspace.
 - MSRV is now 1.85.1.
 
 ### Removed
-- Removed deprecated modules:
+
+- Removed deprecated `zcash_primitives::transaction::sighash::SIGHASH_ALL`, use `zcash_transparent::sighash::SIGHASH_ALL` instead.
+- Removed deprecated `zcash_primitives::transaction::sighash::SIGHASH_NONE`, use `zcash_transparent::sighash::SIGHASH_NONE` instead.
+- Removed deprecated `zcash_primitives::transaction::sighash::SIGHASH_SINGLE`, use `zcash_transparent::sighash::SIGHASH_SINGLE` instead.
+- Removed deprecated `zcash_primitives::transaction::sighash::SIGHASH_MASK`, use `zcash_transparent::sighash::SIGHASH_MASK` instead.
+- Removed deprecated `zcash_primitives::transaction::sighash::SIGHASH_ANYONECANPAY`, use `zcash_transparent::sighash::SIGHASH_ANYONECANPAY` instead.
+- Removed deprecated `zcash_primitives::transaction::sighash::SighashType`, use `zcash_transparent::sighash::SighashType` instead.
+
+- Removed deprecated module `zcash_primitives::transaction::components::amount::testing`:
+  - `arb_positive_amount`, use `zcash_protocol::value::testing::arb_positive_zat_balance` instead.
+  - `arb_amount`, use `zcash_protocol::value::testing::arb_zat_balance`
+  - `arb_nonnegative_amount`, use `zcash_protocol::value::testing::arb_zatoshis` 
+- Removed deprecated module `zcash_primitives::transaction::components::amount`, use `zcash_protocol::value` instead.
+- Removed deprecated module `zcash_primitives::transaction::components::transparent::builder`, use `zcash_transparent::builder` instead.
+- Removed deprecated module `zcash_primitives::transaction::components::transparent::pczt`, use `zcash_transparent::pczt` instead.
+- Removed deprecated module `zcash_primitives::transaction::components::transparent`, use `zcash_transparent` instead.
+- Removed deprecated `zcash_primitives::transaction::components::Outpoint`, use `zcash_transparent::bundle::Outpoint` instead.
+- Removed deprecated `zcash_primitives::transaction::components::TxIn`, use `zcash_transparent::bundle::TxIn` instead.
+- Removed deprecated `zcash_primitives::transaction::components::TxOut`, use `zcash_transparent::bundle::TxOut` instead.
+- Removed deprecated `zcash_primitives::transaction::components::ZatBalance`, use `zcash_protocol::value::ZatBalance` instead.
+- Removed deprecated `zcash_primitives::transaction::components::OutputDescription`, use `sapling_crypto::bundle::OutputDescription` instead.
+- Removed deprecated `zcash_primitives::transaction::components::SpendDescription`, use `sapling_crypto::bundle::SpendDescription` instead.
+
+- Removed other deprecated modules:
     - `zcash_primitives::consensus`
     - `zcash_primitives::constants`
     - `zcash_primitives::memo`
diff --git a/zcash_primitives/src/transaction/components.rs b/zcash_primitives/src/transaction/components.rs
index 944f45e9d9..295ba3d910 100644
--- a/zcash_primitives/src/transaction/components.rs
+++ b/zcash_primitives/src/transaction/components.rs
@@ -7,53 +7,6 @@ pub mod tze;
 
 pub use self::sprout::JsDescription;
 
-#[deprecated(note = "This module is deprecated; use `::zcash_protocol::value` instead.")]
-pub mod amount {
-    #[deprecated(note = "Use `::zcash_protocol::value::BalanceError` instead.")]
-    pub type BalanceError = zcash_protocol::value::BalanceError;
-    #[deprecated(note = "Use `::zcash_protocol::value::ZatBalance` instead.")]
-    pub type Amount = zcash_protocol::value::ZatBalance;
-    #[deprecated(note = "Use `::zcash_protocol::value::Zatoshis` instead.")]
-    pub type NonNegativeAmount = zcash_protocol::value::Zatoshis;
-    #[deprecated(note = "Use `::zcash_protocol::value::COIN` instead.")]
-    pub const COIN: u64 = zcash_protocol::value::COIN;
-
-    #[cfg(any(test, feature = "test-dependencies"))]
-    #[deprecated(note = "Use `::zcash_protocol::value::testing` instead.")]
-    pub mod testing {
-        pub use zcash_protocol::value::testing::arb_positive_zat_balance as arb_positive_amount;
-        pub use zcash_protocol::value::testing::arb_zat_balance as arb_amount;
-        pub use zcash_protocol::value::testing::arb_zatoshis as arb_nonnegative_amount;
-    }
-}
-
-#[deprecated(note = "This module is deprecated; use the `zcash_transparent` crate instead.")]
-pub mod transparent {
-    #[deprecated(note = "This module is deprecated; use `::zcash_transparent::builder` instead.")]
-    pub mod builder {
-        pub use ::transparent::builder::*;
-    }
-    pub use ::transparent::bundle::*;
-    #[deprecated(note = "This module is deprecated; use `::zcash_transparent::pczt` instead.")]
-    pub mod pczt {
-        pub use ::transparent::pczt::*;
-    }
-}
-
-#[deprecated(note = "use `::zcash_transparent::bundle::OutPoint` instead.")]
-pub type OutPoint = ::transparent::bundle::OutPoint;
-#[deprecated(note = "use `::zcash_transparent::bundle::TxIn` instead.")]
-pub type TxIn<A> = ::transparent::bundle::TxIn<A>;
-#[deprecated(note = "use `::zcash_transparent::bundle::TxIn` instead.")]
-pub type TxOut = ::transparent::bundle::TxOut;
-#[deprecated(note = "use `::zcash_protocol::value::ZatBalance` instead.")]
-pub type Amount = zcash_protocol::value::ZatBalance;
-
-#[deprecated(note = "Use `::sapling_crypto::bundle::OutputDescription` instead.")]
-pub type OutputDescription<A> = ::sapling::bundle::OutputDescription<A>;
-#[deprecated(note = "Use `::sapling_crypto::bundle::SpendDescription` instead.")]
-pub type SpendDescription<A> = ::sapling::bundle::SpendDescription<A>;
-
 #[cfg(zcash_unstable = "zfuture")]
 pub use self::tze::{TzeIn, TzeOut};
 
diff --git a/zcash_primitives/src/transaction/components/tze.rs b/zcash_primitives/src/transaction/components/tze.rs
index 10e85ea308..dc208fceec 100644
--- a/zcash_primitives/src/transaction/components/tze.rs
+++ b/zcash_primitives/src/transaction/components/tze.rs
@@ -241,11 +241,10 @@ impl TzeOut {
 pub mod testing {
     use proptest::collection::vec;
     use proptest::prelude::*;
-    use zcash_protocol::consensus::BranchId;
+    use zcash_protocol::{consensus::BranchId, value::testing::arb_zatoshis};
 
     use crate::{
         extensions::transparent::{AuthData, Precondition, Witness},
-        transaction::components::amount::testing::arb_nonnegative_amount,
         transaction::testing::arb_txid,
     };
 
@@ -276,7 +275,7 @@ pub mod testing {
     }
 
     prop_compose! {
-        pub fn arb_tzeout()(value in arb_nonnegative_amount(), precondition in arb_precondition()) -> TzeOut {
+        pub fn arb_tzeout()(value in arb_zatoshis(), precondition in arb_precondition()) -> TzeOut {
             TzeOut { value: value.into(), precondition }
         }
     }
diff --git a/zcash_primitives/src/transaction/sighash.rs b/zcash_primitives/src/transaction/sighash.rs
index 3cf7c80746..b55a204c39 100644
--- a/zcash_primitives/src/transaction/sighash.rs
+++ b/zcash_primitives/src/transaction/sighash.rs
@@ -12,20 +12,6 @@ use {crate::extensions::transparent::Precondition, zcash_protocol::value::Zatosh
 #[cfg(any(zcash_unstable = "zfuture", zcash_unstable = "nu7"))]
 use super::sighash_v6::v6_signature_hash;
 
-#[deprecated(note = "use `::zcash_transparent::sighash::SIGHASH_ALL` instead.")]
-pub const SIGHASH_ALL: u8 = ::transparent::sighash::SIGHASH_ALL;
-#[deprecated(note = "use `::zcash_transparent::sighash::SIGHASH_NONE` instead.")]
-pub const SIGHASH_NONE: u8 = ::transparent::sighash::SIGHASH_NONE;
-#[deprecated(note = "use `::zcash_transparent::sighash::SIGHASH_SINGLE` instead.")]
-pub const SIGHASH_SINGLE: u8 = ::transparent::sighash::SIGHASH_SINGLE;
-#[deprecated(note = "use `::zcash_transparent::sighash::SIGHASH_MASK` instead.")]
-pub const SIGHASH_MASK: u8 = ::transparent::sighash::SIGHASH_MASK;
-#[deprecated(note = "use `::zcash_transparent::sighash::SIGHASH_ANYONECANPAY` instead.")]
-pub const SIGHASH_ANYONECANPAY: u8 = ::transparent::sighash::SIGHASH_ANYONECANPAY;
-
-#[deprecated(note = "use `::zcash_transparent::sighash::SighashType` instead.")]
-pub type SighashType = ::transparent::sighash::SighashType;
-
 pub enum SignableInput<'a> {
     Shielded,
     Transparent(transparent::sighash::SignableInput<'a>),

From e3133a5727598cccad9e186f00b05be86cf9f94d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Nov 2025 05:02:31 +0000
Subject: [PATCH 017/263] build(deps): bump actions/checkout from 5 to 6

Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Commits](https://github.com/actions/checkout/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/audits.yml |  4 ++--
 .github/workflows/book.yml   |  2 +-
 .github/workflows/ci.yml     | 30 +++++++++++++++---------------
 .github/workflows/zizmor.yml |  2 +-
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/audits.yml b/.github/workflows/audits.yml
index 3c72aeff5d..d85fe0e9ee 100644
--- a/.github/workflows/audits.yml
+++ b/.github/workflows/audits.yml
@@ -13,7 +13,7 @@ jobs:
     name: Vet Rust dependencies
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
       - uses: dtolnay/rust-toolchain@stable
@@ -28,7 +28,7 @@ jobs:
     name: Check licenses
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
       - uses: EmbarkStudios/cargo-deny-action@f2ba7abc2abebaf185c833c3961145a3c275caad # v2.0.13
diff --git a/.github/workflows/book.yml b/.github/workflows/book.yml
index 1750e07914..03ef63dde8 100644
--- a/.github/workflows/book.yml
+++ b/.github/workflows/book.yml
@@ -9,7 +9,7 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
       - id: prepare
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 468f1c599d..e8449beef3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,7 +48,7 @@ jobs:
       RUSTDOCFLAGS: ${{ matrix.rustflags }}
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
       - id: prepare
@@ -122,7 +122,7 @@ jobs:
       RUSTDOCFLAGS: ${{ matrix.rustflags }}
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
       - id: prepare
@@ -184,7 +184,7 @@ jobs:
       RUSTDOCFLAGS: ${{ matrix.rustflags }}
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
       - id: prepare
@@ -246,7 +246,7 @@ jobs:
       RUSTDOCFLAGS: ${{ matrix.rustflags }}
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
       - id: prepare
@@ -280,7 +280,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
       - id: prepare
@@ -324,7 +324,7 @@ jobs:
             build_deps: >
               gcc-multilib
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
           path: crates
@@ -370,7 +370,7 @@ jobs:
             build_deps: >
               gcc-arm-none-eabi
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
           path: crates
@@ -415,7 +415,7 @@ jobs:
     name: Bitrot check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
       # Build benchmarks to prevent bitrot
@@ -428,7 +428,7 @@ jobs:
     permissions:
       checks: write
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
       # We can't currently use only the common feature set (to exclude checking of
@@ -452,7 +452,7 @@ jobs:
       checks: write
     continue-on-error: true
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
       # We can't currently use only the common feature set (to exclude checking of
@@ -485,7 +485,7 @@ jobs:
       options: --security-opt seccomp=unconfined
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
       - id: prepare
@@ -518,7 +518,7 @@ jobs:
     name: Intra-doc links
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
       - id: prepare
@@ -544,7 +544,7 @@ jobs:
     name: Rustfmt
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
       - name: Check formatting
@@ -554,7 +554,7 @@ jobs:
     name: protobuf consistency
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
       - id: prepare
@@ -580,7 +580,7 @@ jobs:
     name: UUID validity
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
       - name: Extract UUIDs
diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml
index ac7ada0b9c..e45d095409 100644
--- a/.github/workflows/zizmor.yml
+++ b/.github/workflows/zizmor.yml
@@ -15,7 +15,7 @@ jobs:
       security-events: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v5.0.0 + a doc-only README update
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.0 + a doc-only README update
         with:
           persist-credentials: false
       - name: Install the latest version of uv

From 6b818313c0213c0debe0bae5659750c1d8904f58 Mon Sep 17 00:00:00 2001
From: Daira-Emma Hopwood <daira@jacaranda.org>
Date: Mon, 24 Nov 2025 17:42:58 +0000
Subject: [PATCH 018/263] zizmor.yml: update actions/checkout to pinned v6.0.0

Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
---
 .github/workflows/zizmor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml
index e45d095409..221d6ac104 100644
--- a/.github/workflows/zizmor.yml
+++ b/.github/workflows/zizmor.yml
@@ -15,7 +15,7 @@ jobs:
       security-events: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.0 + a doc-only README update
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           persist-credentials: false
       - name: Install the latest version of uv

From 3645510ffe23f2ad10e4cc9dabd2c86d3242669f Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Tue, 25 Nov 2025 12:06:08 +1300
Subject: [PATCH 019/263] TestDsl::first_block_height and TestDsl::block_height
 return Option, renamed TestDsl::with_standard_sapling_account to
 TestDsl::with_sapling_birthday_account

---
 .../src/data_api/testing/pool.rs              | 93 ++++++++++---------
 .../src/data_api/testing/pool/dsl.rs          | 18 +---
 2 files changed, 53 insertions(+), 58 deletions(-)

diff --git a/zcash_client_backend/src/data_api/testing/pool.rs b/zcash_client_backend/src/data_api/testing/pool.rs
index 5b6cd7a705..20d44d6f02 100644
--- a/zcash_client_backend/src/data_api/testing/pool.rs
+++ b/zcash_client_backend/src/data_api/testing/pool.rs
@@ -204,7 +204,7 @@ pub fn send_single_step_proposed_transfer<T: ShieldedPoolTester>(
     dsf: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(dsf, cache).build::<T>();
 
     // Add funds to the wallet in a single note
     let (h, _, _) = st.add_a_single_note(Zatoshis::const_from_u64(60000));
@@ -366,7 +366,7 @@ pub fn zip_315_confirmations_test_steps<T: ShieldedPoolTester>(
     cache: impl TestCache,
     input_trust: InputTrust,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(dsf, cache).build::<T>();
     let account = st.test_account().cloned().unwrap();
     let starting_balance = Zatoshis::const_from_u64(60_000);
 
@@ -454,13 +454,14 @@ pub fn spend_max_spendable_single_step_proposed_transfer<T: ShieldedPoolTester>(
     dsf: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(dsf, cache).build::<T>();
 
     // Add funds to the wallet in two notes over 5 blocks
     let value = Zatoshis::const_from_u64(60000);
     let h = st
         .add_notes([Some(value), None, None, None, Some(value)])
-        .block_height();
+        .block_height()
+        .unwrap();
 
     // Spendable balance matches total balance
     let account = st.test_account().cloned().unwrap();
@@ -605,7 +606,7 @@ pub fn spend_everything_single_step_proposed_transfer<T: ShieldedPoolTester>(
     dsf: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(dsf, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
 
@@ -739,7 +740,7 @@ pub fn fails_to_send_max_spendable_to_transparent_with_memo<T: ShieldedPoolTeste
 ) {
     use crate::data_api::MaxSpendMode;
 
-    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(dsf, cache).build::<T>();
 
     // Add funds to the wallet in a single note
     st.add_a_single_note(Zatoshis::const_from_u64(60000));
@@ -783,7 +784,7 @@ pub fn spend_everything_proposal_fails_when_unconfirmed_funds_present<T: Shielde
     dsf: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(dsf, cache).build::<T>();
     st.add_notes([
         Some(Zatoshis::const_from_u64(60000)),
         None,
@@ -847,7 +848,7 @@ pub fn send_max_spendable_proposal_succeeds_when_unconfirmed_funds_present<
     dsf: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(dsf, cache).build::<T>();
     let h = st
         .add_notes([
             Some(Zatoshis::const_from_u64(60000)),
@@ -855,7 +856,8 @@ pub fn send_max_spendable_proposal_succeeds_when_unconfirmed_funds_present<
             None,
             Some(Zatoshis::const_from_u64(123456)),
         ])
-        .block_height();
+        .block_height()
+        .unwrap();
 
     // Spendable balance doesn't match total balance
     let account = st.test_account().cloned().unwrap();
@@ -998,7 +1000,7 @@ pub fn spend_everything_multi_step_single_note_proposed_transfer<T: ShieldedPool
 {
     use crate::data_api::{MaxSpendMode, OutputOfSentTx, testing::transparent::GapLimits};
 
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache)
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache)
         .map(|builder| builder.with_gap_limits(GapLimits::new(10, 5, 3)))
         .build::<T>();
 
@@ -1155,7 +1157,7 @@ pub fn spend_everything_multi_step_many_notes_proposed_transfer<T: ShieldedPoolT
 {
     use crate::data_api::{OutputOfSentTx, testing::transparent::GapLimits};
 
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache)
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache)
         .map(|builder| builder.with_gap_limits(GapLimits::new(10, 5, 3)))
         .build::<T>();
 
@@ -1309,7 +1311,7 @@ pub fn spend_everything_multi_step_with_marginal_notes_proposed_transfer<
 {
     use crate::data_api::{MaxSpendMode, OutputOfSentTx, testing::transparent::GapLimits};
 
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache)
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache)
         .map(|builder| builder.with_gap_limits(GapLimits::new(10, 5, 3)))
         .build::<T>();
 
@@ -1457,7 +1459,7 @@ pub fn send_with_multiple_change_outputs<T: ShieldedPoolTester>(
     dsf: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(dsf, cache).build::<T>();
 
     // Add funds to the wallet in a single note
     let value = Zatoshis::const_from_u64(650_0000);
@@ -1628,7 +1630,7 @@ pub fn send_multi_step_proposed_transfer<T: ShieldedPoolTester, Dsf>(
     };
 
     let gap_limits = GapLimits::new(10, 5, 3);
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache)
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache)
         .map(|builder| builder.with_gap_limits(gap_limits))
         .build::<T>();
 
@@ -1978,7 +1980,7 @@ pub fn spend_all_funds_single_step_proposed_transfer<T: ShieldedPoolTester>(
     dsf: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(dsf, cache).build::<T>();
 
     // Add funds to the wallet in a single note
     let value = Zatoshis::const_from_u64(60000);
@@ -2130,7 +2132,7 @@ pub fn spend_all_funds_multi_step_proposed_transfer<T: ShieldedPoolTester, Dsf>(
 {
     use crate::data_api::{OutputOfSentTx, testing::transparent::GapLimits};
 
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache)
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache)
         .map(|builder| builder.with_gap_limits(GapLimits::new(10, 5, 3)))
         .build::<T>();
 
@@ -2277,7 +2279,7 @@ pub fn proposal_fails_if_not_all_ephemeral_outputs_consumed<T: ShieldedPoolTeste
 ) where
     Dsf: DataStoreFactory,
 {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
     let account_id = account.id();
@@ -2356,7 +2358,7 @@ pub fn proposal_fails_if_not_all_ephemeral_outputs_consumed<T: ShieldedPoolTeste
 pub fn create_to_address_fails_on_incorrect_usk<T: ShieldedPoolTester, Dsf: DataStoreFactory>(
     ds_factory: Dsf,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, ()).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, ()).build::<T>();
     let dfvk = T::test_account_fvk(&st);
     let to = T::fvk_default_address(&dfvk);
 
@@ -2393,7 +2395,7 @@ where
     Dsf: DataStoreFactory,
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, ()).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, ()).build::<T>();
 
     let account_id = st.test_account().unwrap().id();
     let dfvk = T::test_account_fvk(&st);
@@ -2422,7 +2424,7 @@ pub fn spend_fails_on_unverified_notes<T: ShieldedPoolTester>(
     ds_factory: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
     let account_id = account.id();
@@ -2603,7 +2605,7 @@ pub fn spend_fails_on_locked_notes<T: ShieldedPoolTester>(
     ds_factory: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache).build::<T>();
 
     let fee_rule = StandardFeeRule::Zip317;
 
@@ -2738,7 +2740,7 @@ pub fn ovk_policy_prevents_recovery_from_chain<T: ShieldedPoolTester, Dsf>(
 ) where
     Dsf: DataStoreFactory,
 {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
     let account_id = account.id();
@@ -2818,7 +2820,7 @@ pub fn spend_succeeds_to_t_addr_zero_change<T: ShieldedPoolTester>(
     ds_factory: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache).build::<T>();
 
     // Add funds to the wallet in a single note
     let value = Zatoshis::const_from_u64(70000);
@@ -2854,7 +2856,7 @@ pub fn change_note_spends_succeed<T: ShieldedPoolTester>(
     ds_factory: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache).build::<T>();
 
     // Add funds to the wallet in a single note owned by the internal spending key
     let value = Zatoshis::const_from_u64(70000);
@@ -3194,7 +3196,7 @@ pub fn zip317_spend<T: ShieldedPoolTester, Dsf: DataStoreFactory>(
     ds_factory: Dsf,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
     let account_id = account.id();
@@ -3281,7 +3283,7 @@ where
     use zcash_keys::keys::UnifiedAddressRequest;
     use zcash_primitives::transaction::builder::DEFAULT_TX_EXPIRY_DELTA;
 
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -3532,7 +3534,7 @@ pub fn checkpoint_gaps<T: ShieldedPoolTester, Dsf: DataStoreFactory>(
     ds_factory: Dsf,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache).build::<T>();
 
     // Generate a block with funds belonging to our wallet.
     st.add_a_single_note(Zatoshis::const_from_u64(500000));
@@ -3614,7 +3616,7 @@ pub fn pool_crossing_required<P0: ShieldedPoolTester, P1: ShieldedPoolTester>(
     // TODO: Allow for Orchard activation after Sapling
     // Here we choose P0, but this has no effect since we supply the viewing keys
     // and generate the blocks directly on the state.
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<P0>();
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache).build::<P0>();
 
     let account = st.test_account().cloned().unwrap();
 
@@ -3702,7 +3704,7 @@ pub fn fully_funded_fully_private<P0: ShieldedPoolTester, P1: ShieldedPoolTester
     cache: impl TestCache,
 ) {
     // TODO: Allow for Orchard activation after Sapling
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<P0>();
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache).build::<P0>();
 
     let account = st.test_account().cloned().unwrap();
 
@@ -3792,7 +3794,7 @@ pub fn fully_funded_send_to_t<P0: ShieldedPoolTester, P1: ShieldedPoolTester>(
     cache: impl TestCache,
 ) {
     // TODO: Allow for Orchard activation after Sapling
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<P0>();
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache).build::<P0>();
 
     let account = st.test_account().cloned().unwrap();
 
@@ -3882,7 +3884,7 @@ pub fn multi_pool_checkpoint<P0: ShieldedPoolTester, P1: ShieldedPoolTester>(
     cache: impl TestCache,
 ) {
     // TODO: Allow for Orchard activation after Sapling
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<P0>();
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache).build::<P0>();
 
     let account = st.test_account().cloned().unwrap();
     let acct_id = account.id();
@@ -4051,7 +4053,7 @@ pub fn multi_pool_checkpoints_with_pruning<P0: ShieldedPoolTester, P1: ShieldedP
     cache: impl TestCache,
 ) {
     // TODO: Allow for Orchard activation after Sapling
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<P0>();
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache).build::<P0>();
 
     let account = st.test_account().cloned().unwrap();
 
@@ -4080,7 +4082,7 @@ pub fn valid_chain_states<T: ShieldedPoolTester>(
     ds_factory: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache).build::<T>();
 
     let dfvk = T::test_account_fvk(&st);
 
@@ -4114,7 +4116,7 @@ pub fn invalid_chain_cache_disconnected<T: ShieldedPoolTester>(
     ds_factory: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache).build::<T>();
 
     let dfvk = T::test_account_fvk(&st);
 
@@ -4169,7 +4171,7 @@ where
     Dsf: DataStoreFactory,
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -4231,7 +4233,7 @@ where
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
     C: TestCache,
 {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
 
@@ -4365,7 +4367,7 @@ pub fn scan_cached_blocks_allows_blocks_out_of_order<T: ShieldedPoolTester>(
     ds_factory: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -4420,7 +4422,7 @@ pub fn scan_cached_blocks_finds_received_notes<T: ShieldedPoolTester, Dsf>(
     Dsf: DataStoreFactory,
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -4465,7 +4467,7 @@ pub fn scan_cached_blocks_finds_change_notes<T: ShieldedPoolTester, Dsf>(
     Dsf: DataStoreFactory,
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -4500,7 +4502,7 @@ pub fn scan_cached_blocks_detects_spends_out_of_order<T: ShieldedPoolTester, Dsf
     Dsf: DataStoreFactory,
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache).build::<T>();
 
     let account = st.test_account().cloned().unwrap();
     let dfvk = T::test_account_fvk(&st);
@@ -4546,7 +4548,7 @@ pub fn metadata_queries_exclude_unwanted_notes<T: ShieldedPoolTester, Dsf, TC>(
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
     TC: TestCache,
 {
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache).build::<T>();
 
     // Create 10 blocks with successively increasing value
     let note_values = (1..=10)
@@ -4554,7 +4556,8 @@ pub fn metadata_queries_exclude_unwanted_notes<T: ShieldedPoolTester, Dsf, TC>(
         .collect::<Vec<_>>();
     let h0 = st
         .add_notes(note_values.clone().into_iter().map(Some))
-        .first_block_height();
+        .first_block_height()
+        .unwrap();
 
     let target_height = TargetHeight::from(h0 + 10);
     let account = st.test_account().cloned().unwrap();
@@ -4747,7 +4750,7 @@ pub fn wallet_recovery_computes_fees<T: ShieldedPoolTester, DsF: DataStoreFactor
 ) {
     use secrecy::ExposeSecret;
 
-    let mut st = TestDsl::with_standard_sapling_account(ds_factory, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache).build::<T>();
 
     let seed = Secret::new(st.test_seed().unwrap().expose_secret().clone());
     let source_account = st.test_account().cloned().unwrap();
@@ -4893,11 +4896,11 @@ pub fn receive_two_notes_with_same_value<T: ShieldedPoolTester>(
     dsf: impl DataStoreFactory,
     cache: impl TestCache,
 ) {
-    let mut st = TestDsl::with_standard_sapling_account(dsf, cache).build::<T>();
+    let mut st = TestDsl::with_sapling_birthday_account(dsf, cache).build::<T>();
 
     // Add funds to the wallet in two identical notes
     let value = Zatoshis::const_from_u64(60000);
-    let h = st.add_notes([[value, value]]).block_height();
+    let h = st.add_notes([[value, value]]).block_height().unwrap();
 
     // Spendable balance matches total balance.
     let account = st.test_account().cloned().unwrap();
diff --git a/zcash_client_backend/src/data_api/testing/pool/dsl.rs b/zcash_client_backend/src/data_api/testing/pool/dsl.rs
index 82155657df..6bbb38aef3 100644
--- a/zcash_client_backend/src/data_api/testing/pool/dsl.rs
+++ b/zcash_client_backend/src/data_api/testing/pool/dsl.rs
@@ -71,7 +71,7 @@ where
     ///     .with_account_from_sapling_activation(BlockHash([0; 32]))
     ///     .into();
     /// ```
-    pub fn with_standard_sapling_account(dsf: Dsf, tc: Cache) -> Self {
+    pub fn with_sapling_birthday_account(dsf: Dsf, tc: Cache) -> Self {
         TestBuilder::new()
             .with_data_store_factory(dsf)
             .with_block_cache(tc)
@@ -153,22 +153,14 @@ impl<T: ShieldedPoolTester, C: TestCache> Default for AddFundsSummary<T, C> {
 
 impl<T: ShieldedPoolTester, C: TestCache> AddFundsSummary<T, C> {
     /// Return the first block height.
-    pub fn first_block_height(&self) -> BlockHeight {
-        if let Some(step) = self.steps.first() {
-            step.results.block_height
-        } else {
-            BlockHeight::from_u32(0)
-        }
+    pub fn first_block_height(&self) -> Option<BlockHeight> {
+        self.steps.first().map(|step| step.results.block_height)
     }
 
     /// Return the latest block height after generating the blocks
     /// that added funds.
-    pub fn block_height(&self) -> BlockHeight {
-        if let Some(step) = self.steps.last() {
-            step.results.block_height
-        } else {
-            BlockHeight::from_u32(0)
-        }
+    pub fn block_height(&self) -> Option<BlockHeight> {
+        self.steps.last().map(|step| step.results.block_height)
     }
 }
 

From a3dfd9ecb883c38e3c2cc8c739d6538ad5860ba0 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Tue, 25 Nov 2025 15:05:10 +1300
Subject: [PATCH 020/263] Rename TestDsl::add_a_single_note and add_notes with
 *_checking_balance suffix

---
 .../src/data_api/testing/pool.rs              | 63 ++++++++++---------
 .../src/data_api/testing/pool/dsl.rs          | 25 ++++++--
 2 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/zcash_client_backend/src/data_api/testing/pool.rs b/zcash_client_backend/src/data_api/testing/pool.rs
index 20d44d6f02..d9bb512baa 100644
--- a/zcash_client_backend/src/data_api/testing/pool.rs
+++ b/zcash_client_backend/src/data_api/testing/pool.rs
@@ -207,7 +207,7 @@ pub fn send_single_step_proposed_transfer<T: ShieldedPoolTester>(
     let mut st = TestDsl::with_sapling_birthday_account(dsf, cache).build::<T>();
 
     // Add funds to the wallet in a single note
-    let (h, _, _) = st.add_a_single_note(Zatoshis::const_from_u64(60000));
+    let (h, _, _) = st.add_a_single_note_checking_balance(Zatoshis::const_from_u64(60000));
 
     let to_extsk = T::sk(&[0xf5; 32]);
     let to: Address = T::sk_default_address(&to_extsk);
@@ -385,8 +385,9 @@ pub fn zip_315_confirmations_test_steps<T: ShieldedPoolTester>(
     };
     let min_confirmations = u32::from(min_confirmations);
 
-    let (_, r, _) = st
-        .add_a_single_note(TestNoteConfig::from(starting_balance).with_address_type(address_type));
+    let (_, r, _) = st.add_a_single_note_checking_balance(
+        TestNoteConfig::from(starting_balance).with_address_type(address_type),
+    );
     let txid = r.txids()[0];
 
     // Mark the external input as explicitly trusted, if so requested
@@ -459,7 +460,7 @@ pub fn spend_max_spendable_single_step_proposed_transfer<T: ShieldedPoolTester>(
     // Add funds to the wallet in two notes over 5 blocks
     let value = Zatoshis::const_from_u64(60000);
     let h = st
-        .add_notes([Some(value), None, None, None, Some(value)])
+        .add_notes_checking_balance([Some(value), None, None, None, Some(value)])
         .block_height()
         .unwrap();
 
@@ -611,7 +612,7 @@ pub fn spend_everything_single_step_proposed_transfer<T: ShieldedPoolTester>(
     let account = st.test_account().cloned().unwrap();
 
     // Add funds to the wallet in a single note
-    let (h, _, _) = st.add_a_single_note(Zatoshis::const_from_u64(60000));
+    let (h, _, _) = st.add_a_single_note_checking_balance(Zatoshis::const_from_u64(60000));
 
     let to_extsk = T::sk(&[0xf5; 32]);
     let to: Address = T::sk_default_address(&to_extsk);
@@ -743,7 +744,7 @@ pub fn fails_to_send_max_spendable_to_transparent_with_memo<T: ShieldedPoolTeste
     let mut st = TestDsl::with_sapling_birthday_account(dsf, cache).build::<T>();
 
     // Add funds to the wallet in a single note
-    st.add_a_single_note(Zatoshis::const_from_u64(60000));
+    st.add_a_single_note_checking_balance(Zatoshis::const_from_u64(60000));
 
     let account = st.test_account().cloned().unwrap();
     let (default_addr, _) = account.usk().default_transparent_address();
@@ -785,7 +786,7 @@ pub fn spend_everything_proposal_fails_when_unconfirmed_funds_present<T: Shielde
     cache: impl TestCache,
 ) {
     let mut st = TestDsl::with_sapling_birthday_account(dsf, cache).build::<T>();
-    st.add_notes([
+    st.add_notes_checking_balance([
         Some(Zatoshis::const_from_u64(60000)),
         None,
         None,
@@ -840,8 +841,7 @@ pub fn spend_everything_proposal_fails_when_unconfirmed_funds_present<T: Shielde
 /// - Add more funds
 /// - Attempts to construct a request to spend the whole balance to an external address in the
 ///   same pool.
-/// - succeds at doing so
-// TODO(schell): as far as I can tell this function is unused in our test suite
+/// - succeeds at doing so
 pub fn send_max_spendable_proposal_succeeds_when_unconfirmed_funds_present<
     T: ShieldedPoolTester,
 >(
@@ -850,7 +850,7 @@ pub fn send_max_spendable_proposal_succeeds_when_unconfirmed_funds_present<
 ) {
     let mut st = TestDsl::with_sapling_birthday_account(dsf, cache).build::<T>();
     let h = st
-        .add_notes([
+        .add_notes_checking_balance([
             Some(Zatoshis::const_from_u64(60000)),
             None,
             None,
@@ -1010,7 +1010,7 @@ pub fn spend_everything_multi_step_single_note_proposed_transfer<T: ShieldedPool
     let value = Zatoshis::const_from_u64(100000);
 
     // Add funds to the wallet.
-    st.add_a_single_note(value);
+    st.add_a_single_note_checking_balance(value);
     let initial_balance = value;
     assert_eq!(
         st.get_spendable_balance(account_id, ConfirmationsPolicy::MIN),
@@ -1167,7 +1167,7 @@ pub fn spend_everything_multi_step_many_notes_proposed_transfer<T: ShieldedPoolT
 
     // Add funds to the wallet.
     for _ in 0..number_of_notes {
-        st.add_a_single_note(note_value);
+        st.add_a_single_note_checking_balance(note_value);
     }
 
     let initial_balance = value;
@@ -1321,8 +1321,8 @@ pub fn spend_everything_multi_step_with_marginal_notes_proposed_transfer<
         (note_value * number_of_notes).expect("sum of notes should not fail.");
 
     for _ in 0..number_of_notes {
-        st.add_a_single_note(note_value);
-        st.add_a_single_note(zip317::MARGINAL_FEE);
+        st.add_a_single_note_checking_balance(note_value);
+        st.add_a_single_note_checking_balance(zip317::MARGINAL_FEE);
     }
 
     let account = st.test_account().cloned().unwrap();
@@ -1463,7 +1463,7 @@ pub fn send_with_multiple_change_outputs<T: ShieldedPoolTester>(
 
     // Add funds to the wallet in a single note
     let value = Zatoshis::const_from_u64(650_0000);
-    let (h, _, _) = st.add_a_single_note(value);
+    let (h, _, _) = st.add_a_single_note_checking_balance(value);
 
     let to_extsk = T::sk(&[0xf5; 32]);
     let to: Address = T::sk_default_address(&to_extsk);
@@ -1984,7 +1984,7 @@ pub fn spend_all_funds_single_step_proposed_transfer<T: ShieldedPoolTester>(
 
     // Add funds to the wallet in a single note
     let value = Zatoshis::const_from_u64(60000);
-    let (h, _, _) = st.add_a_single_note(value);
+    let (h, _, _) = st.add_a_single_note_checking_balance(value);
 
     let spend_amount = Zatoshis::const_from_u64(50000);
     let to_extsk = T::sk(&[0xf5; 32]);
@@ -2432,7 +2432,7 @@ pub fn spend_fails_on_unverified_notes<T: ShieldedPoolTester>(
 
     // Add funds to the wallet in a single note
     let value = Zatoshis::const_from_u64(50000);
-    st.add_a_single_note(value);
+    st.add_a_single_note_checking_balance(value);
 
     // Value is considered pending at 10 confirmations.
     assert_eq!(
@@ -2458,7 +2458,7 @@ pub fn spend_fails_on_unverified_notes<T: ShieldedPoolTester>(
     assert_eq!(summary.map(|s| s.progress().scan()), Some(Ratio::new(1, 1)));
 
     // Add more funds to the wallet in a second note
-    let (h2, _, _) = st.add_a_single_note(value);
+    let (h2, _, _) = st.add_a_single_note_checking_balance(value);
 
     // Verified balance does not include the second note
     let total = (value + value).unwrap();
@@ -2611,7 +2611,7 @@ pub fn spend_fails_on_locked_notes<T: ShieldedPoolTester>(
 
     // Add funds to the wallet in a single note
     let value = Zatoshis::const_from_u64(50000);
-    let (h1, _, _) = st.add_a_single_note(value);
+    let (h1, _, _) = st.add_a_single_note_checking_balance(value);
 
     // Send some of the funds to another address, but don't mine the tx.
     let extsk2 = T::sk(&[0xf5; 32]);
@@ -2748,7 +2748,7 @@ pub fn ovk_policy_prevents_recovery_from_chain<T: ShieldedPoolTester, Dsf>(
 
     // Add funds to the wallet in a single note
     let value = Zatoshis::const_from_u64(50000);
-    let (h1, _, _) = st.add_a_single_note(value);
+    let (h1, _, _) = st.add_a_single_note_checking_balance(value);
 
     let extsk2 = T::sk(&[0xf5; 32]);
     let addr2 = T::sk_default_address(&extsk2);
@@ -2824,7 +2824,7 @@ pub fn spend_succeeds_to_t_addr_zero_change<T: ShieldedPoolTester>(
 
     // Add funds to the wallet in a single note
     let value = Zatoshis::const_from_u64(70000);
-    st.add_a_single_note(value);
+    st.add_a_single_note_checking_balance(value);
 
     let fee_rule = StandardFeeRule::Zip317;
 
@@ -2860,7 +2860,9 @@ pub fn change_note_spends_succeed<T: ShieldedPoolTester>(
 
     // Add funds to the wallet in a single note owned by the internal spending key
     let value = Zatoshis::const_from_u64(70000);
-    st.add_a_single_note(TestNoteConfig::from(value).with_address_type(AddressType::Internal));
+    st.add_a_single_note_checking_balance(
+        TestNoteConfig::from(value).with_address_type(AddressType::Internal),
+    );
 
     // Value is considered pending at 10 confirmations.
     let account = st.test_account().cloned().unwrap();
@@ -3203,11 +3205,11 @@ pub fn zip317_spend<T: ShieldedPoolTester, Dsf: DataStoreFactory>(
     let dfvk = T::test_account_fvk(&st);
 
     // Add funds to the wallet
-    st.add_notes([Some(Zatoshis::const_from_u64(50000))]);
+    st.add_notes_checking_balance([Some(Zatoshis::const_from_u64(50000))]);
 
     // Add 10 uneconomic (dust) notes to the wallet
     for _ in 1..=10 {
-        st.add_notes([Some(Zatoshis::const_from_u64(1000))]);
+        st.add_notes_checking_balance([Some(Zatoshis::const_from_u64(1000))]);
     }
 
     // Spendable balance matches total balance
@@ -3537,7 +3539,7 @@ pub fn checkpoint_gaps<T: ShieldedPoolTester, Dsf: DataStoreFactory>(
     let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache).build::<T>();
 
     // Generate a block with funds belonging to our wallet.
-    st.add_a_single_note(Zatoshis::const_from_u64(500000));
+    st.add_a_single_note_checking_balance(Zatoshis::const_from_u64(500000));
 
     // Create a gap of 10 blocks having no shielded outputs, then add a block that doesn't
     // belong to us so that we can get a checkpoint in the tree.
@@ -4477,7 +4479,7 @@ pub fn scan_cached_blocks_finds_change_notes<T: ShieldedPoolTester, Dsf>(
 
     // Create a fake CompactBlock sending value to the address
     let value = Zatoshis::const_from_u64(50000);
-    let (_, _, nf) = st.add_a_single_note(value);
+    let (_, _, nf) = st.add_a_single_note_checking_balance(value);
 
     // Create a second fake CompactBlock spending value from the address
     let not_our_key = T::sk_to_fvk(&T::sk(&[0xf5; 32]));
@@ -4555,7 +4557,7 @@ pub fn metadata_queries_exclude_unwanted_notes<T: ShieldedPoolTester, Dsf, TC>(
         .map(|i| Zatoshis::const_from_u64(i * 100_0000))
         .collect::<Vec<_>>();
     let h0 = st
-        .add_notes(note_values.clone().into_iter().map(Some))
+        .add_notes_checking_balance(note_values.clone().into_iter().map(Some))
         .first_block_height()
         .unwrap();
 
@@ -4763,7 +4765,7 @@ pub fn wallet_recovery_computes_fees<T: ShieldedPoolTester, DsF: DataStoreFactor
 
     // Get some funds in the source account
     let note_value = Zatoshis::const_from_u64(350000);
-    let _summary = st.add_notes([Some(note_value), Some(note_value)]);
+    let _summary = st.add_notes_checking_balance([Some(note_value), Some(note_value)]);
 
     // Create two transactions sending from the source account to a transparent address in the
     // destination account.
@@ -4900,7 +4902,10 @@ pub fn receive_two_notes_with_same_value<T: ShieldedPoolTester>(
 
     // Add funds to the wallet in two identical notes
     let value = Zatoshis::const_from_u64(60000);
-    let h = st.add_notes([[value, value]]).block_height().unwrap();
+    let h = st
+        .add_notes_checking_balance([[value, value]])
+        .block_height()
+        .unwrap();
 
     // Spendable balance matches total balance.
     let account = st.test_account().cloned().unwrap();
diff --git a/zcash_client_backend/src/data_api/testing/pool/dsl.rs b/zcash_client_backend/src/data_api/testing/pool/dsl.rs
index 6bbb38aef3..5586139c8c 100644
--- a/zcash_client_backend/src/data_api/testing/pool/dsl.rs
+++ b/zcash_client_backend/src/data_api/testing/pool/dsl.rs
@@ -234,7 +234,7 @@ where
     /// This also verifies that the test account contains the expected funds as
     /// part of the _total_, and that the funds are spendable with the minimum number
     /// of confirmations.
-    pub fn add_a_single_note(
+    pub fn add_a_single_note_checking_balance(
         &mut self,
         note: impl Into<TestNoteConfig<T>>,
     ) -> (
@@ -242,16 +242,24 @@ where
         Cache::InsertResult,
         <T::Fvk as TestFvk>::Nullifier,
     ) {
-        let mut summary = self.add_notes([[note]]);
+        let mut summary = self.add_notes_checking_balance([[note]]);
         let res = summary.steps.pop().unwrap().results;
         (res.block_height, res.insert_result, res.nullifiers[0])
     }
 
+    fn scanned_block_height(&self) -> BlockHeight {
+        self.wallet()
+            .block_max_scanned()
+            .unwrap()
+            .map(|meta| meta.block_height())
+            .unwrap_or_else(|| BlockHeight::from_u32(0))
+    }
+
     /// Generates `N` empty blocks.
     ///
     /// Returns the current block height.
     pub fn add_empty_blocks(&mut self, n: usize) -> BlockHeight {
-        let mut out_height = BlockHeight::from_u32(0);
+        let mut out_height = self.scanned_block_height();
         for _ in 0..n {
             let (h, _) = self.generate_empty_block();
             out_height = h;
@@ -286,16 +294,23 @@ where
     ///
     /// Returns a summary of steps.
     ///
+    /// ## Parameters
+    ///
+    /// * `blocks` - A collection of "blocks", where each "block" is a collection of
+    ///   "notes". More specifically, "notes" can be anything that can be converted
+    ///   into a [`TestNoteConfig`]. This allows you to add multiple blocks that each
+    ///   containing zero or more notes with one call to `add_notes`.
+    ///
     /// ## Note
     /// Keep in mind:
     /// * Each block coalesces these notes into a single transaction.
     /// * Funds are added to the default test account.
-    pub fn add_notes(
+    pub fn add_notes_checking_balance(
         &mut self,
         blocks: impl IntoIterator<Item = impl IntoIterator<Item = impl Into<TestNoteConfig<T>>>>,
     ) -> AddFundsSummary<T, Cache> {
         let mut from_height = None;
-        let mut current_height = BlockHeight::from_u32(0);
+        let mut current_height = self.scanned_block_height();
         let mut limit = 0;
         let account = self.get_account();
         let starting_balance = self

From fe64d7f992934b34571589b8aa24bf38dfa63075 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Tue, 25 Nov 2025 09:49:39 -0700
Subject: [PATCH 021/263] Apply suggestions from code review

Co-authored-by: Daira-Emma Hopwood <daira@jacaranda.org>
---
 zcash_primitives/CHANGELOG.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md
index a7c18ba526..d2e66e49c1 100644
--- a/zcash_primitives/CHANGELOG.md
+++ b/zcash_primitives/CHANGELOG.md
@@ -22,10 +22,11 @@ workspace.
 - Removed deprecated `zcash_primitives::transaction::sighash::SIGHASH_ANYONECANPAY`, use `zcash_transparent::sighash::SIGHASH_ANYONECANPAY` instead.
 - Removed deprecated `zcash_primitives::transaction::sighash::SighashType`, use `zcash_transparent::sighash::SighashType` instead.
 
-- Removed deprecated module `zcash_primitives::transaction::components::amount::testing`:
-  - `arb_positive_amount`, use `zcash_protocol::value::testing::arb_positive_zat_balance` instead.
-  - `arb_amount`, use `zcash_protocol::value::testing::arb_zat_balance`
-  - `arb_nonnegative_amount`, use `zcash_protocol::value::testing::arb_zatoshis` 
+- Removed deprecated module `zcash_primitives::transaction::components::amount::testing`,
+  use `zcash_protocol::value::testing` instead with the following renames:
+  - `arb_positive_amount` to `zcash_protocol::value::testing::arb_positive_zat_balance`
+  - `arb_amount` to `zcash_protocol::value::testing::arb_zat_balance`
+  - `arb_nonnegative_amount` to `zcash_protocol::value::testing::arb_zatoshis`.
 - Removed deprecated module `zcash_primitives::transaction::components::amount`, use `zcash_protocol::value` instead.
 - Removed deprecated module `zcash_primitives::transaction::components::transparent::builder`, use `zcash_transparent::builder` instead.
 - Removed deprecated module `zcash_primitives::transaction::components::transparent::pczt`, use `zcash_transparent::pczt` instead.

From b7e65935442141ae19b5b61480ceadb64a2f5fbb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Nov 2025 05:01:59 +0000
Subject: [PATCH 022/263] build(deps): bump EmbarkStudios/cargo-deny-action
 from 2.0.13 to 2.0.14

Bumps [EmbarkStudios/cargo-deny-action](https://github.com/embarkstudios/cargo-deny-action) from 2.0.13 to 2.0.14.
- [Release notes](https://github.com/embarkstudios/cargo-deny-action/releases)
- [Commits](https://github.com/embarkstudios/cargo-deny-action/compare/f2ba7abc2abebaf185c833c3961145a3c275caad...76cd80eb775d7bbbd2d80292136d74d39e1b4918)

---
updated-dependencies:
- dependency-name: EmbarkStudios/cargo-deny-action
  dependency-version: 2.0.14
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/audits.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/audits.yml b/.github/workflows/audits.yml
index 3c72aeff5d..ced9278cb3 100644
--- a/.github/workflows/audits.yml
+++ b/.github/workflows/audits.yml
@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@v5
         with:
           persist-credentials: false
-      - uses: EmbarkStudios/cargo-deny-action@f2ba7abc2abebaf185c833c3961145a3c275caad # v2.0.13
+      - uses: EmbarkStudios/cargo-deny-action@76cd80eb775d7bbbd2d80292136d74d39e1b4918 # v2.0.14
         with:
           command: check licenses
 

From 80b1d26d6b813029481a714838e725dd3c5f1440 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Mon, 3 Nov 2025 16:48:49 -0700
Subject: [PATCH 023/263] zcash_keys: Add `UnifiedFullViewingKey::select_ovk`.

---
 zcash_keys/CHANGELOG.md |   4 ++
 zcash_keys/src/keys.rs  | 105 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 108 insertions(+), 1 deletion(-)

diff --git a/zcash_keys/CHANGELOG.md b/zcash_keys/CHANGELOG.md
index e12e4444e0..6f6c9a2c00 100644
--- a/zcash_keys/CHANGELOG.md
+++ b/zcash_keys/CHANGELOG.md
@@ -9,6 +9,10 @@ workspace.
 
 ## [Unreleased]
 
+### Added
+- `zcash_keys::keys::OutgoingViewingKey`
+- `zcash_keys::keys::UnifiedFullViewingKey::select_ovk`
+
 ### Changed
 - MSRV is now 1.85.1.
 
diff --git a/zcash_keys/src/keys.rs b/zcash_keys/src/keys.rs
index b880f6d8a4..ccf92b7ecc 100644
--- a/zcash_keys/src/keys.rs
+++ b/zcash_keys/src/keys.rs
@@ -4,9 +4,10 @@ use ::transparent::keys::TransparentKeyScope;
 use alloc::string::{String, ToString};
 use alloc::vec::Vec;
 use core::fmt::{self, Display};
+use nonempty::NonEmpty;
 
 use zcash_address::unified::{self, Container, Encoding, Typecode, Ufvk, Uivk};
-use zcash_protocol::consensus;
+use zcash_protocol::{PoolType, consensus};
 use zip32::{AccountId, DiversifierIndex};
 
 use crate::address::UnifiedAddress;
@@ -758,6 +759,51 @@ impl From<bip32::Error> for DerivationError {
     }
 }
 
+/// A key that provides the capability to recover outgoing transaction information from
+/// the block chain.
+#[derive(Debug, Clone, Copy)]
+pub struct OutgoingViewingKey([u8; 32]);
+
+impl From<[u8; 32]> for OutgoingViewingKey {
+    fn from(ovk: [u8; 32]) -> Self {
+        OutgoingViewingKey(ovk)
+    }
+}
+
+#[cfg(feature = "sapling")]
+impl From<OutgoingViewingKey> for ::sapling::keys::OutgoingViewingKey {
+    fn from(value: OutgoingViewingKey) -> Self {
+        ::sapling::keys::OutgoingViewingKey(value.0)
+    }
+}
+
+#[cfg(feature = "sapling")]
+impl From<::sapling::keys::OutgoingViewingKey> for OutgoingViewingKey {
+    fn from(value: ::sapling::keys::OutgoingViewingKey) -> Self {
+        OutgoingViewingKey(value.0)
+    }
+}
+
+#[cfg(feature = "orchard")]
+impl From<OutgoingViewingKey> for ::orchard::keys::OutgoingViewingKey {
+    fn from(value: OutgoingViewingKey) -> Self {
+        ::orchard::keys::OutgoingViewingKey::from(value.0)
+    }
+}
+
+#[cfg(feature = "orchard")]
+impl From<::orchard::keys::OutgoingViewingKey> for OutgoingViewingKey {
+    fn from(value: ::orchard::keys::OutgoingViewingKey) -> Self {
+        OutgoingViewingKey(*value.as_ref())
+    }
+}
+
+impl AsRef<[u8; 32]> for OutgoingViewingKey {
+    fn as_ref(&self) -> &[u8; 32] {
+        &self.0
+    }
+}
+
 /// A [ZIP 316](https://zips.z.cash/zip-0316) unified full viewing key.
 #[derive(Clone, Debug)]
 pub struct UnifiedFullViewingKey {
@@ -1080,6 +1126,63 @@ impl UnifiedFullViewingKey {
                 .default_address()
         })
     }
+
+    /// Selects an outgoing viewing key for a transaction's outputs based upon the type(s) of
+    /// inputs spent in the transaction.
+    ///
+    /// This method selects the OVK of the highest-preference item in [ZIP 316] preference order
+    /// from among the item types represented by the provided input types. It will return `None` in
+    /// the case that this FVK does not contain any items corresponding to the provided input
+    /// sources; this should ordinarily never occur because in order to spend an input, a spending
+    /// key of the appropriate type must be available and that spending key should be represented
+    /// among this UFVK's items.
+    pub fn select_ovk(
+        &self,
+        scope: zip32::Scope,
+        input_sources: &NonEmpty<PoolType>,
+    ) -> Option<OutgoingViewingKey> {
+        #[cfg(feature = "orchard")]
+        if let Some(ovk) = input_sources
+            .contains(&PoolType::ORCHARD)
+            .then(|| {
+                self.orchard()
+                    .map(|k| OutgoingViewingKey::from(k.to_ovk(scope)))
+            })
+            .flatten()
+        {
+            return Some(ovk);
+        };
+
+        #[cfg(feature = "sapling")]
+        if let Some(ovk) = input_sources
+            .contains(&PoolType::SAPLING)
+            .then(|| {
+                self.sapling()
+                    .map(|k| OutgoingViewingKey::from(k.to_ovk(scope)))
+            })
+            .flatten()
+        {
+            return Some(ovk);
+        }
+
+        #[cfg(feature = "transparent-inputs")]
+        if let Some(ovk) = input_sources
+            .contains(&PoolType::Transparent)
+            .then(|| {
+                self.transparent().map(|k| {
+                    OutgoingViewingKey(match scope {
+                        Scope::External => k.external_ovk().as_bytes(),
+                        Scope::Internal => k.internal_ovk().as_bytes(),
+                    })
+                })
+            })
+            .flatten()
+        {
+            return Some(ovk);
+        }
+
+        None
+    }
 }
 
 /// A [ZIP 316](https://zips.z.cash/zip-0316) unified incoming viewing key.

From d1700ce2abfb64cc97b254d811a8ede29b765827 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Wed, 26 Nov 2025 10:06:35 -0700
Subject: [PATCH 024/263] zcash_client_backend: Modify transaction construction
 to use `UnifiedFullViewingKey::select_ovk`

This alters the OVK behavior for transactions created by
`zcash_client_backend::data_api::wallet::create_proposed_transaction` to
mirror the approach implemented by `z_sendmany` in `zcashd`.

Prior to this change, external outputs to a particular pool were made
decryptable by the pool-specific OVK corresponding to the UFVK for
account that provided funds to the transaction, irrespective of whether
any of the funds provided were sourced from that pool.

After this change, a single preferred OVK is selected from the UFVK for
the source account based upon the pools that provided inputs to the
transaction; that OVK is then used to encrypt all external outputs,
irrespective of pool.
---
 zcash_client_backend/src/data_api/error.rs  |   1 +
 zcash_client_backend/src/data_api/wallet.rs | 122 ++++++++++----------
 2 files changed, 65 insertions(+), 58 deletions(-)

diff --git a/zcash_client_backend/src/data_api/error.rs b/zcash_client_backend/src/data_api/error.rs
index 044e141adc..83025398ff 100644
--- a/zcash_client_backend/src/data_api/error.rs
+++ b/zcash_client_backend/src/data_api/error.rs
@@ -43,6 +43,7 @@ pub enum Error<DataSourceError, CommitmentTreeError, SelectionError, FeeError, C
     /// * spend a prior shielded output;
     /// * pay to an output pool for which the corresponding feature is not enabled;
     /// * pay to a TEX address if the "transparent-inputs" feature is not enabled.
+    /// * a proposal step has no inputs
     ProposalNotSupported,
 
     /// No account could be found corresponding to a provided ID.
diff --git a/zcash_client_backend/src/data_api/wallet.rs b/zcash_client_backend/src/data_api/wallet.rs
index 0330a018fb..d26e876b31 100644
--- a/zcash_client_backend/src/data_api/wallet.rs
+++ b/zcash_client_backend/src/data_api/wallet.rs
@@ -64,7 +64,7 @@ use transparent::{address::TransparentAddress, builder::TransparentSigningSet, b
 use zcash_address::ZcashAddress;
 use zcash_keys::{
     address::Address,
-    keys::{UnifiedFullViewingKey, UnifiedSpendingKey},
+    keys::{OutgoingViewingKey, UnifiedFullViewingKey, UnifiedSpendingKey},
 };
 use zcash_primitives::transaction::{
     Transaction, TxId,
@@ -1141,6 +1141,25 @@ where
     #[cfg(all(feature = "transparent-inputs", feature = "orchard"))]
     let has_shielded_inputs = !(sapling_inputs.is_empty() && orchard_inputs.is_empty());
 
+    let input_sources = NonEmpty::from_vec({
+        let mut sources = vec![];
+        if !sapling_inputs.is_empty() {
+            sources.push(PoolType::SAPLING);
+        }
+        #[cfg(feature = "orchard")]
+        if !orchard_inputs.is_empty() {
+            sources.push(PoolType::ORCHARD);
+        }
+        #[cfg(feature = "transparent-inputs")]
+        if !(proposal_step.transparent_inputs().is_empty()
+            && proposal_step.prior_step_inputs().is_empty())
+        {
+            sources.push(PoolType::Transparent);
+        }
+        sources
+    })
+    .ok_or(Error::ProposalNotSupported)?;
+
     for (_sapling_key_scope, sapling_note, merkle_path) in sapling_inputs.into_iter() {
         let key = match _sapling_key_scope {
             Scope::External => ufvk.sapling().map(|k| k.fvk().clone()),
@@ -1259,44 +1278,28 @@ where
         utxos_spent
     };
 
-    #[cfg(feature = "orchard")]
-    let orchard_external_ovk = match &ovk_policy {
-        OvkPolicy::Sender => ufvk
-            .orchard()
-            .map(|fvk| fvk.to_ovk(orchard::keys::Scope::External)),
-        OvkPolicy::Custom { orchard, .. } => Some(orchard.clone()),
-        OvkPolicy::Discard => None,
-    };
-
-    #[cfg(feature = "orchard")]
-    let orchard_internal_ovk = || {
-        #[cfg(feature = "transparent-inputs")]
-        if proposal_step.is_shielding() {
-            return ufvk
-                .transparent()
-                .map(|k| orchard::keys::OutgoingViewingKey::from(k.internal_ovk().as_bytes()));
+    let external_ovk = match ovk_policy {
+        OvkPolicy::Sender => Some(
+            ufvk.select_ovk(zip32::Scope::External, &input_sources)
+                .ok_or(Error::KeyNotAvailable(input_sources.head))?,
+        ),
+        OvkPolicy::Custom {
+            sapling,
+            #[cfg(feature = "orchard")]
+            orchard,
+        } => {
+            let mut ovk = Some(OutgoingViewingKey::from(sapling));
+            #[cfg(feature = "orchard")]
+            if input_sources.contains(&PoolType::ORCHARD) {
+                ovk = Some(OutgoingViewingKey::from(orchard));
+            }
+            ovk
         }
-
-        ufvk.orchard().map(|k| k.to_ovk(Scope::Internal))
-    };
-
-    // Apply the outgoing viewing key policy.
-    let sapling_external_ovk = match &ovk_policy {
-        OvkPolicy::Sender => ufvk.sapling().map(|k| k.to_ovk(Scope::External)),
-        OvkPolicy::Custom { sapling, .. } => Some(*sapling),
         OvkPolicy::Discard => None,
     };
-
-    let sapling_internal_ovk = || {
-        #[cfg(feature = "transparent-inputs")]
-        if proposal_step.is_shielding() {
-            return ufvk
-                .transparent()
-                .map(|k| sapling::keys::OutgoingViewingKey(k.internal_ovk().as_bytes()));
-        }
-
-        ufvk.sapling().map(|k| k.to_ovk(Scope::Internal))
-    };
+    let internal_ovk = ufvk
+        .select_ovk(zip32::Scope::Internal, &input_sources)
+        .ok_or(Error::KeyNotAvailable(input_sources.head))?;
 
     #[cfg(feature = "orchard")]
     let mut orchard_output_meta: Vec<(BuildRecipient<_>, Zatoshis, Option<MemoBytes>)> = vec![];
@@ -1318,25 +1321,28 @@ where
             );
         let recipient_address = payment.recipient_address();
 
-        let add_sapling_output = |builder: &mut Builder<_, _>,
-                                  sapling_output_meta: &mut Vec<_>,
-                                  to: sapling::PaymentAddress|
-         -> Result<
-            (),
-            CreateErrT<DbT, InputsErrT, FeeRuleT, ChangeErrT, N>,
-        > {
-            let memo = payment.memo().map_or_else(MemoBytes::empty, |m| m.clone());
-            builder.add_sapling_output(sapling_external_ovk, to, payment.amount(), memo.clone())?;
-            sapling_output_meta.push((
-                BuildRecipient::External {
-                    recipient_address: recipient_address.clone(),
-                    output_pool: PoolType::SAPLING,
-                },
-                payment.amount(),
-                Some(memo),
-            ));
-            Ok(())
-        };
+        let add_sapling_output =
+            |builder: &mut Builder<_, _>,
+             sapling_output_meta: &mut Vec<_>,
+             to: sapling::PaymentAddress|
+             -> Result<(), CreateErrT<DbT, InputsErrT, FeeRuleT, ChangeErrT, N>> {
+                let memo = payment.memo().map_or_else(MemoBytes::empty, |m| m.clone());
+                builder.add_sapling_output(
+                    external_ovk.map(|k| k.into()),
+                    to,
+                    payment.amount(),
+                    memo.clone(),
+                )?;
+                sapling_output_meta.push((
+                    BuildRecipient::External {
+                        recipient_address: recipient_address.clone(),
+                        output_pool: PoolType::SAPLING,
+                    },
+                    payment.amount(),
+                    Some(memo),
+                ));
+                Ok(())
+            };
 
         #[cfg(feature = "orchard")]
         let add_orchard_output =
@@ -1346,7 +1352,7 @@ where
              -> Result<(), CreateErrT<DbT, InputsErrT, FeeRuleT, ChangeErrT, N>> {
                 let memo = payment.memo().map_or_else(MemoBytes::empty, |m| m.clone());
                 builder.add_orchard_output(
-                    orchard_external_ovk.clone(),
+                    external_ovk.map(|k| k.into()),
                     to,
                     payment.amount().into(),
                     memo.clone(),
@@ -1435,7 +1441,7 @@ where
         match output_pool {
             PoolType::Shielded(ShieldedProtocol::Sapling) => {
                 builder.add_sapling_output(
-                    sapling_internal_ovk(),
+                    Some(internal_ovk.into()),
                     ufvk.sapling()
                         .ok_or(Error::KeyNotAvailable(PoolType::SAPLING))?
                         .change_address()
@@ -1459,7 +1465,7 @@ where
                 #[cfg(feature = "orchard")]
                 {
                     builder.add_orchard_output(
-                        orchard_internal_ovk(),
+                        Some(internal_ovk.into()),
                         ufvk.orchard()
                             .ok_or(Error::KeyNotAvailable(PoolType::ORCHARD))?
                             .address_at(0u32, orchard::keys::Scope::Internal),

From 3363b6fe0e6ff97d45cb7dd744b703233d01c22d Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Wed, 26 Nov 2025 16:46:36 -0700
Subject: [PATCH 025/263] zcash_client_backend: Modify `OvkPolicy` to make
 transactions decryptable with a single OVK

Prior to this change:
- When using `OvkPolicy::Custom`, external outputs were made decryptable
  with the OVK corresponding to the pool in which those outputs were
  produced.
- Internal outputs were always made decryptable using the wallet's
  internal OVK.

After this change:
- When using `OvkPolicy::Custom`, all external outputs are made
  decryptable with a single OVK, irrespective of pool.
- Internal outputs are not made decryptable using an OVK, unless one is
  explicitly specified using the `internal_ovk` property of
  `OvkPolicy::Custom`. In all other cases, wallet-internal outputs will
  only be recoverable using the wallet's internal IVK.
---
 zcash_client_backend/CHANGELOG.md           | 18 +++++++++++
 zcash_client_backend/src/data_api/wallet.rs | 36 ++++++++-------------
 zcash_client_backend/src/wallet.rs          | 24 +++++++-------
 3 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index 1d6740cb53..26ff4e7d8a 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -10,6 +10,24 @@ workspace.
 
 ## [Unreleased]
 
+### Changed
+- `zcash_client_backend::wallet::OvkPolicy` has been substantially modified
+  to reflect the view that a single outgoing viewing key should be uniformly
+  applied to encrypt all external transaction outputs, irrespective of which
+  pool those outputs are produced into, and that by default wallet-internal
+  outputs should not be decryptable using an OVK (and will therefore only
+  be recoverable using the wallet's internal IVK).
+  - The semantics of `OvkPolicy::Sender` have changed. This policy now
+    specifies that wallet-internal change outputs should be encrypted
+    using a random key, rendering them unrecoverable to entities that
+    do not posess the internal IVK for the wallet.
+  - The `OvkPolicy::Custom` variant has changed. Instead of pool-specific
+    OVKs, this now encapsulates a pair of OVKs, one to be used for all
+    shielded external outputs of the transaction, and a second (optional)
+    key that will be used to encrypt any wallet-internal change outputs
+    that would otherwise only be recoverable using the wallet's internal
+    IVK.
+
 ## [0.21.0] - 2025-11-05
 
 ### Added
diff --git a/zcash_client_backend/src/data_api/wallet.rs b/zcash_client_backend/src/data_api/wallet.rs
index d26e876b31..0e6e1af226 100644
--- a/zcash_client_backend/src/data_api/wallet.rs
+++ b/zcash_client_backend/src/data_api/wallet.rs
@@ -64,7 +64,7 @@ use transparent::{address::TransparentAddress, builder::TransparentSigningSet, b
 use zcash_address::ZcashAddress;
 use zcash_keys::{
     address::Address,
-    keys::{OutgoingViewingKey, UnifiedFullViewingKey, UnifiedSpendingKey},
+    keys::{UnifiedFullViewingKey, UnifiedSpendingKey},
 };
 use zcash_primitives::transaction::{
     Transaction, TxId,
@@ -1278,28 +1278,20 @@ where
         utxos_spent
     };
 
-    let external_ovk = match ovk_policy {
-        OvkPolicy::Sender => Some(
-            ufvk.select_ovk(zip32::Scope::External, &input_sources)
-                .ok_or(Error::KeyNotAvailable(input_sources.head))?,
+    let (external_ovk, internal_ovk) = match ovk_policy {
+        OvkPolicy::Sender => (
+            Some(
+                ufvk.select_ovk(zip32::Scope::External, &input_sources)
+                    .ok_or(Error::KeyNotAvailable(input_sources.head))?,
+            ),
+            None,
         ),
         OvkPolicy::Custom {
-            sapling,
-            #[cfg(feature = "orchard")]
-            orchard,
-        } => {
-            let mut ovk = Some(OutgoingViewingKey::from(sapling));
-            #[cfg(feature = "orchard")]
-            if input_sources.contains(&PoolType::ORCHARD) {
-                ovk = Some(OutgoingViewingKey::from(orchard));
-            }
-            ovk
-        }
-        OvkPolicy::Discard => None,
+            external_ovk,
+            internal_ovk,
+        } => (Some(external_ovk), internal_ovk),
+        OvkPolicy::Discard => (None, None),
     };
-    let internal_ovk = ufvk
-        .select_ovk(zip32::Scope::Internal, &input_sources)
-        .ok_or(Error::KeyNotAvailable(input_sources.head))?;
 
     #[cfg(feature = "orchard")]
     let mut orchard_output_meta: Vec<(BuildRecipient<_>, Zatoshis, Option<MemoBytes>)> = vec![];
@@ -1441,7 +1433,7 @@ where
         match output_pool {
             PoolType::Shielded(ShieldedProtocol::Sapling) => {
                 builder.add_sapling_output(
-                    Some(internal_ovk.into()),
+                    internal_ovk.map(|k| k.into()),
                     ufvk.sapling()
                         .ok_or(Error::KeyNotAvailable(PoolType::SAPLING))?
                         .change_address()
@@ -1465,7 +1457,7 @@ where
                 #[cfg(feature = "orchard")]
                 {
                     builder.add_orchard_output(
-                        Some(internal_ovk.into()),
+                        internal_ovk.map(|k| k.into()),
                         ufvk.orchard()
                             .ok_or(Error::KeyNotAvailable(PoolType::ORCHARD))?
                             .address_at(0u32, orchard::keys::Scope::Internal),
diff --git a/zcash_client_backend/src/wallet.rs b/zcash_client_backend/src/wallet.rs
index 9d5ef24867..2ce5999e65 100644
--- a/zcash_client_backend/src/wallet.rs
+++ b/zcash_client_backend/src/wallet.rs
@@ -9,6 +9,7 @@ use ::transparent::{
     bundle::{OutPoint, TxOut},
 };
 use zcash_address::ZcashAddress;
+use zcash_keys::keys::OutgoingViewingKey;
 use zcash_note_encryption::EphemeralKeyBytes;
 use zcash_primitives::transaction::{TxId, fees::transparent as transparent_fees};
 use zcash_protocol::{
@@ -602,8 +603,9 @@ impl<NoteRef> orchard_fees::InputView<NoteRef> for ReceivedNote<NoteRef, orchard
 pub enum OvkPolicy {
     /// Use the outgoing viewing key from the sender's [`UnifiedFullViewingKey`].
     ///
-    /// Transaction outputs will be decryptable by the sender, in addition to the
-    /// recipients.
+    /// External transaction outputs will be decryptable by the sender, in addition to the
+    /// recipients. Wallet-internal transaction outputs will be decryptable only with the wallet's
+    /// internal-scoped incoming viewing key.
     ///
     /// [`UnifiedFullViewingKey`]: zcash_keys::keys::UnifiedFullViewingKey
     Sender,
@@ -614,9 +616,8 @@ pub enum OvkPolicy {
     /// Transaction outputs will be decryptable by the recipients, and whoever controls
     /// the provided outgoing viewing keys.
     Custom {
-        sapling: sapling::keys::OutgoingViewingKey,
-        #[cfg(feature = "orchard")]
-        orchard: orchard::keys::OutgoingViewingKey,
+        external_ovk: OutgoingViewingKey,
+        internal_ovk: Option<OutgoingViewingKey>,
     },
     /// Use no outgoing viewing keys. Transaction outputs will be decryptable by their
     /// recipients, but not by the sender.
@@ -624,15 +625,16 @@ pub enum OvkPolicy {
 }
 
 impl OvkPolicy {
-    /// Constructs an [`OvkPolicy::Custom`] value from a single arbitrary 32-byte key.
+    /// Constructs an [`OvkPolicy::Custom`] value from a single arbitrary 32-byte key with both the
+    /// external_ovk and internal_ovk components set to the same key.
     ///
-    /// Outputs of transactions created with this OVK policy will be recoverable using
-    /// this key irrespective of the output pool.
+    /// Outputs of transactions created with this OVK policy will be recoverable using this key
+    /// irrespective of whether they are external outputs or wallet-internal change outputs.
     pub fn custom_from_common_bytes(key: &[u8; 32]) -> Self {
+        let k = OutgoingViewingKey::from(*key);
         OvkPolicy::Custom {
-            sapling: sapling::keys::OutgoingViewingKey(*key),
-            #[cfg(feature = "orchard")]
-            orchard: orchard::keys::OutgoingViewingKey::from(*key),
+            external_ovk: k,
+            internal_ovk: Some(k),
         }
     }
 }

From 4e634914ccf86f955a63eb29105286cf19b3f923 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Fri, 28 Nov 2025 11:08:06 -0700
Subject: [PATCH 026/263] Address comments from code review.

---
 zcash_client_backend/CHANGELOG.md           | 9 +++++----
 zcash_client_backend/src/data_api/wallet.rs | 6 ++----
 zcash_client_backend/src/wallet.rs          | 4 +++-
 zcash_keys/Cargo.toml                       | 1 +
 zcash_keys/src/keys.rs                      | 4 ++--
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index 26ff4e7d8a..833a47eea9 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -17,10 +17,11 @@ workspace.
   pool those outputs are produced into, and that by default wallet-internal
   outputs should not be decryptable using an OVK (and will therefore only
   be recoverable using the wallet's internal IVK).
-  - The semantics of `OvkPolicy::Sender` have changed. This policy now
-    specifies that wallet-internal change outputs should be encrypted
-    using a random key, rendering them unrecoverable to entities that
-    do not posess the internal IVK for the wallet.
+  - The semantics of `OvkPolicy::Sender` have changed. In addition to using
+    a single OVK for all shielded outputs irrespective of pools, it now
+    specifies that wallet-internal change outputs should be treated as though
+    the policy for those outputs were `OvkPolicy::None`, rendering them only
+    recoverable using the wallet's internal IVK. 
   - The `OvkPolicy::Custom` variant has changed. Instead of pool-specific
     OVKs, this now encapsulates a pair of OVKs, one to be used for all
     shielded external outputs of the transaction, and a second (optional)
diff --git a/zcash_client_backend/src/data_api/wallet.rs b/zcash_client_backend/src/data_api/wallet.rs
index 0e6e1af226..66bf6a6245 100644
--- a/zcash_client_backend/src/data_api/wallet.rs
+++ b/zcash_client_backend/src/data_api/wallet.rs
@@ -1007,10 +1007,6 @@ where
 
     // We only support spending transparent payments or transparent ephemeral outputs from a
     // prior step (when "transparent-inputs" is enabled).
-    //
-    // TODO: Maybe support spending prior shielded outputs at some point? Doing so would require
-    // a higher-level approach in the wallet that waits for transactions with shielded outputs to
-    // be mined and only then attempts to perform the next step.
     #[allow(clippy::never_loop)]
     for input_ref in proposal_step.prior_step_inputs() {
         let (prior_step, _) = prior_step_results
@@ -1150,6 +1146,8 @@ where
         if !orchard_inputs.is_empty() {
             sources.push(PoolType::ORCHARD);
         }
+        // We assume here that prior step outputs cannot be shielded, due to checks above (and the
+        // fact that the witness required to spend such outputs could not be computed.)
         #[cfg(feature = "transparent-inputs")]
         if !(proposal_step.transparent_inputs().is_empty()
             && proposal_step.prior_step_inputs().is_empty())
diff --git a/zcash_client_backend/src/wallet.rs b/zcash_client_backend/src/wallet.rs
index 2ce5999e65..bd81cf54dd 100644
--- a/zcash_client_backend/src/wallet.rs
+++ b/zcash_client_backend/src/wallet.rs
@@ -601,13 +601,15 @@ impl<NoteRef> orchard_fees::InputView<NoteRef> for ReceivedNote<NoteRef, orchard
 /// [ZIP 310]: https://zips.z.cash/zip-0310
 #[derive(Debug, Clone)]
 pub enum OvkPolicy {
-    /// Use the outgoing viewing key from the sender's [`UnifiedFullViewingKey`].
+    /// Use an outgoing viewing key produced from the sender's [`UnifiedFullViewingKey`],
+    /// selected via the policy documented in [`UnifiedFullViewingKey::select_ovk`].
     ///
     /// External transaction outputs will be decryptable by the sender, in addition to the
     /// recipients. Wallet-internal transaction outputs will be decryptable only with the wallet's
     /// internal-scoped incoming viewing key.
     ///
     /// [`UnifiedFullViewingKey`]: zcash_keys::keys::UnifiedFullViewingKey
+    /// [`UnifiedFullViewingKey::select_ovk`]: zcash_keys::keys::UnifiedFullViewingKey::select_ovk
     Sender,
 
     /// Use custom outgoing viewing keys. These might for instance be derived from a
diff --git a/zcash_keys/Cargo.toml b/zcash_keys/Cargo.toml
index c67320f3fa..11a7ddccab 100644
--- a/zcash_keys/Cargo.toml
+++ b/zcash_keys/Cargo.toml
@@ -83,6 +83,7 @@ rand.workspace = true
 rand_chacha.workspace = true
 rand_core.workspace = true
 secp256k1 = { workspace = true, features = ["rand"] }
+transparent = { workspace = true, features = ["test-dependencies"] }
 zcash_address = { workspace = true, features = ["test-dependencies"] }
 zcash_script.workspace = true
 
diff --git a/zcash_keys/src/keys.rs b/zcash_keys/src/keys.rs
index ccf92b7ecc..f51f1cbe5c 100644
--- a/zcash_keys/src/keys.rs
+++ b/zcash_keys/src/keys.rs
@@ -1171,8 +1171,8 @@ impl UnifiedFullViewingKey {
             .then(|| {
                 self.transparent().map(|k| {
                     OutgoingViewingKey(match scope {
-                        Scope::External => k.external_ovk().as_bytes(),
-                        Scope::Internal => k.internal_ovk().as_bytes(),
+                        zip32::Scope::External => k.external_ovk().as_bytes(),
+                        zip32::Scope::Internal => k.internal_ovk().as_bytes(),
                     })
                 })
             })

From 0e7c8d5c526703d940a7a606884d686754517d9c Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@electriccoin.co>
Date: Tue, 2 Dec 2025 10:55:51 +0000
Subject: [PATCH 027/263] zcash_primitives: Clean up changelog

---
 zcash_primitives/CHANGELOG.md | 59 +++++++++++++++++------------------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md
index d2e66e49c1..27a5345ec8 100644
--- a/zcash_primitives/CHANGELOG.md
+++ b/zcash_primitives/CHANGELOG.md
@@ -14,36 +14,35 @@ workspace.
 - MSRV is now 1.85.1.
 
 ### Removed
-
-- Removed deprecated `zcash_primitives::transaction::sighash::SIGHASH_ALL`, use `zcash_transparent::sighash::SIGHASH_ALL` instead.
-- Removed deprecated `zcash_primitives::transaction::sighash::SIGHASH_NONE`, use `zcash_transparent::sighash::SIGHASH_NONE` instead.
-- Removed deprecated `zcash_primitives::transaction::sighash::SIGHASH_SINGLE`, use `zcash_transparent::sighash::SIGHASH_SINGLE` instead.
-- Removed deprecated `zcash_primitives::transaction::sighash::SIGHASH_MASK`, use `zcash_transparent::sighash::SIGHASH_MASK` instead.
-- Removed deprecated `zcash_primitives::transaction::sighash::SIGHASH_ANYONECANPAY`, use `zcash_transparent::sighash::SIGHASH_ANYONECANPAY` instead.
-- Removed deprecated `zcash_primitives::transaction::sighash::SighashType`, use `zcash_transparent::sighash::SighashType` instead.
-
-- Removed deprecated module `zcash_primitives::transaction::components::amount::testing`,
-  use `zcash_protocol::value::testing` instead with the following renames:
-  - `arb_positive_amount` to `zcash_protocol::value::testing::arb_positive_zat_balance`
-  - `arb_amount` to `zcash_protocol::value::testing::arb_zat_balance`
-  - `arb_nonnegative_amount` to `zcash_protocol::value::testing::arb_zatoshis`.
-- Removed deprecated module `zcash_primitives::transaction::components::amount`, use `zcash_protocol::value` instead.
-- Removed deprecated module `zcash_primitives::transaction::components::transparent::builder`, use `zcash_transparent::builder` instead.
-- Removed deprecated module `zcash_primitives::transaction::components::transparent::pczt`, use `zcash_transparent::pczt` instead.
-- Removed deprecated module `zcash_primitives::transaction::components::transparent`, use `zcash_transparent` instead.
-- Removed deprecated `zcash_primitives::transaction::components::Outpoint`, use `zcash_transparent::bundle::Outpoint` instead.
-- Removed deprecated `zcash_primitives::transaction::components::TxIn`, use `zcash_transparent::bundle::TxIn` instead.
-- Removed deprecated `zcash_primitives::transaction::components::TxOut`, use `zcash_transparent::bundle::TxOut` instead.
-- Removed deprecated `zcash_primitives::transaction::components::ZatBalance`, use `zcash_protocol::value::ZatBalance` instead.
-- Removed deprecated `zcash_primitives::transaction::components::OutputDescription`, use `sapling_crypto::bundle::OutputDescription` instead.
-- Removed deprecated `zcash_primitives::transaction::components::SpendDescription`, use `sapling_crypto::bundle::SpendDescription` instead.
-
-- Removed other deprecated modules:
-    - `zcash_primitives::consensus`
-    - `zcash_primitives::constants`
-    - `zcash_primitives::memo`
-    - `zcash_primitives::zip32`
-    - `zcash_primitives::legacy`
+- `zcash_primitives::consensus` module (use `zcash_protocol::consensus` instead).
+- `zcash_primitives::constants` module (use `zcash_protocol::constants` instead).
+- `zcash_primitives::legacy` module (use the `zcash_transparent` crate instead).
+- `zcash_primitives::memo` module (use `zcash_protocol::memo` instead)
+- `zcash_primitives::transaction`:
+  - `components`:
+    - `amount::testing` module; use `zcash_protocol::value::testing` instead
+      with the following renames:
+      - `arb_positive_amount` to `zcash_protocol::value::testing::arb_positive_zat_balance`
+      - `arb_amount` to `zcash_protocol::value::testing::arb_zat_balance`
+      - `arb_nonnegative_amount` to `zcash_protocol::value::testing::arb_zatoshis`.
+    - `amount` module (use `zcash_protocol::value` instead).
+    - `transparent::builder` module (use `zcash_transparent::builder` instead).
+    - `transparent::pczt` module (use `zcash_transparent::pczt` instead).
+    - `transparent` module (use `zcash_transparent` instead).
+    - `Amount` (use `zcash_protocol::value::ZatBalance` instead).
+    - `Outpoint` (use `zcash_transparent::bundle::Outpoint` instead).
+    - `OutputDescription` (use `sapling_crypto::bundle::OutputDescription` instead).
+    - `SpendDescription` (use `sapling_crypto::bundle::SpendDescription` instead).
+    - `TxIn` (use `zcash_transparent::bundle::TxIn` instead).
+    - `TxOut` (use `zcash_transparent::bundle::TxOut` instead).
+  - `sighash`:
+    - `SIGHASH_ALL` (use `zcash_transparent::sighash::SIGHASH_ALL` instead).
+    - `SIGHASH_NONE` (use `zcash_transparent::sighash::SIGHASH_NONE` instead).
+    - `SIGHASH_SINGLE` (use `zcash_transparent::sighash::SIGHASH_SINGLE` instead).
+    - `SIGHASH_MASK` (use `zcash_transparent::sighash::SIGHASH_MASK` instead).
+    - `SIGHASH_ANYONECANPAY` (use `zcash_transparent::sighash::SIGHASH_ANYONECANPAY` instead).
+    - `SighashType` (use `zcash_transparent::sighash::SighashType` instead).
+- `zcash_primitives::zip32` module (use the `zip32` crate instead).
 
 ## [0.26.1] - 2025-10-18
 

From 8d5fcc491d0e2c4bff62e7b6057ca7351f04aee4 Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@electriccoin.co>
Date: Thu, 20 Nov 2025 17:20:20 +0000
Subject: [PATCH 028/263] zcash_transparent: Support appending external sigs to
 PCZT inputs

---
 zcash_transparent/CHANGELOG.md       |  10 +++
 zcash_transparent/src/pczt/signer.rs | 112 +++++++++++++++++++++++++++
 2 files changed, 122 insertions(+)

diff --git a/zcash_transparent/CHANGELOG.md b/zcash_transparent/CHANGELOG.md
index 3b93b867db..8c9c35cb91 100644
--- a/zcash_transparent/CHANGELOG.md
+++ b/zcash_transparent/CHANGELOG.md
@@ -10,8 +10,18 @@ workspace.
 
 ## [Unreleased]
 
+### Added
+- `zcash_transparent::pczt`:
+  - `Input::with_signable_input`
+  - `Input::append_signature`
+
 ### Changed
 - MSRV is now 1.85.1.
+- `zcash_transparent::pczt`:
+  - `SignerError` has added variants:
+    - `InvalidExternalSignature`
+    - `MissingPreimage`
+    - `UnsupportedPubkey`
 
 ## [0.6.1] - 2025-10-27
 
diff --git a/zcash_transparent/src/pczt/signer.rs b/zcash_transparent/src/pczt/signer.rs
index 8213f8af52..d1dfa7e8a7 100644
--- a/zcash_transparent/src/pczt/signer.rs
+++ b/zcash_transparent/src/pczt/signer.rs
@@ -8,6 +8,26 @@ use crate::{
 };
 
 impl super::Input {
+    /// Helper to prepare a [`SignableInput`] for this input.
+    ///
+    /// This can be used to calculate the sighash for this input within its transaction,
+    /// to produce a signature externally suitable for passing to [`Self::append_signature`].
+    pub fn with_signable_input<T, F>(&self, index: usize, f: F) -> T
+    where
+        F: FnOnce(SignableInput) -> T,
+    {
+        // For P2PKH, `script_code` is always the same as `script_pubkey`.
+        let script_code = self.redeem_script.as_ref().unwrap_or(&self.script_pubkey);
+
+        f(SignableInput {
+            hash_type: self.sighash_type,
+            index,
+            script_code: &Script::from(script_code),
+            script_pubkey: &Script::from(&self.script_pubkey),
+            value: self.value,
+        })
+    }
+
     /// Signs the transparent spend with the given spend authorizing key.
     ///
     /// It is the caller's responsibility to perform any semantic validity checks on the
@@ -81,11 +101,103 @@ impl super::Input {
 
         Ok(())
     }
+
+    /// Appends the given signature to the transparent spend.
+    ///
+    /// It is the caller's responsibility to perform any semantic validity checks on the
+    /// PCZT (for example, comfirming that the change amounts are correct) before calling
+    /// this method.
+    ///
+    /// Returns an error if the signature does not match any pubkey involved with spend
+    /// control of the input's spent coin. The supported script formats are:
+    /// - P2PKH
+    ///   - The [`Input::hash160_preimages`] field must contan a mapping from the `pubkeyhash` to
+    ///     the pubkey.
+    /// - P2MS
+    /// - P2PK
+    ///
+    /// [`Input::hash160_preimages`]: super::Input::hash160_preimages
+    pub fn append_signature<C: secp256k1::Verification, F>(
+        &mut self,
+        index: usize,
+        calculate_sighash: F,
+        sig: secp256k1::ecdsa::Signature,
+        secp: &secp256k1::Secp256k1<C>,
+    ) -> Result<(), SignerError>
+    where
+        F: FnOnce(SignableInput) -> [u8; 32],
+    {
+        // For P2PKH, `script_code` is always the same as `script_pubkey`.
+        let script_code = self.redeem_script.as_ref().unwrap_or(&self.script_pubkey);
+        let script_kind = script_code
+            .refine()
+            .ok()
+            .as_ref()
+            .and_then(solver::standard);
+
+        fn to_pubkey(data: &[u8]) -> Result<[u8; 33], SignerError> {
+            data.try_into().map_err(|_| SignerError::UnsupportedPubkey)
+        }
+
+        // Extract all candidate pubkeys.
+        let pubkeys = match script_kind {
+            Some(solver::ScriptKind::PubKeyHash { hash }) => {
+                let data = self
+                    .hash160_preimages()
+                    .get(&hash)
+                    .ok_or(SignerError::MissingPreimage)?;
+                to_pubkey(data).map(|pubkey| vec![pubkey])
+            }
+            Some(solver::ScriptKind::MultiSig { pubkeys, .. }) => pubkeys
+                .iter()
+                .map(|data| to_pubkey(data.as_slice()))
+                .collect::<Result<Vec<_>, _>>(),
+            Some(solver::ScriptKind::PubKey { data }) => {
+                to_pubkey(data.as_slice()).map(|pubkey| vec![pubkey])
+            }
+            // This spending key isn't involved with the input in any way we can detect.
+            _ => Err(SignerError::WrongSpendingKey),
+        }?;
+
+        let sighash = calculate_sighash(SignableInput {
+            hash_type: self.sighash_type,
+            index,
+            script_code: &Script::from(script_code),
+            script_pubkey: &Script::from(&self.script_pubkey),
+            value: self.value,
+        });
+        let msg = secp256k1::Message::from_digest(sighash);
+
+        // Find the pubkey that the signature validates with.
+        for pubkey in pubkeys {
+            let pk = secp256k1::PublicKey::from_slice(&pubkey)
+                .map_err(|_| SignerError::UnsupportedPubkey)?;
+
+            if secp.verify_ecdsa(&msg, &sig, &pk).is_ok() {
+                // Signature has to have the SighashType appended to it.
+                let mut sig_bytes: Vec<u8> = sig.serialize_der()[..].to_vec();
+                sig_bytes.extend([self.sighash_type.encode()]);
+
+                self.partial_signatures.insert(pubkey, sig_bytes);
+
+                return Ok(());
+            }
+        }
+
+        Err(SignerError::InvalidExternalSignature)
+    }
 }
 
 /// Errors that can occur while signing a transparent input in a PCZT.
 #[derive(Debug)]
 pub enum SignerError {
+    /// A provided external signature was not valid for any detected pubkey involved with
+    /// spend control of the input's spent coin.
+    InvalidExternalSignature,
+    /// A required entry in one of the preimage maps is missing.
+    MissingPreimage,
+    /// A pubkey within the transparent input uses an unsupported format.
+    UnsupportedPubkey,
     /// The provided `sk` does not match any pubkey involved with spend control of the
     /// input's spent coin.
     WrongSpendingKey,

From feefa606fd83a7b142c512cf77bf1758a68bc80d Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@electriccoin.co>
Date: Thu, 20 Nov 2025 17:21:21 +0000
Subject: [PATCH 029/263] pczt: Support appending external signatures to inputs

---
 Cargo.lock                        |  18 ++--
 Cargo.toml                        |   4 +-
 pczt/CHANGELOG.md                 |  10 ++
 pczt/src/roles/signer/mod.rs      | 173 +++++++++++++++++++++++++-----
 supply-chain/audits.toml          |  34 ++++--
 supply-chain/imports.lock         |  33 +++---
 zcash_client_backend/CHANGELOG.md |   1 +
 zcash_client_sqlite/CHANGELOG.md  |   3 +
 zcash_keys/CHANGELOG.md           |   1 +
 zcash_primitives/CHANGELOG.md     |   1 +
 zcash_proofs/CHANGELOG.md         |   1 +
 11 files changed, 216 insertions(+), 63 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 47ad11a241..d70b89aed1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1979,9 +1979,9 @@ dependencies = [
 
 [[package]]
 name = "halo2_gadgets"
-version = "0.3.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73a5e510d58a07d8ed238a5a8a436fe6c2c79e1bb2611f62688bc65007b4e6e7"
+checksum = "45824ce0dd12e91ec0c68ebae2a7ed8ae19b70946624c849add59f1d1a62a143"
 dependencies = [
  "arrayvec",
  "bitvec",
@@ -2017,14 +2017,15 @@ dependencies = [
 
 [[package]]
 name = "halo2_proofs"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b867a8d9bbb85fca76fff60652b5cd19b853a1c4d0665cb89bee68b18d2caf0"
+checksum = "05713f117155643ce10975e0bee44a274bcda2f4bb5ef29a999ad67c1fa8d4d3"
 dependencies = [
  "blake2b_simd",
  "ff",
  "group",
  "halo2_legacy_pdqsort",
+ "indexmap 1.9.3",
  "maybe-rayon",
  "pasta_curves",
  "rand_core 0.6.4",
@@ -2927,9 +2928,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
 [[package]]
 name = "orchard"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1ef66fcf99348242a20d582d7434da381a867df8dc155b3a980eca767c56137"
+checksum = "6c01cd4ea711aab5f263f2b7aa6966687a2d6c7df4f78eb1b97a66a7a4e78e3b"
 dependencies = [
  "aes",
  "bitvec",
@@ -2950,6 +2951,7 @@ dependencies = [
  "pasta_curves",
  "proptest",
  "rand 0.8.5",
+ "rand_core 0.6.4",
  "reddsa",
  "serde",
  "sinsemilla",
@@ -4054,9 +4056,9 @@ dependencies = [
 
 [[package]]
 name = "sapling-crypto"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9d3c081c83f1dc87403d9d71a06f52301c0aa9ea4c17da2a3435bbf493ffba4"
+checksum = "5433ab8c1cd52dfad3b903143e371d5bdd514ab7952f71414e6d66a5da8223cd"
 dependencies = [
  "aes",
  "bellman",
diff --git a/Cargo.toml b/Cargo.toml
index 7fd4f9cfca..b5d1394abe 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -64,10 +64,10 @@ blake2s_simd = { version = "1", default-features = false }
 bls12_381 = "0.8"
 jubjub = "0.10"
 redjubjub = { version = "0.8", default-features = false }
-sapling = { package = "sapling-crypto", version = "0.5", default-features = false }
+sapling = { package = "sapling-crypto", version = "0.6", default-features = false }
 
 # - Orchard
-orchard = { version = "0.11", default-features = false }
+orchard = { version = "0.12", default-features = false }
 pasta_curves = "0.5"
 
 # - Transparent
diff --git a/pczt/CHANGELOG.md b/pczt/CHANGELOG.md
index 6e225ef0cb..c86001c03d 100644
--- a/pczt/CHANGELOG.md
+++ b/pczt/CHANGELOG.md
@@ -10,6 +10,16 @@ workspace.
 
 ## [Unreleased]
 
+### Added
+- `pczt::roles::signer`:
+  - `Signer::sighash`
+  - `Signer::append_transparent_signature`
+  - `Signer::apply_sapling_signature`
+  - `Signer::apply_orchard_signature`
+
+### Changed
+- Migrated to `orchard 0.12`, `sapling-crypto 0.6`.
+
 ## [0.5.0] - 2025-11-05
 
 ### Changed
diff --git a/pczt/src/roles/signer/mod.rs b/pczt/src/roles/signer/mod.rs
index 7fcd603ec3..3b01244358 100644
--- a/pczt/src/roles/signer/mod.rs
+++ b/pczt/src/roles/signer/mod.rs
@@ -14,6 +14,7 @@
 //!   - A source of randomness.
 
 use blake2b_simd::Hash as Blake2bHash;
+use orchard::primitives::redpallas;
 use rand_core::OsRng;
 
 use ::transparent::sighash::{SIGHASH_ANYONECANPAY, SIGHASH_NONE, SIGHASH_SINGLE};
@@ -50,7 +51,7 @@ pub struct Signer {
     tx_data: TransactionData<EffectsOnly>,
     txid_parts: TxDigests<Blake2bHash>,
     shielded_sighash: [u8; 32],
-    secp: secp256k1::Secp256k1<secp256k1::SignOnly>,
+    secp: secp256k1::Secp256k1<secp256k1::All>,
 }
 
 impl Signer {
@@ -78,10 +79,7 @@ impl Signer {
                 version_group_id,
             })),
         }?;
-        let shielded_sighash = v5_signature_hash(&tx_data, &SignableInput::Shielded, &txid_parts)
-            .as_ref()
-            .try_into()
-            .expect("correct length");
+        let shielded_sighash = sighash(&tx_data, &SignableInput::Shielded, &txid_parts);
 
         Ok(Self {
             global,
@@ -91,7 +89,38 @@ impl Signer {
             tx_data,
             txid_parts,
             shielded_sighash,
-            secp: secp256k1::Secp256k1::signing_only(),
+            secp: secp256k1::Secp256k1::new(),
+        })
+    }
+
+    /// Calculates the signature digest that must be signed to authorize shielded spends.
+    ///
+    /// This can be used to produce a signature externally suitable for passing to e.g.
+    /// [`Self::apply_orchard_signature`].}
+    pub fn shielded_sighash(&self) -> [u8; 32] {
+        self.shielded_sighash
+    }
+
+    /// Calculates the signature digest that must be signed to authorize the transparent
+    /// spend at the given index.
+    ///
+    /// This can be used to produce a signature externally suitable for passing to e.g.
+    /// [`Self::append_transparent_signature`].}
+    ///
+    /// Returns an error if `index` is invalid for this PCZT.
+    pub fn transparent_sighash(&self, index: usize) -> Result<[u8; 32], Error> {
+        let input = self
+            .transparent
+            .inputs()
+            .get(index)
+            .ok_or(Error::InvalidIndex)?;
+
+        input.with_signable_input(index, |signable_input| {
+            Ok(sighash(
+                &self.tx_data,
+                &SignableInput::Transparent(signable_input),
+                &self.txid_parts,
+            ))
         })
     }
 
@@ -105,6 +134,49 @@ impl Signer {
         index: usize,
         sk: &secp256k1::SecretKey,
     ) -> Result<(), Error> {
+        self.generate_or_append_transparent_signature(index, |input, tx_data, txid_parts, secp| {
+            input.sign(
+                index,
+                |input| sighash(tx_data, &SignableInput::Transparent(input), txid_parts),
+                sk,
+                secp,
+            )
+        })
+    }
+
+    /// Appends the given signature to the transparent spend.
+    ///
+    /// It is the caller's responsibility to perform any semantic validity checks on the
+    /// PCZT (for example, comfirming that the change amounts are correct) before calling
+    /// this method.
+    pub fn append_transparent_signature(
+        &mut self,
+        index: usize,
+        signature: secp256k1::ecdsa::Signature,
+    ) -> Result<(), Error> {
+        self.generate_or_append_transparent_signature(index, |input, tx_data, txid_parts, secp| {
+            input.append_signature(
+                index,
+                |input| sighash(tx_data, &SignableInput::Transparent(input), txid_parts),
+                signature,
+                secp,
+            )
+        })
+    }
+
+    fn generate_or_append_transparent_signature<F>(
+        &mut self,
+        index: usize,
+        f: F,
+    ) -> Result<(), Error>
+    where
+        F: FnOnce(
+            &mut transparent::pczt::Input,
+            &TransactionData<EffectsOnly>,
+            &TxDigests<Blake2bHash>,
+            &secp256k1::Secp256k1<secp256k1::All>,
+        ) -> Result<(), transparent::pczt::SignerError>,
+    {
         let input = self
             .transparent
             .inputs_mut()
@@ -114,23 +186,8 @@ impl Signer {
         // Check consistency of the input being signed.
         // TODO
 
-        input
-            .sign(
-                index,
-                |input| {
-                    v5_signature_hash(
-                        &self.tx_data,
-                        &SignableInput::Transparent(input),
-                        &self.txid_parts,
-                    )
-                    .as_ref()
-                    .try_into()
-                    .unwrap()
-                },
-                sk,
-                &self.secp,
-            )
-            .map_err(Error::TransparentSign)?;
+        // Generate or apply the signature.
+        f(input, &self.tx_data, &self.txid_parts, &self.secp).map_err(Error::TransparentSign)?;
 
         // Update transaction modifiability:
         // - If the Signer added a signature that does not use `SIGHASH_ANYONECANPAY`, the
@@ -170,6 +227,30 @@ impl Signer {
         index: usize,
         ask: &sapling::keys::SpendAuthorizingKey,
     ) -> Result<(), Error> {
+        self.generate_or_apply_sapling_signature(index, |spend, shielded_sighash| {
+            spend.sign(shielded_sighash, ask, OsRng)
+        })
+    }
+
+    /// Applies the given signature to the Sapling spend.
+    ///
+    /// It is the caller's responsibility to perform any semantic validity checks on the
+    /// PCZT (for example, comfirming that the change amounts are correct) before calling
+    /// this method.
+    pub fn apply_sapling_signature(
+        &mut self,
+        index: usize,
+        signature: redjubjub::Signature<redjubjub::SpendAuth>,
+    ) -> Result<(), Error> {
+        self.generate_or_apply_sapling_signature(index, |spend, shielded_sighash| {
+            spend.apply_signature(shielded_sighash, signature)
+        })
+    }
+
+    fn generate_or_apply_sapling_signature<F>(&mut self, index: usize, f: F) -> Result<(), Error>
+    where
+        F: FnOnce(&mut sapling::pczt::Spend, [u8; 32]) -> Result<(), sapling::pczt::SignerError>,
+    {
         let spend = self
             .sapling
             .spends_mut()
@@ -187,9 +268,8 @@ impl Signer {
         }
         .map_err(Error::SaplingVerify)?;
 
-        spend
-            .sign(self.shielded_sighash, ask, OsRng)
-            .map_err(Error::SaplingSign)?;
+        // Generate or apply the signature.
+        f(spend, self.shielded_sighash).map_err(Error::SaplingSign)?;
 
         // Update transaction modifiability: all transaction effects have been committed
         // to by the signature.
@@ -212,6 +292,30 @@ impl Signer {
         index: usize,
         ask: &orchard::keys::SpendAuthorizingKey,
     ) -> Result<(), Error> {
+        self.generate_or_apply_orchard_signature(index, |spend, shielded_sighash| {
+            spend.sign(shielded_sighash, ask, OsRng)
+        })
+    }
+
+    /// Applies the given signature to the Orchard spend.
+    ///
+    /// It is the caller's responsibility to perform any semantic validity checks on the
+    /// PCZT (for example, comfirming that the change amounts are correct) before calling
+    /// this method.
+    pub fn apply_orchard_signature(
+        &mut self,
+        index: usize,
+        signature: redpallas::Signature<redpallas::SpendAuth>,
+    ) -> Result<(), Error> {
+        self.generate_or_apply_orchard_signature(index, |action, shielded_sighash| {
+            action.apply_signature(shielded_sighash, signature)
+        })
+    }
+
+    fn generate_or_apply_orchard_signature<F>(&mut self, index: usize, f: F) -> Result<(), Error>
+    where
+        F: FnOnce(&mut orchard::pczt::Action, [u8; 32]) -> Result<(), orchard::pczt::SignerError>,
+    {
         let action = self
             .orchard
             .actions_mut()
@@ -230,9 +334,8 @@ impl Signer {
         }
         .map_err(Error::OrchardVerify)?;
 
-        action
-            .sign(self.shielded_sighash, ask, OsRng)
-            .map_err(Error::OrchardSign)?;
+        // Generate or apply the signature.
+        f(action, self.shielded_sighash).map_err(Error::OrchardSign)?;
 
         // Update transaction modifiability: all transaction effects have been committed
         // to by the signature.
@@ -310,6 +413,18 @@ impl Authorization for EffectsOnly {
     type TzeAuth = core::convert::Infallible;
 }
 
+/// Helper to produce the correct sighash for a PCZT.
+fn sighash(
+    tx_data: &TransactionData<EffectsOnly>,
+    signable_input: &SignableInput,
+    txid_parts: &TxDigests<Blake2bHash>,
+) -> [u8; 32] {
+    v5_signature_hash(tx_data, signable_input, txid_parts)
+        .as_ref()
+        .try_into()
+        .expect("correct length")
+}
+
 /// Errors that can occur while creating signatures for a PCZT.
 #[derive(Debug)]
 pub enum Error {
diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
index 9eadebec94..192b0a61fa 100644
--- a/supply-chain/audits.toml
+++ b/supply-chain/audits.toml
@@ -1846,7 +1846,7 @@ end = "2025-12-16"
 
 [[trusted.halo2_gadgets]]
 criteria = ["safe-to-deploy", "crypto-reviewed"]
-user-id = 1244 # ebfull
+user-id = 1244
 start = "2022-05-10"
 end = "2025-04-22"
 
@@ -1862,15 +1862,21 @@ user-id = 6289 # Jack Grigg (str4d)
 start = "2024-12-13"
 end = "2025-12-16"
 
+[[trusted.halo2_proofs]]
+criteria = "safe-to-deploy"
+user-id = 6289 # Jack Grigg (str4d)
+start = "2022-01-20"
+end = "2026-12-05"
+
 [[trusted.halo2_proofs]]
 criteria = ["safe-to-deploy", "crypto-reviewed"]
-user-id = 1244 # ebfull
+user-id = 1244
 start = "2022-05-10"
 end = "2025-04-22"
 
 [[trusted.incrementalmerkletree]]
 criteria = "safe-to-deploy"
-user-id = 1244 # ebfull
+user-id = 1244
 start = "2021-06-24"
 end = "2025-04-22"
 
@@ -1898,6 +1904,12 @@ user-id = 6289 # Jack Grigg (str4d)
 start = "2021-09-03"
 end = "2025-12-16"
 
+[[trusted.orchard]]
+criteria = "safe-to-deploy"
+user-id = 6289 # Jack Grigg (str4d)
+start = "2021-01-07"
+end = "2026-12-05"
+
 [[trusted.orchard]]
 criteria = "safe-to-deploy"
 user-id = 169181 # Kris Nuttycombe (nuttycom)
@@ -1906,7 +1918,7 @@ end = "2025-08-12"
 
 [[trusted.orchard]]
 criteria = ["safe-to-deploy", "crypto-reviewed", "license-reviewed"]
-user-id = 1244 # ebfull
+user-id = 1244
 start = "2022-10-19"
 end = "2025-04-22"
 
@@ -1940,6 +1952,12 @@ user-id = 199950 # Daira-Emma Hopwood (daira)
 start = "2023-03-30"
 end = "2026-02-21"
 
+[[trusted.sapling-crypto]]
+criteria = "safe-to-deploy"
+user-id = 6289 # Jack Grigg (str4d)
+start = "2024-01-26"
+end = "2026-12-05"
+
 [[trusted.sapling-crypto]]
 criteria = "safe-to-deploy"
 user-id = 169181 # Kris Nuttycombe (nuttycom)
@@ -2110,7 +2128,7 @@ end = "2025-07-19"
 
 [[trusted.zcash_address]]
 criteria = "safe-to-deploy"
-user-id = 1244 # ebfull
+user-id = 1244
 start = "2022-10-19"
 end = "2025-04-22"
 
@@ -2152,7 +2170,7 @@ end = "2026-06-02"
 
 [[trusted.zcash_encoding]]
 criteria = "safe-to-deploy"
-user-id = 1244 # ebfull
+user-id = 1244
 start = "2022-10-19"
 end = "2025-04-22"
 
@@ -2176,7 +2194,7 @@ end = "2025-04-23"
 
 [[trusted.zcash_history]]
 criteria = "safe-to-deploy"
-user-id = 1244 # ebfull
+user-id = 1244
 start = "2020-03-04"
 end = "2025-04-22"
 
@@ -2218,7 +2236,7 @@ end = "2026-10-24"
 
 [[trusted.zcash_primitives]]
 criteria = ["safe-to-deploy", "crypto-reviewed", "license-reviewed"]
-user-id = 1244 # ebfull
+user-id = 1244
 start = "2019-10-08"
 end = "2025-04-22"
 
diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index 0dccba6ae0..113bbe05ff 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -30,8 +30,8 @@ user-login = "str4d"
 user-name = "Jack Grigg"
 
 [[publisher.halo2_gadgets]]
-version = "0.3.1"
-when = "2024-12-16"
+version = "0.4.0"
+when = "2025-12-04"
 user-id = 6289
 user-login = "str4d"
 user-name = "Jack Grigg"
@@ -51,10 +51,11 @@ user-login = "str4d"
 user-name = "Jack Grigg"
 
 [[publisher.halo2_proofs]]
-version = "0.3.0"
-when = "2023-03-22"
-user-id = 1244
-user-login = "ebfull"
+version = "0.3.2"
+when = "2025-12-04"
+user-id = 6289
+user-login = "str4d"
+user-name = "Jack Grigg"
 
 [[publisher.incrementalmerkletree]]
 version = "0.8.2"
@@ -78,11 +79,11 @@ user-login = "str4d"
 user-name = "Jack Grigg"
 
 [[publisher.orchard]]
-version = "0.11.0"
-when = "2025-02-21"
-user-id = 169181
-user-login = "nuttycom"
-user-name = "Kris Nuttycombe"
+version = "0.12.0"
+when = "2025-12-05"
+user-id = 6289
+user-login = "str4d"
+user-name = "Jack Grigg"
 
 [[publisher.pczt]]
 version = "0.5.0"
@@ -92,11 +93,11 @@ user-login = "nuttycom"
 user-name = "Kris Nuttycombe"
 
 [[publisher.sapling-crypto]]
-version = "0.5.0"
-when = "2025-02-21"
-user-id = 169181
-user-login = "nuttycom"
-user-name = "Kris Nuttycombe"
+version = "0.6.0"
+when = "2025-12-05"
+user-id = 6289
+user-login = "str4d"
+user-name = "Jack Grigg"
 
 [[publisher.schemerz]]
 version = "0.2.0"
diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index 833a47eea9..ef7d292e62 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -11,6 +11,7 @@ workspace.
 ## [Unreleased]
 
 ### Changed
+- Migrated to `orchard 0.12`, `sapling-crypto 0.6`.
 - `zcash_client_backend::wallet::OvkPolicy` has been substantially modified
   to reflect the view that a single outgoing viewing key should be uniformly
   applied to encrypt all external transaction outputs, irrespective of which
diff --git a/zcash_client_sqlite/CHANGELOG.md b/zcash_client_sqlite/CHANGELOG.md
index 817bbf3e5b..490075735e 100644
--- a/zcash_client_sqlite/CHANGELOG.md
+++ b/zcash_client_sqlite/CHANGELOG.md
@@ -10,6 +10,9 @@ workspace.
 
 ## [Unreleased]
 
+### Changed
+- Migrated to `orchard 0.12`, `sapling-crypto 0.6`.
+
 ## [0.18.10, 0.19.1] - 2025-11-25
 
 ### Fixed
diff --git a/zcash_keys/CHANGELOG.md b/zcash_keys/CHANGELOG.md
index 6f6c9a2c00..43e556bf01 100644
--- a/zcash_keys/CHANGELOG.md
+++ b/zcash_keys/CHANGELOG.md
@@ -15,6 +15,7 @@ workspace.
 
 ### Changed
 - MSRV is now 1.85.1.
+- Migrated to `orchard 0.12`, `sapling-crypto 0.6`.
 
 ## [0.12.0] - 2025-10-13
 
diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md
index 27a5345ec8..9b4b7c08a2 100644
--- a/zcash_primitives/CHANGELOG.md
+++ b/zcash_primitives/CHANGELOG.md
@@ -12,6 +12,7 @@ workspace.
 
 ### Changed
 - MSRV is now 1.85.1.
+- Migrated to `orchard 0.12`, `sapling-crypto 0.6`.
 
 ### Removed
 - `zcash_primitives::consensus` module (use `zcash_protocol::consensus` instead).
diff --git a/zcash_proofs/CHANGELOG.md b/zcash_proofs/CHANGELOG.md
index d01cf1a297..e6dc6bebe4 100644
--- a/zcash_proofs/CHANGELOG.md
+++ b/zcash_proofs/CHANGELOG.md
@@ -12,6 +12,7 @@ workspace.
 
 ### Changed
 - MSRV is now 1.85.1.
+- Migrated to `sapling-crypto 0.6`.
 
 ## [0.26.1] - 2025-10-18
 

From 0f343cce38720283d369096162282afc2c30a171 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Wed, 3 Dec 2025 17:19:27 -0700
Subject: [PATCH 030/263] zcash_client_sqlite: Add columns to `v_tx_outputs`

This adds the following columns to the `v_tx_outputs` view:
* transaction_id - the database-internal transaction identifier,
  which is needed to make efficient joins between `v_tx_outputs` and
  other tables
* mined_height - the block height at which the transaction that
  produceed the output was mined, if any; this is useful for computing
  the confirmation depth for a given received output.
* recipient_key_scope - the key scope that received the output, which
  is needed in order to compute the number of confirmations required
  before the output may be spent.
---
 zcash_client_sqlite/CHANGELOG.md              |   6 +
 zcash_client_sqlite/src/wallet/db.rs          |  48 +++--
 zcash_client_sqlite/src/wallet/encoding.rs    |  11 ++
 .../src/wallet/init/migrations.rs             |   4 +-
 .../migrations/v_tx_outputs_key_scopes.rs     | 164 ++++++++++++++++++
 5 files changed, 219 insertions(+), 14 deletions(-)
 create mode 100644 zcash_client_sqlite/src/wallet/init/migrations/v_tx_outputs_key_scopes.rs

diff --git a/zcash_client_sqlite/CHANGELOG.md b/zcash_client_sqlite/CHANGELOG.md
index 490075735e..84c2eb256a 100644
--- a/zcash_client_sqlite/CHANGELOG.md
+++ b/zcash_client_sqlite/CHANGELOG.md
@@ -10,6 +10,12 @@ workspace.
 
 ## [Unreleased]
 
+### Added
+- The following columns have been added to the exposed `v_tx_outputs` view:
+  - `transaction_id`
+  - `mined_height`
+  - `recipient_key_scope`
+
 ### Changed
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`.
 
diff --git a/zcash_client_sqlite/src/wallet/db.rs b/zcash_client_sqlite/src/wallet/db.rs
index 998d92b8b0..148ca54e16 100644
--- a/zcash_client_sqlite/src/wallet/db.rs
+++ b/zcash_client_sqlite/src/wallet/db.rs
@@ -1081,7 +1081,12 @@ GROUP BY notes.account_id, notes.transaction_id";
 ///   and as change.
 ///
 /// # Columns
-/// - `txid`: The id of the transaction in which the output was sent or received.
+/// - `transaction_id`: The database-internal identifier for the transaction that produced this
+///   output. This is intended for use when it is necessary to perform efficient joins against
+///   other tables and views. It should not ever be exposed to end-users.
+/// - `txid`: The byte representation of the consensus transaction ID for the transaction that
+///   produced thid outout. This byte vector must be reversed and hex-encoded for display to
+///   users.
 /// - `output_pool`: The value pool for the transaction; valid values for this are:
 ///   - 0: Transparent
 ///   - 2: Sapling
@@ -1089,6 +1094,11 @@ GROUP BY notes.account_id, notes.transaction_id";
 /// - `output_index`: The index of the output within the transaction bundle associated with
 ///   the `output_pool` value; that is, within `vout` for transparent, the vector of
 ///   Sapling `OutputDescription` values, or the vector of Orchard actions.
+/// - `tx_mined_height`: An optional value identifying the block height at which the transaction that
+///   produced this output was mined, or NULL if the transaction is unmined.
+/// - `tx_trust_status`: A flag indicating whether the transaction that produced these outputs
+///   should be considered "trusted". When set to `1`, outputs of this transaction will be considered
+///   spendable with `trusted` confirmations instead of `untrusted` confirmations.
 /// - `from_account_uuid`: The UUID of the wallet account that created the output, if the wallet
 ///   spent notes in creating the transaction. Note that if multiple accounts in the wallet
 ///   contributed funds in creating the associated transaction, redundant rows will exist in the
@@ -1110,11 +1120,16 @@ GROUP BY notes.account_id, notes.transaction_id";
 /// - `memo`: The binary content of the memo associated with the output, if the output is a
 ///   shielded output and the memo was received by the wallet, sent by the wallet or was able to be
 ///   decrypted with the wallet's outgoing viewing key.
+/// - `recipient_key_scope`: the ZIP 32 key scope of the key that received or decrypted this
+///   output, encoded as `0` for external scope, `1` for internal scope, and `2` for ephemeral
+///   scope.
 pub(super) const VIEW_TX_OUTPUTS: &str = "
 CREATE VIEW v_tx_outputs AS
 WITH unioned AS (
     -- select all outputs received by the wallet
-    SELECT transactions.txid            AS txid,
+    SELECT transactions.id_tx           AS transaction_id,
+           transactions.txid            AS txid,
+           transactions.mined_height    AS mined_height,
            ro.pool                      AS output_pool,
            ro.output_index              AS output_index,
            from_account.uuid            AS from_account_uuid,
@@ -1123,7 +1138,8 @@ WITH unioned AS (
            a.diversifier_index_be       AS diversifier_index_be,
            ro.value                     AS value,
            ro.is_change                 AS is_change,
-           ro.memo                      AS memo
+           ro.memo                      AS memo,
+           a.key_scope                  AS recipient_key_scope
     FROM v_received_outputs ro
     JOIN transactions
         ON transactions.id_tx = ro.transaction_id
@@ -1135,7 +1151,9 @@ WITH unioned AS (
     LEFT JOIN accounts to_account ON to_account.id = ro.account_id
     UNION ALL
     -- select all outputs sent from the wallet to external recipients
-    SELECT transactions.txid            AS txid,
+    SELECT transactions.id_tx           AS transaction_id,
+           transactions.txid            AS txid,
+           transactions.mined_height    AS mined_height,
            sent_notes.output_pool       AS output_pool,
            sent_notes.output_index      AS output_index,
            from_account.uuid            AS from_account_uuid,
@@ -1144,7 +1162,8 @@ WITH unioned AS (
            NULL                         AS diversifier_index_be,
            sent_notes.value             AS value,
            0                            AS is_change,
-           sent_notes.memo              AS memo
+           sent_notes.memo              AS memo,
+           NULL                         AS recipient_key_scope
     FROM sent_notes
     JOIN transactions
         ON transactions.id_tx = sent_notes.transaction_id
@@ -1154,17 +1173,20 @@ WITH unioned AS (
 )
 -- merge duplicate rows while retaining maximum information
 SELECT
-    txid,
+    transaction_id,
+    MAX(txid),
+    MAX(mined_height) AS mined_height,
     output_pool,
     output_index,
-    max(from_account_uuid) AS from_account_uuid,
-    max(to_account_uuid) AS to_account_uuid,
-    max(to_address) AS to_address,
-    max(value) AS value,
-    max(is_change) AS is_change,
-    max(memo) AS memo
+    MAX(from_account_uuid) AS from_account_uuid,
+    MAX(to_account_uuid) AS to_account_uuid,
+    MAX(to_address) AS to_address,
+    MAX(value) AS value,
+    MAX(is_change) AS is_change,
+    MAX(memo) AS memo,
+    MAX(recipient_key_scope) AS recipient_key_scope
 FROM unioned
-GROUP BY txid, output_pool, output_index";
+GROUP BY transaction_id, output_pool, output_index";
 
 pub(super) fn view_sapling_shard_scan_ranges<P: Parameters>(params: &P) -> String {
     format!(
diff --git a/zcash_client_sqlite/src/wallet/encoding.rs b/zcash_client_sqlite/src/wallet/encoding.rs
index f83bb0fd8d..f45e8502dc 100644
--- a/zcash_client_sqlite/src/wallet/encoding.rs
+++ b/zcash_client_sqlite/src/wallet/encoding.rs
@@ -42,6 +42,17 @@ pub(crate) fn pool_code(pool_type: PoolType) -> i64 {
     }
 }
 
+pub(crate) fn parse_pool_code(code: i64) -> Result<PoolType, SqliteClientError> {
+    match code {
+        0i64 => Ok(PoolType::Transparent),
+        2i64 => Ok(PoolType::SAPLING),
+        3i64 => Ok(PoolType::ORCHARD),
+        _ => Err(SqliteClientError::CorruptedData(format!(
+            "Invalid pool code: {code}"
+        ))),
+    }
+}
+
 pub(crate) fn account_kind_code(value: &AccountSource) -> u32 {
     match value {
         AccountSource::Derived { .. } => 0,
diff --git a/zcash_client_sqlite/src/wallet/init/migrations.rs b/zcash_client_sqlite/src/wallet/init/migrations.rs
index c63ee2075d..a643107243 100644
--- a/zcash_client_sqlite/src/wallet/init/migrations.rs
+++ b/zcash_client_sqlite/src/wallet/init/migrations.rs
@@ -48,6 +48,7 @@ mod v_transactions_net;
 mod v_transactions_note_uniqueness;
 mod v_transactions_shielding_balance;
 mod v_transactions_transparent_history;
+mod v_tx_outputs_key_scopes;
 mod v_tx_outputs_return_addrs;
 mod v_tx_outputs_use_legacy_false;
 mod wallet_summaries;
@@ -215,6 +216,7 @@ pub(super) fn all_migrations<
         Box::new(v_received_output_spends_account::Migration),
         Box::new(add_transaction_trust_marker::Migration),
         Box::new(account_delete_cascade::Migration),
+        Box::new(v_tx_outputs_key_scopes::Migration),
     ]
 }
 
@@ -355,7 +357,7 @@ pub const V_0_18_5: &[Uuid] = &[
 pub const V_0_19_0: &[Uuid] = &[account_delete_cascade::MIGRATION_ID];
 
 /// Leaf migrations as of the current repository state.
-pub const CURRENT_LEAF_MIGRATIONS: &[Uuid] = &[account_delete_cascade::MIGRATION_ID];
+pub const CURRENT_LEAF_MIGRATIONS: &[Uuid] = &[v_tx_outputs_key_scopes::MIGRATION_ID];
 
 pub(super) fn verify_network_compatibility<P: consensus::Parameters>(
     conn: &rusqlite::Connection,
diff --git a/zcash_client_sqlite/src/wallet/init/migrations/v_tx_outputs_key_scopes.rs b/zcash_client_sqlite/src/wallet/init/migrations/v_tx_outputs_key_scopes.rs
new file mode 100644
index 0000000000..03b103f048
--- /dev/null
+++ b/zcash_client_sqlite/src/wallet/init/migrations/v_tx_outputs_key_scopes.rs
@@ -0,0 +1,164 @@
+//! This migration adds missing key scope information to the `v_received_outputs` and
+//! `v_tx_outputs` views.
+use std::collections::HashSet;
+
+use schemerz_rusqlite::RusqliteMigration;
+use uuid::Uuid;
+
+use crate::wallet::init::{WalletMigrationError, migrations::account_delete_cascade};
+
+pub(super) const MIGRATION_ID: Uuid = Uuid::from_u128(0x97ac36a9_196f_4dd9_993d_722bde95bebc);
+
+const DEPENDENCIES: &[Uuid] = &[account_delete_cascade::MIGRATION_ID];
+
+pub(super) struct Migration;
+
+impl schemerz::Migration<Uuid> for Migration {
+    fn id(&self) -> Uuid {
+        MIGRATION_ID
+    }
+
+    fn dependencies(&self) -> HashSet<Uuid> {
+        DEPENDENCIES.iter().copied().collect()
+    }
+
+    fn description(&self) -> &'static str {
+        "Adds `ON DELETE CASCADE` to foreign keys to support account deletion."
+    }
+}
+
+impl RusqliteMigration for Migration {
+    type Error = WalletMigrationError;
+
+    fn up(&self, conn: &rusqlite::Transaction) -> Result<(), Self::Error> {
+        conn.execute_batch(
+            r#"
+            DROP VIEW v_tx_outputs;
+            CREATE VIEW v_tx_outputs AS
+            WITH unioned AS (
+                -- select all outputs received by the wallet
+                SELECT transactions.id_tx           AS transaction_id,
+                       transactions.txid            AS txid,
+                       transactions.mined_height    AS mined_height,
+                       ro.pool                      AS output_pool,
+                       ro.output_index              AS output_index,
+                       from_account.uuid            AS from_account_uuid,
+                       to_account.uuid              AS to_account_uuid,
+                       a.address                    AS to_address,
+                       a.diversifier_index_be       AS diversifier_index_be,
+                       ro.value                     AS value,
+                       ro.is_change                 AS is_change,
+                       ro.memo                      AS memo,
+                       a.key_scope                  AS recipient_key_scope
+                FROM v_received_outputs ro
+                JOIN transactions
+                    ON transactions.id_tx = ro.transaction_id
+                LEFT JOIN addresses a ON a.id = ro.address_id
+                -- join to the sent_notes table to obtain `from_account_id`
+                LEFT JOIN sent_notes ON sent_notes.id = ro.sent_note_id
+                -- join on the accounts table to obtain account UUIDs
+                LEFT JOIN accounts from_account ON from_account.id = sent_notes.from_account_id
+                LEFT JOIN accounts to_account ON to_account.id = ro.account_id
+                UNION ALL
+                -- select all outputs sent from the wallet to external recipients
+                SELECT transactions.id_tx           AS transaction_id,
+                       transactions.txid            AS txid,
+                       transactions.mined_height    AS mined_height,
+                       sent_notes.output_pool       AS output_pool,
+                       sent_notes.output_index      AS output_index,
+                       from_account.uuid            AS from_account_uuid,
+                       NULL                         AS to_account_uuid,
+                       sent_notes.to_address        AS to_address,
+                       NULL                         AS diversifier_index_be,
+                       sent_notes.value             AS value,
+                       0                            AS is_change,
+                       sent_notes.memo              AS memo,
+                       NULL                         AS recipient_key_scope
+                FROM sent_notes
+                JOIN transactions
+                    ON transactions.id_tx = sent_notes.transaction_id
+                LEFT JOIN v_received_outputs ro ON ro.sent_note_id = sent_notes.id
+                -- join on the accounts table to obtain account UUIDs
+                LEFT JOIN accounts from_account ON from_account.id = sent_notes.from_account_id
+            )
+            -- merge duplicate rows while retaining maximum information
+            SELECT
+                transaction_id,
+                MAX(txid),
+                MAX(mined_height) AS mined_height,
+                output_pool,
+                output_index,
+                MAX(from_account_uuid) AS from_account_uuid,
+                MAX(to_account_uuid) AS to_account_uuid,
+                MAX(to_address) AS to_address,
+                MAX(value) AS value,
+                MAX(is_change) AS is_change,
+                MAX(memo) AS memo,
+                MAX(recipient_key_scope) AS recipient_key_scope
+            FROM unioned
+            GROUP BY transaction_id, output_pool, output_index;
+            "#,
+        )?;
+
+        Ok(())
+    }
+
+    fn down(&self, _transaction: &rusqlite::Transaction) -> Result<(), Self::Error> {
+        Err(WalletMigrationError::CannotRevert(MIGRATION_ID))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use zcash_client_backend::data_api::testing::{pool::dsl::TestDsl, sapling::SaplingPoolTester};
+    use zcash_protocol::{PoolType, value::Zatoshis};
+
+    use crate::{
+        error::SqliteClientError,
+        testing::{BlockCache, db::TestDbFactory},
+        wallet::{KeyScope, encoding::parse_pool_code, init::migrations::tests::test_migrate},
+    };
+
+    #[test]
+    fn migrate() {
+        test_migrate(&[super::MIGRATION_ID]);
+    }
+
+    #[test]
+    fn v_tx_outputs_validity() {
+        let dsf = TestDbFactory::default();
+        let cache = BlockCache::new();
+        let mut st =
+            TestDsl::with_sapling_birthday_account(dsf, cache).build::<SaplingPoolTester>();
+
+        // Add funds to the wallet in a single note
+        let (h, _, _) = st.add_a_single_note_checking_balance(Zatoshis::const_from_u64(60000));
+
+        let mut stmt = st.wallet().conn().prepare(
+            "SELECT transaction_id, output_pool, output_index, value, recipient_key_scope FROM v_tx_outputs"
+        ).unwrap();
+
+        let results = stmt
+            .query_and_then::<_, SqliteClientError, _, _>([], |row| {
+                let txid = row.get::<_, i64>("transaction_id")?;
+                let pool = parse_pool_code(row.get("output_pool")?)?;
+                let output_index = row.get::<_, u32>("output_index")?;
+                let value = row.get::<_, u32>("value")?;
+                let recipient_key_scope = row
+                    .get::<_, Option<i64>>("recipient_key_scope")?
+                    .map(KeyScope::decode)
+                    .transpose()?;
+
+                Ok((txid, pool, output_index, value, recipient_key_scope))
+            })
+            .unwrap()
+            .collect::<Result<Vec<_>, _>>()
+            .unwrap();
+
+        assert_eq!(results.len(), 1);
+        let (_, pool, _, value, recipient_key_scope) = results[0];
+        assert_eq!(pool, PoolType::SAPLING);
+        assert_eq!(value, 60000);
+        assert_eq!(recipient_key_scope, Some(KeyScope::EXTERNAL));
+    }
+}

From 8dfd88ced662561ccbda0ada786bd7c9223e34c4 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Fri, 5 Dec 2025 10:03:12 -0700
Subject: [PATCH 031/263] zcash_client_backend: Add
 `ConfirmationsPolicy::confirmations_until_spendable`

---
 zcash_client_backend/CHANGELOG.md             |   3 +
 zcash_client_backend/src/data_api/wallet.rs   |  84 +++++++++++++++
 zcash_client_sqlite/src/wallet.rs             |  31 +++---
 zcash_client_sqlite/src/wallet/common.rs      | 102 +++++++-----------
 .../migrations/v_tx_outputs_key_scopes.rs     |   2 +-
 5 files changed, 146 insertions(+), 76 deletions(-)

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index ef7d292e62..867669a5ec 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -10,6 +10,9 @@ workspace.
 
 ## [Unreleased]
 
+### Added
+- `zcash_client_backend::data_api::wallet::ConfirmationsPolicy::confirmations_until_spendable`
+
 ### Changed
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`.
 - `zcash_client_backend::wallet::OvkPolicy` has been substantially modified
diff --git a/zcash_client_backend/src/data_api/wallet.rs b/zcash_client_backend/src/data_api/wallet.rs
index 66bf6a6245..9c6adfe76c 100644
--- a/zcash_client_backend/src/data_api/wallet.rs
+++ b/zcash_client_backend/src/data_api/wallet.rs
@@ -512,6 +512,90 @@ impl ConfirmationsPolicy {
     pub fn allow_zero_conf_shielding(&self) -> bool {
         self.allow_zero_conf_shielding
     }
+
+    /// Returns the number of confirmations until a transaction output is considered spendable,
+    /// given information about the output and the inputs to the transaction that produced it.
+    ///
+    /// # Parameters
+    /// - `target_height`: The minimum height at which the output will be potentially spent.
+    /// - `pool_type`: The Zcash pool that the output was received into.
+    /// - `receiving_key_scope`: The ZIP 32 [`Scope`] of the key that received the output,
+    ///   or `None` if the scope is unknown or corresponds to the ephemeral transparent
+    ///   key scope.
+    /// - `mined_height`: The block height at which the transaction that produced the output was
+    ///   mined, if any.
+    /// - `tx_trusted`: A boolean flag indicating whether the received transaction has been
+    ///   explicitly marked as trusted by the user.
+    /// - `max_shielding_input_height`: For outputs that are the result of wallet-internal
+    ///   shielding transactions, the maximum height at which any transparent input to that
+    ///   transaction was received.
+    /// - `tx_shielding_inputs_trusted`: For outputs that are the result of wallet-internal
+    ///   shielding transactions, a flag indicating whether all transparent inputs to that
+    ///   transaction have been explicitly marked as trusted by the user.
+    #[allow(clippy::too_many_arguments)]
+    pub fn confirmations_until_spendable(
+        &self,
+        target_height: TargetHeight,
+        pool_type: PoolType,
+        receiving_key_scope: Option<Scope>,
+        mined_height: Option<BlockHeight>,
+        tx_trusted: bool,
+        max_shielding_input_height: Option<BlockHeight>,
+        tx_shielding_inputs_trusted: bool,
+    ) -> u32 {
+        // Trusted outputs of transactions mined at heights greater than `trusted_height` will not
+        // be treated as spendable.
+        let trusted_height = target_height.saturating_sub(u32::from(self.trusted));
+        // Untrusted outputs of transactions mined at heights greater than `untrusted_height` will
+        // not be treated as spendable.
+        let untrusted_height = target_height.saturating_sub(u32::from(self.untrusted));
+
+        // Calculate the possible options for confirmations.
+        // - If the output's tx is unmined, we are constantly waiting for the maximum number of
+        //   confirmations.
+        // - If the output's tx is mined, the required number of confirmations decreases to a floor
+        //   of zero.
+        let confs_for_trusted =
+            mined_height.map_or(u32::from(self.trusted), |h| h - trusted_height);
+        let confs_for_untrusted =
+            mined_height.map_or(u32::from(self.untrusted), |h| h - untrusted_height);
+        match pool_type {
+            PoolType::Transparent => {
+                #[cfg(feature = "transparent-inputs")]
+                let zc_shielding = self.allow_zero_conf_shielding;
+                #[cfg(not(feature = "transparent-inputs"))]
+                let zc_shielding = false;
+
+                if zc_shielding {
+                    0
+                } else if tx_trusted || receiving_key_scope == Some(Scope::Internal) {
+                    confs_for_trusted
+                } else {
+                    confs_for_untrusted
+                }
+            }
+            PoolType::Shielded(_) => {
+                if tx_trusted {
+                    confs_for_trusted
+                } else if receiving_key_scope == Some(Scope::Internal) {
+                    // If the note was the output of a shielding transaction, we use the mined
+                    // height of the transparent source funds & their trust status instead of the
+                    // height at which the shielding transaction was mined.
+                    if let Some(h) = max_shielding_input_height {
+                        if tx_shielding_inputs_trusted {
+                            h - trusted_height
+                        } else {
+                            h - untrusted_height
+                        }
+                    } else {
+                        confs_for_trusted
+                    }
+                } else {
+                    confs_for_untrusted
+                }
+            }
+        }
+    }
 }
 
 /// Select transaction inputs, compute fees, and construct a proposal for a transaction or series
diff --git a/zcash_client_sqlite/src/wallet.rs b/zcash_client_sqlite/src/wallet.rs
index e43a402b8f..ab77769a5c 100644
--- a/zcash_client_sqlite/src/wallet.rs
+++ b/zcash_client_sqlite/src/wallet.rs
@@ -2144,8 +2144,6 @@ pub(crate) fn get_wallet_summary<P: consensus::Parameters>(
 
         let trusted_height =
             target_height.saturating_sub(u32::from(confirmations_policy.trusted()));
-        let untrusted_height =
-            target_height.saturating_sub(u32::from(confirmations_policy.untrusted()));
 
         let any_spendable =
             anchor_height.map_or(Ok(false), |h| is_any_spendable(tx, h, table_prefix))?;
@@ -2153,8 +2151,10 @@ pub(crate) fn get_wallet_summary<P: consensus::Parameters>(
         let mut stmt_select_notes = tx.prepare_cached(&format!(
             "SELECT accounts.uuid, rn.id, rn.value, rn.is_change, rn.recipient_key_scope,
                     scan_state.max_priority,
-                    t.mined_height AS mined_height,
-                    MAX(tt.mined_height) AS max_shielding_input_height
+                    t.mined_height,
+                    IFNULL(t.trust_status, 0) AS trust_status,
+                    MAX(tt.mined_height) AS max_shielding_input_height,
+                    MIN(IFNULL(tt.trust_status, 0)) AS min_shielding_input_trust
              FROM {table_prefix}_received_notes rn
              INNER JOIN accounts ON accounts.id = rn.account_id
              INNER JOIN transactions t ON t.id_tx = rn.transaction_id
@@ -2213,25 +2213,28 @@ pub(crate) fn get_wallet_summary<P: consensus::Parameters>(
                 .get::<_, Option<u32>>("mined_height")?
                 .map(BlockHeight::from);
 
+            let tx_trusted = row.get::<_, bool>("trust_status")?;
+
             let max_shielding_input_height = row
                 .get::<_, Option<u32>>("max_shielding_input_height")?
                 .map(BlockHeight::from);
 
+            let tx_shielding_inputs_trusted = row.get::<_, bool>("min_shielding_input_trust")?;
+
             // A note is spendable if we have enough chain tip information to construct witnesses,
             // the shard that its witness resides in is sufficiently scanned that we can construct
             // the witness for the note, and the note has enough confirmations to be spent.
             let is_spendable = any_spendable
                 && max_priority <= ScanPriority::Scanned
-                && match recipient_key_scope {
-                    Some(KeyScope::INTERNAL) => {
-                        // The note was has at least `trusted` confirmations.
-                        received_height.iter().any(|h| h <= &trusted_height) &&
-                        // And, if the note was the output of a shielding transaction, its
-                        // transparent inputs have at least `untrusted` confirmations.
-                        max_shielding_input_height.iter().all(|h| h <= &untrusted_height)
-                    }
-                    _ => received_height.iter().any(|h| h <= &untrusted_height),
-                };
+                && confirmations_policy.confirmations_until_spendable(
+                    target_height,
+                    PoolType::Shielded(protocol),
+                    recipient_key_scope.and_then(|k| zip32::Scope::try_from(k).ok()),
+                    received_height,
+                    tx_trusted,
+                    max_shielding_input_height,
+                    tx_shielding_inputs_trusted,
+                ) == 0;
 
             let is_pending_change =
                 is_change && received_height.iter().all(|h| h > &trusted_height);
diff --git a/zcash_client_sqlite/src/wallet/common.rs b/zcash_client_sqlite/src/wallet/common.rs
index 757413a362..25f7193ebf 100644
--- a/zcash_client_sqlite/src/wallet/common.rs
+++ b/zcash_client_sqlite/src/wallet/common.rs
@@ -3,7 +3,6 @@
 use incrementalmerkletree::Position;
 use rusqlite::{Connection, Row, named_params, types::Value};
 use std::{num::NonZeroU64, rc::Rc};
-use zip32::Scope;
 
 use zcash_client_backend::{
     data_api::{
@@ -456,13 +455,9 @@ where
         },
     )?;
 
-    let trusted_height = target_height.saturating_sub(u32::from(confirmations_policy.trusted()));
-    let untrusted_height =
-        target_height.saturating_sub(u32::from(confirmations_policy.untrusted()));
-
     row_results
         .map(|t| match t? {
-            (Some(note), max_shard_priority, trusted, tx_shielding_inputs_trusted) => {
+            (Some(note), max_shard_priority, tx_trusted, tx_shielding_inputs_trusted) => {
                 let shard_scanned = max_shard_priority
                     .iter()
                     .any(|p| *p <= ScanPriority::Scanned);
@@ -472,27 +467,15 @@ where
                     .zip(note_request.anchor_height())
                     .is_some_and(|(h, ah)| h <= ah);
 
-                let has_confirmations = match (note.mined_height(), note.spending_key_scope()) {
-                    (None, _) => false,
-                    (Some(received_height), Scope::Internal) => {
-                        // The note has the required number of confirmations for a trusted note.
-                        received_height <= trusted_height &&
-                        // if the note was the output of a shielding transaction
-                        note.max_shielding_input_height().iter().all(|h| {
-                            // its inputs have at least `untrusted` confirmations
-                            h <= &untrusted_height ||
-                            // or its inputs are trusted and have at least `trusted` confirmations
-                            (h <= &trusted_height && tx_shielding_inputs_trusted)
-                        })
-                    }
-                    (Some(received_height), Scope::External) => {
-                        // The note has the required number of confirmations for an untrusted note.
-                        received_height <= untrusted_height ||
-                        // or it is the output of an explicitly trusted tx and has at least
-                        // `trusted` confirmations
-                        (received_height <= trusted_height && trusted)
-                    }
-                };
+                let has_confirmations = confirmations_policy.confirmations_until_spendable(
+                    target_height,
+                    PoolType::Shielded(protocol),
+                    Some(note.spending_key_scope()),
+                    note.mined_height(),
+                    tx_trusted,
+                    note.max_shielding_input_height(),
+                    tx_shielding_inputs_trusted,
+                ) == 0;
 
                 match (
                     note_request,
@@ -637,50 +620,47 @@ where
         ],
         |row| {
             let tx_trust_status = row.get::<_, bool>("trust_status")?;
+            let max_shielding_input_height = row
+                .get::<_, Option<u32>>("max_shielding_input_height")?
+                .map(BlockHeight::from);
             let tx_shielding_inputs_trusted = row.get::<_, bool>("min_shielding_input_trust")?;
             let note = to_spendable_note(params, row)?;
 
-            Ok(note.map(|n| (n, tx_trust_status, tx_shielding_inputs_trusted)))
+            Ok(note.map(|n| {
+                (
+                    n,
+                    tx_trust_status,
+                    max_shielding_input_height,
+                    tx_shielding_inputs_trusted,
+                )
+            }))
         },
     )?;
 
-    let trusted_height = target_height.saturating_sub(u32::from(confirmations_policy.trusted()));
-    let untrusted_height =
-        target_height.saturating_sub(u32::from(confirmations_policy.untrusted()));
-
     notes
         .filter_map(|result_maybe_note| {
             let result_note = result_maybe_note.transpose()?;
             result_note
-                .map(|(note, trusted, tx_shielding_inputs_trusted)| {
-                    let received_height = note
-                        .mined_height()
-                        .expect("mined height checked to be non-null");
-
-                    let has_confirmations = match note.spending_key_scope() {
-                        Scope::Internal => {
-                            // The note was has at least `trusted` confirmations.
-                            received_height <= trusted_height &&
-                            // And, if the note was the output of a shielding transaction, its
-                            // transparent inputs have at least `untrusted` confirmations.
-                            note.max_shielding_input_height().iter().all(|h| {
-                                // its inputs have at least `untrusted` confirmations
-                                h <= &untrusted_height ||
-                                // or its inputs are trusted and have at least `trusted` confirmations
-                                (h <= &trusted_height && tx_shielding_inputs_trusted)
-                            })
-                        }
-                        Scope::External => {
-                            // The note has the required number of confirmations for an untrusted note.
-                            received_height <= untrusted_height ||
-                            // or it is the output of an explicitly trusted tx and has at least
-                            // `trusted` confirmations
-                            (received_height <= trusted_height && trusted)
-                        }
-                    };
-
-                    has_confirmations.then_some(note)
-                })
+                .map(
+                    |(
+                        note,
+                        tx_trusted,
+                        max_shielding_input_height,
+                        tx_shielding_inputs_trusted,
+                    )| {
+                        let has_confirmations = confirmations_policy.confirmations_until_spendable(
+                            target_height,
+                            PoolType::Shielded(protocol),
+                            Some(note.spending_key_scope()),
+                            note.mined_height(),
+                            tx_trusted,
+                            max_shielding_input_height,
+                            tx_shielding_inputs_trusted,
+                        ) == 0;
+
+                        has_confirmations.then_some(note)
+                    },
+                )
                 .transpose()
         })
         .collect::<Result<Vec<_>, _>>()
diff --git a/zcash_client_sqlite/src/wallet/init/migrations/v_tx_outputs_key_scopes.rs b/zcash_client_sqlite/src/wallet/init/migrations/v_tx_outputs_key_scopes.rs
index 03b103f048..fac2bbd5df 100644
--- a/zcash_client_sqlite/src/wallet/init/migrations/v_tx_outputs_key_scopes.rs
+++ b/zcash_client_sqlite/src/wallet/init/migrations/v_tx_outputs_key_scopes.rs
@@ -132,7 +132,7 @@ mod tests {
             TestDsl::with_sapling_birthday_account(dsf, cache).build::<SaplingPoolTester>();
 
         // Add funds to the wallet in a single note
-        let (h, _, _) = st.add_a_single_note_checking_balance(Zatoshis::const_from_u64(60000));
+        let (_h, _, _) = st.add_a_single_note_checking_balance(Zatoshis::const_from_u64(60000));
 
         let mut stmt = st.wallet().conn().prepare(
             "SELECT transaction_id, output_pool, output_index, value, recipient_key_scope FROM v_tx_outputs"

From 108e1724f43b40d9e9529a039fbce0bc1e7a2e6e Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Fri, 21 Nov 2025 13:45:01 -0700
Subject: [PATCH 032/263] zcash_client_backend: Add
 `WalletRead::get_received_outputs`

Fixes #2045
---
 zcash_client_backend/CHANGELOG.md             |  2 +
 zcash_client_backend/src/data_api.rs          | 64 ++++++++++++++-
 zcash_client_backend/src/data_api/testing.rs  | 15 +++-
 .../src/data_api/testing/pool.rs              | 17 +++-
 zcash_client_memory/src/wallet_read.rs        | 12 ++-
 zcash_client_sqlite/src/lib.rs                | 20 ++++-
 zcash_client_sqlite/src/wallet.rs             | 80 ++++++++++++++++++-
 zcash_client_sqlite/src/wallet/db.rs          | 41 +++++-----
 .../migrations/v_tx_outputs_key_scopes.rs     | 41 +++++-----
 9 files changed, 241 insertions(+), 51 deletions(-)

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index 867669a5ec..178d8efff7 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -11,6 +11,7 @@ workspace.
 ## [Unreleased]
 
 ### Added
+- `zcash_client_backend::data_api::ReceivedTransactionOutput`
 - `zcash_client_backend::data_api::wallet::ConfirmationsPolicy::confirmations_until_spendable`
 
 ### Changed
@@ -32,6 +33,7 @@ workspace.
     key that will be used to encrypt any wallet-internal change outputs
     that would otherwise only be recoverable using the wallet's internal
     IVK.
+- `zcash_client_backend::data_api::WalletRead` has added method `get_received_outputs.
 
 ## [0.21.0] - 2025-11-05
 
diff --git a/zcash_client_backend/src/data_api.rs b/zcash_client_backend/src/data_api.rs
index 95a3290170..714a7961f4 100644
--- a/zcash_client_backend/src/data_api.rs
+++ b/zcash_client_backend/src/data_api.rs
@@ -83,7 +83,7 @@ use zcash_keys::{
 };
 use zcash_primitives::{block::BlockHash, transaction::Transaction};
 use zcash_protocol::{
-    ShieldedProtocol, TxId,
+    PoolType, ShieldedProtocol, TxId,
     consensus::BlockHeight,
     memo::{Memo, MemoBytes},
     value::{BalanceError, Zatoshis},
@@ -1897,6 +1897,17 @@ pub trait WalletRead {
     /// transaction data requests, such as when it is necessary to fill in purely-transparent
     /// transaction history by walking the chain backwards via transparent inputs.
     fn transaction_data_requests(&self) -> Result<Vec<TransactionDataRequest>, Self::Error>;
+
+    /// Returns a vector of [`ReceivedTransactionOutput`] values describing the outputs of the
+    /// specified transaction that were received by the wallet. The number of confirmations until
+    /// each received output will be considered spendable is determined based upon the specified
+    /// target height and confirmations policy.
+    fn get_received_outputs(
+        &self,
+        txid: TxId,
+        target_height: TargetHeight,
+        confirmations_policy: ConfirmationsPolicy,
+    ) -> Result<Vec<ReceivedTransactionOutput>, Self::Error>;
 }
 
 /// Read-only operations required for testing light wallet functions.
@@ -2469,6 +2480,57 @@ impl<'a, AccountId> SentTransaction<'a, AccountId> {
     }
 }
 
+/// High-level information about the output of a transaction received by the wallet.
+///
+/// This type is capable of representing both shielded and transparent outputs. It does not
+/// internally store the transaction ID, so it must be interpreted in the context of a caller
+/// having requested output information for a specific transaction.
+pub struct ReceivedTransactionOutput {
+    pool_type: PoolType,
+    output_index: usize,
+    value: Zatoshis,
+    confirmations_until_spendable: u32,
+}
+
+impl ReceivedTransactionOutput {
+    /// Constructs a [`ReceivedTransactionOutput`] from its constituent parts.
+    pub fn from_parts(
+        pool_type: PoolType,
+        output_index: usize,
+        value: Zatoshis,
+        confirmations_until_spendable: u32,
+    ) -> Self {
+        Self {
+            pool_type,
+            output_index,
+            value,
+            confirmations_until_spendable,
+        }
+    }
+
+    /// Returns the pool in which the output value was received.
+    pub fn pool_type(&self) -> PoolType {
+        self.pool_type
+    }
+
+    /// Returns the index of the output among the transaction's outputs to the associated pool.
+    pub fn output_index(&self) -> usize {
+        self.output_index
+    }
+
+    /// Returns the value of the output.
+    pub fn value(&self) -> Zatoshis {
+        self.value
+    }
+
+    /// Returns the number of confirmations required for the output to be treated as spendable,
+    /// given a [`ConfirmationsPolicy`] that was specified at the time of the request for this
+    /// data.
+    pub fn confirmations_until_spendable(&self) -> u32 {
+        self.confirmations_until_spendable
+    }
+}
+
 /// An output of a transaction generated by the wallet.
 ///
 /// This type is capable of representing both shielded and transparent outputs.
diff --git a/zcash_client_backend/src/data_api/testing.rs b/zcash_client_backend/src/data_api/testing.rs
index 6f34c5bc24..c2c8731cfc 100644
--- a/zcash_client_backend/src/data_api/testing.rs
+++ b/zcash_client_backend/src/data_api/testing.rs
@@ -47,9 +47,9 @@ use zip321::Payment;
 use super::{
     Account, AccountBalance, AccountBirthday, AccountMeta, AccountPurpose, AccountSource,
     AddressInfo, BlockMetadata, DecryptedTransaction, InputSource, NoteFilter, NullifierQuery,
-    ReceivedNotes, SAPLING_SHARD_HEIGHT, ScannedBlock, SeedRelevance, SentTransaction,
-    TransactionDataRequest, TransactionStatus, WalletCommitmentTrees, WalletRead, WalletSummary,
-    WalletTest, WalletWrite, Zip32Derivation,
+    ReceivedNotes, ReceivedTransactionOutput, SAPLING_SHARD_HEIGHT, ScannedBlock, SeedRelevance,
+    SentTransaction, TransactionDataRequest, TransactionStatus, WalletCommitmentTrees, WalletRead,
+    WalletSummary, WalletTest, WalletWrite, Zip32Derivation,
     chain::{BlockSource, ChainState, CommitmentTreeRoot, ScanSummary, scan_cached_blocks},
     error::Error,
     scanning::ScanRange,
@@ -2781,6 +2781,15 @@ impl WalletRead for MockWalletDb {
     fn transaction_data_requests(&self) -> Result<Vec<TransactionDataRequest>, Self::Error> {
         Ok(vec![])
     }
+
+    fn get_received_outputs(
+        &self,
+        _txid: TxId,
+        _target_height: TargetHeight,
+        _confirmations_policy: ConfirmationsPolicy,
+    ) -> Result<Vec<ReceivedTransactionOutput>, Self::Error> {
+        Ok(vec![])
+    }
 }
 
 impl WalletWrite for MockWalletDb {
diff --git a/zcash_client_backend/src/data_api/testing/pool.rs b/zcash_client_backend/src/data_api/testing/pool.rs
index d9bb512baa..d278566b45 100644
--- a/zcash_client_backend/src/data_api/testing/pool.rs
+++ b/zcash_client_backend/src/data_api/testing/pool.rs
@@ -391,13 +391,28 @@ pub fn zip_315_confirmations_test_steps<T: ShieldedPoolTester>(
     let txid = r.txids()[0];
 
     // Mark the external input as explicitly trusted, if so requested
-    if input_trust == InputTrust::ExternalTrusted {
+    let trusted = input_trust == InputTrust::ExternalTrusted;
+    if trusted {
         st.wallet_mut().set_tx_trust(txid, true).unwrap();
     }
 
     let add_confirmation = |i: u32| {
         let (h, _) = st.generate_empty_block();
         st.scan_cached_blocks(h, 1);
+        let outputs = st
+            .wallet()
+            .get_received_outputs(txid, TargetHeight::from(h + 1), confirmations_policy)
+            .unwrap();
+        assert_eq!(outputs.len(), 1);
+        assert_eq!(
+            outputs[0].confirmations_until_spendable(),
+            u32::from(if trusted {
+                confirmations_policy.trusted()
+            } else {
+                confirmations_policy.untrusted()
+            })
+            .saturating_sub(i + 1)
+        );
         ConfirmationStep {
             i,
             confirmation_requirement: min_confirmations,
diff --git a/zcash_client_memory/src/wallet_read.rs b/zcash_client_memory/src/wallet_read.rs
index ff95498fae..e13f023346 100644
--- a/zcash_client_memory/src/wallet_read.rs
+++ b/zcash_client_memory/src/wallet_read.rs
@@ -7,7 +7,8 @@ use nonempty::NonEmpty;
 use secrecy::{ExposeSecret, SecretVec};
 use shardtree::store::ShardStore as _;
 use zcash_client_backend::data_api::{
-    AddressInfo, BlockMetadata, NullifierQuery, WalletRead, WalletSummary, Zip32Derivation,
+    AddressInfo, BlockMetadata, NullifierQuery, ReceivedTransactionOutput, WalletRead,
+    WalletSummary, Zip32Derivation,
     scanning::ScanRange,
     wallet::{ConfirmationsPolicy, TargetHeight},
 };
@@ -738,6 +739,15 @@ impl<P: consensus::Parameters> WalletRead for MemoryWalletDb<P> {
     fn utxo_query_height(&self, _account: Self::AccountId) -> Result<BlockHeight, Self::Error> {
         todo!()
     }
+
+    fn get_received_outputs(
+        &self,
+        _txid: TxId,
+        _target_height: TargetHeight,
+        _confirmations_policy: ConfirmationsPolicy,
+    ) -> Result<Vec<ReceivedTransactionOutput>, Self::Error> {
+        todo!()
+    }
 }
 
 /// Copied from zcash_client_sqlite::wallet::seed_matches_derived_account
diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs
index 7798bd1df2..c5348913a8 100644
--- a/zcash_client_sqlite/src/lib.rs
+++ b/zcash_client_sqlite/src/lib.rs
@@ -58,9 +58,9 @@ use zcash_client_backend::{
     data_api::{
         self, Account, AccountBirthday, AccountMeta, AccountPurpose, AccountSource, AddressInfo,
         BlockMetadata, DecryptedTransaction, InputSource, NoteFilter, NullifierQuery,
-        ReceivedNotes, SAPLING_SHARD_HEIGHT, ScannedBlock, SeedRelevance, SentTransaction,
-        TargetValue, TransactionDataRequest, WalletCommitmentTrees, WalletRead, WalletSummary,
-        WalletWrite, Zip32Derivation,
+        ReceivedNotes, ReceivedTransactionOutput, SAPLING_SHARD_HEIGHT, ScannedBlock,
+        SeedRelevance, SentTransaction, TargetValue, TransactionDataRequest, WalletCommitmentTrees,
+        WalletRead, WalletSummary, WalletWrite, Zip32Derivation,
         chain::{BlockSource, ChainState, CommitmentTreeRoot},
         scanning::{ScanPriority, ScanRange},
         wallet::{ConfirmationsPolicy, TargetHeight},
@@ -1061,6 +1061,20 @@ impl<C: Borrow<rusqlite::Connection>, P: consensus::Parameters, CL, R> WalletRea
             Ok(vec![])
         }
     }
+
+    fn get_received_outputs(
+        &self,
+        txid: TxId,
+        target_height: TargetHeight,
+        confirmations_policy: ConfirmationsPolicy,
+    ) -> Result<Vec<ReceivedTransactionOutput>, Self::Error> {
+        wallet::get_received_outputs(
+            self.conn.borrow(),
+            txid,
+            target_height,
+            confirmations_policy,
+        )
+    }
 }
 
 #[cfg(any(test, feature = "test-dependencies"))]
diff --git a/zcash_client_sqlite/src/wallet.rs b/zcash_client_sqlite/src/wallet.rs
index ab77769a5c..e632245256 100644
--- a/zcash_client_sqlite/src/wallet.rs
+++ b/zcash_client_sqlite/src/wallet.rs
@@ -75,7 +75,7 @@ use std::{
 
 use encoding::{
     KeyScope, ReceiverFlags, account_kind_code, decode_diversifier_index_be,
-    encode_diversifier_index_be, memo_repr, pool_code,
+    encode_diversifier_index_be, memo_repr, parse_pool_code, pool_code,
 };
 use incrementalmerkletree::{Marking, Retention};
 use rusqlite::{self, Connection, OptionalExtension, named_params, params};
@@ -89,9 +89,9 @@ use zcash_client_backend::{
     DecryptedOutput,
     data_api::{
         Account as _, AccountBalance, AccountBirthday, AccountPurpose, AccountSource, AddressInfo,
-        AddressSource, BlockMetadata, DecryptedTransaction, Progress, Ratio, SAPLING_SHARD_HEIGHT,
-        SentTransaction, SentTransactionOutput, TransactionDataRequest, TransactionStatus,
-        WalletSummary, Zip32Derivation,
+        AddressSource, BlockMetadata, DecryptedTransaction, Progress, Ratio,
+        ReceivedTransactionOutput, SAPLING_SHARD_HEIGHT, SentTransaction, SentTransactionOutput,
+        TransactionDataRequest, TransactionStatus, WalletSummary, Zip32Derivation,
         scanning::{ScanPriority, ScanRange},
         wallet::{ConfirmationsPolicy, TargetHeight},
     },
@@ -4765,6 +4765,78 @@ pub(crate) fn get_block_range(
     .map_err(SqliteClientError::from)
 }
 
+pub(crate) fn get_received_outputs(
+    conn: &rusqlite::Connection,
+    txid: TxId,
+    target_height: TargetHeight,
+    confirmations_policy: ConfirmationsPolicy,
+) -> Result<Vec<ReceivedTransactionOutput>, SqliteClientError> {
+    let mut stmt_received_outputs = conn.prepare_cached(
+        "SELECT
+             vto.output_pool,
+             vto.output_index,
+             vto.recipient_key_scope,
+             vto.value,
+             vto.tx_mined_height,
+             IFNULL(vto.tx_trust_status, 0) AS tx_trust_status,
+             MAX(tt.mined_height) AS max_shielding_input_height,
+             MIN(IFNULL(tt.trust_status, 0)) AS min_shielding_input_trust
+         FROM v_tx_outputs vto
+         LEFT OUTER JOIN transparent_received_output_spends ros
+            ON ros.transaction_id = vto.transaction_id
+         LEFT OUTER JOIN transparent_received_outputs tro
+            ON tro.id = ros.transparent_received_output_id
+         LEFT OUTER JOIN transactions tt
+            ON tt.id_tx = tro.transaction_id
+         WHERE vto.txid = :txid
+         GROUP BY vto.output_pool, vto.output_index",
+    )?;
+
+    let results = stmt_received_outputs
+        .query_and_then::<_, SqliteClientError, _, _>(
+            named_params![":txid": txid.as_ref()],
+            |row| {
+                let pool_type = parse_pool_code(row.get("output_pool")?)?;
+                let output_index = row.get("output_index")?;
+                let value = Zatoshis::from_nonnegative_i64(row.get("value")?)?;
+                let mined_height = row
+                    .get::<_, Option<u32>>("tx_mined_height")?
+                    .map(BlockHeight::from);
+                let max_shielding_input_height = row
+                    .get::<_, Option<u32>>("max_shielding_input_height")?
+                    .map(BlockHeight::from);
+                let tx_shielding_inputs_trusted =
+                    row.get::<_, bool>("min_shielding_input_trust")?;
+                let key_scope = row
+                    .get::<_, Option<i64>>("recipient_key_scope")?
+                    .map(KeyScope::decode)
+                    .transpose()?;
+                let tx_trusted = row.get::<_, bool>("tx_trust_status")?;
+
+                let confirmations_until_spendable = confirmations_policy
+                    .confirmations_until_spendable(
+                        target_height,
+                        pool_type,
+                        key_scope.and_then(|s| zip32::Scope::try_from(s).ok()),
+                        mined_height,
+                        tx_trusted,
+                        max_shielding_input_height,
+                        tx_shielding_inputs_trusted,
+                    );
+
+                Ok(ReceivedTransactionOutput::from_parts(
+                    pool_type,
+                    output_index,
+                    value,
+                    confirmations_until_spendable,
+                ))
+            },
+        )?
+        .collect::<Result<Vec<_>, _>>()?;
+
+    Ok(results)
+}
+
 #[cfg(any(test, feature = "test-dependencies"))]
 pub mod testing {
     use incrementalmerkletree::Position;
diff --git a/zcash_client_sqlite/src/wallet/db.rs b/zcash_client_sqlite/src/wallet/db.rs
index 148ca54e16..7513c883a7 100644
--- a/zcash_client_sqlite/src/wallet/db.rs
+++ b/zcash_client_sqlite/src/wallet/db.rs
@@ -1127,9 +1127,10 @@ pub(super) const VIEW_TX_OUTPUTS: &str = "
 CREATE VIEW v_tx_outputs AS
 WITH unioned AS (
     -- select all outputs received by the wallet
-    SELECT transactions.id_tx           AS transaction_id,
-           transactions.txid            AS txid,
-           transactions.mined_height    AS mined_height,
+    SELECT t.id_tx                      AS transaction_id,
+           t.txid                       AS txid,
+           t.mined_height               AS mined_height,
+           IFNULL(t.trust_status, 0)    AS trust_status,
            ro.pool                      AS output_pool,
            ro.output_index              AS output_index,
            from_account.uuid            AS from_account_uuid,
@@ -1141,8 +1142,8 @@ WITH unioned AS (
            ro.memo                      AS memo,
            a.key_scope                  AS recipient_key_scope
     FROM v_received_outputs ro
-    JOIN transactions
-        ON transactions.id_tx = ro.transaction_id
+    JOIN transactions t
+        ON t.id_tx = ro.transaction_id
     LEFT JOIN addresses a ON a.id = ro.address_id
     -- join to the sent_notes table to obtain `from_account_id`
     LEFT JOIN sent_notes ON sent_notes.id = ro.sent_note_id
@@ -1151,9 +1152,10 @@ WITH unioned AS (
     LEFT JOIN accounts to_account ON to_account.id = ro.account_id
     UNION ALL
     -- select all outputs sent from the wallet to external recipients
-    SELECT transactions.id_tx           AS transaction_id,
-           transactions.txid            AS txid,
-           transactions.mined_height    AS mined_height,
+    SELECT t.id_tx                      AS transaction_id,
+           t.txid                       AS txid,
+           t.mined_height               AS mined_height,
+           IFNULL(t.trust_status, 0)    AS trust_status,
            sent_notes.output_pool       AS output_pool,
            sent_notes.output_index      AS output_index,
            from_account.uuid            AS from_account_uuid,
@@ -1165,8 +1167,8 @@ WITH unioned AS (
            sent_notes.memo              AS memo,
            NULL                         AS recipient_key_scope
     FROM sent_notes
-    JOIN transactions
-        ON transactions.id_tx = sent_notes.transaction_id
+    JOIN transactions t
+        ON t.id_tx = sent_notes.transaction_id
     LEFT JOIN v_received_outputs ro ON ro.sent_note_id = sent_notes.id
     -- join on the accounts table to obtain account UUIDs
     LEFT JOIN accounts from_account ON from_account.id = sent_notes.from_account_id
@@ -1174,17 +1176,18 @@ WITH unioned AS (
 -- merge duplicate rows while retaining maximum information
 SELECT
     transaction_id,
-    MAX(txid),
-    MAX(mined_height) AS mined_height,
+    MAX(txid)                   AS txid,
+    MAX(mined_height)           AS tx_mined_height,
+    MIN(trust_status)           AS tx_trust_status,
     output_pool,
     output_index,
-    MAX(from_account_uuid) AS from_account_uuid,
-    MAX(to_account_uuid) AS to_account_uuid,
-    MAX(to_address) AS to_address,
-    MAX(value) AS value,
-    MAX(is_change) AS is_change,
-    MAX(memo) AS memo,
-    MAX(recipient_key_scope) AS recipient_key_scope
+    MAX(from_account_uuid)      AS from_account_uuid,
+    MAX(to_account_uuid)        AS to_account_uuid,
+    MAX(to_address)             AS to_address,
+    MAX(value)                  AS value,
+    MAX(is_change)              AS is_change,
+    MAX(memo)                   AS memo,
+    MAX(recipient_key_scope)    AS recipient_key_scope
 FROM unioned
 GROUP BY transaction_id, output_pool, output_index";
 
diff --git a/zcash_client_sqlite/src/wallet/init/migrations/v_tx_outputs_key_scopes.rs b/zcash_client_sqlite/src/wallet/init/migrations/v_tx_outputs_key_scopes.rs
index fac2bbd5df..a08150e90d 100644
--- a/zcash_client_sqlite/src/wallet/init/migrations/v_tx_outputs_key_scopes.rs
+++ b/zcash_client_sqlite/src/wallet/init/migrations/v_tx_outputs_key_scopes.rs
@@ -37,9 +37,10 @@ impl RusqliteMigration for Migration {
             CREATE VIEW v_tx_outputs AS
             WITH unioned AS (
                 -- select all outputs received by the wallet
-                SELECT transactions.id_tx           AS transaction_id,
-                       transactions.txid            AS txid,
-                       transactions.mined_height    AS mined_height,
+                SELECT t.id_tx                      AS transaction_id,
+                       t.txid                       AS txid,
+                       t.mined_height               AS mined_height,
+                       IFNULL(t.trust_status, 0)    AS trust_status,
                        ro.pool                      AS output_pool,
                        ro.output_index              AS output_index,
                        from_account.uuid            AS from_account_uuid,
@@ -51,8 +52,8 @@ impl RusqliteMigration for Migration {
                        ro.memo                      AS memo,
                        a.key_scope                  AS recipient_key_scope
                 FROM v_received_outputs ro
-                JOIN transactions
-                    ON transactions.id_tx = ro.transaction_id
+                JOIN transactions t
+                    ON t.id_tx = ro.transaction_id
                 LEFT JOIN addresses a ON a.id = ro.address_id
                 -- join to the sent_notes table to obtain `from_account_id`
                 LEFT JOIN sent_notes ON sent_notes.id = ro.sent_note_id
@@ -61,9 +62,10 @@ impl RusqliteMigration for Migration {
                 LEFT JOIN accounts to_account ON to_account.id = ro.account_id
                 UNION ALL
                 -- select all outputs sent from the wallet to external recipients
-                SELECT transactions.id_tx           AS transaction_id,
-                       transactions.txid            AS txid,
-                       transactions.mined_height    AS mined_height,
+                SELECT t.id_tx                      AS transaction_id,
+                       t.txid                       AS txid,
+                       t.mined_height               AS mined_height,
+                       IFNULL(t.trust_status, 0)    AS trust_status,
                        sent_notes.output_pool       AS output_pool,
                        sent_notes.output_index      AS output_index,
                        from_account.uuid            AS from_account_uuid,
@@ -75,8 +77,8 @@ impl RusqliteMigration for Migration {
                        sent_notes.memo              AS memo,
                        NULL                         AS recipient_key_scope
                 FROM sent_notes
-                JOIN transactions
-                    ON transactions.id_tx = sent_notes.transaction_id
+                JOIN transactions t
+                    ON t.id_tx = sent_notes.transaction_id
                 LEFT JOIN v_received_outputs ro ON ro.sent_note_id = sent_notes.id
                 -- join on the accounts table to obtain account UUIDs
                 LEFT JOIN accounts from_account ON from_account.id = sent_notes.from_account_id
@@ -84,17 +86,18 @@ impl RusqliteMigration for Migration {
             -- merge duplicate rows while retaining maximum information
             SELECT
                 transaction_id,
-                MAX(txid),
-                MAX(mined_height) AS mined_height,
+                MAX(txid)                   AS txid,
+                MAX(mined_height)           AS tx_mined_height,
+                MIN(trust_status)           AS tx_trust_status,
                 output_pool,
                 output_index,
-                MAX(from_account_uuid) AS from_account_uuid,
-                MAX(to_account_uuid) AS to_account_uuid,
-                MAX(to_address) AS to_address,
-                MAX(value) AS value,
-                MAX(is_change) AS is_change,
-                MAX(memo) AS memo,
-                MAX(recipient_key_scope) AS recipient_key_scope
+                MAX(from_account_uuid)      AS from_account_uuid,
+                MAX(to_account_uuid)        AS to_account_uuid,
+                MAX(to_address)             AS to_address,
+                MAX(value)                  AS value,
+                MAX(is_change)              AS is_change,
+                MAX(memo)                   AS memo,
+                MAX(recipient_key_scope)    AS recipient_key_scope
             FROM unioned
             GROUP BY transaction_id, output_pool, output_index;
             "#,

From e74064ce6906a7dcd9ceca0087e7c03f8251a122 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris.nuttycombe@gmail.com>
Date: Mon, 8 Dec 2025 08:52:29 -0700
Subject: [PATCH 033/263] Apply suggestions from code review

Co-authored-by: Jack Grigg <thestr4d@gmail.com>
---
 zcash_client_sqlite/CHANGELOG.md                  | 3 ++-
 zcash_client_sqlite/src/wallet/db.rs              | 2 +-
 zcash_client_sqlite/src/wallet/init/migrations.rs | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/zcash_client_sqlite/CHANGELOG.md b/zcash_client_sqlite/CHANGELOG.md
index 84c2eb256a..717aee3615 100644
--- a/zcash_client_sqlite/CHANGELOG.md
+++ b/zcash_client_sqlite/CHANGELOG.md
@@ -13,7 +13,8 @@ workspace.
 ### Added
 - The following columns have been added to the exposed `v_tx_outputs` view:
   - `transaction_id`
-  - `mined_height`
+  - `tx_mined_height`
+  - `tx_trust_status`
   - `recipient_key_scope`
 
 ### Changed
diff --git a/zcash_client_sqlite/src/wallet/db.rs b/zcash_client_sqlite/src/wallet/db.rs
index 7513c883a7..1f1c8bcd62 100644
--- a/zcash_client_sqlite/src/wallet/db.rs
+++ b/zcash_client_sqlite/src/wallet/db.rs
@@ -1096,7 +1096,7 @@ GROUP BY notes.account_id, notes.transaction_id";
 ///   Sapling `OutputDescription` values, or the vector of Orchard actions.
 /// - `tx_mined_height`: An optional value identifying the block height at which the transaction that
 ///   produced this output was mined, or NULL if the transaction is unmined.
-/// - `tx_trust_status`: A flag indicating whether the transaction that produced these outputs
+/// - `tx_trust_status`: A flag indicating whether the transaction that produced this output
 ///   should be considered "trusted". When set to `1`, outputs of this transaction will be considered
 ///   spendable with `trusted` confirmations instead of `untrusted` confirmations.
 /// - `from_account_uuid`: The UUID of the wallet account that created the output, if the wallet
diff --git a/zcash_client_sqlite/src/wallet/init/migrations.rs b/zcash_client_sqlite/src/wallet/init/migrations.rs
index a643107243..3a119070d2 100644
--- a/zcash_client_sqlite/src/wallet/init/migrations.rs
+++ b/zcash_client_sqlite/src/wallet/init/migrations.rs
@@ -131,6 +131,8 @@ pub(super) fn all_migrations<
     //                     \                       \         v_received_output_spends_account      /        /
     //                      \                       \               /                             /        /
     //                       `------------------- account_delete_cascade ---------------------------------'
+    //                                                      |
+    //                                           v_tx_outputs_key_scopes
     //
     let rng = Rc::new(Mutex::new(rng));
     vec![

From 9dd7924631649fc4344e037b4eff64572eff5ba6 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Mon, 8 Dec 2025 14:41:07 -0700
Subject: [PATCH 034/263] Squashed 'zcash_client_backend/lightwallet-protocol/'
 changes from b314868de..23f0768ea

23f0768ea Release lightwallet-protocol v0.4.0
41156c767 Merge pull request #11 from zcash/feature/get_mempool_tx_pools
7c130e883 Add `lightwalletProtocolVersion` field to `LightdInfo` struct.
edbb726d7 Apply suggestion from code review
38fddd73b Apply suggestions from code review
0250f2720 Add pool type filtering to `GetMempoolTx` argument.
54ccaadd5 Change semantics of pool-based pruning of compact transactions from "may prune" to "must prune".
b0667ec99 Merge pull request #9 from zcash/2025-11-doc-TransparentAddressBlockFilter
f3fea7bd4 doc: TransparentAddressBlockFilter doesn't include mempool
a67dd323a Merge pull request #8 from zcash/2025-11-lightdinfo-upgrade-info
11da4b7e3 add next upgrade info to LightdInfo structure (GetLightdInfo)
42cd8f720 Transparent data docs update (#7)
c0cf957ac Merge pull request #5 from zcash/2025-11-comments
912fc3609 Minor clarification in GetBlockRange documentation.
6b03f2cce Documentation (comments) only
d978256a2 Merge pull request #1 from zcash/compact_tx_transparent
7eeb82e7c Merge pull request #4 from zcash/add_changelog
a95359dc9 Apply suggestions from code review
592b637a8 Add transparent data to the `CompactBlock` format.
9d1fb2c41 Add a CHANGELOG.md that documents the evolution of the light client protocol.
180717dfa Merge pull request #3 from zcash/merge_librustzcash_history
450bd4181 Merge the history of the .proto files from `librustzcash` for complete history preservation.
a4859d11d Move protobuf files into place for use in `zcash/lightwallet-protocol`
2e66cdd9e Update zcash_client_backend/proto/service.proto
eda012519 fix comment
f838d10ad Add gRPC LightdInfo Donation Address
db12c0415 Merge pull request #1473 from nuttycom/wallet/enrichment_queue
698feba96 Apply suggestions from code review
20ce57ab3 zcash_client_backend: Add `block_height` argument to `decrypt_and_store_transaction`
a6dea1da8 Merge pull request #1482 from zancas/doc_tweak
4d2d45fc9 fix incorrect doc-comment
e826f4740 update CompactBlock doc-comment, to cover non-Sapling shielded notes, and addresses
e9a6c00bf Various documentation improvements
988bc7214 Merge pull request #872 from nuttycom/feature/pre_dag_sync-suggest_scan_ranges
58d07d469 Implement `suggest_scan_ranges` and `update_chain_tip`
a9222b338 Address comments from code review.
e20310857 Rename proto::compact::{BlockMetadata => ChainMetadata}
ac63418c5 Reorganize Sapling and Orchard note commitment tree sizes in CompactBlock.
0fdca14f1 zcash_client_backend: Add note commitment tree sizes to `CompactBlock` serialization.
2a0c2b8b7 zcash_client_backend: Add gRPC bindings behind feature flag
1342f0480 zcash_client_backend: Address compact_formats.proto comments
68aa4e01b zcash_client_backend: Bring in latest `compact_formats.proto`
e712eb1bc Add prevHash field to CompactBlock
440384c3e Build protobufs for compact formats

git-subtree-dir: zcash_client_backend/lightwallet-protocol
git-subtree-split: 23f0768ea4471b63285f3c0e9b6fbb361674aa2b
---
 CHANGELOG.md                    | 171 ++++++++++++++++++++++++++++++++
 walletrpc/compact_formats.proto |  73 +++++++++++---
 walletrpc/service.proto         | 114 +++++++++++++++------
 3 files changed, 314 insertions(+), 44 deletions(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000000..59a13060ff
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,171 @@
+# Changelog
+All notable changes to this library will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this library adheres to Rust's notion of
+[Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## Unreleased
+
+## [v0.4.0] - 2025-12-03
+
+### Added
+- `compact_formats.CompactTxIn`
+- `compact_formats.TxOut`
+- `service.PoolType`
+- `service.LightdInfo` has added fields `upgradeName`, `upgradeHeight`, and
+  `lightwalletProtocolVersion`
+- `compact_formats.CompactTx` has added fields `vin` and `vout`,
+  which may be used to represent transparent transaction input and output data.
+- `service.BlockRange` has added field `poolTypes`, which allows
+  the caller of service methods that take this type as input to cause returned
+  data to be filtered to include information only for the specified protocols.
+  For backwards compatibility, when this field is set the default (empty) value,
+  servers should return Sapling and Orchard data. This field is to be ignored
+  when the type is used as part of a `service.TransparentAddressBlockFilter`.
+
+### Changed
+- The `hash` field of `compact_formats.CompactTx` has been renamed to `txid`.
+  This is a serialization-compatible clarification, as the index of this field
+  in the .proto type does not change.
+- `service.Exclude` has been renamed to `service.GetMempoolTxRequest` and has
+  an added `poolTypes` field, which allows the caller of this method to specify
+  which pools the resulting `CompactTx` values should contain data for.
+
+### Deprecated
+- `service.CompactTxStreamer`:
+    - The `GetBlockNullifiers` and `GetBlockRangeNullifiers` methods are
+      deprecated.
+
+## [v0.3.6] - 2025-05-20
+
+### Added
+- `service.LightdInfo` has added field `donationAddress`
+- `service.CompactTxStreamer.GetTaddressTransactions`. This duplicates
+  the `GetTaddressTxids` method, but is more accurately named.
+
+### Deprecated
+- `service.CompactTxStreamer.GetTaddressTxids`. Use `GetTaddressTransactions`
+  instead.
+
+## [v0.3.5] - 2023-07-03
+
+### Added
+- `compact_formats.ChainMetadata`
+- `service.ShieldedProtocol`
+- `service.GetSubtreeRootsArg`
+- `service.SubtreeRoot`
+- `service.CompactTxStreamer.GetBlockNullifiers`
+- `service.CompactTxStreamer.GetBlockRangeNullifiers`
+- `service.CompactTxStreamer.SubtreeRoots`
+
+### Changed
+- `compact_formats.CompactBlock` has added field `chainMetadata`
+- `compact_formats.CompactSaplingOutput.epk` has been renamed to `ephemeralKey`
+
+## [v0.3.4] - UNKNOWN
+
+### Added
+- `service.CompactTxStreamer.GetLatestTreeState`
+
+## [v0.3.3] - 2022-04-02
+
+### Added
+- `service.TreeState` has added field `orchardTree`
+
+### Changed
+- `service.TreeState.tree` has been renamed to `saplingTree`
+
+## [v0.3.2] - 2021-12-09
+
+### Changed
+- `compact_formats.CompactOrchardAction.encCiphertext` has been renamed to
+  `CompactOrchardAction.ciphertext`
+
+## [v0.3.1] - 2021-12-09
+
+### Added
+- `compact_formats.CompactOrchardAction`
+- `service.CompactTxStreamer.GetMempoolTx` (removed in 0.3.0) has been reintroduced.
+- `service.Exclude` (removed in 0.3.0) has been reintroduced.
+
+### Changed
+- `compact_formats.CompactSpend` has been renamed `CompactSaplingSpend`
+- `compact_formats.CompactOutput` has been renamed `CompactSaplingOutput`
+
+## [v0.3.0] - 2021-07-23
+
+### Added
+- `service.CompactTxStreamer.GetMempoolStream`
+
+### Removed
+- `service.CompactTxStreamer.GetMempoolTx` has been replaced by `GetMempoolStream`
+- `service.Exclude` has been removed as it is now unused.
+
+## [v0.2.4] - 2021-01-14
+
+### Changed
+- `service.GetAddressUtxosArg.address` has been replaced by the
+  repeated field `addresses`. This is a [conditionally-safe](https://protobuf.dev/programming-guides/proto3/#conditionally-safe-changes)
+  format change.
+- `service.GetAddressUtxosReply` has added field `address`
+
+## [v0.2.3] - 2021-01-14
+
+### Added
+- `service.LightdInfo` has added fields:
+  - `estimatedHeight`
+  - `zcashdBuild`
+  - `zcashdSubversion`
+
+## [v0.2.2] - 2020-10-22
+
+### Added
+- `service.TreeState`
+- `service.GetAddressUtxosArg`
+- `service.GetAddressUtxosReply`
+- `service.GetAddressUtxosReplyList`
+- `service.CompactTxStreamer.GetTreeState`
+- `service.CompactTxStreamer.GetAddressUtxos`
+- `service.CompactTxStreamer.GetAddressUtxosStream`
+
+## [v0.2.1] - 2020-10-06
+
+### Added
+- `service.Address`
+- `service.AddressList`
+- `service.Balance`
+- `service.Exclude`
+- `service.CompactTxStreamer.GetTaddressBalance`
+- `service.CompactTxStreamer.GetTaddressBalanceStream`
+- `service.CompactTxStreamer.GetMempoolTx`
+- `service.LightdInfo` has added fields:
+  - `gitCommit`
+  - `branch`
+  - `buildDate`
+  - `buildUser`
+
+## [v0.2.0] - 2020-04-24
+
+### Added
+- `service.Duration`
+- `service.PingResponse`
+- `service.CompactTxStreamer.Ping`
+
+### Removed
+- `service.TransparentAddress` was removed (it was unused in any service API).
+
+## [v0.1.1] - 2019-11-27
+
+### Added
+- `service.Empty`
+- `service.LightdInfo`
+- `service.TransparentAddress`
+- `service.TransparentAddressBlockFilter`
+- `service.CompactTxStreamer.GetTaddressTxids`
+- `service.CompactTxStreamer.GetLightdInfo`
+- `service.RawTransaction` has added field `height`
+
+## [v0.1.0] - 2019-09-19
+
+Initial release
diff --git a/walletrpc/compact_formats.proto b/walletrpc/compact_formats.proto
index c799448cec..c62c7acbb1 100644
--- a/walletrpc/compact_formats.proto
+++ b/walletrpc/compact_formats.proto
@@ -7,8 +7,8 @@ package cash.z.wallet.sdk.rpc;
 option go_package = "lightwalletd/walletrpc";
 option swift_prefix = "";
 
-// Remember that proto3 fields are all optional. A field that is not present will be set to its zero value.
-// bytes fields of hashes are in canonical little-endian format.
+// REMINDER: proto3 fields are all optional. A field that is not present will be set to its zero/false/empty
+// value.
 
 // Information about the state of the chain as of a given block.
 message ChainMetadata {
@@ -16,34 +16,40 @@ message ChainMetadata {
     uint32 orchardCommitmentTreeSize = 2; // the size of the Orchard note commitment tree as of the end of this block
 }
 
-// A compact representation of the shielded data in a Zcash block.
+// A compact representation of a Zcash block.
 //
 // CompactBlock is a packaging of ONLY the data from a block that's needed to:
 //   1. Detect a payment to your Shielded address
 //   2. Detect a spend of your Shielded notes
 //   3. Update your witnesses to generate new spend proofs.
+//   4. Spend UTXOs associated to t-addresses of your wallet.
 message CompactBlock {
     uint32 protoVersion = 1;         // the version of this wire format, for storage
     uint64 height = 2;               // the height of this block
     bytes hash = 3;                  // the ID (hash) of this block, same as in block explorers
     bytes prevHash = 4;              // the ID (hash) of this block's predecessor
     uint32 time = 5;                 // Unix epoch time when the block was mined
-    bytes header = 6;                // (hash, prevHash, and time) OR (full header)
+    bytes header = 6;                // full header (as returned by the getblock RPC)
     repeated CompactTx vtx = 7;      // zero or more compact transactions from this block
     ChainMetadata chainMetadata = 8; // information about the state of the chain as of this block
 }
 
-// A compact representation of the shielded data in a Zcash transaction.
+// A compact representation of a Zcash transaction.
 //
 // CompactTx contains the minimum information for a wallet to know if this transaction
-// is relevant to it (either pays to it or spends from it) via shielded elements
-// only. This message will not encode a transparent-to-transparent transaction.
+// is relevant to it (either pays to it or spends from it) via shielded elements. Additionally,
+// it can optionally include the minimum necessary data to detect payments to transparent addresses
+// related to your wallet.
 message CompactTx {
-    // Index and hash will allow the receiver to call out to chain
-    // explorers or other data structures to retrieve more information
-    // about this transaction.
-    uint64 index = 1;   // the index within the full block
-    bytes hash = 2;     // the ID (hash) of this transaction, same as in block explorers
+    // The index of the transaction within the block.
+    uint64 index = 1;
+
+    // The id of the transaction as defined in
+    // [§ 7.1.1 ‘Transaction Identifiers’](https://zips.z.cash/protocol/protocol.pdf#txnidentifiers)
+    // This byte array MUST be in protocol order and MUST NOT be reversed
+    // or hex-encoded; the byte-reversed and hex-encoded representation is
+    // exclusively a textual representation of a txid.
+    bytes txid = 2;
 
     // The transaction fee: present if server can provide. In the case of a
     // stateless server and a transaction with transparent inputs, this will be
@@ -55,6 +61,41 @@ message CompactTx {
     repeated CompactSaplingSpend spends = 4;
     repeated CompactSaplingOutput outputs = 5;
     repeated CompactOrchardAction actions = 6;
+
+    // `CompactTxIn` values corresponding to the `vin` entries of the full transaction.
+    //
+    // Note: the single null-outpoint input for coinbase transactions is omitted. Light
+    // clients can test `CompactTx.index == 0` to determine whether a `CompactTx`
+    // represents a coinbase transaction, as the coinbase transaction is always the
+    // first transaction in any block.
+    repeated CompactTxIn vin = 7;
+
+    // A sequence of transparent outputs being created by the transaction.
+    repeated TxOut vout = 8;
+}
+
+// A compact representation of a transparent transaction input.
+message CompactTxIn {
+    // The id of the transaction that generated the output being spent. This
+    // byte array must be in protocol order and MUST NOT be reversed or
+    // hex-encoded.
+    bytes prevoutTxid = 1;
+
+    // The index of the output being spent in the `vout` array of the
+    // transaction referred to by `prevoutTxid`.
+    uint32 prevoutIndex = 2;
+}
+
+// A transparent output being created by the transaction.
+//
+// This contains identical data to the `TxOut` type in the transaction itself, and
+// thus it is not "compact".
+message TxOut {
+    // The value of the output, in Zatoshis.
+    uint64 value = 1;
+
+    // The script pubkey that must be satisfied in order to spend this output.
+    bytes scriptPubKey = 2;
 }
 
 // A compact representation of a [Sapling Spend](https://zips.z.cash/protocol/protocol.pdf#spendencodingandconsensus).
@@ -62,7 +103,7 @@ message CompactTx {
 // CompactSaplingSpend is a Sapling Spend Description as described in 7.3 of the Zcash
 // protocol specification.
 message CompactSaplingSpend {
-    bytes nf = 1;   // nullifier (see the Zcash protocol specification)
+    bytes nf = 1;   // Nullifier (see the Zcash protocol specification)
 }
 
 // A compact representation of a [Sapling Output](https://zips.z.cash/protocol/protocol.pdf#outputencodingandconsensus).
@@ -70,9 +111,9 @@ message CompactSaplingSpend {
 // It encodes the `cmu` field, `ephemeralKey` field, and a 52-byte prefix of the
 // `encCiphertext` field of a Sapling Output Description. Total size is 116 bytes.
 message CompactSaplingOutput {
-    bytes cmu = 1;          // note commitment u-coordinate
-    bytes ephemeralKey = 2; // ephemeral public key
-    bytes ciphertext = 3;   // first 52 bytes of ciphertext
+    bytes cmu = 1;          // Note commitment u-coordinate.
+    bytes ephemeralKey = 2; // Ephemeral public key.
+    bytes ciphertext = 3;   // First 52 bytes of ciphertext.
 }
 
 // A compact representation of an [Orchard Action](https://zips.z.cash/protocol/protocol.pdf#actionencodingandconsensus).
diff --git a/walletrpc/service.proto b/walletrpc/service.proto
index 0a0989c7d3..d3dc8ba045 100644
--- a/walletrpc/service.proto
+++ b/walletrpc/service.proto
@@ -8,18 +8,35 @@ option go_package = "lightwalletd/walletrpc";
 option swift_prefix = "";
 import "compact_formats.proto";
 
+// An identifier for a Zcash value pool.
+enum PoolType {
+    POOL_TYPE_INVALID = 0;
+    TRANSPARENT = 1;
+    SAPLING = 2;
+    ORCHARD = 3;
+}
+
 // A BlockID message contains identifiers to select a block: a height or a
 // hash. Specification by hash is not implemented, but may be in the future.
 message BlockID {
-     uint64 height = 1;
-     bytes hash = 2;
+    uint64 height = 1;
+    bytes hash = 2;
 }
 
 // BlockRange specifies a series of blocks from start to end inclusive.
 // Both BlockIDs must be heights; specification by hash is not yet supported.
+//
+// If no pool types are specified, the server should default to the legacy
+// behavior of returning only data relevant to the shielded (Sapling and
+// Orchard) pools; otherwise, the server should prune `CompactBlocks` returned
+// to include only data relevant to the requested pool types. Clients MUST 
+// verify that the version of the server they are connected to are capable
+// of returning pruned and/or transparent data before setting `poolTypes`
+// to a non-empty value.
 message BlockRange {
     BlockID start = 1;
     BlockID end = 2;
+    repeated PoolType poolTypes = 3;
 }
 
 // A TxFilter contains the information needed to identify a particular
@@ -93,13 +110,21 @@ message LightdInfo {
     string zcashdBuild = 13;            // example: "v4.1.1-877212414"
     string zcashdSubversion = 14;       // example: "/MagicBean:4.1.1/"
     string donationAddress = 15;        // Zcash donation UA address
+    string upgradeName = 16;            // name of next pending network upgrade, empty if none scheduled
+    uint64 upgradeHeight = 17;          // height of next pending upgrade, zero if none is scheduled
+    string lightwalletProtocolVersion = 18; // version of https://github.com/zcash/lightwallet-protocol served by this server
 }
 
-// TransparentAddressBlockFilter restricts the results to the given address
-// or block range.
+// TransparentAddressBlockFilter restricts the results of the GRPC methods that
+// use it to the transactions that involve the given address and were mined in
+// the specified block range. Non-default values for both the address and the
+// block range must be specified. Mempool transactions are not included.
+//
+// The `poolTypes` field of the `range` argument should be ignored.
+// Implementations MAY consider it an error if any pool types are specified.
 message TransparentAddressBlockFilter {
     string address = 1;     // t-address
-    BlockRange range = 2;   // start, end heights
+    BlockRange range = 2;   // start, end heights only
 }
 
 // Duration is currently used only for testing, so that the Ping rpc
@@ -127,10 +152,23 @@ message Balance {
     int64 valueZat = 1;
 }
 
-// The a shortened transaction ID is the prefix in big-endian (hex) format
-// (then converted to binary).
-message Exclude {
-    repeated bytes txid = 1;
+// Request parameters for the `GetMempoolTx` RPC.
+message GetMempoolTxRequest {
+    // A list of transaction ID byte string suffixes that should be excluded
+    // from the response. These suffixes may be produced either directly from
+    // the underlying txid bytes, or, if the source values are encoded txid
+    // strings, by truncating the hexadecimal representation of each
+    // transaction ID to an even number of characters, and then hex-decoding
+    // and then byte-reversing this value to obtain the byte representation.
+    repeated bytes exclude_txid_suffixes = 1;
+    // We reserve field number 2 for a potential future `exclude_txid_prefixes`
+    // field.
+    reserved 2;
+    // The server must prune `CompactTx`s returned to include only data
+    // relevant to the requested pool types. If no pool types are specified,
+    // the server should default to the legacy behavior of returning only data
+    // relevant to the shielded (Sapling and Orchard) pools.
+    repeated PoolType poolTypes = 3;
 }
 
 // The TreeState is derived from the Zcash z_gettreestate rpc.
@@ -181,44 +219,63 @@ message GetAddressUtxosReplyList {
 service CompactTxStreamer {
     // Return the BlockID of the block at the tip of the best chain
     rpc GetLatestBlock(ChainSpec) returns (BlockID) {}
+
     // Return the compact block corresponding to the given block identifier
     rpc GetBlock(BlockID) returns (CompactBlock) {}
-    // Same as GetBlock except actions contain only nullifiers
+
+    // Same as GetBlock except the returned CompactBlock value contains only
+    // nullifiers.
+    //
+    // Note: this method is deprecated. Implementations should ignore any
+    // `PoolType::TRANSPARENT` member of the `poolTypes` argument.
     rpc GetBlockNullifiers(BlockID) returns (CompactBlock) {}
-    // Return a list of consecutive compact blocks
+
+    // Return a list of consecutive compact blocks in the specified range,
+    // which is inclusive of `range.end`.
+    //
+    // If range.start <= range.end, blocks are returned increasing height order;
+    // otherwise blocks are returned in decreasing height order.
     rpc GetBlockRange(BlockRange) returns (stream CompactBlock) {}
-    // Same as GetBlockRange except actions contain only nullifiers
+
+    // Same as GetBlockRange except the returned CompactBlock values contain
+    // only nullifiers.
+    //
+    // Note: this method is deprecated. Implementations should ignore any
+    // `PoolType::TRANSPARENT` member of the `poolTypes` argument.
     rpc GetBlockRangeNullifiers(BlockRange) returns (stream CompactBlock) {}
 
     // Return the requested full (not compact) transaction (as from zcashd)
     rpc GetTransaction(TxFilter) returns (RawTransaction) {}
+
     // Submit the given transaction to the Zcash network
     rpc SendTransaction(RawTransaction) returns (SendResponse) {}
 
-    // Return the transactions corresponding to the given t-address within the given block range
-    // NB - this method is misnamed, it returns transactions, not transaction IDs.
+    // Return RawTransactions that match the given transparent address filter.
+    //
+    // Note: This function is misnamed, it returns complete `RawTransaction` values, not TxIds.
     // NOTE: this method is deprecated, please use GetTaddressTransactions instead.
     rpc GetTaddressTxids(TransparentAddressBlockFilter) returns (stream RawTransaction) {}
 
-    // Return the transactions corresponding to the given t-address within the given block range
+    // Return the transactions corresponding to the given t-address within the given block range.
+    // Mempool transactions are not included in the results.
     rpc GetTaddressTransactions(TransparentAddressBlockFilter) returns (stream RawTransaction) {}
 
     rpc GetTaddressBalance(AddressList) returns (Balance) {}
     rpc GetTaddressBalanceStream(stream Address) returns (Balance) {}
 
-    // Return the compact transactions currently in the mempool; the results
-    // can be a few seconds out of date. If the Exclude list is empty, return
-    // all transactions; otherwise return all *except* those in the Exclude list
-    // (if any); this allows the client to avoid receiving transactions that it
-    // already has (from an earlier call to this rpc). The transaction IDs in the
-    // Exclude list can be shortened to any number of bytes to make the request
-    // more bandwidth-efficient; if two or more transactions in the mempool
-    // match a shortened txid, they are all sent (none is excluded). Transactions
-    // in the exclude list that don't exist in the mempool are ignored.
-    //
-    // The a shortened transaction ID is the prefix in big-endian (hex) format
-    // (then converted to binary). See smoke-test.bash for examples.
-    rpc GetMempoolTx(Exclude) returns (stream CompactTx) {}
+    // Returns a stream of the compact transaction representation for transactions
+    // currently in the mempool. The results of this operation may be a few
+    // seconds out of date. If the `exclude_txid_suffixes` list is empty,
+    // return all transactions; otherwise return all *except* those in the
+    // `exclude_txid_suffixes` list (if any); this allows the client to avoid
+    // receiving transactions that it already has (from an earlier call to this
+    // RPC). The transaction IDs in the `exclude_txid_suffixes` list can be
+    // shortened to any number of bytes to make the request more
+    // bandwidth-efficient; if two or more transactions in the mempool match a
+    // txid suffix, none of the matching transactions are excluded. Txid
+    // suffixes in the exclude list that don't match any transactions in the
+    // mempool are ignored.
+    rpc GetMempoolTx(GetMempoolTxRequest) returns (stream CompactTx) {}
 
     // Return a stream of current Mempool transactions. This will keep the output stream open while
     // there are mempool transactions. It will close the returned stream when a new block is mined.
@@ -240,6 +297,7 @@ service CompactTxStreamer {
 
     // Return information about this lightwalletd instance and the blockchain
     rpc GetLightdInfo(Empty) returns (LightdInfo) {}
+
     // Testing-only, requires lightwalletd --ping-very-insecure (do not enable in production)
     rpc Ping(Duration) returns (PingResponse) {}
 }

From b96cb27ed4ed7272965eec76a72f4b3df96704e6 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Mon, 8 Dec 2025 17:00:00 -0700
Subject: [PATCH 035/263] zcash_client_backend: Regenerate lightwallet GRPC API
 types after lightwallet-protocol_v0.4.0 update.

---
 zcash_client_backend/CHANGELOG.md             |  17 ++-
 zcash_client_backend/build.rs                 |   8 ++
 .../src/proto/compact_formats.rs              |  71 +++++++---
 zcash_client_backend/src/proto/service.rs     | 134 ++++++++++++++----
 4 files changed, 187 insertions(+), 43 deletions(-)

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index 178d8efff7..7e187f0cf0 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -13,9 +13,24 @@ workspace.
 ### Added
 - `zcash_client_backend::data_api::ReceivedTransactionOutput`
 - `zcash_client_backend::data_api::wallet::ConfirmationsPolicy::confirmations_until_spendable`
+- in `zcash_client_backend::proto::compact_formats`:
+  - `CompactTx` has added fields `vin` and `vout`
+  - Added types `CompactTxIn`, `TxOut`
+- in `zcash_client_backend::proto::service`:
+  - Added enum `PoolType`
+  - `BlockRange` has added field `pool_types`
+  - `LightdInfo` has added fields `upgrade_name`, `upgrade_height`, and `lighwallet_protocol_version`
+  - `GetMempoolTxRequest` (previously named `Exclude`) has added field `pool_types`
 
 ### Changed
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`.
+- Migrated to `lightwallet-protocol v0.4.0`. This results in the following API
+  changes:
+  - in `zcash_client_backend::proto::compact_formats`:
+    - `CompactTx::hash` has been renamed to `CompactTx::txid`
+  - in `zcash_client_backend::proto::service`:
+    - `Exclude` has been renamed to `GetMempoolTxRequest`
+    - `Exclude::txid` has been renamed to `GetMempoolTxRequest::exclude_txid_suffixes`
 - `zcash_client_backend::wallet::OvkPolicy` has been substantially modified
   to reflect the view that a single outgoing viewing key should be uniformly
   applied to encrypt all external transaction outputs, irrespective of which
@@ -26,7 +41,7 @@ workspace.
     a single OVK for all shielded outputs irrespective of pools, it now
     specifies that wallet-internal change outputs should be treated as though
     the policy for those outputs were `OvkPolicy::None`, rendering them only
-    recoverable using the wallet's internal IVK. 
+    recoverable using the wallet's internal IVK.
   - The `OvkPolicy::Custom` variant has changed. Instead of pool-specific
     OVKs, this now encapsulates a pair of OVKs, one to be used for all
     shielded external outputs of the transaction, and a second (optional)
diff --git a/zcash_client_backend/build.rs b/zcash_client_backend/build.rs
index b97699dd06..afc52c3b6b 100644
--- a/zcash_client_backend/build.rs
+++ b/zcash_client_backend/build.rs
@@ -60,6 +60,14 @@ fn build() -> io::Result<()> {
             ".cash.z.wallet.sdk.rpc.CompactTx",
             "crate::proto::compact_formats::CompactTx",
         )
+        .extern_path(
+            ".cash.z.wallet.sdk.rpc.CompactTxIn",
+            "crate::proto::compact_formats::CompactTxIn",
+        )
+        .extern_path(
+            ".cash.z.wallet.sdk.rpc.TxOut",
+            "crate::proto::compact_formats::TxOut",
+        )
         .extern_path(
             ".cash.z.wallet.sdk.rpc.CompactSaplingSpend",
             "crate::proto::compact_formats::CompactSaplingSpend",
diff --git a/zcash_client_backend/src/proto/compact_formats.rs b/zcash_client_backend/src/proto/compact_formats.rs
index 3cee859467..e0af5156e6 100644
--- a/zcash_client_backend/src/proto/compact_formats.rs
+++ b/zcash_client_backend/src/proto/compact_formats.rs
@@ -9,12 +9,13 @@ pub struct ChainMetadata {
     #[prost(uint32, tag = "2")]
     pub orchard_commitment_tree_size: u32,
 }
-/// A compact representation of the shielded data in a Zcash block.
+/// A compact representation of a Zcash block.
 ///
 /// CompactBlock is a packaging of ONLY the data from a block that's needed to:
 ///    1. Detect a payment to your Shielded address
 ///    2. Detect a spend of your Shielded notes
 ///    3. Update your witnesses to generate new spend proofs.
+///    4. Spend UTXOs associated to t-addresses of your wallet.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CompactBlock {
     /// the version of this wire format, for storage
@@ -32,7 +33,7 @@ pub struct CompactBlock {
     /// Unix epoch time when the block was mined
     #[prost(uint32, tag = "5")]
     pub time: u32,
-    /// (hash, prevHash, and time) OR (full header)
+    /// full header (as returned by the getblock RPC)
     #[prost(bytes = "vec", tag = "6")]
     pub header: ::prost::alloc::vec::Vec<u8>,
     /// zero or more compact transactions from this block
@@ -42,23 +43,24 @@ pub struct CompactBlock {
     #[prost(message, optional, tag = "8")]
     pub chain_metadata: ::core::option::Option<ChainMetadata>,
 }
-/// A compact representation of the shielded data in a Zcash transaction.
+/// A compact representation of a Zcash transaction.
 ///
 /// CompactTx contains the minimum information for a wallet to know if this transaction
-/// is relevant to it (either pays to it or spends from it) via shielded elements
-/// only. This message will not encode a transparent-to-transparent transaction.
+/// is relevant to it (either pays to it or spends from it) via shielded elements. Additionally,
+/// it can optionally include the minimum necessary data to detect payments to transparent addresses
+/// related to your wallet.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CompactTx {
-    /// Index and hash will allow the receiver to call out to chain
-    /// explorers or other data structures to retrieve more information
-    /// about this transaction.
-    ///
-    /// the index within the full block
+    /// The index of the transaction within the block.
     #[prost(uint64, tag = "1")]
     pub index: u64,
-    /// the ID (hash) of this transaction, same as in block explorers
+    /// The id of the transaction as defined in
+    /// [§ 7.1.1 ‘Transaction Identifiers’](<https://zips.z.cash/protocol/protocol.pdf#txnidentifiers>)
+    /// This byte array MUST be in protocol order and MUST NOT be reversed
+    /// or hex-encoded; the byte-reversed and hex-encoded representation is
+    /// exclusively a textual representation of a txid.
     #[prost(bytes = "vec", tag = "2")]
-    pub hash: ::prost::alloc::vec::Vec<u8>,
+    pub txid: ::prost::alloc::vec::Vec<u8>,
     /// The transaction fee: present if server can provide. In the case of a
     /// stateless server and a transaction with transparent inputs, this will be
     /// unset because the calculation requires reference to prior transactions.
@@ -72,6 +74,43 @@ pub struct CompactTx {
     pub outputs: ::prost::alloc::vec::Vec<CompactSaplingOutput>,
     #[prost(message, repeated, tag = "6")]
     pub actions: ::prost::alloc::vec::Vec<CompactOrchardAction>,
+    /// `CompactTxIn` values corresponding to the `vin` entries of the full transaction.
+    ///
+    /// Note: the single null-outpoint input for coinbase transactions is omitted. Light
+    /// clients can test `CompactTx.index == 0` to determine whether a `CompactTx`
+    /// represents a coinbase transaction, as the coinbase transaction is always the
+    /// first transaction in any block.
+    #[prost(message, repeated, tag = "7")]
+    pub vin: ::prost::alloc::vec::Vec<CompactTxIn>,
+    /// A sequence of transparent outputs being created by the transaction.
+    #[prost(message, repeated, tag = "8")]
+    pub vout: ::prost::alloc::vec::Vec<TxOut>,
+}
+/// A compact representation of a transparent transaction input.
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
+pub struct CompactTxIn {
+    /// The id of the transaction that generated the output being spent. This
+    /// byte array must be in protocol order and MUST NOT be reversed or
+    /// hex-encoded.
+    #[prost(bytes = "vec", tag = "1")]
+    pub prevout_txid: ::prost::alloc::vec::Vec<u8>,
+    /// The index of the output being spent in the `vout` array of the
+    /// transaction referred to by `prevoutTxid`.
+    #[prost(uint32, tag = "2")]
+    pub prevout_index: u32,
+}
+/// A transparent output being created by the transaction.
+///
+/// This contains identical data to the `TxOut` type in the transaction itself, and
+/// thus it is not "compact".
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
+pub struct TxOut {
+    /// The value of the output, in Zatoshis.
+    #[prost(uint64, tag = "1")]
+    pub value: u64,
+    /// The script pubkey that must be satisfied in order to spend this output.
+    #[prost(bytes = "vec", tag = "2")]
+    pub script_pub_key: ::prost::alloc::vec::Vec<u8>,
 }
 /// A compact representation of a [Sapling Spend](<https://zips.z.cash/protocol/protocol.pdf#spendencodingandconsensus>).
 ///
@@ -79,7 +118,7 @@ pub struct CompactTx {
 /// protocol specification.
 #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct CompactSaplingSpend {
-    /// nullifier (see the Zcash protocol specification)
+    /// Nullifier (see the Zcash protocol specification)
     #[prost(bytes = "vec", tag = "1")]
     pub nf: ::prost::alloc::vec::Vec<u8>,
 }
@@ -89,13 +128,13 @@ pub struct CompactSaplingSpend {
 /// `encCiphertext` field of a Sapling Output Description. Total size is 116 bytes.
 #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct CompactSaplingOutput {
-    /// note commitment u-coordinate
+    /// Note commitment u-coordinate.
     #[prost(bytes = "vec", tag = "1")]
     pub cmu: ::prost::alloc::vec::Vec<u8>,
-    /// ephemeral public key
+    /// Ephemeral public key.
     #[prost(bytes = "vec", tag = "2")]
     pub ephemeral_key: ::prost::alloc::vec::Vec<u8>,
-    /// first 52 bytes of ciphertext
+    /// First 52 bytes of ciphertext.
     #[prost(bytes = "vec", tag = "3")]
     pub ciphertext: ::prost::alloc::vec::Vec<u8>,
 }
diff --git a/zcash_client_backend/src/proto/service.rs b/zcash_client_backend/src/proto/service.rs
index be3930af61..05d6a5ed20 100644
--- a/zcash_client_backend/src/proto/service.rs
+++ b/zcash_client_backend/src/proto/service.rs
@@ -10,12 +10,22 @@ pub struct BlockId {
 }
 /// BlockRange specifies a series of blocks from start to end inclusive.
 /// Both BlockIDs must be heights; specification by hash is not yet supported.
+///
+/// If no pool types are specified, the server should default to the legacy
+/// behavior of returning only data relevant to the shielded (Sapling and
+/// Orchard) pools; otherwise, the server should prune `CompactBlocks` returned
+/// to include only data relevant to the requested pool types. Clients MUST
+/// verify that the version of the server they are connected to are capable
+/// of returning pruned and/or transparent data before setting `poolTypes`
+/// to a non-empty value.
 #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct BlockRange {
     #[prost(message, optional, tag = "1")]
     pub start: ::core::option::Option<BlockId>,
     #[prost(message, optional, tag = "2")]
     pub end: ::core::option::Option<BlockId>,
+    #[prost(enumeration = "PoolType", repeated, tag = "3")]
+    pub pool_types: ::prost::alloc::vec::Vec<i32>,
 }
 /// A TxFilter contains the information needed to identify a particular
 /// transaction: either a block and an index, or a direct transaction hash.
@@ -123,15 +133,29 @@ pub struct LightdInfo {
     /// Zcash donation UA address
     #[prost(string, tag = "15")]
     pub donation_address: ::prost::alloc::string::String,
+    /// name of next pending network upgrade, empty if none scheduled
+    #[prost(string, tag = "16")]
+    pub upgrade_name: ::prost::alloc::string::String,
+    /// height of next pending upgrade, zero if none is scheduled
+    #[prost(uint64, tag = "17")]
+    pub upgrade_height: u64,
+    /// version of <https://github.com/zcash/lightwallet-protocol> served by this server
+    #[prost(string, tag = "18")]
+    pub lightwallet_protocol_version: ::prost::alloc::string::String,
 }
-/// TransparentAddressBlockFilter restricts the results to the given address
-/// or block range.
+/// TransparentAddressBlockFilter restricts the results of the GRPC methods that
+/// use it to the transactions that involve the given address and were mined in
+/// the specified block range. Non-default values for both the address and the
+/// block range must be specified. Mempool transactions are not included.
+///
+/// The `poolTypes` field of the `range` argument should be ignored.
+/// Implementations MAY consider it an error if any pool types are specified.
 #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct TransparentAddressBlockFilter {
     /// t-address
     #[prost(string, tag = "1")]
     pub address: ::prost::alloc::string::String,
-    /// start, end heights
+    /// start, end heights only
     #[prost(message, optional, tag = "2")]
     pub range: ::core::option::Option<BlockRange>,
 }
@@ -168,12 +192,23 @@ pub struct Balance {
     #[prost(int64, tag = "1")]
     pub value_zat: i64,
 }
-/// The a shortened transaction ID is the prefix in big-endian (hex) format
-/// (then converted to binary).
+/// Request parameters for the `GetMempoolTx` RPC.
 #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
-pub struct Exclude {
+pub struct GetMempoolTxRequest {
+    /// A list of transaction ID byte string suffixes that should be excluded
+    /// from the response. These suffixes may be produced either directly from
+    /// the underlying txid bytes, or, if the source values are encoded txid
+    /// strings, by truncating the hexadecimal representation of each
+    /// transaction ID to an even number of characters, and then hex-decoding
+    /// and then byte-reversing this value to obtain the byte representation.
     #[prost(bytes = "vec", repeated, tag = "1")]
-    pub txid: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
+    pub exclude_txid_suffixes: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
+    /// The server must prune `CompactTx`s returned to include only data
+    /// relevant to the requested pool types. If no pool types are specified,
+    /// the server should default to the legacy behavior of returning only data
+    /// relevant to the shielded (Sapling and Orchard) pools.
+    #[prost(enumeration = "PoolType", repeated, tag = "3")]
+    pub pool_types: ::prost::alloc::vec::Vec<i32>,
 }
 /// The TreeState is derived from the Zcash z_gettreestate rpc.
 #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
@@ -253,6 +288,39 @@ pub struct GetAddressUtxosReplyList {
     #[prost(message, repeated, tag = "1")]
     pub address_utxos: ::prost::alloc::vec::Vec<GetAddressUtxosReply>,
 }
+/// An identifier for a Zcash value pool.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+#[repr(i32)]
+pub enum PoolType {
+    Invalid = 0,
+    Transparent = 1,
+    Sapling = 2,
+    Orchard = 3,
+}
+impl PoolType {
+    /// String value of the enum field names used in the ProtoBuf definition.
+    ///
+    /// The values are not transformed in any way and thus are considered stable
+    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
+    pub fn as_str_name(&self) -> &'static str {
+        match self {
+            Self::Invalid => "POOL_TYPE_INVALID",
+            Self::Transparent => "TRANSPARENT",
+            Self::Sapling => "SAPLING",
+            Self::Orchard => "ORCHARD",
+        }
+    }
+    /// Creates an enum from field names used in the ProtoBuf definition.
+    pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
+        match value {
+            "POOL_TYPE_INVALID" => Some(Self::Invalid),
+            "TRANSPARENT" => Some(Self::Transparent),
+            "SAPLING" => Some(Self::Sapling),
+            "ORCHARD" => Some(Self::Orchard),
+            _ => None,
+        }
+    }
+}
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
 #[repr(i32)]
 pub enum ShieldedProtocol {
@@ -417,7 +485,11 @@ pub mod compact_tx_streamer_client {
                 );
             self.inner.unary(req, path, codec).await
         }
-        /// Same as GetBlock except actions contain only nullifiers
+        /// Same as GetBlock except the returned CompactBlock value contains only
+        /// nullifiers.
+        ///
+        /// Note: this method is deprecated. Implementations should ignore any
+        /// `PoolType::TRANSPARENT` member of the `poolTypes` argument.
         pub async fn get_block_nullifiers(
             &mut self,
             request: impl tonic::IntoRequest<super::BlockId>,
@@ -447,7 +519,11 @@ pub mod compact_tx_streamer_client {
                 );
             self.inner.unary(req, path, codec).await
         }
-        /// Return a list of consecutive compact blocks
+        /// Return a list of consecutive compact blocks in the specified range,
+        /// which is inclusive of `range.end`.
+        ///
+        /// If range.start <= range.end, blocks are returned increasing height order;
+        /// otherwise blocks are returned in decreasing height order.
         pub async fn get_block_range(
             &mut self,
             request: impl tonic::IntoRequest<super::BlockRange>,
@@ -479,7 +555,11 @@ pub mod compact_tx_streamer_client {
                 );
             self.inner.server_streaming(req, path, codec).await
         }
-        /// Same as GetBlockRange except actions contain only nullifiers
+        /// Same as GetBlockRange except the returned CompactBlock values contain
+        /// only nullifiers.
+        ///
+        /// Note: this method is deprecated. Implementations should ignore any
+        /// `PoolType::TRANSPARENT` member of the `poolTypes` argument.
         pub async fn get_block_range_nullifiers(
             &mut self,
             request: impl tonic::IntoRequest<super::BlockRange>,
@@ -565,8 +645,9 @@ pub mod compact_tx_streamer_client {
                 );
             self.inner.unary(req, path, codec).await
         }
-        /// Return the transactions corresponding to the given t-address within the given block range
-        /// NB - this method is misnamed, it returns transactions, not transaction IDs.
+        /// Return RawTransactions that match the given transparent address filter.
+        ///
+        /// Note: This function is misnamed, it returns complete `RawTransaction` values, not TxIds.
         /// NOTE: this method is deprecated, please use GetTaddressTransactions instead.
         pub async fn get_taddress_txids(
             &mut self,
@@ -597,7 +678,8 @@ pub mod compact_tx_streamer_client {
                 );
             self.inner.server_streaming(req, path, codec).await
         }
-        /// Return the transactions corresponding to the given t-address within the given block range
+        /// Return the transactions corresponding to the given t-address within the given block range.
+        /// Mempool transactions are not included in the results.
         pub async fn get_taddress_transactions(
             &mut self,
             request: impl tonic::IntoRequest<super::TransparentAddressBlockFilter>,
@@ -679,21 +761,21 @@ pub mod compact_tx_streamer_client {
                 );
             self.inner.client_streaming(req, path, codec).await
         }
-        /// Return the compact transactions currently in the mempool; the results
-        /// can be a few seconds out of date. If the Exclude list is empty, return
-        /// all transactions; otherwise return all *except* those in the Exclude list
-        /// (if any); this allows the client to avoid receiving transactions that it
-        /// already has (from an earlier call to this rpc). The transaction IDs in the
-        /// Exclude list can be shortened to any number of bytes to make the request
-        /// more bandwidth-efficient; if two or more transactions in the mempool
-        /// match a shortened txid, they are all sent (none is excluded). Transactions
-        /// in the exclude list that don't exist in the mempool are ignored.
-        ///
-        /// The a shortened transaction ID is the prefix in big-endian (hex) format
-        /// (then converted to binary). See smoke-test.bash for examples.
+        /// Returns a stream of the compact transaction representation for transactions
+        /// currently in the mempool. The results of this operation may be a few
+        /// seconds out of date. If the `exclude_txid_suffixes` list is empty,
+        /// return all transactions; otherwise return all *except* those in the
+        /// `exclude_txid_suffixes` list (if any); this allows the client to avoid
+        /// receiving transactions that it already has (from an earlier call to this
+        /// RPC). The transaction IDs in the `exclude_txid_suffixes` list can be
+        /// shortened to any number of bytes to make the request more
+        /// bandwidth-efficient; if two or more transactions in the mempool match a
+        /// txid suffix, none of the matching transactions are excluded. Txid
+        /// suffixes in the exclude list that don't match any transactions in the
+        /// mempool are ignored.
         pub async fn get_mempool_tx(
             &mut self,
-            request: impl tonic::IntoRequest<super::Exclude>,
+            request: impl tonic::IntoRequest<super::GetMempoolTxRequest>,
         ) -> std::result::Result<
             tonic::Response<
                 tonic::codec::Streaming<crate::proto::compact_formats::CompactTx>,

From 4ee193db62d706c2e6ff3eb7db2a1602cc650f1c Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Mon, 8 Dec 2025 14:46:08 -0700
Subject: [PATCH 036/263] zcash_client_backend: Adapt to GRPC API changes after
 lightwallet-protocol_v0.4.0 update.

---
 zcash_client_backend/src/data_api/testing.rs                | 4 ++--
 zcash_client_backend/src/proto.rs                           | 6 +++---
 zcash_client_backend/src/scanning.rs                        | 4 ++--
 zcash_client_backend/src/sync.rs                            | 1 +
 .../src/wallet/init/migrations/receiving_key_scopes.rs      | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/zcash_client_backend/src/data_api/testing.rs b/zcash_client_backend/src/data_api/testing.rs
index c2c8731cfc..94ff07dfe9 100644
--- a/zcash_client_backend/src/data_api/testing.rs
+++ b/zcash_client_backend/src/data_api/testing.rs
@@ -2199,7 +2199,7 @@ fn fake_compact_tx<R: RngCore + CryptoRng>(rng: &mut R) -> CompactTx {
     let mut ctx = CompactTx::default();
     let mut txid = vec![0; 32];
     rng.fill_bytes(&mut txid);
-    ctx.hash = txid;
+    ctx.txid = txid;
 
     ctx
 }
@@ -2294,7 +2294,7 @@ fn fake_compact_block_from_tx(
     // Create a fake CompactTx containing the transaction.
     let mut ctx = CompactTx {
         index: tx_index as u64,
-        hash: tx.txid().as_ref().to_vec(),
+        txid: tx.txid().as_ref().to_vec(),
         ..Default::default()
     };
 
diff --git a/zcash_client_backend/src/proto.rs b/zcash_client_backend/src/proto.rs
index 5af8aec872..a45045a23d 100644
--- a/zcash_client_backend/src/proto.rs
+++ b/zcash_client_backend/src/proto.rs
@@ -109,9 +109,9 @@ impl compact_formats::CompactBlock {
 impl compact_formats::CompactTx {
     /// Returns the transaction Id
     pub fn txid(&self) -> TxId {
-        let mut hash = [0u8; 32];
-        hash.copy_from_slice(&self.hash);
-        TxId::from_bytes(hash)
+        let mut txid_bytes = [0u8; 32];
+        txid_bytes.copy_from_slice(&self.txid);
+        TxId::from_bytes(txid_bytes)
     }
 }
 
diff --git a/zcash_client_backend/src/scanning.rs b/zcash_client_backend/src/scanning.rs
index 72141c78d8..9992ce6c69 100644
--- a/zcash_client_backend/src/scanning.rs
+++ b/zcash_client_backend/src/scanning.rs
@@ -1234,7 +1234,7 @@ pub mod testing {
         let mut ctx = CompactTx::default();
         let mut txid = vec![0; 32];
         rng.fill_bytes(&mut txid);
-        ctx.hash = txid;
+        ctx.txid = txid;
         ctx.spends.push(cspend);
         ctx.outputs.push(cout);
         ctx
@@ -1300,7 +1300,7 @@ pub mod testing {
         let mut ctx = CompactTx::default();
         let mut txid = vec![0; 32];
         rng.fill_bytes(&mut txid);
-        ctx.hash = txid;
+        ctx.txid = txid;
         ctx.spends.push(cspend);
         ctx.outputs.push(cout);
         ctx.index = cb.vtx.len() as u64;
diff --git a/zcash_client_backend/src/sync.rs b/zcash_client_backend/src/sync.rs
index c5d35ddc80..20a0260db9 100644
--- a/zcash_client_backend/src/sync.rs
+++ b/zcash_client_backend/src/sync.rs
@@ -331,6 +331,7 @@ where
     let range = service::BlockRange {
         start: Some(start),
         end: Some(end),
+        pool_types: vec![],
     };
     let compact_blocks = client
         .get_block_range(range)
diff --git a/zcash_client_sqlite/src/wallet/init/migrations/receiving_key_scopes.rs b/zcash_client_sqlite/src/wallet/init/migrations/receiving_key_scopes.rs
index 2a3935b864..1e56825fd6 100644
--- a/zcash_client_sqlite/src/wallet/init/migrations/receiving_key_scopes.rs
+++ b/zcash_client_sqlite/src/wallet/init/migrations/receiving_key_scopes.rs
@@ -645,7 +645,7 @@ mod tests {
         let tx = res.transaction();
 
         let mut compact_tx = CompactTx {
-            hash: tx.txid().as_ref()[..].into(),
+            txid: tx.txid().as_ref()[..].into(),
             ..Default::default()
         };
         for output in tx.sapling_bundle().unwrap().shielded_outputs() {

From 87f179782eb369ccc89cf3ab030d0baf17feaaaf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Dec 2025 05:02:16 +0000
Subject: [PATCH 037/263] build(deps): bump codecov/codecov-action from 5.5.1
 to 5.5.2

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 5.5.1 to 5.5.2.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/5a1091511ad55cbe89839c7260b706298ca349f7...671740ac38dd9b0130fbe1cec585b89eea48d3de)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-version: 5.5.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 468f1c599d..58f61a23e0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -508,7 +508,7 @@ jobs:
           --timeout 600
           --out xml
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
 

From 8ce6e727cd321f0b7ecf21e10f6af02659ac41b6 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Tue, 9 Dec 2025 17:12:47 -0700
Subject: [PATCH 038/263] zcash_address: Add
 `ZcashAddress::is_transparent_only`

---
 components/zcash_address/CHANGELOG.md |  3 +++
 components/zcash_address/src/lib.rs   | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/components/zcash_address/CHANGELOG.md b/components/zcash_address/CHANGELOG.md
index c46fa40eb3..bce46086bc 100644
--- a/components/zcash_address/CHANGELOG.md
+++ b/components/zcash_address/CHANGELOG.md
@@ -10,6 +10,9 @@ workspace.
 
 ## [Unreleased]
 
+### Added
+- `zcash_address::ZcashAddress::is_transparent_only`
+
 ### Removed
 
 - Removed deprecated `zcash_address::Network`, use `zcash_protocol::consensus::Network` instead.
diff --git a/components/zcash_address/src/lib.rs b/components/zcash_address/src/lib.rs
index 27e99421b7..8237e8540b 100644
--- a/components/zcash_address/src/lib.rs
+++ b/components/zcash_address/src/lib.rs
@@ -317,6 +317,25 @@ impl ZcashAddress {
         }
     }
 
+    /// Returns whether the only recognized receivers of this address are transparent protocol
+    /// receivers.
+    ///
+    /// A unified address with unknown receivers may be considered transparent-only if it does not
+    /// also contain a Sapling or Orchard receiver, i.e. if ordinary transaction construction
+    /// methods would produce a transaction sending to a transparent address.
+    pub fn is_transparent_only(&self) -> bool {
+        use AddressKind::*;
+        match &self.kind {
+            Sprout(_) | Sapling(_) => false,
+            Unified(addr) => {
+                addr.has_receiver_of_type(PoolType::Transparent)
+                    && !(addr.has_receiver_of_type(PoolType::SAPLING)
+                        || addr.has_receiver_of_type(PoolType::ORCHARD))
+            }
+            P2pkh(_) | P2sh(_) | Tex(_) => true,
+        }
+    }
+
     /// Returns whether or not this address contains or corresponds to the given unified address
     /// receiver.
     pub fn matches_receiver(&self, receiver: &Receiver) -> bool {

From 3ba4199aa4a330283eb34858f2ed0915fe0e9b20 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Tue, 9 Dec 2025 17:20:39 -0700
Subject: [PATCH 039/263] zip321: Make `zip321::Payment::amount` an optional
 field.

Previously, the amount field of the payment would be set to zero if no
amount parameter was present; however, this behavior is not specified by
ZIP 321. The semantics of this field have now been altered such that if
no amount is specified by a payment request, this should be interpreted
to mean that the sender of the transaction should specify an amount for
the payment.
---
 components/zip321/CHANGELOG.md |  20 +++++-
 components/zip321/src/lib.rs   | 114 ++++++++++++++++++++++++---------
 2 files changed, 101 insertions(+), 33 deletions(-)

diff --git a/components/zip321/CHANGELOG.md b/components/zip321/CHANGELOG.md
index 621e712d67..1a89e3d27b 100644
--- a/components/zip321/CHANGELOG.md
+++ b/components/zip321/CHANGELOG.md
@@ -8,10 +8,28 @@ indicated by the `PLANNED` status in order to make it possible to correctly
 represent the transitive `semver` implications of changes within the enclosing
 workspace.
 
-## [Unreleased]
+## [0.7.0] - PENDING
 
 ### Changed
 - MSRV is now 1.85.1.
+- `zip321::Payment::amount` now returns `Option<Zatoshis>` instead of `Zatoshis`.
+  Previously, the amount field of the payment would be set to zero if no amount
+  parameter was present; however, this behavior is not specified by ZIP 321.
+  The semantics of this field have now been altered such that if no amount is
+  specified by a payment request, this should be interpreted to mean that the
+  sender of the transaction should specify an amount for the payment.
+- `zip321::Payment::new` now takes its `amount` parameter as `Option<Zatoshis>`
+  instead of `Zatoshis`. It now returns `None` if the payment requests that a
+  zero-valued output OR a memo be sent to a transparent-only address.
+- `zip321::Zip321Error` has added variant `Zip321Error::ZeroValuedTransparentOutput`.
+  Zero-valued transparent outputs are rejected by the Zcash consensus rules,
+  and so payments to transparent addresses with the `amount` parameter explicitly
+  set to zero are now disallowed.
+- The return type of `zip321::TransactionRequest::total` has been modified;
+  it now returns `Ok(None)` if any payment amount is `None`, as the total
+  is not well-defined in this case.
+- `zip321::Zip321Error` has been marked `#[non_exhaustive]` to permit future
+  semver-compatible additions to the errors that can be identified at parse time.
 
 ## [0.6.0] - 2025-10-02
 
diff --git a/components/zip321/src/lib.rs b/components/zip321/src/lib.rs
index 3f1e77bcd9..9e46e95346 100644
--- a/components/zip321/src/lib.rs
+++ b/components/zip321/src/lib.rs
@@ -25,6 +25,7 @@ use zcash_protocol::{
 
 /// Errors that may be produced in decoding of payment requests.
 #[derive(Debug, Clone, PartialEq, Eq)]
+#[non_exhaustive]
 pub enum Zip321Error {
     /// A memo field in the ZIP 321 URI was not properly base-64 encoded
     InvalidBase64(base64::DecodeError),
@@ -39,6 +40,9 @@ pub enum Zip321Error {
     /// The payment at the wrapped index attempted to include a memo when sending to a
     /// transparent recipient address, which is not supported by the protocol.
     TransparentMemo(usize),
+    /// The payment at the wrapped index requested a zero-valued output to a transparent recipient
+    /// address, which is disallowed by the Zcash consensus rules.
+    ZeroValuedTransparentOutput(usize),
     /// The payment at the wrapped index did not include a recipient address.
     RecipientMissing(usize),
     /// The ZIP 321 URI was malformed and failed to parse.
@@ -75,6 +79,10 @@ impl Display for Zip321Error {
                 f,
                 "Payment {idx} is invalid: cannot send a memo to a transparent recipient address"
             ),
+            Zip321Error::ZeroValuedTransparentOutput(idx) => write!(
+                f,
+                "Payment {idx} is invalid: zero-valued transparent outputs are disallowed by consensus"
+            ),
             Zip321Error::RecipientMissing(idx) => {
                 write!(f, "Payment {idx} is missing its recipient address")
             }
@@ -115,8 +123,8 @@ pub fn memo_from_base64(s: &str) -> Result<MemoBytes, Zip321Error> {
 pub struct Payment {
     /// The address to which the payment should be sent.
     recipient_address: ZcashAddress,
-    /// The amount of the payment that is being requested.
-    amount: Zatoshis,
+    /// The amount of the payment that is being requested, if any.
+    amount: Option<Zatoshis>,
     /// A memo that, if included, must be provided with the payment.
     /// If a memo is present and [`recipient_address`] is not a shielded
     /// address, the wallet should report an error.
@@ -136,17 +144,34 @@ pub struct Payment {
 impl Payment {
     /// Constructs a new [`Payment`] from its constituent parts.
     ///
+    /// # Parameters
+    /// - `recipient_address`: The address to which the payment should be sent.
+    /// - `amount`: The amount of the payment that is being requested, if any. If no amount is
+    ///   provided, this indicates that the sender of should specify the amount.
+    /// - `memo`: A memo that, if included, must be provided with the payment. If a memo is present
+    ///   and [`recipient_address`] is not a shielded address, the wallet should report an error.
+    /// - `label` A human-readable label for this payment (usually identifying information
+    ///   associated with the recipient address) within the larger structure of the transaction
+    ///   request.
+    /// - `message`: A human-readable message to be displayed to the user describing the
+    ///   purpose of this payment within the larger structure of the transaction request.
+    /// - `other_params`: A list of other arbitrary key/value pairs associated with this payment.
+    ///
     /// Returns `None` if the payment requests that a memo be sent to a recipient that cannot
-    /// receive a memo.
+    /// receive a memo or a zero-valued output be sent to a transparent address.
     pub fn new(
         recipient_address: ZcashAddress,
-        amount: Zatoshis,
+        amount: Option<Zatoshis>,
         memo: Option<MemoBytes>,
         label: Option<String>,
         message: Option<String>,
         other_params: Vec<(String, String)>,
     ) -> Option<Self> {
-        if memo.is_none() || recipient_address.can_receive_memo() {
+        if (recipient_address.is_transparent_only() && amount == Some(Zatoshis::ZERO))
+            || (memo.is_some() && !recipient_address.can_receive_memo())
+        {
+            None
+        } else {
             Some(Self {
                 recipient_address,
                 amount,
@@ -155,16 +180,18 @@ impl Payment {
                 message,
                 other_params,
             })
-        } else {
-            None
         }
     }
 
     /// Constructs a new [`Payment`] paying the given address the specified amount.
+    ///
+    /// # Parameters
+    /// - `recipient_address`: The address to which the payment should be sent.
+    /// - `amount`: The amount of the payment that is being requested.
     pub fn without_memo(recipient_address: ZcashAddress, amount: Zatoshis) -> Self {
         Self {
             recipient_address,
-            amount,
+            amount: Some(amount),
             memo: None,
             label: None,
             message: None,
@@ -178,7 +205,7 @@ impl Payment {
     }
 
     /// Returns the value of the payment that is being requested, in zatoshis.
-    pub fn amount(&self) -> Zatoshis {
+    pub fn amount(&self) -> Option<Zatoshis> {
         self.amount
     }
 
@@ -274,14 +301,20 @@ impl TransactionRequest {
 
     /// Returns the total value of payments to be made.
     ///
-    /// Returns `Err` in the case of overflow, or if the value is
-    /// outside the range `0..=MAX_MONEY` zatoshis.
-    pub fn total(&self) -> Result<Zatoshis, BalanceError> {
+    /// Returns Ok(None) if any payment does not specify an amount, as the total of the request is
+    /// not well-defined in this circumstance.
+    ///
+    /// Returns `Err` if any summation step results in a value outside the range `0..=MAX_MONEY`
+    /// zatoshis.
+    pub fn total(&self) -> Result<Option<Zatoshis>, BalanceError> {
         self.payments
             .values()
-            .map(|p| p.amount)
-            .try_fold(Zatoshis::ZERO, |acc, a| {
-                (acc + a).ok_or(BalanceError::Overflow)
+            .try_fold(Some(Zatoshis::ZERO), |total_opt, payment| {
+                if let (Some(total), Some(value)) = (total_opt, payment.amount) {
+                    (total + value).ok_or(BalanceError::Overflow).map(Some)
+                } else {
+                    Ok(None)
+                }
             })
     }
 
@@ -312,7 +345,11 @@ impl TransactionRequest {
             payment_index: Option<usize>,
         ) -> impl IntoIterator<Item = String> + '_ {
             std::iter::empty()
-                .chain(Some(render::amount_param(payment.amount, payment_index)))
+                .chain(
+                    payment
+                        .amount
+                        .map(|a| render::amount_param(a, payment_index)),
+                )
                 .chain(
                     payment
                         .memo
@@ -599,7 +636,7 @@ mod parse {
 
         let mut payment = Payment {
             recipient_address: *addr.ok_or(Zip321Error::RecipientMissing(i))?,
-            amount: Zatoshis::ZERO,
+            amount: None,
             memo: None,
             label: None,
             message: None,
@@ -608,7 +645,13 @@ mod parse {
 
         for v in vs {
             match v {
-                Param::Amount(a) => payment.amount = a,
+                Param::Amount(a) => {
+                    if payment.recipient_address().is_transparent_only() && a == Zatoshis::ZERO {
+                        return Err(Zip321Error::ZeroValuedTransparentOutput(i));
+                    } else {
+                        payment.amount = Some(a)
+                    }
+                }
                 Param::Memo(m) => {
                     if payment.recipient_address.can_receive_memo() {
                         payment.memo = Some(*m);
@@ -782,12 +825,13 @@ mod parse {
 
 #[cfg(any(test, feature = "test-dependencies"))]
 pub mod testing {
-    use proptest::collection::btree_map;
-    use proptest::collection::vec;
+    use proptest::collection::{btree_map, vec};
     use proptest::option;
     use proptest::prelude::{any, prop_compose};
+    use proptest::strategy::Strategy as _;
 
     use zcash_address::testing::arb_address;
+    use zcash_protocol::value::Zatoshis;
     use zcash_protocol::{consensus::NetworkType, value::testing::arb_zatoshis};
 
     use super::{MemoBytes, Payment, TransactionRequest};
@@ -801,8 +845,14 @@ pub mod testing {
 
     prop_compose! {
         pub fn arb_zip321_payment(network: NetworkType)(
-            recipient_address in arb_address(network),
-            amount in arb_zatoshis(),
+            (recipient_address, amount) in arb_address(network).prop_flat_map(|addr| {
+                arb_zatoshis().prop_filter_map(
+                    "zero-valued outputs to transparent addresses are disallowed by consensus",
+                    move |zat| (!addr.is_transparent_only() || zat > Zatoshis::ZERO).then_some(
+                        (addr.clone(), zat)
+                    )
+                )
+            }),
             memo in option::of(arb_valid_memo()),
             message in option::of(any::<String>()),
             label in option::of(any::<String>()),
@@ -816,7 +866,7 @@ pub mod testing {
                 .collect();
             Payment {
                 recipient_address,
-                amount,
+                amount: Some(amount),
                 memo,
                 label,
                 message,
@@ -913,7 +963,7 @@ mod tests {
             vec![
                 Payment {
                     recipient_address: ZcashAddress::try_from_encoded("ztestsapling1n65uaftvs2g7075q2x2a04shfk066u3lldzxsrprfrqtzxnhc9ps73v4lhx4l9yfxj46sl0q90k").unwrap(),
-                    amount: Zatoshis::const_from_u64(376876902796286),
+                    amount: Some(Zatoshis::const_from_u64(376876902796286)),
                     memo: None,
                     label: None,
                     message: Some("".to_string()),
@@ -934,7 +984,7 @@ mod tests {
             vec![
                 Payment {
                     recipient_address: ZcashAddress::try_from_encoded("ztestsapling1n65uaftvs2g7075q2x2a04shfk066u3lldzxsrprfrqtzxnhc9ps73v4lhx4l9yfxj46sl0q90k").unwrap(),
-                    amount: Zatoshis::ZERO,
+                    amount: None,
                     memo: None,
                     label: None,
                     message: None,
@@ -952,7 +1002,7 @@ mod tests {
             vec![
                 Payment {
                     recipient_address: ZcashAddress::try_from_encoded("ztestsapling1n65uaftvs2g7075q2x2a04shfk066u3lldzxsrprfrqtzxnhc9ps73v4lhx4l9yfxj46sl0q90k").unwrap(),
-                    amount: Zatoshis::ZERO,
+                    amount: Some(Zatoshis::ZERO),
                     memo: None,
                     label: None,
                     message: Some("".to_string()),
@@ -996,7 +1046,7 @@ mod tests {
         let valid_1 = "zcash:ztestsapling10yy2ex5dcqkclhc7z7yrnjq2z6feyjad56ptwlfgmy77dmaqqrl9gyhprdx59qgmsnyfska2kez?amount=1&memo=VGhpcyBpcyBhIHNpbXBsZSBtZW1vLg&message=Thank%20you%20for%20your%20purchase";
         let v1r = TransactionRequest::from_uri(valid_1).unwrap();
         assert_eq!(
-            v1r.payments.get(&0).map(|p| p.amount),
+            v1r.payments.get(&0).and_then(|p| p.amount),
             Some(Zatoshis::const_from_u64(100000000))
         );
 
@@ -1004,11 +1054,11 @@ mod tests {
         let mut v2r = TransactionRequest::from_uri(valid_2).unwrap();
         v2r.normalize();
         assert_eq!(
-            v2r.payments.get(&0).map(|p| p.amount),
+            v2r.payments.get(&0).and_then(|p| p.amount),
             Some(Zatoshis::const_from_u64(12345600000))
         );
         assert_eq!(
-            v2r.payments.get(&1).map(|p| p.amount),
+            v2r.payments.get(&1).and_then(|p| p.amount),
             Some(Zatoshis::const_from_u64(78900000))
         );
 
@@ -1017,7 +1067,7 @@ mod tests {
         let valid_3 = "zcash:ztestsapling10yy2ex5dcqkclhc7z7yrnjq2z6feyjad56ptwlfgmy77dmaqqrl9gyhprdx59qgmsnyfska2kez?amount=20999999.99999999";
         let v3r = TransactionRequest::from_uri(valid_3).unwrap();
         assert_eq!(
-            v3r.payments.get(&0).map(|p| p.amount),
+            v3r.payments.get(&0).and_then(|p| p.amount),
             Some(Zatoshis::const_from_u64(2099999999999999))
         );
 
@@ -1026,7 +1076,7 @@ mod tests {
         let valid_4 = "zcash:ztestsapling10yy2ex5dcqkclhc7z7yrnjq2z6feyjad56ptwlfgmy77dmaqqrl9gyhprdx59qgmsnyfska2kez?amount=21000000";
         let v4r = TransactionRequest::from_uri(valid_4).unwrap();
         assert_eq!(
-            v4r.payments.get(&0).map(|p| p.amount),
+            v4r.payments.get(&0).and_then(|p| p.amount),
             Some(Zatoshis::const_from_u64(2100000000000000))
         );
     }
@@ -1036,7 +1086,7 @@ mod tests {
         let valid_1 = "zcash:zregtestsapling1qqqqqqqqqqqqqqqqqqcguyvaw2vjk4sdyeg0lc970u659lvhqq7t0np6hlup5lusxle7505hlz3?amount=1&memo=VGhpcyBpcyBhIHNpbXBsZSBtZW1vLg&message=Thank%20you%20for%20your%20purchase";
         let v1r = TransactionRequest::from_uri(valid_1).unwrap();
         assert_eq!(
-            v1r.payments.get(&0).map(|p| p.amount),
+            v1r.payments.get(&0).and_then(|p| p.amount),
             Some(Zatoshis::const_from_u64(100000000))
         );
     }

From a078a78881f13d633ef36dddf52453f8a89c052a Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Tue, 9 Dec 2025 18:48:20 -0700
Subject: [PATCH 040/263] zcash_client_backend: Update to `zip321 0.7`

---
 zcash_client_backend/CHANGELOG.md             |  6 ++-
 zcash_client_backend/src/data_api/wallet.rs   | 17 +++++---
 .../src/data_api/wallet/input_selection.rs    | 43 +++++++++++++------
 zcash_client_backend/src/proposal.rs          | 28 ++++++++----
 4 files changed, 63 insertions(+), 31 deletions(-)

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index 7e187f0cf0..3958f36f6c 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -21,9 +21,10 @@ workspace.
   - `BlockRange` has added field `pool_types`
   - `LightdInfo` has added fields `upgrade_name`, `upgrade_height`, and `lighwallet_protocol_version`
   - `GetMempoolTxRequest` (previously named `Exclude`) has added field `pool_types`
+- `impl From<zcash_client_backend::proposal::ProposalError> for zcash_client_backend::data_api::wallet::input_selection::InputSelectorError<...>`
 
 ### Changed
-- Migrated to `orchard 0.12`, `sapling-crypto 0.6`.
+- Migrated to `orchard 0.12`, `sapling-crypto 0.6`, `zip321 0.7`
 - Migrated to `lightwallet-protocol v0.4.0`. This results in the following API
   changes:
   - in `zcash_client_backend::proto::compact_formats`:
@@ -48,7 +49,8 @@ workspace.
     key that will be used to encrypt any wallet-internal change outputs
     that would otherwise only be recoverable using the wallet's internal
     IVK.
-- `zcash_client_backend::data_api::WalletRead` has added method `get_received_outputs.
+- `zcash_client_backend::data_api::WalletRead` has added method `get_received_outputs`.
+- `zcash_client_backend::proposal::ProposalError` has added variant `PaymentAmountMissing`
 
 ## [0.21.0] - 2025-11-05
 
diff --git a/zcash_client_backend/src/data_api/wallet.rs b/zcash_client_backend/src/data_api/wallet.rs
index 9c6adfe76c..b95f400487 100644
--- a/zcash_client_backend/src/data_api/wallet.rs
+++ b/zcash_client_backend/src/data_api/wallet.rs
@@ -701,7 +701,7 @@ where
     let request = zip321::TransactionRequest::new(vec![
         Payment::new(
             to.to_zcash_address(params),
-            amount,
+            Some(amount),
             memo,
             None,
             None,
@@ -1393,6 +1393,9 @@ where
             .expect(
                 "The mapping between payment index and payment is checked in step construction",
             );
+        let payment_amount = payment
+            .amount()
+            .ok_or(ProposalError::PaymentAmountMissing(payment_index))?;
         let recipient_address = payment.recipient_address();
 
         let add_sapling_output =
@@ -1404,7 +1407,7 @@ where
                 builder.add_sapling_output(
                     external_ovk.map(|k| k.into()),
                     to,
-                    payment.amount(),
+                    payment_amount,
                     memo.clone(),
                 )?;
                 sapling_output_meta.push((
@@ -1412,7 +1415,7 @@ where
                         recipient_address: recipient_address.clone(),
                         output_pool: PoolType::SAPLING,
                     },
-                    payment.amount(),
+                    payment_amount,
                     Some(memo),
                 ));
                 Ok(())
@@ -1428,7 +1431,7 @@ where
                 builder.add_orchard_output(
                     external_ovk.map(|k| k.into()),
                     to,
-                    payment.amount().into(),
+                    payment_amount.into(),
                     memo.clone(),
                 )?;
                 orchard_output_meta.push((
@@ -1436,7 +1439,7 @@ where
                         recipient_address: recipient_address.clone(),
                         output_pool: PoolType::ORCHARD,
                     },
-                    payment.amount(),
+                    payment_amount,
                     Some(memo),
                 ));
                 Ok(())
@@ -1450,14 +1453,14 @@ where
                 if payment.memo().is_some() {
                     return Err(Error::MemoForbidden);
                 }
-                builder.add_transparent_output(&to, payment.amount())?;
+                builder.add_transparent_output(&to, payment_amount)?;
                 transparent_output_meta.push((
                     BuildRecipient::External {
                         recipient_address: recipient_address.clone(),
                         output_pool: PoolType::TRANSPARENT,
                     },
                     to,
-                    payment.amount(),
+                    payment_amount,
                     StepOutputIndex::Payment(payment_index),
                 ));
                 Ok(())
diff --git a/zcash_client_backend/src/data_api/wallet/input_selection.rs b/zcash_client_backend/src/data_api/wallet/input_selection.rs
index cf80b2355d..74eab24899 100644
--- a/zcash_client_backend/src/data_api/wallet/input_selection.rs
+++ b/zcash_client_backend/src/data_api/wallet/input_selection.rs
@@ -150,6 +150,12 @@ impl<E, S, C, N> From<ChangeError<C, N>> for InputSelectorError<E, S, C, N> {
     }
 }
 
+impl<E, S, C, N> From<ProposalError> for InputSelectorError<E, S, C, N> {
+    fn from(err: ProposalError) -> Self {
+        InputSelectorError::Proposal(err)
+    }
+}
+
 /// A strategy for selecting transaction inputs and proposing transaction outputs.
 ///
 /// Proposals should include only economically useful inputs, as determined by `Self::FeeRule`;
@@ -414,6 +420,9 @@ impl<DbT: InputSource> InputSelector for GreedyInputSelector<DbT> {
         let mut total_ephemeral = Zatoshis::ZERO;
 
         for (idx, payment) in transaction_request.payments() {
+            let payment_amount = payment
+                .amount()
+                .ok_or(ProposalError::PaymentAmountMissing(*idx))?;
             let recipient_address: Address = payment
                 .recipient_address()
                 .clone()
@@ -422,7 +431,7 @@ impl<DbT: InputSource> InputSelector for GreedyInputSelector<DbT> {
             match recipient_address {
                 Address::Transparent(addr) => {
                     payment_pools.insert(*idx, PoolType::TRANSPARENT);
-                    transparent_outputs.push(TxOut::new(payment.amount(), addr.script().into()));
+                    transparent_outputs.push(TxOut::new(payment_amount, addr.script().into()));
                 }
                 #[cfg(feature = "transparent-inputs")]
                 Address::Tex(data) => {
@@ -430,7 +439,7 @@ impl<DbT: InputSource> InputSelector for GreedyInputSelector<DbT> {
 
                     tr1_payment_pools.insert(*idx, PoolType::TRANSPARENT);
                     tr1_transparent_outputs
-                        .push(TxOut::new(payment.amount(), p2pkh_addr.script().into()));
+                        .push(TxOut::new(payment_amount, p2pkh_addr.script().into()));
                     tr1_payments.push(
                         Payment::new(
                             payment.recipient_address().clone(),
@@ -442,7 +451,7 @@ impl<DbT: InputSource> InputSelector for GreedyInputSelector<DbT> {
                         )
                         .expect("cannot fail because memo is None"),
                     );
-                    total_ephemeral = (total_ephemeral + payment.amount())
+                    total_ephemeral = (total_ephemeral + payment_amount)
                         .ok_or(GreedyInputSelectorError::Balance(BalanceError::Overflow))?;
                 }
                 #[cfg(not(feature = "transparent-inputs"))]
@@ -453,26 +462,25 @@ impl<DbT: InputSource> InputSelector for GreedyInputSelector<DbT> {
                 }
                 Address::Sapling(_) => {
                     payment_pools.insert(*idx, PoolType::SAPLING);
-                    sapling_outputs.push(SaplingPayment(payment.amount()));
+                    sapling_outputs.push(SaplingPayment(payment_amount));
                 }
                 Address::Unified(addr) => {
                     #[cfg(feature = "orchard")]
                     if addr.has_orchard() {
                         payment_pools.insert(*idx, PoolType::ORCHARD);
-                        orchard_outputs.push(OrchardPayment(payment.amount()));
+                        orchard_outputs.push(OrchardPayment(payment_amount));
                         continue;
                     }
 
                     if addr.has_sapling() {
                         payment_pools.insert(*idx, PoolType::SAPLING);
-                        sapling_outputs.push(SaplingPayment(payment.amount()));
+                        sapling_outputs.push(SaplingPayment(payment_amount));
                         continue;
                     }
 
                     if let Some(addr) = addr.transparent() {
                         payment_pools.insert(*idx, PoolType::TRANSPARENT);
-                        transparent_outputs
-                            .push(TxOut::new(payment.amount(), addr.script().into()));
+                        transparent_outputs.push(TxOut::new(payment_amount, addr.script().into()));
                         continue;
                     }
 
@@ -879,12 +887,19 @@ where
     let tr0_balance = TransactionBalance::new(tr0_change, tr0_fee)
         .expect("the sum of an single-element vector of fee values cannot overflow");
 
-    let payment = zip321::Payment::new(recipient, total_to_recipient, memo, None, None, vec![])
-        .ok_or_else(|| {
-            InputSelectorError::Proposal(ProposalError::Zip321(
-                zip321::Zip321Error::TransparentMemo(0),
-            ))
-        })?;
+    let payment = zip321::Payment::new(
+        recipient,
+        Some(total_to_recipient),
+        memo,
+        None,
+        None,
+        vec![],
+    )
+    .ok_or_else(|| {
+        InputSelectorError::Proposal(ProposalError::Zip321(zip321::Zip321Error::TransparentMemo(
+            0,
+        )))
+    })?;
 
     let transaction_request =
         TransactionRequest::new(vec![payment.clone()]).map_err(|payment_error| {
diff --git a/zcash_client_backend/src/proposal.rs b/zcash_client_backend/src/proposal.rs
index 8288fb5136..e8b334b6a2 100644
--- a/zcash_client_backend/src/proposal.rs
+++ b/zcash_client_backend/src/proposal.rs
@@ -51,6 +51,8 @@ pub enum ProposalError {
     SpendsChange(StepOutput),
     /// The proposal results in an invalid payment request according to ZIP-321.
     Zip321(Zip321Error),
+    /// The ZIP 321 payment request at the wrapped index lacked payment amount information.
+    PaymentAmountMissing(usize),
     /// A proposal step created an ephemeral output that was not spent in any later step.
     #[cfg(feature = "transparent-inputs")]
     EphemeralOutputLeftUnspent(StepOutput),
@@ -116,6 +118,12 @@ impl Display for ProposalError {
             ProposalError::Zip321(r) => {
                 write!(f, "The proposal results in an invalid payment {r:?}.",)
             }
+            ProposalError::PaymentAmountMissing(idx) => {
+                write!(
+                    f,
+                    "Payment amount not specified for requested payment at index {idx}."
+                )
+            }
             #[cfg(feature = "transparent-inputs")]
             ProposalError::EphemeralOutputLeftUnspent(r) => write!(
                 f,
@@ -419,12 +427,14 @@ impl<NoteRef> Step<NoteRef> {
             return Err(ProposalError::PaymentPoolsMismatch);
         }
         for (idx, pool) in &payment_pools {
-            if !transaction_request
-                .payments()
-                .get(idx)
-                .iter()
-                .any(|payment| payment.recipient_address().can_receive_as(*pool))
-            {
+            if let Some(payment) = transaction_request.payments().get(idx) {
+                if !payment.recipient_address().can_receive_as(*pool) {
+                    return Err(ProposalError::PaymentPoolsMismatch);
+                }
+                if payment.amount().is_none() {
+                    return Err(ProposalError::PaymentAmountMissing(*idx));
+                }
+            } else {
                 return Err(ProposalError::PaymentPoolsMismatch);
             }
         }
@@ -455,7 +465,8 @@ impl<NoteRef> Step<NoteRef> {
                         .payments()
                         .get(&i)
                         .ok_or(ProposalError::ReferenceError(*s_ref))?
-                        .amount(),
+                        .amount()
+                        .ok_or(ProposalError::PaymentAmountMissing(i))?,
                     StepOutputIndex::Change(i) => step
                         .balance
                         .proposed_change()
@@ -474,7 +485,8 @@ impl<NoteRef> Step<NoteRef> {
 
         let request_total = transaction_request
             .total()
-            .map_err(|_| ProposalError::RequestTotalInvalid)?;
+            .map_err(|_| ProposalError::RequestTotalInvalid)?
+            .expect("all payments previously checked to have amount values");
         let output_total = (request_total + balance.total()).ok_or(ProposalError::Overflow)?;
 
         if is_shielding

From 99d3ae4a38615c38842501d583a377dd77d1e6c2 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Wed, 10 Dec 2025 12:52:07 -0700
Subject: [PATCH 041/263] cargo vet updates following the
 `zcash_protocol-0.7.1` release.

---
 supply-chain/audits.toml  |  6 +--
 supply-chain/config.toml  | 20 ---------
 supply-chain/imports.lock | 92 +++++++++++++++++++++++++++++----------
 3 files changed, 71 insertions(+), 47 deletions(-)

diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
index befb6c1cb9..8787f8bbb7 100644
--- a/supply-chain/audits.toml
+++ b/supply-chain/audits.toml
@@ -1170,7 +1170,7 @@ end = "2025-04-22"
 criteria = "safe-to-deploy"
 user-id = 169181 # Kris Nuttycombe (nuttycom)
 start = "2024-08-20"
-end = "2025-08-26"
+end = "2026-12-10"
 
 [[trusted.zcash_client_backend]]
 criteria = "safe-to-deploy"
@@ -1260,7 +1260,7 @@ end = "2026-09-25"
 criteria = "safe-to-deploy"
 user-id = 169181 # Kris Nuttycombe (nuttycom)
 start = "2024-08-20"
-end = "2025-08-26"
+end = "2026-12-10"
 
 [[trusted.zcash_primitives]]
 criteria = ["safe-to-deploy", "crypto-reviewed", "license-reviewed"]
@@ -1284,7 +1284,7 @@ end = "2026-09-25"
 criteria = "safe-to-deploy"
 user-id = 169181 # Kris Nuttycombe (nuttycom)
 start = "2024-08-20"
-end = "2025-08-26"
+end = "2026-12-10"
 
 [[trusted.zcash_proofs]]
 criteria = ["safe-to-deploy", "crypto-reviewed", "license-reviewed"]
diff --git a/supply-chain/config.toml b/supply-chain/config.toml
index 66f085a495..672a64131a 100644
--- a/supply-chain/config.toml
+++ b/supply-chain/config.toml
@@ -167,10 +167,6 @@ criteria = "safe-to-deploy"
 version = "1.0.3"
 criteria = "safe-to-deploy"
 
-[[exemptions.atomic-waker]]
-version = "1.1.2"
-criteria = "safe-to-deploy"
-
 [[exemptions.backtrace]]
 version = "0.3.69"
 criteria = "safe-to-deploy"
@@ -223,10 +219,6 @@ criteria = "safe-to-deploy"
 version = "0.8.0"
 criteria = "safe-to-deploy"
 
-[[exemptions.bounded-vec]]
-version = "0.9.0"
-criteria = "safe-to-deploy"
-
 [[exemptions.bounded-vec-deque]]
 version = "0.1.1"
 criteria = "safe-to-deploy"
@@ -475,10 +467,6 @@ criteria = "safe-to-deploy"
 version = "0.13.8"
 criteria = "safe-to-deploy"
 
-[[exemptions.embedded-io]]
-version = "0.6.1"
-criteria = "safe-to-deploy"
-
 [[exemptions.enum-ordinalize]]
 version = "3.1.15"
 criteria = "safe-to-deploy"
@@ -527,10 +515,6 @@ criteria = "safe-to-run"
 version = "0.8.0"
 criteria = "safe-to-deploy"
 
-[[exemptions.fixedbitset]]
-version = "0.4.2"
-criteria = "safe-to-deploy"
-
 [[exemptions.fluid-let]]
 version = "1.0.0"
 criteria = "safe-to-deploy"
@@ -1443,10 +1427,6 @@ criteria = "safe-to-deploy"
 version = "0.1.27"
 criteria = "safe-to-deploy"
 
-[[exemptions.tracing-log]]
-version = "0.2.0"
-criteria = "safe-to-deploy"
-
 [[exemptions.tracing-test]]
 version = "0.2.5"
 criteria = "safe-to-deploy"
diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index 4909ef1325..9016420f6d 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -288,8 +288,8 @@ user-login = "str4d"
 user-name = "Jack Grigg"
 
 [[publisher.zcash_address]]
-version = "0.9.0"
-when = "2025-07-31"
+version = "0.10.1"
+when = "2025-10-20"
 user-id = 169181
 user-login = "nuttycom"
 user-name = "Kris Nuttycombe"
@@ -337,25 +337,25 @@ user-login = "str4d"
 user-name = "Jack Grigg"
 
 [[publisher.zcash_primitives]]
-version = "0.25.0"
-when = "2025-09-25"
-user-id = 6289
-user-login = "str4d"
-user-name = "Jack Grigg"
+version = "0.26.1"
+when = "2025-10-20"
+user-id = 169181
+user-login = "nuttycom"
+user-name = "Kris Nuttycombe"
 
 [[publisher.zcash_proofs]]
-version = "0.25.0"
-when = "2025-09-25"
-user-id = 6289
-user-login = "str4d"
-user-name = "Jack Grigg"
+version = "0.26.1"
+when = "2025-10-20"
+user-id = 169181
+user-login = "nuttycom"
+user-name = "Kris Nuttycombe"
 
 [[publisher.zcash_protocol]]
-version = "0.6.2"
-when = "2025-09-25"
-user-id = 6289
-user-login = "str4d"
-user-name = "Jack Grigg"
+version = "0.7.1"
+when = "2025-10-20"
+user-id = 169181
+user-login = "nuttycom"
+user-name = "Kris Nuttycombe"
 
 [[publisher.zcash_script]]
 version = "0.4.0"
@@ -372,11 +372,11 @@ user-login = "daira"
 user-name = "Daira-Emma Hopwood"
 
 [[publisher.zcash_transparent]]
-version = "0.5.0"
-when = "2025-09-25"
-user-id = 6289
-user-login = "str4d"
-user-name = "Jack Grigg"
+version = "0.6.0"
+when = "2025-10-02"
+user-id = 169181
+user-login = "nuttycom"
+user-name = "Kris Nuttycombe"
 
 [[publisher.zip32]]
 version = "0.2.0"
@@ -386,8 +386,8 @@ user-login = "nuttycom"
 user-name = "Kris Nuttycombe"
 
 [[publisher.zip321]]
-version = "0.5.0"
-when = "2025-07-31"
+version = "0.6.0"
+when = "2025-10-02"
 user-id = 169181
 user-login = "nuttycom"
 user-name = "Kris Nuttycombe"
@@ -425,6 +425,12 @@ Unsafe code, but its logic looks good to me. Necessary given what it is
 doing. Well tested, has quickchecks.
 """
 
+[[audits.bytecode-alliance.audits.atomic-waker]]
+who = "Alex Crichton <alex@alexcrichton.com>"
+criteria = "safe-to-deploy"
+version = "1.1.2"
+notes = "Contains `unsafe` code but it's well-documented and scoped to what it's intended to be doing. Otherwise a well-focused and straightforward crate."
+
 [[audits.bytecode-alliance.audits.base64]]
 who = "Pat Hickey <phickey@fastly.com>"
 criteria = "safe-to-deploy"
@@ -512,6 +518,12 @@ criteria = "safe-to-deploy"
 version = "0.4.0"
 notes = "No `unsafe` code and only uses `std` in ways one would expect the crate to do so."
 
+[[audits.bytecode-alliance.audits.embedded-io]]
+who = "Alex Crichton <alex@alexcrichton.com>"
+criteria = "safe-to-deploy"
+delta = "0.4.0 -> 0.6.1"
+notes = "Major updates, but almost all safe code. Lots of pruning/deletions, nothing out of the ordrinary."
+
 [[audits.bytecode-alliance.audits.errno]]
 who = "Dan Gohman <dev@sunfishcode.online>"
 criteria = "safe-to-deploy"
@@ -543,6 +555,16 @@ This update had a few doc updates but no otherwise-substantial source code
 updates.
 """
 
+[[audits.bytecode-alliance.audits.fixedbitset]]
+who = "Nick Fitzgerald <fitzgen@gmail.com>"
+criteria = "safe-to-deploy"
+version = "0.4.2"
+notes = """
+No ambient I/O. Uses some `unsafe`, but the uses look good and are guarded by
+relevant assertions, although could use some comments and some slight
+refactoring into helpers to dedupe unsafe blocks in my personal opinion.
+"""
+
 [[audits.bytecode-alliance.audits.futures-channel]]
 who = "Joel Dice <joel.dice@gmail.com>"
 criteria = "safe-to-deploy"
@@ -792,6 +814,21 @@ without `unsafe`. Skimming the crate everything looks reasonable and what one
 would expect from idiomatic safe collections in Rust.
 """
 
+[[audits.bytecode-alliance.audits.tracing-log]]
+who = "Alex Crichton <alex@alexcrichton.com>"
+criteria = "safe-to-deploy"
+version = "0.1.3"
+notes = """
+This is a standard adapter between the `log` ecosystem and the `tracing`
+ecosystem. There's one `unsafe` block in this crate and it's well-scoped.
+"""
+
+[[audits.bytecode-alliance.audits.tracing-log]]
+who = "Alex Crichton <alex@alexcrichton.com>"
+criteria = "safe-to-deploy"
+delta = "0.1.3 -> 0.2.0"
+notes = "Nothing out of the ordinary, a typical major version update and nothing awry."
+
 [[audits.bytecode-alliance.audits.tracing-subscriber]]
 who = "Pat Hickey <phickey@fastly.com>"
 criteria = "safe-to-deploy"
@@ -2914,6 +2951,13 @@ delta = "0.10.3 -> 0.10.4"
 notes = "Adds panics to prevent a block size of zero from causing unsoundness."
 aggregated-from = "https://raw.githubusercontent.com/zcash/zcash/master/qa/supply-chain/audits.toml"
 
+[[audits.zcash.audits.bounded-vec]]
+who = "Kris Nuttycombe <kris@nutty.land>"
+criteria = "safe-to-deploy"
+version = "0.9.0"
+notes = "Crate forbids unsafe code and uses no powerful imports. It consists primarily of safe constructors for newtype wrappers around `Vec`."
+aggregated-from = "https://raw.githubusercontent.com/zcash/zcash/master/qa/supply-chain/audits.toml"
+
 [[audits.zcash.audits.bs58]]
 who = "Daira-Emma Hopwood <daira@jacaranda.org>"
 criteria = "safe-to-deploy"

From 84895d29109aa2caedc3e6f0987f17988028467f Mon Sep 17 00:00:00 2001
From: Marek <m@rek.onl>
Date: Sun, 30 Nov 2025 21:45:16 +0100
Subject: [PATCH 042/263] zcash_protocol: Add `TxId::NULL`

Co-authored-by: Kris Nuttycombe <kris@nutty.land>
Co-authored-by: Jack Grigg <jack@electriccoin.co>
---
 components/zcash_protocol/CHANGELOG.md |  3 +++
 components/zcash_protocol/src/txid.rs  | 10 +++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/components/zcash_protocol/CHANGELOG.md b/components/zcash_protocol/CHANGELOG.md
index 29ef6458cb..e193a6c37e 100644
--- a/components/zcash_protocol/CHANGELOG.md
+++ b/components/zcash_protocol/CHANGELOG.md
@@ -10,6 +10,9 @@ workspace.
 
 ## [Unreleased]
 
+### Added
+- `zcash_protocol::txid::TxId::NULL`
+
 ## [0.7.1] - 2025-10-18
 
 ### Fixed
diff --git a/components/zcash_protocol/src/txid.rs b/components/zcash_protocol/src/txid.rs
index ddbbfefd9f..ee76c71a35 100644
--- a/components/zcash_protocol/src/txid.rs
+++ b/components/zcash_protocol/src/txid.rs
@@ -48,6 +48,10 @@ impl From<TxId> for [u8; 32] {
 }
 
 impl TxId {
+    /// The all-zeros txid. This is reserved as the txid of the transparent input to a coinbase
+    /// transaction.
+    pub const NULL: TxId = TxId([0u8; 32]);
+
     /// Wraps the given byte array as a TxId value
     pub const fn from_bytes(bytes: [u8; 32]) -> Self {
         TxId(bytes)
@@ -66,9 +70,9 @@ impl TxId {
         Ok(())
     }
 
-    /// Returns true when the txid consists of all zeros; this only occurs for coinbase
-    /// transactions.
+    /// Returns true when the txid consists of all zeros, indicating the input
+    /// to a coinbase transaction.
     pub fn is_null(&self) -> bool {
-        self.0 == [0u8; 32]
+        *self == Self::NULL
     }
 }

From 278a8423a06672343910f17be1570b51e2e722bd Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Wed, 10 Dec 2025 11:57:02 -0700
Subject: [PATCH 043/263] Release zcash_protocol version 0.7.2

---
 Cargo.lock                             | 2 +-
 components/zcash_protocol/CHANGELOG.md | 2 ++
 components/zcash_protocol/Cargo.toml   | 2 +-
 supply-chain/imports.lock              | 4 ++++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1f21675477..d67512108f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6705,7 +6705,7 @@ dependencies = [
 
 [[package]]
 name = "zcash_protocol"
-version = "0.7.1"
+version = "0.7.2"
 dependencies = [
  "core2",
  "document-features",
diff --git a/components/zcash_protocol/CHANGELOG.md b/components/zcash_protocol/CHANGELOG.md
index e193a6c37e..156f0bf669 100644
--- a/components/zcash_protocol/CHANGELOG.md
+++ b/components/zcash_protocol/CHANGELOG.md
@@ -10,6 +10,8 @@ workspace.
 
 ## [Unreleased]
 
+## [0.7.2] - 2025-12-10
+
 ### Added
 - `zcash_protocol::txid::TxId::NULL`
 
diff --git a/components/zcash_protocol/Cargo.toml b/components/zcash_protocol/Cargo.toml
index e13774d795..83cc6712ed 100644
--- a/components/zcash_protocol/Cargo.toml
+++ b/components/zcash_protocol/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "zcash_protocol"
 description = "Zcash protocol network constants and value types."
-version = "0.7.1"
+version = "0.7.2"
 authors = [
     "Jack Grigg <jack@electriccoin.co>",
     "Kris Nuttycombe <kris@nutty.land>",
diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index 9016420f6d..c371cc769b 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -1,6 +1,10 @@
 
 # cargo-vet imports lock
 
+[[unpublished.zcash_protocol]]
+version = "0.7.2"
+audited_as = "0.7.1"
+
 [[publisher.bumpalo]]
 version = "3.16.0"
 when = "2024-04-08"

From 98a4f576ac0cb15b1b4945383be950b8b5dc021a Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Thu, 11 Dec 2025 12:35:44 -0700
Subject: [PATCH 044/263] Post-release `cargo vet` update.

---
 supply-chain/imports.lock | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index c371cc769b..75f9e08439 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -1,10 +1,6 @@
 
 # cargo-vet imports lock
 
-[[unpublished.zcash_protocol]]
-version = "0.7.2"
-audited_as = "0.7.1"
-
 [[publisher.bumpalo]]
 version = "3.16.0"
 when = "2024-04-08"
@@ -355,8 +351,8 @@ user-login = "nuttycom"
 user-name = "Kris Nuttycombe"
 
 [[publisher.zcash_protocol]]
-version = "0.7.1"
-when = "2025-10-20"
+version = "0.7.2"
+when = "2025-12-11"
 user-id = 169181
 user-login = "nuttycom"
 user-name = "Kris Nuttycombe"

From 5e4082378a3ab8211b86adeeadc3555bacb2a560 Mon Sep 17 00:00:00 2001
From: Marek <m@rek.onl>
Date: Sun, 30 Nov 2025 21:45:16 +0100
Subject: [PATCH 045/263] zcash_transparent: Construct null outpoints

Co-authored-by: Kris Nuttycombe <kris@nutty.land>
Co-authored-by: Jack Grigg <jack@electriccoin.co>
---
 Cargo.toml                      |  2 +-
 zcash_transparent/CHANGELOG.md  |  3 +++
 zcash_transparent/src/bundle.rs | 14 ++++++++++----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index e1203b94a5..05382c434e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,7 +40,7 @@ zcash_address = { version = "0.10", path = "components/zcash_address", default-f
 zcash_client_backend = { version = "0.20", path = "zcash_client_backend" }
 zcash_encoding = { version = "0.3", path = "components/zcash_encoding", default-features = false }
 zcash_keys = { version = "0.11", path = "zcash_keys" }
-zcash_protocol = { version = "0.7", path = "components/zcash_protocol", default-features = false }
+zcash_protocol = { version = "0.7.2", path = "components/zcash_protocol", default-features = false }
 zip321 = { version = "0.6", path = "components/zip321" }
 
 zcash_note_encryption = "0.4.1"
diff --git a/zcash_transparent/CHANGELOG.md b/zcash_transparent/CHANGELOG.md
index dd5077e0cb..adf9e6eeb9 100644
--- a/zcash_transparent/CHANGELOG.md
+++ b/zcash_transparent/CHANGELOG.md
@@ -10,6 +10,9 @@ workspace.
 
 ## [Unreleased]
 
+### Added
+- `zcash_transparent::bundle::Outpoint::NULL`
+
 ## [0.6.1] - 2025-10-27
 
 ### Added
diff --git a/zcash_transparent/src/bundle.rs b/zcash_transparent/src/bundle.rs
index 83c180bfbc..3501f926a5 100644
--- a/zcash_transparent/src/bundle.rs
+++ b/zcash_transparent/src/bundle.rs
@@ -146,9 +146,17 @@ pub struct OutPoint {
 }
 
 impl OutPoint {
+    /// Returns the null [`OutPoint`] in the Bitcoin sense:
+    /// - [`TxId`] is set to all-zeroes, and
+    /// - output index is set to [`u32::MAX`].
+    pub const NULL: OutPoint = OutPoint {
+        hash: TxId::NULL,
+        n: u32::MAX,
+    };
+
     /// Constructs an `OutPoint` for the output at index `n` in the transaction
     /// with txid `hash`.
-    pub fn new(hash: [u8; 32], n: u32) -> Self {
+    pub const fn new(hash: [u8; 32], n: u32) -> Self {
         OutPoint {
             hash: TxId::from_bytes(hash),
             n,
@@ -180,9 +188,7 @@ impl OutPoint {
     /// Returns `true` if this `OutPoint` is "null" in the Bitcoin sense: it has txid set to
     /// all-zeroes and output index set to `u32::MAX`.
     fn is_null(&self) -> bool {
-        // From `BaseOutPoint::IsNull()` in zcashd:
-        //   return (hash.IsNull() && n == (uint32_t) -1);
-        self.hash.is_null() && self.n == u32::MAX
+        *self == Self::NULL
     }
 
     /// Returns the output index of this `OutPoint`.

From b0ca95e25bf568c6583d91544771bdbc4713c5b5 Mon Sep 17 00:00:00 2001
From: Marek <m@rek.onl>
Date: Sun, 30 Nov 2025 21:45:54 +0100
Subject: [PATCH 046/263] zcash_transparent: Construct coinbase inputs

Co-authored-by: Kris Nuttycombe <kris@nutty.land>
Co-authored-by: Greg Pfeil <greg@technomadic.org>
Co-authored-by: Jack Grigg <jack@electriccoin.co>
Co-authored-by: Daira-Emma Hopwood <daira@jacaranda.org>
---
 zcash_transparent/CHANGELOG.md    |  9 ++-
 zcash_transparent/src/builder.rs  |  8 +++
 zcash_transparent/src/bundle.rs   | 94 ++++++++++++++++++++++++++++++-
 zcash_transparent/src/coinbase.rs | 59 +++++++++++++++++++
 zcash_transparent/src/lib.rs      |  4 ++
 5 files changed, 172 insertions(+), 2 deletions(-)
 create mode 100644 zcash_transparent/src/coinbase.rs

diff --git a/zcash_transparent/CHANGELOG.md b/zcash_transparent/CHANGELOG.md
index adf9e6eeb9..1a45c35235 100644
--- a/zcash_transparent/CHANGELOG.md
+++ b/zcash_transparent/CHANGELOG.md
@@ -11,7 +11,14 @@ workspace.
 ## [Unreleased]
 
 ### Added
-- `zcash_transparent::bundle::Outpoint::NULL`
+- `zcash_transparent`:
+  - `builder`:
+    - `Coinbase` marker type
+    - `impl Authorization for Coinbase`
+  - `bundle`:
+    - `Outpoint::NULL`
+    - `TxIn::<builder::Coinbase>::coinbase`
+  - `coinbase` module, containing helpers for constructing coinbase transactions.
 
 ## [0.6.1] - 2025-10-27
 
diff --git a/zcash_transparent/src/builder.rs b/zcash_transparent/src/builder.rs
index 1968bd629b..1aacd1e95c 100644
--- a/zcash_transparent/src/builder.rs
+++ b/zcash_transparent/src/builder.rs
@@ -239,6 +239,14 @@ pub struct TransparentSignatureContext<'a, V: secp256k1::Verification = secp256k
     final_script_sigs: Vec<Option<script::Sig>>,
 }
 
+/// [`Authorization`] marker type for coinbase transactions without authorization data.
+#[derive(Debug, Clone)]
+pub struct Coinbase;
+
+impl Authorization for Coinbase {
+    type ScriptSig = script::Sig;
+}
+
 impl TransparentBuilder {
     /// Constructs a new TransparentBuilder
     pub fn empty() -> Self {
diff --git a/zcash_transparent/src/bundle.rs b/zcash_transparent/src/bundle.rs
index 3501f926a5..f7fc7d4f9c 100644
--- a/zcash_transparent/src/bundle.rs
+++ b/zcash_transparent/src/bundle.rs
@@ -3,15 +3,22 @@
 use alloc::vec::Vec;
 use core::fmt::Debug;
 use core2::io::{self, Read, Write};
-use zcash_script::script;
+use zcash_script::{
+    opcode::{Evaluable as _, PushValue},
+    pattern::push_num,
+    pv,
+    script::{self, Evaluable as _},
+};
 
 use zcash_protocol::{
+    consensus::BlockHeight,
     value::{BalanceError, ZatBalance, Zatoshis},
     TxId,
 };
 
 use crate::{
     address::{Script, TransparentAddress},
+    builder, coinbase,
     sighash::TransparentAuthorizingContext,
 };
 
@@ -264,6 +271,91 @@ impl TxIn<Authorized> {
     }
 }
 
+impl TxIn<builder::Coinbase> {
+    /// Creates an input for a coinbase transaction.
+    ///
+    /// - Does not support creating inputs for the genesis block.
+    /// - The `miner_data` parameter can carry arbitrary data, which will be included in the input's
+    ///   `script_sig` field, as long as the field's length stays within
+    ///   [`coinbase::MAX_COINBASE_SCRIPT_LEN`] bytes.
+    pub fn coinbase(
+        height: BlockHeight,
+        miner_data: Option<PushValue>,
+    ) -> Result<Self, coinbase::Error> {
+        let h = match i64::from(height) {
+            0 => Err(coinbase::Error::GenesisInputNotSupported),
+            h => Ok(push_num(h)),
+        }?;
+
+        let h_len = h.byte_len();
+        assert!(h_len > 0);
+
+        // # Consensus
+        //
+        // > A coinbase transaction for a block at block height greater than 0 MUST have a script
+        // > that, as its first item, encodes the block height `height` as follows. For `height` in
+        // > the range {1 .. 16}, the encoding is a single byte of value `0x50` + `height`.
+        // > Otherwise, let `heightBytes` be the signed little-endian representation of `height`,
+        // > using the minimum nonzero number of bytes such that the most significant byte is <
+        // > `0x80`. The length of `heightBytes` MUST be in the range {1 .. 5}. Then the encoding is
+        // > the length of `heightBytes` encoded as one byte, followed by `heightBytes` itself. This
+        // > matches the encoding used by Bitcoin in the implementation of [BIP-34] (but the
+        // > description here is to be considered normative).
+        //
+        // <https://zips.z.cash/protocol/protocol.pdf#txnconsensus>
+        //
+        // ## Note
+        //
+        // The height is encoded in `push_num`, which always returns an opcode, and every opcode
+        // serializes to at least one byte, so we assert the lower bound.
+        //
+        // [BIP-34]: <https://github.com/bitcoin/bips/blob/master/bip-0034.mediawiki>
+        if h_len > coinbase::MAX_COINBASE_HEIGHT_LEN {
+            return Err(coinbase::Error::OversizedHeight);
+        }
+
+        let script_sig = script::Component(
+            [
+                Some(h),
+                // Consensus rule: coinbase script must be at least 2 bytes.
+                (h_len < coinbase::MIN_COINBASE_SCRIPT_LEN && miner_data.is_none())
+                    .then_some(pv::_0),
+                miner_data,
+            ]
+            .into_iter()
+            .flatten()
+            .collect(),
+        );
+
+        let s_len = script_sig.byte_len();
+        assert!(s_len >= coinbase::MIN_COINBASE_SCRIPT_LEN);
+
+        // # Consensus
+        //
+        // > A coinbase transaction script MUST have length in {2 .. 100} bytes.
+        //
+        // <https://zips.z.cash/protocol/protocol.pdf#txnconsensus>
+        //
+        // ## Note
+        //
+        // The `miner_data` param always contains an opcode, and every opcode serializes to at least
+        // one byte, so we assert the lower bound.
+        if s_len > coinbase::MAX_COINBASE_SCRIPT_LEN {
+            return Err(coinbase::Error::OversizedScript);
+        }
+
+        // We set the `prevout` argument to [`OutPoint::NULL`] since [§ 3.11] defines coinbase txs
+        // as those that have a single transparent input with a null `prevout` field.
+        //
+        // We set the `sequence` field to [`u32::MAX`] to disable time-locking, as described in the
+        // [Bitcoin Developer Reference].
+        //
+        // [§ 3.11]: <https://zips.z.cash/protocol/protocol.pdf#coinbasetransactions>
+        // [Bitcoin Developer Reference]: <https://developer.bitcoin.org/devguide/transactions.html#locktime-and-sequence-number>
+        Ok(TxIn::from_parts(OutPoint::NULL, script_sig, u32::MAX))
+    }
+}
+
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct TxOut {
     #[deprecated(since = "0.4.1", note = "use the value() accessor instead.")]
diff --git a/zcash_transparent/src/coinbase.rs b/zcash_transparent/src/coinbase.rs
new file mode 100644
index 0000000000..4a8fdefb49
--- /dev/null
+++ b/zcash_transparent/src/coinbase.rs
@@ -0,0 +1,59 @@
+//! Types, constants, and functions related to coinbase transactions.
+
+use alloc::fmt;
+
+/// The minimum length of the coinbase transaction script.
+///
+/// [§ 7.1.2](https://zips.z.cash/protocol/protocol.pdf#txnconsensus) specifies:
+///
+/// > A coinbase transaction script MUST have length in {2 .. 100} bytes.
+pub const MIN_COINBASE_SCRIPT_LEN: usize = 2;
+
+/// The maximum length of the coinbase transaction script.
+///
+/// [§ 7.1.2](https://zips.z.cash/protocol/protocol.pdf#txnconsensus) specifies:
+///
+/// > A coinbase transaction script MUST have length in {2 .. 100} bytes.
+pub const MAX_COINBASE_SCRIPT_LEN: usize = 100;
+
+/// The maximum length of the encoded height in the coinbase transaction script.
+///
+/// [§ 7.1.2](https://zips.z.cash/protocol/protocol.pdf#txnconsensus) specifies:
+///
+/// > The length of `heightBytes` MUST be in the range {1 .. 5}. Then the encoding is the length of
+/// > `heightBytes` encoded as one byte, followed by `heightBytes` itself.
+pub const MAX_COINBASE_HEIGHT_LEN: usize = 6;
+
+/// Errors related to coinbase transactions.
+#[derive(Clone, Debug)]
+#[non_exhaustive]
+pub enum Error {
+    /// Encoded coinbase script exceeds [`MAX_COINBASE_SCRIPT_LEN`].
+    OversizedScript,
+    /// Encoded block height exceeds [`MAX_COINBASE_HEIGHT_LEN`].
+    OversizedHeight,
+    /// Creating a coinbase input for the genesis block is not supported.
+    GenesisInputNotSupported,
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Error::OversizedScript => write!(
+                f,
+                "encoded coinbase script exceeds the limit of {MAX_COINBASE_SCRIPT_LEN} bytes",
+            ),
+            Error::OversizedHeight => write!(
+                f,
+                "encoded block height exceeds the limit of {MAX_COINBASE_HEIGHT_LEN} bytes",
+            ),
+            Error::GenesisInputNotSupported => write!(
+                f,
+                "creating a coinbase input for the genesis block is not supported",
+            ),
+        }
+    }
+}
+
+#[cfg(feature = "std")]
+impl std::error::Error for Error {}
diff --git a/zcash_transparent/src/lib.rs b/zcash_transparent/src/lib.rs
index 0b55c47e3f..05eb5c35e3 100644
--- a/zcash_transparent/src/lib.rs
+++ b/zcash_transparent/src/lib.rs
@@ -6,9 +6,13 @@
 
 #![no_std]
 
+#[cfg(feature = "std")]
+extern crate std;
+
 pub mod address;
 pub mod builder;
 pub mod bundle;
+pub mod coinbase;
 pub mod keys;
 pub mod pczt;
 pub mod sighash;

From c5540ba96d8801420cc25f451c0204b0fdcf9c6b Mon Sep 17 00:00:00 2001
From: Marek <m@rek.onl>
Date: Sun, 30 Nov 2025 21:46:15 +0100
Subject: [PATCH 047/263] zcash_transparent: Impl
 `TransparentAuthorizingContext` for `Coinbase`

---
 zcash_transparent/CHANGELOG.md   |  1 +
 zcash_transparent/src/builder.rs | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/zcash_transparent/CHANGELOG.md b/zcash_transparent/CHANGELOG.md
index 1a45c35235..6b8a058e3a 100644
--- a/zcash_transparent/CHANGELOG.md
+++ b/zcash_transparent/CHANGELOG.md
@@ -15,6 +15,7 @@ workspace.
   - `builder`:
     - `Coinbase` marker type
     - `impl Authorization for Coinbase`
+    - `impl TransparentAuthorizingContext for Coinbase`
   - `bundle`:
     - `Outpoint::NULL`
     - `TxIn::<builder::Coinbase>::coinbase`
diff --git a/zcash_transparent/src/builder.rs b/zcash_transparent/src/builder.rs
index 1aacd1e95c..6bcebd3c64 100644
--- a/zcash_transparent/src/builder.rs
+++ b/zcash_transparent/src/builder.rs
@@ -247,6 +247,16 @@ impl Authorization for Coinbase {
     type ScriptSig = script::Sig;
 }
 
+impl TransparentAuthorizingContext for Coinbase {
+    fn input_amounts(&self) -> Vec<Zatoshis> {
+        vec![]
+    }
+
+    fn input_scriptpubkeys(&self) -> Vec<Script> {
+        vec![]
+    }
+}
+
 impl TransparentBuilder {
     /// Constructs a new TransparentBuilder
     pub fn empty() -> Self {

From 0d750047f3cdaa449e0bf569f1747dcd1fe4f0e0 Mon Sep 17 00:00:00 2001
From: Marek <m@rek.onl>
Date: Sun, 30 Nov 2025 21:46:22 +0100
Subject: [PATCH 048/263] zcash_transparent: Impl `MapAuth<Coinbase,
 Authorized` for `Coinbase`

---
 zcash_transparent/CHANGELOG.md   |  1 +
 zcash_transparent/src/builder.rs | 22 +++++++++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/zcash_transparent/CHANGELOG.md b/zcash_transparent/CHANGELOG.md
index 6b8a058e3a..7552ad403b 100644
--- a/zcash_transparent/CHANGELOG.md
+++ b/zcash_transparent/CHANGELOG.md
@@ -15,6 +15,7 @@ workspace.
   - `builder`:
     - `Coinbase` marker type
     - `impl Authorization for Coinbase`
+    - `impl MapAuth<Coinbase, Authorized> for Coinbase`
     - `impl TransparentAuthorizingContext for Coinbase`
   - `bundle`:
     - `Outpoint::NULL`
diff --git a/zcash_transparent/src/builder.rs b/zcash_transparent/src/builder.rs
index 6bcebd3c64..ea94e15f04 100644
--- a/zcash_transparent/src/builder.rs
+++ b/zcash_transparent/src/builder.rs
@@ -6,11 +6,14 @@ use core::fmt;
 
 use zcash_protocol::value::{BalanceError, ZatBalance, Zatoshis};
 
-use zcash_script::{op, script};
+use zcash_script::{
+    op,
+    script::{self, Code, Evaluable},
+};
 
 use crate::{
     address::{Script, TransparentAddress},
-    bundle::{Authorization, Authorized, Bundle, TxIn, TxOut},
+    bundle::{Authorization, Authorized, Bundle, MapAuth, TxIn, TxOut},
     pczt,
     sighash::{SignableInput, TransparentAuthorizingContext},
 };
@@ -24,7 +27,7 @@ use {
     core::iter,
     sha2::Digest,
     zcash_encoding::CompactSize,
-    zcash_script::{pattern::push_script, pv, script::Evaluable, solver},
+    zcash_script::{pattern::push_script, pv, solver},
 };
 
 #[cfg(not(feature = "transparent-inputs"))]
@@ -257,6 +260,19 @@ impl TransparentAuthorizingContext for Coinbase {
     }
 }
 
+impl MapAuth<Coinbase, Authorized> for Coinbase {
+    fn map_script_sig(
+        &self,
+        s: <Coinbase as Authorization>::ScriptSig,
+    ) -> <Authorized as Authorization>::ScriptSig {
+        Script(Code(s.to_bytes()))
+    }
+
+    fn map_authorization(&self, _: Coinbase) -> Authorized {
+        Authorized
+    }
+}
+
 impl TransparentBuilder {
     /// Constructs a new TransparentBuilder
     pub fn empty() -> Self {

From 597cdc9c02ea8d134566bded4a7443a5921b12d1 Mon Sep 17 00:00:00 2001
From: Marek <m@rek.onl>
Date: Sun, 30 Nov 2025 21:46:31 +0100
Subject: [PATCH 049/263] zcash_transparent: Construct coinbase bundles

Co-authored-by: Daira-Emma Hopwood <daira@jacaranda.org>
---
 zcash_transparent/CHANGELOG.md    |  1 +
 zcash_transparent/src/builder.rs  | 31 +++++++++++++++++++++++++++++--
 zcash_transparent/src/coinbase.rs |  5 +++++
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/zcash_transparent/CHANGELOG.md b/zcash_transparent/CHANGELOG.md
index 7552ad403b..dea437729b 100644
--- a/zcash_transparent/CHANGELOG.md
+++ b/zcash_transparent/CHANGELOG.md
@@ -17,6 +17,7 @@ workspace.
     - `impl Authorization for Coinbase`
     - `impl MapAuth<Coinbase, Authorized> for Coinbase`
     - `impl TransparentAuthorizingContext for Coinbase`
+    - `TransparentBuilder::build_coinbase`
   - `bundle`:
     - `Outpoint::NULL`
     - `TxIn::<builder::Coinbase>::coinbase`
diff --git a/zcash_transparent/src/builder.rs b/zcash_transparent/src/builder.rs
index ea94e15f04..0c94810ce6 100644
--- a/zcash_transparent/src/builder.rs
+++ b/zcash_transparent/src/builder.rs
@@ -4,17 +4,21 @@ use alloc::collections::BTreeMap;
 use alloc::vec::Vec;
 use core::fmt;
 
-use zcash_protocol::value::{BalanceError, ZatBalance, Zatoshis};
+use zcash_protocol::{
+    consensus::BlockHeight,
+    value::{BalanceError, ZatBalance, Zatoshis},
+};
 
 use zcash_script::{
     op,
+    opcode::PushValue,
     script::{self, Code, Evaluable},
 };
 
 use crate::{
     address::{Script, TransparentAddress},
     bundle::{Authorization, Authorized, Bundle, MapAuth, TxIn, TxOut},
-    pczt,
+    coinbase, pczt,
     sighash::{SignableInput, TransparentAuthorizingContext},
 };
 
@@ -426,6 +430,29 @@ impl TransparentBuilder {
         }
     }
 
+    /// Builds a coinbase bundle.
+    ///
+    /// Returns an error if:
+    ///
+    /// - any inputs were added to the builder, or if
+    /// - `miner_data` makes the tx input oversized, vid. [`TxIn::coinbase`].
+    pub fn build_coinbase(
+        self,
+        height: BlockHeight,
+        miner_data: Option<PushValue>,
+    ) -> Result<Bundle<Coinbase>, coinbase::Error> {
+        #[cfg(feature = "transparent-inputs")]
+        if !self.inputs.is_empty() {
+            return Err(coinbase::Error::UnexpectedInputs);
+        }
+
+        Ok(Bundle {
+            vin: vec![TxIn::coinbase(height, miner_data)?],
+            vout: self.vout,
+            authorization: Coinbase,
+        })
+    }
+
     /// Builds a bundle containing the given inputs and outputs, for inclusion in a PCZT.
     pub fn build_for_pczt(self) -> Option<pczt::Bundle> {
         #[cfg(feature = "transparent-inputs")]
diff --git a/zcash_transparent/src/coinbase.rs b/zcash_transparent/src/coinbase.rs
index 4a8fdefb49..9ff2575429 100644
--- a/zcash_transparent/src/coinbase.rs
+++ b/zcash_transparent/src/coinbase.rs
@@ -34,6 +34,8 @@ pub enum Error {
     OversizedHeight,
     /// Creating a coinbase input for the genesis block is not supported.
     GenesisInputNotSupported,
+    /// Coinbase transactions must contain only a dummy input.
+    UnexpectedInputs,
 }
 
 impl fmt::Display for Error {
@@ -51,6 +53,9 @@ impl fmt::Display for Error {
                 f,
                 "creating a coinbase input for the genesis block is not supported",
             ),
+            Error::UnexpectedInputs => {
+                write!(f, "coinbase transactions must contain only a dummy input",)
+            }
         }
     }
 }

From e9be6fd76c5d076727701befcec7645c35d33cae Mon Sep 17 00:00:00 2001
From: Marek <m@rek.onl>
Date: Sun, 30 Nov 2025 21:46:43 +0100
Subject: [PATCH 050/263] zcash_transparent: Impl `std::error::Error` trait for
 `builder::Error`

Note that this should be reworked such that `core::error::Error` is
implemented instead once our MSRV supports this change.

Co-authored-by: Kris Nuttycombe <kris@nutty.land>
---
 zcash_transparent/CHANGELOG.md   | 3 ++-
 zcash_transparent/src/builder.rs | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/zcash_transparent/CHANGELOG.md b/zcash_transparent/CHANGELOG.md
index dea437729b..51ef3b079c 100644
--- a/zcash_transparent/CHANGELOG.md
+++ b/zcash_transparent/CHANGELOG.md
@@ -18,6 +18,7 @@ workspace.
     - `impl MapAuth<Coinbase, Authorized> for Coinbase`
     - `impl TransparentAuthorizingContext for Coinbase`
     - `TransparentBuilder::build_coinbase`
+    - `std::error::Error for Error` when the `std` feature is enabled.
   - `bundle`:
     - `Outpoint::NULL`
     - `TxIn::<builder::Coinbase>::coinbase`
@@ -117,7 +118,7 @@ workspace.
 - The type of `zcash_transparent::bundle::Bundle::value_balance` has changed.
   The closure provided to this method for input retrieval can now indicate that
   an input for the given outpoint is not available, and `value_balance` will
-  return `Ok(None)` when this is the case. 
+  return `Ok(None)` when this is the case.
 
 ### Removed
 - Removed deprecated method `zcash_transparent::keys::pubkey_to_address`;
diff --git a/zcash_transparent/src/builder.rs b/zcash_transparent/src/builder.rs
index 0c94810ce6..c60c7fad4a 100644
--- a/zcash_transparent/src/builder.rs
+++ b/zcash_transparent/src/builder.rs
@@ -82,6 +82,9 @@ impl fmt::Display for Error {
     }
 }
 
+#[cfg(feature = "std")]
+impl std::error::Error for Error {}
+
 /// A set of transparent signing keys.
 ///
 /// When the `transparent-inputs` feature flag is enabled, transparent signing keys can be

From 91b39f029a1a16668c720b708c0e7878edec0a8c Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Wed, 10 Dec 2025 12:10:34 -0700
Subject: [PATCH 051/263] Release zcash_transparent version 0.6.2

---
 Cargo.lock                     | 2 +-
 supply-chain/imports.lock      | 4 ++++
 zcash_transparent/CHANGELOG.md | 2 ++
 zcash_transparent/Cargo.toml   | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f365e83f6f..bb2bf2c9c2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6744,7 +6744,7 @@ dependencies = [
 
 [[package]]
 name = "zcash_transparent"
-version = "0.6.1"
+version = "0.6.2"
 dependencies = [
  "bip32",
  "blake2b_simd",
diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index 28fbeb0cef..6d311f2f3e 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -1,6 +1,10 @@
 
 # cargo-vet imports lock
 
+[[unpublished.zcash_transparent]]
+version = "0.6.2"
+audited_as = "0.6.1"
+
 [[publisher.bumpalo]]
 version = "3.16.0"
 when = "2024-04-08"
diff --git a/zcash_transparent/CHANGELOG.md b/zcash_transparent/CHANGELOG.md
index 51ef3b079c..11a2793f0d 100644
--- a/zcash_transparent/CHANGELOG.md
+++ b/zcash_transparent/CHANGELOG.md
@@ -10,6 +10,8 @@ workspace.
 
 ## [Unreleased]
 
+## [0.6.2] - 2025-12-12
+
 ### Added
 - `zcash_transparent`:
   - `builder`:
diff --git a/zcash_transparent/Cargo.toml b/zcash_transparent/Cargo.toml
index 8f40d4c745..89fe360788 100644
--- a/zcash_transparent/Cargo.toml
+++ b/zcash_transparent/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "zcash_transparent"
 description = "Rust implementations of the Zcash transparent protocol"
-version = "0.6.1"
+version = "0.6.2"
 authors = [
     "Jack Grigg <jack@electriccoin.co>",
     "Kris Nuttycombe <kris@electriccoin.co>",

From 819283dc0552d55e587cbe976ab345557d7cb000 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Fri, 12 Dec 2025 13:48:48 -0700
Subject: [PATCH 052/263] Cargo vet updates after zcash_transparent-0.6.2
 release.

---
 supply-chain/imports.lock | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index 6d311f2f3e..15eb427cdd 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -1,10 +1,6 @@
 
 # cargo-vet imports lock
 
-[[unpublished.zcash_transparent]]
-version = "0.6.2"
-audited_as = "0.6.1"
-
 [[publisher.bumpalo]]
 version = "3.16.0"
 when = "2024-04-08"
@@ -376,11 +372,11 @@ user-login = "daira"
 user-name = "Daira-Emma Hopwood"
 
 [[publisher.zcash_transparent]]
-version = "0.6.1"
-when = "2025-10-27"
-user-id = 6289
-user-login = "str4d"
-user-name = "Jack Grigg"
+version = "0.6.2"
+when = "2025-12-12"
+user-id = 169181
+user-login = "nuttycom"
+user-name = "Kris Nuttycombe"
 
 [[publisher.zip32]]
 version = "0.2.0"

From 26c86dac8e2d54283972a72c2be4930d7e22c45c Mon Sep 17 00:00:00 2001
From: Marek <m@rek.onl>
Date: Sun, 30 Nov 2025 21:46:56 +0100
Subject: [PATCH 053/263] zcash_primitives: Add `Coinbase` marker type

Co-authored-by: Jack Grigg <jack@electriccoin.co>
---
 zcash_primitives/src/transaction/mod.rs | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/zcash_primitives/src/transaction/mod.rs b/zcash_primitives/src/transaction/mod.rs
index bbb816d87f..e3752e7cb5 100644
--- a/zcash_primitives/src/transaction/mod.rs
+++ b/zcash_primitives/src/transaction/mod.rs
@@ -267,7 +267,7 @@ impl Authorization for Authorized {
     type TzeAuth = tze::Authorized;
 }
 
-/// [`Authorization`] marker type for transactions without authorization data.
+/// [`Authorization`] marker type for non-coinbase transactions without authorization data.
 ///
 /// Currently this includes Sapling proofs because the types in this crate support v4
 /// transactions, which commit to the Sapling proofs in the transaction digest.
@@ -285,6 +285,21 @@ impl Authorization for Unauthorized {
     type TzeAuth = tze::builder::Unauthorized;
 }
 
+/// [`Authorization`] marker type for coinbase transactions without authorization data.
+struct Coinbase;
+
+#[cfg(feature = "circuits")]
+impl Authorization for Coinbase {
+    type TransparentAuth = ::transparent::builder::Coinbase;
+    type SaplingAuth =
+        sapling_builder::InProgress<sapling_builder::Proven, sapling_builder::Unsigned>;
+    type OrchardAuth =
+        orchard::builder::InProgress<orchard::builder::Unproven, orchard::builder::Unauthorized>;
+
+    #[cfg(zcash_unstable = "zfuture")]
+    type TzeAuth = tze::builder::Unauthorized;
+}
+
 /// A Zcash transaction.
 #[derive(Debug)]
 pub struct Transaction {

From ad832c2d4ac7e07fdfbc776ce1a9f3a346fcc122 Mon Sep 17 00:00:00 2001
From: Marek <m@rek.onl>
Date: Sun, 30 Nov 2025 21:47:02 +0100
Subject: [PATCH 054/263] zcash_primitives: Fix construction of coinbase
 transactions.

Co-authored-by: Kris Nuttycombe <kris@nutty.land>
Co-authored-by: Jack Grigg <jack@electriccoin.co>
Co-authored-by: Arya <aryasolhi@gmail.com>
---
 zcash_primitives/CHANGELOG.md               |  12 +
 zcash_primitives/src/transaction/builder.rs | 284 ++++++++++++++++----
 2 files changed, 237 insertions(+), 59 deletions(-)

diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md
index 6e1abc01c1..1b7d908c58 100644
--- a/zcash_primitives/CHANGELOG.md
+++ b/zcash_primitives/CHANGELOG.md
@@ -10,6 +10,18 @@ workspace.
 
 ## [Unreleased]
 
+### Added
+- `zcash_primitives::transaction::builder`:
+  - `BuildConfig::is_coinbase`
+  - `Builder::set_coinbase_miner_data`
+
+### Fixed
+- `zcash_primitives::transaction::builder::Builder` has been modified to
+  support constructing transparent coinbase transactions. Previously, although
+  `BuildConfig::Coinbase` was a configuration that could be selected, the
+  transaction that was generated as a result would not be a valid coinbase
+  transaction.
+
 ## [0.26.1] - 2025-10-18
 
 ### Fixed
diff --git a/zcash_primitives/src/transaction/builder.rs b/zcash_primitives/src/transaction/builder.rs
index 6fa9121397..17dea2edbb 100644
--- a/zcash_primitives/src/transaction/builder.rs
+++ b/zcash_primitives/src/transaction/builder.rs
@@ -11,6 +11,7 @@ use zcash_protocol::{
     memo::MemoBytes,
     value::{BalanceError, ZatBalance, Zatoshis},
 };
+use zcash_script::opcode::PushValue;
 
 use crate::transaction::{
     fees::{
@@ -28,7 +29,7 @@ use {
     crate::transaction::{
         sighash::{signature_hash, SignableInput},
         txid::TxIdDigester,
-        TransactionData, Unauthorized,
+        Authorization, Coinbase, TransactionData, TxDigests, Unauthorized,
     },
     ::sapling::prover::{OutputProver, SpendProver},
     ::transparent::builder::TransparentSigningSet,
@@ -202,7 +203,7 @@ impl Progress {
     }
 }
 
-/// Rules for how the builder should be configured for each shielded pool.
+/// Rules for how the builder should be configured for each shielded pool or coinbase tx.
 #[derive(Clone, Copy)]
 pub enum BuildConfig {
     Standard {
@@ -242,6 +243,11 @@ impl BuildConfig {
             )),
         }
     }
+
+    /// Returns `true` if this configuration is for building a coinbase transaction.
+    pub fn is_coinbase(&self) -> bool {
+        matches!(self, BuildConfig::Coinbase)
+    }
 }
 
 /// The result of a transaction build operation, which includes the resulting transaction along
@@ -315,6 +321,7 @@ pub struct Builder<'a, P, U: sapling::builder::ProverProgress> {
     tze_builder: TzeBuilder<'a, TransactionData<Unauthorized>>,
     #[cfg(not(zcash_unstable = "zfuture"))]
     tze_builder: core::marker::PhantomData<&'a ()>,
+    miner_data: Option<PushValue>,
     _progress_notifier: U,
 }
 
@@ -386,11 +393,26 @@ impl<'a, P: consensus::Parameters> Builder<'a, P, ()> {
                 )
             });
 
+        // # Consensus Rules
+        //
+        // > [NU5 onward] The `nExpiryHeight` field of a coinbase transaction MUST be equal to its
+        // > block height.
+        //
+        // ## Notes
+        //
+        // We set the expiry height for coinbase txs to the block height regardless of the network
+        // upgrade.
+        let expiry_height = if build_config.is_coinbase() {
+            target_height
+        } else {
+            target_height + DEFAULT_TX_EXPIRY_DELTA
+        };
+
         Builder {
             params,
             build_config,
             target_height,
-            expiry_height: target_height + DEFAULT_TX_EXPIRY_DELTA,
+            expiry_height,
             #[cfg(all(
                 any(zcash_unstable = "nu7", zcash_unstable = "zfuture"),
                 feature = "zip-233"
@@ -403,6 +425,7 @@ impl<'a, P: consensus::Parameters> Builder<'a, P, ()> {
             tze_builder: TzeBuilder::empty(),
             #[cfg(not(zcash_unstable = "zfuture"))]
             tze_builder: core::marker::PhantomData,
+            miner_data: None,
             _progress_notifier: (),
         }
     }
@@ -432,6 +455,7 @@ impl<'a, P: consensus::Parameters> Builder<'a, P, ()> {
             sapling_builder: self.sapling_builder,
             orchard_builder: self.orchard_builder,
             tze_builder: self.tze_builder,
+            miner_data: self.miner_data,
             _progress_notifier,
         }
     }
@@ -514,6 +538,19 @@ impl<P: consensus::Parameters, U: sapling::builder::ProverProgress> Builder<'_,
             .map_err(Error::SaplingBuild)
     }
 
+    /// Sets the miner data for coinbase transactions.
+    ///
+    /// This returns an error if the [`BuildConfig`] provided to this builder is not
+    /// [`BuildConfig::Coinbase`].
+    pub fn set_coinbase_miner_data(&mut self, miner_data: PushValue) -> Result<(), ()> {
+        if self.build_config.is_coinbase() {
+            self.miner_data = Some(miner_data);
+            Ok(())
+        } else {
+            Err(())
+        }
+    }
+
     /// Adds a transparent P2PKH coin to be spent in this transaction.
     #[cfg(feature = "transparent-inputs")]
     pub fn add_transparent_input(
@@ -706,16 +743,43 @@ impl<P: consensus::Parameters, U: sapling::builder::ProverProgress> Builder<'_,
         output_prover: &OP,
         fee_rule: &FR,
     ) -> Result<BuildResult, Error<FR::Error>> {
-        let fee = self.get_fee(fee_rule).map_err(Error::Fee)?;
-        self.build_internal(
-            transparent_signing_set,
-            sapling_extsks,
-            orchard_saks,
-            rng,
-            spend_prover,
-            output_prover,
-            fee,
-        )
+        if self.build_config.is_coinbase() {
+            let target_height = self.target_height;
+
+            self.build_internal::<Coinbase, _, _, _, _>(
+                |b, miner_data| build_transparent_coinbase(b, target_height, miner_data),
+                |b, _, _| Ok(b.clone().map_authorization(transparent::builder::Coinbase)),
+                #[cfg(zcash_unstable = "zfuture")]
+                |_| (None, vec![]),
+                #[cfg(zcash_unstable = "zfuture")]
+                |_, _, _| unreachable!(),
+                &[],
+                &[],
+                rng,
+                spend_prover,
+                output_prover,
+                None,
+            )
+        } else {
+            let fee = self.get_fee(fee_rule).map_err(Error::Fee)?;
+
+            self.build_internal::<Unauthorized, _, _, _, _>(
+                |b, _| Ok(b.build()),
+                |b, unauthed_tx, txid_parts| {
+                    authorize_transparent(b, unauthed_tx, txid_parts, transparent_signing_set)
+                },
+                #[cfg(zcash_unstable = "zfuture")]
+                |_| (None, vec![]),
+                #[cfg(zcash_unstable = "zfuture")]
+                |_, _, _| unreachable!(),
+                sapling_extsks,
+                orchard_saks,
+                rng,
+                spend_prover,
+                output_prover,
+                Some(fee),
+            )
+        }
     }
 
     /// Builds a transaction from the configured spends and outputs.
@@ -738,30 +802,97 @@ impl<P: consensus::Parameters, U: sapling::builder::ProverProgress> Builder<'_,
         output_prover: &OP,
         fee_rule: &FR,
     ) -> Result<BuildResult, Error<FR::Error>> {
-        let fee = self.get_fee_zfuture(fee_rule).map_err(Error::Fee)?;
-        self.build_internal(
-            transparent_signing_set,
-            sapling_extsks,
-            orchard_saks,
-            rng,
-            spend_prover,
-            output_prover,
-            fee,
-        )
+        if self.build_config.is_coinbase() {
+            let target_height = self.target_height;
+
+            self.build_internal::<Coinbase, _, _, _, _>(
+                |b, miner_data| build_transparent_coinbase(b, target_height, miner_data),
+                |b, _, _| Ok(b.clone().map_authorization(transparent::builder::Coinbase)),
+                |_| (None, vec![]),
+                |_, _, _| unreachable!(),
+                &[],
+                &[],
+                rng,
+                spend_prover,
+                output_prover,
+                None,
+            )
+        } else {
+            let fee = self.get_fee_zfuture(fee_rule).map_err(Error::Fee)?;
+
+            self.build_internal::<Unauthorized, _, _, _, _>(
+                |b, _| Ok(b.build()),
+                |b, unauthed_tx, txid_parts| {
+                    authorize_transparent(b, unauthed_tx, txid_parts, transparent_signing_set)
+                },
+                |b| b.build(),
+                |b, unauthed_tx, tze_signers| b.clone().into_authorized(&unauthed_tx, tze_signers),
+                sapling_extsks,
+                orchard_saks,
+                rng,
+                spend_prover,
+                output_prover,
+                Some(fee),
+            )
+        }
     }
 
     #[allow(clippy::too_many_arguments)]
     #[cfg(feature = "circuits")]
-    fn build_internal<R: RngCore + CryptoRng, SP: SpendProver, OP: OutputProver, FE>(
+    fn build_internal<A, R, SP, OP, FE>(
         self,
-        transparent_signing_set: &TransparentSigningSet,
+        build_transparent: impl FnOnce(
+            TransparentBuilder,
+            Option<PushValue>,
+        ) -> Result<
+            Option<transparent::bundle::Bundle<A::TransparentAuth>>,
+            Error<FE>,
+        >,
+        authorize_transparent: impl FnOnce(
+            &transparent::bundle::Bundle<A::TransparentAuth>,
+            &TransactionData<A>,
+            &TxDigests<blake2b_simd::Hash>,
+        ) -> Result<
+            transparent::bundle::Bundle<transparent::bundle::Authorized>,
+            transparent::builder::Error,
+        >,
+        #[cfg(zcash_unstable = "zfuture")] build_future: impl FnOnce(
+            TzeBuilder<'_, TransactionData<Unauthorized>>,
+        ) -> (
+            Option<tze::Bundle<A::TzeAuth>>,
+            Vec<tze::builder::TzeSigner<'_, TransactionData<A>>>,
+        ),
+        #[cfg(zcash_unstable = "zfuture")] authorize_future: impl FnOnce(
+            &tze::Bundle<A::TzeAuth>,
+            &TransactionData<A>,
+            Vec<tze::builder::TzeSigner<'_, TransactionData<A>>>,
+        ) -> Result<
+            tze::Bundle<tze::Authorized>,
+            tze::builder::Error,
+        >,
         sapling_extsks: &[sapling::zip32::ExtendedSpendingKey],
         orchard_saks: &[orchard::keys::SpendAuthorizingKey],
         mut rng: R,
         spend_prover: &SP,
         output_prover: &OP,
-        fee: Zatoshis,
-    ) -> Result<BuildResult, Error<FE>> {
+        fee: Option<Zatoshis>,
+    ) -> Result<BuildResult, Error<FE>>
+    where
+        A: Authorization<
+            SaplingAuth = sapling::builder::InProgress<
+                sapling::builder::Proven,
+                sapling::builder::Unsigned,
+            >,
+            OrchardAuth = orchard::builder::InProgress<
+                orchard::builder::Unproven,
+                orchard::builder::Unauthorized,
+            >,
+        >,
+        A::TransparentAuth: transparent::sighash::TransparentAuthorizingContext,
+        R: RngCore + CryptoRng,
+        SP: SpendProver,
+        OP: OutputProver,
+    {
         let consensus_branch_id = BranchId::for_height(&self.params, self.target_height);
 
         // determine transaction version
@@ -771,20 +902,24 @@ impl<P: consensus::Parameters, U: sapling::builder::ProverProgress> Builder<'_,
         // Consistency checks
         //
 
-        // After fees are accounted for, the value balance of the transaction must be zero.
-        let balance_after_fees = (self.value_balance()? - fee).ok_or(BalanceError::Underflow)?;
+        assert_eq!(self.build_config.is_coinbase(), fee.is_none());
+        if let Some(fee) = fee {
+            // After fees are accounted for, the value balance of the transaction must be zero.
+            let balance_after_fees =
+                (self.value_balance()? - fee).ok_or(BalanceError::Underflow)?;
 
-        match balance_after_fees.cmp(&ZatBalance::zero()) {
-            Ordering::Less => {
-                return Err(Error::InsufficientFunds(-balance_after_fees));
-            }
-            Ordering::Greater => {
-                return Err(Error::ChangeRequired(balance_after_fees));
-            }
-            Ordering::Equal => (),
-        };
+            match balance_after_fees.cmp(&ZatBalance::zero()) {
+                Ordering::Less => {
+                    return Err(Error::InsufficientFunds(-balance_after_fees));
+                }
+                Ordering::Greater => {
+                    return Err(Error::ChangeRequired(balance_after_fees));
+                }
+                Ordering::Equal => (),
+            };
+        }
 
-        let transparent_bundle = self.transparent_builder.build();
+        let transparent_bundle = build_transparent(self.transparent_builder, self.miner_data)?;
 
         let (sapling_bundle, sapling_meta) = match self
             .sapling_builder
@@ -831,11 +966,11 @@ impl<P: consensus::Parameters, U: sapling::builder::ProverProgress> Builder<'_,
         };
 
         #[cfg(zcash_unstable = "zfuture")]
-        let (tze_bundle, tze_signers) = self.tze_builder.build();
+        let (tze_bundle, tze_signers) = build_future(self.tze_builder);
 
-        let unauthed_tx: TransactionData<Unauthorized> = TransactionData {
+        let unauthed_tx: TransactionData<A> = TransactionData {
             version,
-            consensus_branch_id: BranchId::for_height(&self.params, self.target_height),
+            consensus_branch_id,
             lock_time: 0,
             expiry_height: self.expiry_height,
             #[cfg(all(
@@ -844,6 +979,15 @@ impl<P: consensus::Parameters, U: sapling::builder::ProverProgress> Builder<'_,
             ))]
             zip233_amount: self.zip233_amount,
             transparent_bundle,
+            // We don't support constructing Sprout bundles.
+            //
+            // # Consensus
+            //
+            // > A coinbase transaction MUST NOT have any JoinSplit descriptions.
+            //
+            // > A coinbase transaction MUST NOT have any Spend descriptions.
+            //
+            // <https://zips.z.cash/protocol/protocol.pdf#txnconsensus>
             sprout_bundle: None,
             sapling_bundle,
             orchard_bundle,
@@ -858,28 +1002,16 @@ impl<P: consensus::Parameters, U: sapling::builder::ProverProgress> Builder<'_,
 
         let transparent_bundle = unauthed_tx
             .transparent_bundle
-            .clone()
-            .map(|b| {
-                b.apply_signatures(
-                    |input| {
-                        *signature_hash(
-                            &unauthed_tx,
-                            &SignableInput::Transparent(input),
-                            &txid_parts,
-                        )
-                        .as_ref()
-                    },
-                    transparent_signing_set,
-                )
-            })
+            .as_ref()
+            .map(|b| authorize_transparent(b, &unauthed_tx, &txid_parts))
             .transpose()
             .map_err(Error::TransparentBuild)?;
 
         #[cfg(zcash_unstable = "zfuture")]
         let tze_bundle = unauthed_tx
             .tze_bundle
-            .clone()
-            .map(|b| b.into_authorized(&unauthed_tx, tze_signers))
+            .as_ref()
+            .map(|b| authorize_future(b, &unauthed_tx, tze_signers))
             .transpose()
             .map_err(Error::TzeBuild)?;
 
@@ -1021,6 +1153,39 @@ impl<P: consensus::Parameters, U: sapling::builder::ProverProgress> Builder<'_,
     }
 }
 
+#[cfg(feature = "circuits")]
+fn build_transparent_coinbase<FE>(
+    b: TransparentBuilder,
+    target_height: BlockHeight,
+    miner_data: Option<PushValue>,
+) -> Result<Option<transparent::bundle::Bundle<transparent::builder::Coinbase>>, Error<FE>> {
+    b.build_coinbase(target_height, miner_data)
+        .map(Some)
+        // TODO: in a future breaking release of `zcash_primitives`, this `map_err` should be
+        // removed in favor of a specific `Error::Coinbase` variant. For now we are shoving all
+        // errors in coinbase output construction into `UnsupportedScript` to allow for a
+        // semver-compatible release of `zcash_primitives`.
+        .map_err(|_| {
+            Error::<FE>::TransparentBuild(::transparent::builder::Error::UnsupportedScript)
+        })
+}
+
+#[cfg(feature = "circuits")]
+fn authorize_transparent(
+    b: &transparent::bundle::Bundle<transparent::builder::Unauthorized>,
+    unauthed_tx: &TransactionData<Unauthorized>,
+    txid_parts: &TxDigests<blake2b_simd::Hash>,
+    transparent_signing_set: &TransparentSigningSet,
+) -> Result<transparent::bundle::Bundle<transparent::bundle::Authorized>, transparent::builder::Error>
+{
+    b.clone().apply_signatures(
+        |input| {
+            *signature_hash(unauthed_tx, &SignableInput::Transparent(input), txid_parts).as_ref()
+        },
+        transparent_signing_set,
+    )
+}
+
 #[cfg(zcash_unstable = "zfuture")]
 impl<'a, P: consensus::Parameters, U: sapling::builder::ProverProgress> ExtensionTxBuilder<'a>
     for Builder<'a, P, U>
@@ -1171,12 +1336,13 @@ mod tests {
             zip233_amount: Zatoshis::ZERO,
             transparent_builder: TransparentBuilder::empty(),
             sapling_builder: None,
+            orchard_builder: None,
             #[cfg(zcash_unstable = "zfuture")]
             tze_builder: TzeBuilder::empty(),
             #[cfg(not(zcash_unstable = "zfuture"))]
             tze_builder: core::marker::PhantomData,
+            miner_data: None,
             _progress_notifier: (),
-            orchard_builder: None,
         };
 
         let mut transparent_signing_set = TransparentSigningSet::new();

From 97a8937c3565b8afcbcaf634b0e1b1db56e8a87e Mon Sep 17 00:00:00 2001
From: Marek <m@rek.onl>
Date: Sun, 30 Nov 2025 21:47:10 +0100
Subject: [PATCH 055/263] zcash_primitives: Clarify docs for build fn in
 TxBuilder

Co-authored-by: Daira-Emma Hopwood <daira@jacaranda.org>
---
 zcash_primitives/src/transaction/builder.rs | 26 +++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/zcash_primitives/src/transaction/builder.rs b/zcash_primitives/src/transaction/builder.rs
index 17dea2edbb..d82b01f781 100644
--- a/zcash_primitives/src/transaction/builder.rs
+++ b/zcash_primitives/src/transaction/builder.rs
@@ -729,8 +729,17 @@ impl<P: consensus::Parameters, U: sapling::builder::ProverProgress> Builder<'_,
 
     /// Builds a transaction from the configured spends and outputs.
     ///
-    /// Upon success, returns a tuple containing the final transaction, and the
-    /// [`SaplingMetadata`] generated during the build process.
+    /// Upon success, returns a [`BuildResult`] containing:
+    ///
+    /// - the [final transaction],
+    /// - the [Sapling metadata], and
+    /// - the [Orchard metadata]
+    ///
+    /// generated during the build process.
+    ///
+    /// [Sapling metadata]: ::sapling::builder::SaplingMetadata
+    /// [Orchard metadata]: ::orchard::builder::BundleMetadata
+    /// [final transaction]: Transaction
     #[allow(clippy::too_many_arguments)]
     #[cfg(feature = "circuits")]
     pub fn build<R: RngCore + CryptoRng, SP: SpendProver, OP: OutputProver, FR: FeeRule>(
@@ -784,8 +793,17 @@ impl<P: consensus::Parameters, U: sapling::builder::ProverProgress> Builder<'_,
 
     /// Builds a transaction from the configured spends and outputs.
     ///
-    /// Upon success, returns a tuple containing the final transaction, and the
-    /// [`SaplingMetadata`] generated during the build process.
+    /// Upon success, returns a [`BuildResult`] containing:
+    ///
+    /// - the [final transaction],
+    /// - the [Sapling metadata], and
+    /// - the [Orchard metadata]
+    ///
+    /// generated during the build process.
+    ///
+    /// [Sapling metadata]: ::sapling::builder::SaplingMetadata
+    /// [Orchard metadata]: ::orchard::builder::BundleMetadata
+    /// [final transaction]: Transaction
     #[cfg(zcash_unstable = "zfuture")]
     pub fn build_zfuture<
         R: RngCore + CryptoRng,

From d2bc83f26286cabf84815691ea3ffa4cb46c42c4 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Wed, 10 Dec 2025 16:54:48 -0700
Subject: [PATCH 056/263] Release zcash_primitives version 0.26.2

---
 Cargo.lock                    | 2 +-
 supply-chain/imports.lock     | 4 ++++
 zcash_primitives/CHANGELOG.md | 2 ++
 zcash_primitives/Cargo.toml   | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bb2bf2c9c2..352dcadfe8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6634,7 +6634,7 @@ dependencies = [
 
 [[package]]
 name = "zcash_primitives"
-version = "0.26.1"
+version = "0.26.2"
 dependencies = [
  "assert_matches",
  "bip32",
diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index 15eb427cdd..7a9c30fbd2 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -1,6 +1,10 @@
 
 # cargo-vet imports lock
 
+[[unpublished.zcash_primitives]]
+version = "0.26.2"
+audited_as = "0.26.1"
+
 [[publisher.bumpalo]]
 version = "3.16.0"
 when = "2024-04-08"
diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md
index 1b7d908c58..2d1da631d0 100644
--- a/zcash_primitives/CHANGELOG.md
+++ b/zcash_primitives/CHANGELOG.md
@@ -10,6 +10,8 @@ workspace.
 
 ## [Unreleased]
 
+## [0.26.2] - 2025-12-12
+
 ### Added
 - `zcash_primitives::transaction::builder`:
   - `BuildConfig::is_coinbase`
diff --git a/zcash_primitives/Cargo.toml b/zcash_primitives/Cargo.toml
index 6562c29e7e..82ac5bd2d0 100644
--- a/zcash_primitives/Cargo.toml
+++ b/zcash_primitives/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "zcash_primitives"
 description = "Rust implementations of the Zcash primitives"
-version = "0.26.1"
+version = "0.26.2"
 authors = [
     "Jack Grigg <jack@z.cash>",
     "Kris Nuttycombe <kris@electriccoin.co>"

From 4d3ecc2362250d416102eb6091b4713bde65eddb Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Fri, 12 Dec 2025 14:35:01 -0700
Subject: [PATCH 057/263] Update `cargo vet` metadata after
 `zcash_primitives-0.26.2` release.

---
 supply-chain/imports.lock | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index 7a9c30fbd2..8489eb0826 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -1,10 +1,6 @@
 
 # cargo-vet imports lock
 
-[[unpublished.zcash_primitives]]
-version = "0.26.2"
-audited_as = "0.26.1"
-
 [[publisher.bumpalo]]
 version = "3.16.0"
 when = "2024-04-08"
@@ -341,8 +337,8 @@ user-login = "str4d"
 user-name = "Jack Grigg"
 
 [[publisher.zcash_primitives]]
-version = "0.26.1"
-when = "2025-10-20"
+version = "0.26.2"
+when = "2025-12-12"
 user-id = 169181
 user-login = "nuttycom"
 user-name = "Kris Nuttycombe"

From 498a0478bede8556c1873a850ec4d0cac9102ab7 Mon Sep 17 00:00:00 2001
From: Marek <m@rek.onl>
Date: Sun, 30 Nov 2025 21:45:54 +0100
Subject: [PATCH 058/263] zcash_transparent: Replace impls of
 `std::error::Error` with `core::error::Error`

This is possible now that the MSRV for `zcash_transparent` has been
increased for `zcash_transparent-0.7.x`.
---
 zcash_transparent/CHANGELOG.md    | 3 +++
 zcash_transparent/src/builder.rs  | 3 +--
 zcash_transparent/src/coinbase.rs | 3 +--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/zcash_transparent/CHANGELOG.md b/zcash_transparent/CHANGELOG.md
index d70aa1200e..3b5aafb4b7 100644
--- a/zcash_transparent/CHANGELOG.md
+++ b/zcash_transparent/CHANGELOG.md
@@ -14,6 +14,9 @@ workspace.
 - `zcash_transparent::pczt`:
   - `Input::with_signable_input`
   - `Input::append_signature`
+- `impl core::error::Error` for:
+  -` zcash_transparent::builder::Error`
+  - `zcash_transparent::coinbase::Error`
 
 ### Changed
 - MSRV is now 1.85.1.
diff --git a/zcash_transparent/src/builder.rs b/zcash_transparent/src/builder.rs
index 674a8ab074..73cbb0b055 100644
--- a/zcash_transparent/src/builder.rs
+++ b/zcash_transparent/src/builder.rs
@@ -99,8 +99,7 @@ impl fmt::Display for Error {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for Error {}
+impl core::error::Error for Error {}
 
 /// A set of transparent signing keys.
 ///
diff --git a/zcash_transparent/src/coinbase.rs b/zcash_transparent/src/coinbase.rs
index 9ff2575429..916f10a715 100644
--- a/zcash_transparent/src/coinbase.rs
+++ b/zcash_transparent/src/coinbase.rs
@@ -60,5 +60,4 @@ impl fmt::Display for Error {
     }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for Error {}
+impl core::error::Error for Error {}

From 05578c1ef435f8b6c107b82b622467d8d6146eb4 Mon Sep 17 00:00:00 2001
From: Marek <m@rek.onl>
Date: Sun, 30 Nov 2025 21:47:02 +0100
Subject: [PATCH 059/263] zcash_primitives: Move coinbase miner data into the
 `BuildConfig::Coinbase` variant payload.

Co-authored-by: Kris Nuttycombe <kris@nutty.land>
Co-authored-by: Arya <aryasolhi@gmail.com>
---
 zcash_primitives/CHANGELOG.md               |  11 +
 zcash_primitives/src/transaction/builder.rs | 219 ++++++++++----------
 2 files changed, 120 insertions(+), 110 deletions(-)

diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md
index abfbd431d3..81a0435bc7 100644
--- a/zcash_primitives/CHANGELOG.md
+++ b/zcash_primitives/CHANGELOG.md
@@ -10,9 +10,18 @@ workspace.
 
 ## [Unreleased]
 
+### Added
+- `zcash_primitives::transaction::builder`:
+  - `impl<FE> From<coinbase::Error> for Error<FE>`
+
 ### Changed
 - MSRV is now 1.85.1.
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`.
+- `zcash_primitives::transaction::builder`:
+  - `Error` has a new `Coinbase` variant.
+  - `BuildConfig`:
+    -  The `Coinbase` variant now includes an `Option<zcash_script::opcode::PushValue>` payload.
+    -  No longer implements `Copy`.
 
 ### Removed
 - `zcash_primitives::consensus` module (use `zcash_protocol::consensus` instead).
@@ -20,6 +29,8 @@ workspace.
 - `zcash_primitives::legacy` module (use the `zcash_transparent` crate instead).
 - `zcash_primitives::memo` module (use `zcash_protocol::memo` instead)
 - `zcash_primitives::transaction`:
+  - `builder::Builder::set_coinbase_miner_data` use the added
+    `BuildConfig::Coinbase` payload instead.
   - `components`:
     - `amount::testing` module; use `zcash_protocol::value::testing` instead
       with the following renames:
diff --git a/zcash_primitives/src/transaction/builder.rs b/zcash_primitives/src/transaction/builder.rs
index 4801b6f58b..bd5aa0a227 100644
--- a/zcash_primitives/src/transaction/builder.rs
+++ b/zcash_primitives/src/transaction/builder.rs
@@ -5,7 +5,9 @@ use core::fmt;
 use rand::{CryptoRng, RngCore};
 
 use ::sapling::{Note, PaymentAddress, builder::SaplingMetadata};
-use ::transparent::{address::TransparentAddress, builder::TransparentBuilder, bundle::TxOut};
+use ::transparent::{
+    address::TransparentAddress, builder::TransparentBuilder, bundle::TxOut, coinbase,
+};
 use zcash_protocol::{
     consensus::{self, BlockHeight, BranchId, NetworkUpgrade, Parameters},
     memo::MemoBytes,
@@ -105,6 +107,8 @@ pub enum Error<FE> {
     /// The builder was constructed with a target height before NU5 activation, but an Orchard
     /// spend or output was added.
     OrchardBuilderNotAvailable,
+    /// An error occurred in constructing a coinbase transaction.
+    Coinbase(coinbase::Error),
     /// An error occurred in constructing the TZE parts of a transaction.
     #[cfg(zcash_unstable = "zfuture")]
     TzeBuild(tze::builder::Error),
@@ -136,6 +140,10 @@ impl<FE: fmt::Display> fmt::Display for Error<FE> {
                 f,
                 "Cannot create Orchard transactions without an Orchard anchor, or before NU5 activation"
             ),
+            Error::Coinbase(err) => write!(
+                f,
+                "An error occurred in constructing a coinbase transaction: {err}"
+            ),
             #[cfg(zcash_unstable = "zfuture")]
             Error::TzeBuild(err) => err.fmt(f),
         }
@@ -169,6 +177,12 @@ impl<FE> From<orchard::builder::SpendError> for Error<FE> {
     }
 }
 
+impl<FE> From<coinbase::Error> for Error<FE> {
+    fn from(e: coinbase::Error) -> Self {
+        Error::Coinbase(e)
+    }
+}
+
 /// Reports on the progress made by the builder towards building a transaction.
 pub struct Progress {
     /// The number of steps completed.
@@ -204,13 +218,15 @@ impl Progress {
 }
 
 /// Rules for how the builder should be configured for each shielded pool or coinbase tx.
-#[derive(Clone, Copy)]
+#[derive(Clone)]
 pub enum BuildConfig {
     Standard {
         sapling_anchor: Option<sapling::Anchor>,
         orchard_anchor: Option<orchard::Anchor>,
     },
-    Coinbase,
+    Coinbase {
+        miner_data: Option<PushValue>,
+    },
 }
 
 impl BuildConfig {
@@ -222,7 +238,7 @@ impl BuildConfig {
             BuildConfig::Standard { sapling_anchor, .. } => sapling_anchor
                 .as_ref()
                 .map(|a| (sapling::builder::BundleType::DEFAULT, *a)),
-            BuildConfig::Coinbase => Some((
+            BuildConfig::Coinbase { .. } => Some((
                 sapling::builder::BundleType::Coinbase,
                 sapling::Anchor::empty_tree(),
             )),
@@ -237,7 +253,7 @@ impl BuildConfig {
             BuildConfig::Standard { orchard_anchor, .. } => orchard_anchor
                 .as_ref()
                 .map(|a| (orchard::builder::BundleType::DEFAULT, *a)),
-            BuildConfig::Coinbase => Some((
+            BuildConfig::Coinbase { .. } => Some((
                 orchard::builder::BundleType::Coinbase,
                 orchard::Anchor::empty_tree(),
             )),
@@ -246,7 +262,7 @@ impl BuildConfig {
 
     /// Returns `true` if this configuration is for building a coinbase transaction.
     pub fn is_coinbase(&self) -> bool {
-        matches!(self, BuildConfig::Coinbase)
+        matches!(self, BuildConfig::Coinbase { .. })
     }
 }
 
@@ -321,7 +337,6 @@ pub struct Builder<'a, P, U: sapling::builder::ProverProgress> {
     tze_builder: TzeBuilder<'a, TransactionData<Unauthorized>>,
     #[cfg(not(zcash_unstable = "zfuture"))]
     tze_builder: core::marker::PhantomData<&'a ()>,
-    miner_data: Option<PushValue>,
     _progress_notifier: U,
 }
 
@@ -425,7 +440,6 @@ impl<'a, P: consensus::Parameters> Builder<'a, P, ()> {
             tze_builder: TzeBuilder::empty(),
             #[cfg(not(zcash_unstable = "zfuture"))]
             tze_builder: core::marker::PhantomData,
-            miner_data: None,
             _progress_notifier: (),
         }
     }
@@ -455,7 +469,6 @@ impl<'a, P: consensus::Parameters> Builder<'a, P, ()> {
             sapling_builder: self.sapling_builder,
             orchard_builder: self.orchard_builder,
             tze_builder: self.tze_builder,
-            miner_data: self.miner_data,
             _progress_notifier,
         }
     }
@@ -538,19 +551,6 @@ impl<P: consensus::Parameters, U: sapling::builder::ProverProgress> Builder<'_,
             .map_err(Error::SaplingBuild)
     }
 
-    /// Sets the miner data for coinbase transactions.
-    ///
-    /// This returns an error if the [`BuildConfig`] provided to this builder is not
-    /// [`BuildConfig::Coinbase`].
-    pub fn set_coinbase_miner_data(&mut self, miner_data: PushValue) -> Result<(), ()> {
-        if self.build_config.is_coinbase() {
-            self.miner_data = Some(miner_data);
-            Ok(())
-        } else {
-            Err(())
-        }
-    }
-
     /// Adds a transparent P2PKH coin to be spent in this transaction.
     #[cfg(feature = "transparent-inputs")]
     pub fn add_transparent_input(
@@ -752,42 +752,50 @@ impl<P: consensus::Parameters, U: sapling::builder::ProverProgress> Builder<'_,
         output_prover: &OP,
         fee_rule: &FR,
     ) -> Result<BuildResult, Error<FR::Error>> {
-        if self.build_config.is_coinbase() {
-            let target_height = self.target_height;
-
-            self.build_internal::<Coinbase, _, _, _, _>(
-                |b, miner_data| build_transparent_coinbase(b, target_height, miner_data),
-                |b, _, _| Ok(b.clone().map_authorization(transparent::builder::Coinbase)),
-                #[cfg(zcash_unstable = "zfuture")]
-                |_| (None, vec![]),
-                #[cfg(zcash_unstable = "zfuture")]
-                |_, _, _| unreachable!(),
-                &[],
-                &[],
-                rng,
-                spend_prover,
-                output_prover,
-                None,
-            )
-        } else {
-            let fee = self.get_fee(fee_rule).map_err(Error::Fee)?;
-
-            self.build_internal::<Unauthorized, _, _, _, _>(
-                |b, _| Ok(b.build()),
-                |b, unauthed_tx, txid_parts| {
-                    authorize_transparent(b, unauthed_tx, txid_parts, transparent_signing_set)
-                },
-                #[cfg(zcash_unstable = "zfuture")]
-                |_| (None, vec![]),
-                #[cfg(zcash_unstable = "zfuture")]
-                |_, _, _| unreachable!(),
-                sapling_extsks,
-                orchard_saks,
-                rng,
-                spend_prover,
-                output_prover,
-                Some(fee),
-            )
+        match &self.build_config {
+            BuildConfig::Coinbase { miner_data } => {
+                let target_height = self.target_height;
+                let miner_data = miner_data.clone();
+
+                self.build_internal::<Coinbase, _, _, _, _>(
+                    |b| {
+                        b.build_coinbase(target_height, miner_data)
+                            .map(Some)
+                            .map_err(Error::Coinbase)
+                    },
+                    |b, _, _| Ok(b.clone().map_authorization(transparent::builder::Coinbase)),
+                    #[cfg(zcash_unstable = "zfuture")]
+                    |_| (None, vec![]),
+                    #[cfg(zcash_unstable = "zfuture")]
+                    |_, _, _| unreachable!(),
+                    &[],
+                    &[],
+                    rng,
+                    spend_prover,
+                    output_prover,
+                    None,
+                )
+            }
+            BuildConfig::Standard { .. } => {
+                let fee = self.get_fee(fee_rule).map_err(Error::Fee)?;
+
+                self.build_internal::<Unauthorized, _, _, _, _>(
+                    |b| Ok(b.build()),
+                    |b, unauthed_tx, txid_parts| {
+                        authorize_transparent(b, unauthed_tx, txid_parts, transparent_signing_set)
+                    },
+                    #[cfg(zcash_unstable = "zfuture")]
+                    |_| (None, vec![]),
+                    #[cfg(zcash_unstable = "zfuture")]
+                    |_, _, _| unreachable!(),
+                    sapling_extsks,
+                    orchard_saks,
+                    rng,
+                    spend_prover,
+                    output_prover,
+                    Some(fee),
+                )
+            }
         }
     }
 
@@ -820,38 +828,48 @@ impl<P: consensus::Parameters, U: sapling::builder::ProverProgress> Builder<'_,
         output_prover: &OP,
         fee_rule: &FR,
     ) -> Result<BuildResult, Error<FR::Error>> {
-        if self.build_config.is_coinbase() {
-            let target_height = self.target_height;
-
-            self.build_internal::<Coinbase, _, _, _, _>(
-                |b, miner_data| build_transparent_coinbase(b, target_height, miner_data),
-                |b, _, _| Ok(b.clone().map_authorization(transparent::builder::Coinbase)),
-                |_| (None, vec![]),
-                |_, _, _| unreachable!(),
-                &[],
-                &[],
-                rng,
-                spend_prover,
-                output_prover,
-                None,
-            )
-        } else {
-            let fee = self.get_fee_zfuture(fee_rule).map_err(Error::Fee)?;
-
-            self.build_internal::<Unauthorized, _, _, _, _>(
-                |b, _| Ok(b.build()),
-                |b, unauthed_tx, txid_parts| {
-                    authorize_transparent(b, unauthed_tx, txid_parts, transparent_signing_set)
-                },
-                |b| b.build(),
-                |b, unauthed_tx, tze_signers| b.clone().into_authorized(&unauthed_tx, tze_signers),
-                sapling_extsks,
-                orchard_saks,
-                rng,
-                spend_prover,
-                output_prover,
-                Some(fee),
-            )
+        match &self.build_config {
+            BuildConfig::Coinbase { miner_data } => {
+                let target_height = self.target_height;
+                let miner_data = miner_data.clone();
+
+                self.build_internal::<Coinbase, _, _, _, _>(
+                    |b| {
+                        b.build_coinbase(target_height, miner_data)
+                            .map(Some)
+                            .map_err(Error::Coinbase)
+                    },
+                    |b, _, _| Ok(b.clone().map_authorization(transparent::builder::Coinbase)),
+                    |_| (None, vec![]),
+                    |_, _, _| unreachable!(),
+                    &[],
+                    &[],
+                    rng,
+                    spend_prover,
+                    output_prover,
+                    None,
+                )
+            }
+            BuildConfig::Standard { .. } => {
+                let fee = self.get_fee_zfuture(fee_rule).map_err(Error::Fee)?;
+
+                self.build_internal::<Unauthorized, _, _, _, _>(
+                    |b| Ok(b.build()),
+                    |b, unauthed_tx, txid_parts| {
+                        authorize_transparent(b, unauthed_tx, txid_parts, transparent_signing_set)
+                    },
+                    |b| b.build(),
+                    |b, unauthed_tx, tze_signers| {
+                        b.clone().into_authorized(&unauthed_tx, tze_signers)
+                    },
+                    sapling_extsks,
+                    orchard_saks,
+                    rng,
+                    spend_prover,
+                    output_prover,
+                    Some(fee),
+                )
+            }
         }
     }
 
@@ -861,7 +879,6 @@ impl<P: consensus::Parameters, U: sapling::builder::ProverProgress> Builder<'_,
         self,
         build_transparent: impl FnOnce(
             TransparentBuilder,
-            Option<PushValue>,
         ) -> Result<
             Option<transparent::bundle::Bundle<A::TransparentAuth>>,
             Error<FE>,
@@ -937,7 +954,7 @@ impl<P: consensus::Parameters, U: sapling::builder::ProverProgress> Builder<'_,
             };
         }
 
-        let transparent_bundle = build_transparent(self.transparent_builder, self.miner_data)?;
+        let transparent_bundle = build_transparent(self.transparent_builder)?;
 
         let (sapling_bundle, sapling_meta) = match self
             .sapling_builder
@@ -1171,23 +1188,6 @@ impl<P: consensus::Parameters, U: sapling::builder::ProverProgress> Builder<'_,
     }
 }
 
-#[cfg(feature = "circuits")]
-fn build_transparent_coinbase<FE>(
-    b: TransparentBuilder,
-    target_height: BlockHeight,
-    miner_data: Option<PushValue>,
-) -> Result<Option<transparent::bundle::Bundle<transparent::builder::Coinbase>>, Error<FE>> {
-    b.build_coinbase(target_height, miner_data)
-        .map(Some)
-        // TODO: in a future breaking release of `zcash_primitives`, this `map_err` should be
-        // removed in favor of a specific `Error::Coinbase` variant. For now we are shoving all
-        // errors in coinbase output construction into `UnsupportedScript` to allow for a
-        // semver-compatible release of `zcash_primitives`.
-        .map_err(|_| {
-            Error::<FE>::TransparentBuild(::transparent::builder::Error::UnsupportedScript)
-        })
-}
-
 #[cfg(feature = "circuits")]
 fn authorize_transparent(
     b: &transparent::bundle::Bundle<transparent::builder::Unauthorized>,
@@ -1359,7 +1359,6 @@ mod tests {
             tze_builder: TzeBuilder::empty(),
             #[cfg(not(zcash_unstable = "zfuture"))]
             tze_builder: core::marker::PhantomData,
-            miner_data: None,
             _progress_notifier: (),
         };
 

From d96b87f8634735feaffc711d0ce5ccbf59c8c0d7 Mon Sep 17 00:00:00 2001
From: Marek <m@rek.onl>
Date: Sun, 30 Nov 2025 21:47:22 +0100
Subject: [PATCH 060/263] zcash_primitives: Make `Builder::add_orchard_output`
 take `Zatoshis` instead of `u64`

Co-authored-by: Kris Nuttycombe <kris@nutty.land>
---
 pczt/tests/end_to_end.rs                    | 14 +++++++-------
 zcash_client_backend/src/data_api/wallet.rs |  4 ++--
 zcash_primitives/CHANGELOG.md               |  2 ++
 zcash_primitives/src/transaction/builder.rs |  4 ++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pczt/tests/end_to_end.rs b/pczt/tests/end_to_end.rs
index d741be2287..6150cc4702 100644
--- a/pczt/tests/end_to_end.rs
+++ b/pczt/tests/end_to_end.rs
@@ -94,7 +94,7 @@ fn transparent_to_orchard() {
         .add_orchard_output::<zip317::FeeRule>(
             Some(orchard_ovk),
             recipient,
-            100_000,
+            Zatoshis::const_from_u64(100_000),
             MemoBytes::empty(),
         )
         .unwrap();
@@ -102,7 +102,7 @@ fn transparent_to_orchard() {
         .add_orchard_output::<zip317::FeeRule>(
             Some(orchard_fvk.to_ovk(zip32::Scope::Internal)),
             orchard_fvk.address_at(0u32, orchard::keys::Scope::Internal),
-            885_000,
+            Zatoshis::const_from_u64(885_000),
             MemoBytes::empty(),
         )
         .unwrap();
@@ -250,7 +250,7 @@ fn transparent_p2sh_multisig_to_orchard() {
         .add_orchard_output::<zip317::FeeRule>(
             Some(orchard_ovk),
             recipient,
-            100_000,
+            Zatoshis::const_from_u64(100_000),
             MemoBytes::empty(),
         )
         .unwrap();
@@ -258,7 +258,7 @@ fn transparent_p2sh_multisig_to_orchard() {
         .add_orchard_output::<zip317::FeeRule>(
             Some(orchard_fvk.to_ovk(zip32::Scope::Internal)),
             orchard_fvk.address_at(0u32, orchard::keys::Scope::Internal),
-            880_000,
+            Zatoshis::const_from_u64(880_000),
             MemoBytes::empty(),
         )
         .unwrap();
@@ -450,7 +450,7 @@ fn sapling_to_orchard() {
         .add_orchard_output::<zip317::FeeRule>(
             Some(sapling_dfvk.to_ovk(zip32::Scope::External).0.into()),
             recipient,
-            100_000,
+            Zatoshis::const_from_u64(100_000),
             MemoBytes::empty(),
         )
         .unwrap();
@@ -609,7 +609,7 @@ fn orchard_to_orchard() {
         .add_orchard_output::<zip317::FeeRule>(
             Some(orchard_ovk),
             recipient,
-            100_000,
+            Zatoshis::const_from_u64(100_000),
             MemoBytes::empty(),
         )
         .unwrap();
@@ -617,7 +617,7 @@ fn orchard_to_orchard() {
         .add_orchard_output::<zip317::FeeRule>(
             Some(orchard_fvk.to_ovk(zip32::Scope::Internal)),
             orchard_fvk.address_at(0u32, orchard::keys::Scope::Internal),
-            890_000,
+            Zatoshis::const_from_u64(890_000),
             MemoBytes::empty(),
         )
         .unwrap();
diff --git a/zcash_client_backend/src/data_api/wallet.rs b/zcash_client_backend/src/data_api/wallet.rs
index b95f400487..a737ce48ed 100644
--- a/zcash_client_backend/src/data_api/wallet.rs
+++ b/zcash_client_backend/src/data_api/wallet.rs
@@ -1431,7 +1431,7 @@ where
                 builder.add_orchard_output(
                     external_ovk.map(|k| k.into()),
                     to,
-                    payment_amount.into(),
+                    payment_amount,
                     memo.clone(),
                 )?;
                 orchard_output_meta.push((
@@ -1546,7 +1546,7 @@ where
                         ufvk.orchard()
                             .ok_or(Error::KeyNotAvailable(PoolType::ORCHARD))?
                             .address_at(0u32, orchard::keys::Scope::Internal),
-                        change_value.value().into(),
+                        change_value.value(),
                         memo.clone(),
                     )?;
                     orchard_output_meta.push((
diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md
index 81a0435bc7..90f802a60b 100644
--- a/zcash_primitives/CHANGELOG.md
+++ b/zcash_primitives/CHANGELOG.md
@@ -19,6 +19,8 @@ workspace.
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`.
 - `zcash_primitives::transaction::builder`:
   - `Error` has a new `Coinbase` variant.
+  - `Builder::add_orchard_output`'s `value` parameter now has type `Zatoshis`
+    instead of `u64`.
   - `BuildConfig`:
     -  The `Coinbase` variant now includes an `Option<zcash_script::opcode::PushValue>` payload.
     -  No longer implements `Copy`.
diff --git a/zcash_primitives/src/transaction/builder.rs b/zcash_primitives/src/transaction/builder.rs
index bd5aa0a227..93608c1854 100644
--- a/zcash_primitives/src/transaction/builder.rs
+++ b/zcash_primitives/src/transaction/builder.rs
@@ -498,7 +498,7 @@ impl<P: consensus::Parameters, U: sapling::builder::ProverProgress> Builder<'_,
         &mut self,
         ovk: Option<orchard::keys::OutgoingViewingKey>,
         recipient: orchard::Address,
-        value: u64,
+        value: Zatoshis,
         memo: MemoBytes,
     ) -> Result<(), Error<FE>> {
         self.orchard_builder
@@ -507,7 +507,7 @@ impl<P: consensus::Parameters, U: sapling::builder::ProverProgress> Builder<'_,
             .add_output(
                 ovk,
                 recipient,
-                orchard::value::NoteValue::from_raw(value),
+                orchard::value::NoteValue::from_raw(value.into()),
                 memo.into_bytes(),
             )
             .map_err(Error::OrchardRecipient)

From 4b122638cdcdbaf98f7221434e2b39c1dc8d760c Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Fri, 12 Dec 2025 15:10:48 -0700
Subject: [PATCH 061/263] zcash_client_memory: Fix broken `--cfg
 zcash_unstable="zfuture"` build

---
 zcash_client_memory/Cargo.toml         | 6 ++++++
 zcash_client_memory/src/wallet_read.rs | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/zcash_client_memory/Cargo.toml b/zcash_client_memory/Cargo.toml
index d52e4c6c68..285b4cce42 100644
--- a/zcash_client_memory/Cargo.toml
+++ b/zcash_client_memory/Cargo.toml
@@ -122,6 +122,12 @@ unstable = ["zcash_client_backend/unstable"]
 ## Enables compatibility with legacy zcashd wallet data
 zcashd-compat = ["zcash_keys/zcashd-compat", "zcash_client_backend/zcashd-compat"]
 
+## Enables the prospective ZIP 233 (Network Sustainability Mechanism) feature.
+zip-233 = ["zcash_primitives/zip-233"]
+
 [build-dependencies]
 prost-build.workspace = true
 which.workspace = true
+
+[lints]
+workspace = true
diff --git a/zcash_client_memory/src/wallet_read.rs b/zcash_client_memory/src/wallet_read.rs
index e13f023346..9f96a045b3 100644
--- a/zcash_client_memory/src/wallet_read.rs
+++ b/zcash_client_memory/src/wallet_read.rs
@@ -548,6 +548,11 @@ impl<P: consensus::Parameters> WalletRead for MemoryWalletDb<P> {
                         BranchId::for_height(&self.params, expiry_height),
                         tx_data.lock_time(),
                         expiry_height,
+                        #[cfg(all(
+                            any(zcash_unstable = "nu7", zcash_unstable = "zfuture"),
+                            feature = "zip-233"
+                        ))]
+                        tx_data.zip233_amount(),
                         tx_data.transparent_bundle().cloned(),
                         tx_data.sprout_bundle().cloned(),
                         tx_data.sapling_bundle().cloned(),

From 6d67f05e4b88907ce2108ceef77577a7d5300ac9 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Mon, 15 Dec 2025 08:51:42 -0700
Subject: [PATCH 062/263] zcash_primitives: Update to
 `zcash_transparent-0.6.2`.

---
 Cargo.lock                    | 2 +-
 Cargo.toml                    | 2 +-
 zcash_primitives/CHANGELOG.md | 8 ++++++++
 zcash_primitives/Cargo.toml   | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 352dcadfe8..4c3b1ea493 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6634,7 +6634,7 @@ dependencies = [
 
 [[package]]
 name = "zcash_primitives"
-version = "0.26.2"
+version = "0.26.3"
 dependencies = [
  "assert_matches",
  "bip32",
diff --git a/Cargo.toml b/Cargo.toml
index 05382c434e..f8bf1c8720 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -76,7 +76,7 @@ block-buffer = { version = "=0.11.0-rc.3" } # later RCs require edition2024
 crypto-common = { version = "=0.2.0-rc.1" } # later RCs require edition2024
 ripemd = { version = "0.1", default-features = false }
 secp256k1 = { version = "0.29", default-features = false, features = ["alloc"] }
-transparent = { package = "zcash_transparent", version = "0.6", path = "zcash_transparent", default-features = false }
+transparent = { package = "zcash_transparent", version = "0.6.2", path = "zcash_transparent", default-features = false }
 zcash_script = { version = "0.4.2", default-features = false }
 zeroize = { version = "1.7", default-features = false }
 
diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md
index 2d1da631d0..6a34528f63 100644
--- a/zcash_primitives/CHANGELOG.md
+++ b/zcash_primitives/CHANGELOG.md
@@ -10,6 +10,14 @@ workspace.
 
 ## [Unreleased]
 
+## [0.26.3] - 2025-12-15
+
+### Fixed
+- Fixed missing update to `zcash_transparent 0.6.2`; without this change,
+  downstream crates using `cargo update -p zcash_primitives` would end up
+  with their codebase failing to compile unless they also manually update
+  `zcash_transparent`.
+
 ## [0.26.2] - 2025-12-12
 
 ### Added
diff --git a/zcash_primitives/Cargo.toml b/zcash_primitives/Cargo.toml
index 82ac5bd2d0..b2865775bc 100644
--- a/zcash_primitives/Cargo.toml
+++ b/zcash_primitives/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "zcash_primitives"
 description = "Rust implementations of the Zcash primitives"
-version = "0.26.2"
+version = "0.26.3"
 authors = [
     "Jack Grigg <jack@z.cash>",
     "Kris Nuttycombe <kris@electriccoin.co>"

From fa8248436f2394baed1e8efbf6bec92edb2e761d Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Mon, 15 Dec 2025 09:44:03 -0700
Subject: [PATCH 063/263] Yank `zcash_primitives-0.26.2`

---
 supply-chain/imports.lock     |  4 ++--
 zcash_primitives/CHANGELOG.md | 14 ++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index 8489eb0826..29d70096fe 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -337,8 +337,8 @@ user-login = "str4d"
 user-name = "Jack Grigg"
 
 [[publisher.zcash_primitives]]
-version = "0.26.2"
-when = "2025-12-12"
+version = "0.26.3"
+when = "2025-12-15"
 user-id = 169181
 user-login = "nuttycom"
 user-name = "Kris Nuttycombe"
diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md
index 6a34528f63..1c32d8476f 100644
--- a/zcash_primitives/CHANGELOG.md
+++ b/zcash_primitives/CHANGELOG.md
@@ -12,14 +12,6 @@ workspace.
 
 ## [0.26.3] - 2025-12-15
 
-### Fixed
-- Fixed missing update to `zcash_transparent 0.6.2`; without this change,
-  downstream crates using `cargo update -p zcash_primitives` would end up
-  with their codebase failing to compile unless they also manually update
-  `zcash_transparent`.
-
-## [0.26.2] - 2025-12-12
-
 ### Added
 - `zcash_primitives::transaction::builder`:
   - `BuildConfig::is_coinbase`
@@ -31,6 +23,12 @@ workspace.
   `BuildConfig::Coinbase` was a configuration that could be selected, the
   transaction that was generated as a result would not be a valid coinbase
   transaction.
+- Fixed a problem in the `zcash_primitives-0.26.2` release where we missed
+  updating to `zcash_transparent 0.6.2`; without this change, downstream crates
+  using `cargo update -p zcash_primitives` would end up with their codebase
+  failing to compile unless they also manually updated `zcash_transparent`.
+
+## [0.26.2] - YANKED
 
 ## [0.26.1] - 2025-10-18
 

From 621844f56b53e4b915ef861b6c2592297b00672a Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@electriccoin.co>
Date: Mon, 15 Dec 2025 21:34:12 +0000
Subject: [PATCH 064/263] zcash_transparent: Add
 `zip48::FullViewingKey::derive_matching_account_priv_key`

---
 zcash_transparent/CHANGELOG.md |  4 ++
 zcash_transparent/src/zip48.rs | 78 +++++++++++++++++++++++++++++++++-
 2 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/zcash_transparent/CHANGELOG.md b/zcash_transparent/CHANGELOG.md
index 11a2793f0d..633d6abed2 100644
--- a/zcash_transparent/CHANGELOG.md
+++ b/zcash_transparent/CHANGELOG.md
@@ -10,6 +10,10 @@ workspace.
 
 ## [Unreleased]
 
+### Added
+- `zcash_transparent::zip48`:
+  - `FullViewingKey::derive_matching_account_priv_key`
+
 ## [0.6.2] - 2025-12-12
 
 ### Added
diff --git a/zcash_transparent/src/zip48.rs b/zcash_transparent/src/zip48.rs
index 99591ce3b2..bbe335d991 100644
--- a/zcash_transparent/src/zip48.rs
+++ b/zcash_transparent/src/zip48.rs
@@ -44,12 +44,21 @@ impl AccountPrivKey {
         params: &P,
         seed: &[u8],
         account: AccountId,
+    ) -> Result<AccountPrivKey, bip32::Error> {
+        Self::from_seed_with_coin_type(seed, params.coin_type(), account)
+    }
+
+    /// Internal helper constructor that doesn't depend on [`consensus::Parameters`].
+    fn from_seed_with_coin_type(
+        seed: &[u8],
+        coin_type: u32,
+        account: AccountId,
     ) -> Result<AccountPrivKey, bip32::Error> {
         let root = ExtendedPrivateKey::new(seed)?;
         let fingerprint = root.public_key().fingerprint();
         let derivation = vec![
             BIP_48_PURPOSE(),
-            ChildNumber::new(params.coin_type(), true)?,
+            ChildNumber::new(coin_type, true)?,
             ChildNumber::new(account.into(), true)?,
             ZCASH_P2SH_SCRIPT_TYPE(),
         ];
@@ -141,6 +150,25 @@ impl AccountPubKey {
         }
     }
 
+    /// Returns the ZIP 48 coin type and account ID for this public key.
+    fn coin_type_and_account(&self) -> (u32, AccountId) {
+        // By construction, the derivation is always a ZIP 48 path.
+        let derivation = self.origin.derivation();
+        (
+            derivation
+                .get(1)
+                .expect("valid ZIP 48 derivation path")
+                .index(),
+            AccountId::try_from(
+                derivation
+                    .get(2)
+                    .expect("valid ZIP 48 derivation path")
+                    .index(),
+            )
+            .expect("valid"),
+        )
+    }
+
     /// Encodes this public key as a [BIP 388 `KEY_INFO` expression].
     ///
     /// [BIP 388 `KEY_INFO` expression]: https://github.com/bitcoin/bips/blob/master/bip-0388.mediawiki#key-information-vector
@@ -229,6 +257,18 @@ impl FullViewingKey {
         }
     }
 
+    /// Returns the ZIP 48 coin type and account ID for this full viewing key.
+    fn coin_type_and_account(&self) -> (u32, AccountId) {
+        // By construction of `Self`:
+        // - `key_info` contains at least one key.
+        // - All keys in `key_info` have the same derivation information, so we only need
+        //   to look at the first.
+        self.key_info
+            .first()
+            .expect("at least one key")
+            .coin_type_and_account()
+    }
+
     /// Returns the [BIP 388 wallet descriptor template] for this full viewing key.
     ///
     /// [BIP 388 wallet descriptor template]: https://github.com/bitcoin/bips/blob/master/bip-0388.mediawiki#wallet-descriptor-template
@@ -255,6 +295,28 @@ impl FullViewingKey {
         t
     }
 
+    /// Derives the [`AccountPrivKey`] from the given seed that matches this full viewing
+    /// key.
+    ///
+    /// Returns `Ok(None)` if the given seed does not match any of the public keys.
+    pub fn derive_matching_account_priv_key(
+        &self,
+        seed: &[u8],
+    ) -> Result<Option<AccountPrivKey>, bip32::Error> {
+        let (coin_type, account) = self.coin_type_and_account();
+        let candiate_privkey = AccountPrivKey::from_seed_with_coin_type(seed, coin_type, account)?;
+        let candiate_pubkey = candiate_privkey.to_account_pubkey();
+
+        for key in &self.key_info {
+            if key == &candiate_pubkey {
+                return Ok(Some(candiate_privkey));
+            }
+        }
+
+        // Nothing matched.
+        Ok(None)
+    }
+
     /// Derives the scoped P2SH address for this account at the given index, along with
     /// the corresponding redeem script.
     pub fn derive_address(
@@ -420,6 +482,20 @@ mod tests {
                 assert_eq!(&key.key_info_expression(&params), expected);
             }
 
+            for (i, seed) in seeds.iter().enumerate() {
+                if i < tv.key_information_vector.len() {
+                    assert!(matches!(
+                        fvk.derive_matching_account_priv_key(seed),
+                        Ok(Some(_)),
+                    ));
+                } else {
+                    assert!(matches!(
+                        fvk.derive_matching_account_priv_key(seed),
+                        Ok(None),
+                    ));
+                }
+            }
+
             for (i, address) in tv.external_addresses {
                 assert_eq!(
                     &fvk.derive_address(

From 7eb630e79cffb795359ff53fa73d14457d97bc26 Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@electriccoin.co>
Date: Mon, 15 Dec 2025 22:05:05 +0000
Subject: [PATCH 065/263] zcash_transparent: Minor internal refactors in
 `zip48` module

---
 Cargo.lock                     |  1 +
 zcash_transparent/Cargo.toml   |  1 +
 zcash_transparent/src/zip48.rs | 21 ++++++++-------------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bb2bf2c9c2..bf9c3bf622 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6753,6 +6753,7 @@ dependencies = [
  "document-features",
  "getset",
  "hex",
+ "nonempty",
  "proptest",
  "ripemd 0.1.3",
  "secp256k1",
diff --git a/zcash_transparent/Cargo.toml b/zcash_transparent/Cargo.toml
index 89fe360788..e9792afc7a 100644
--- a/zcash_transparent/Cargo.toml
+++ b/zcash_transparent/Cargo.toml
@@ -52,6 +52,7 @@ zcash_script = { workspace = true, features = ["descriptor"] }
 # (Breaking upgrades to these are usually backwards-compatible, but check MSRVs.)
 # - Boilerplate
 getset.workspace = true
+nonempty.workspace = true
 
 # - Documentation
 document-features = { workspace = true, optional = true }
diff --git a/zcash_transparent/src/zip48.rs b/zcash_transparent/src/zip48.rs
index bbe335d991..f15a0142cb 100644
--- a/zcash_transparent/src/zip48.rs
+++ b/zcash_transparent/src/zip48.rs
@@ -3,6 +3,7 @@ use alloc::string::{String, ToString};
 use alloc::vec::Vec;
 
 use bip32::{ChildNumber, ExtendedPrivateKey, ExtendedPublicKey, Prefix};
+use nonempty::NonEmpty;
 use secp256k1::{PublicKey, SecretKey};
 use zcash_protocol::consensus::{self, NetworkConstants};
 use zcash_script::{
@@ -82,7 +83,7 @@ impl AccountPrivKey {
     pub fn to_account_pubkey(&self) -> AccountPubKey {
         AccountPubKey {
             origin: self.origin.clone(),
-            key: ExtendedPublicKey::from(&self.key),
+            key: self.key.public_key(),
         }
     }
 
@@ -212,7 +213,7 @@ impl AccountPubKey {
 /// [ZIP 48]: https://zips.z.cash/zip-0048
 pub struct FullViewingKey {
     threshold: u8,
-    key_info: Vec<AccountPubKey>,
+    key_info: NonEmpty<AccountPubKey>,
 }
 
 impl FullViewingKey {
@@ -226,9 +227,8 @@ impl FullViewingKey {
         threshold: u8,
         key_info: Vec<AccountPubKey>,
     ) -> Result<Self, FullViewingKeyError> {
-        if key_info.is_empty() {
-            Err(FullViewingKeyError::NoPubKeys)
-        } else if key_info.len() > 15 {
+        let key_info = NonEmpty::from_vec(key_info).ok_or(FullViewingKeyError::NoPubKeys)?;
+        if key_info.len() > 15 {
             Err(FullViewingKeyError::TooManyPubKeys)
         } else if usize::from(threshold) > key_info.len() {
             Err(FullViewingKeyError::InvalidThreshold)
@@ -259,14 +259,9 @@ impl FullViewingKey {
 
     /// Returns the ZIP 48 coin type and account ID for this full viewing key.
     fn coin_type_and_account(&self) -> (u32, AccountId) {
-        // By construction of `Self`:
-        // - `key_info` contains at least one key.
-        // - All keys in `key_info` have the same derivation information, so we only need
-        //   to look at the first.
-        self.key_info
-            .first()
-            .expect("at least one key")
-            .coin_type_and_account()
+        // By construction of `Self`, all keys in `key_info` have the same derivation
+        // information, so we only need to look at the first.
+        self.key_info.first().coin_type_and_account()
     }
 
     /// Returns the [BIP 388 wallet descriptor template] for this full viewing key.

From 0d2788c5b741722e3ed59593d849c54b44327614 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Wed, 6 Aug 2025 11:17:35 +1200
Subject: [PATCH 066/263] eip681 crate

---
 Cargo.lock                     |  185 +++-
 Cargo.toml                     |    5 +-
 components/eip681/CHANGELOG.md |   14 +
 components/eip681/Cargo.toml   |   40 +
 components/eip681/README.md    |   21 +
 components/eip681/src/lib.rs   |   25 +
 components/eip681/src/parse.rs | 1533 ++++++++++++++++++++++++++++++++
 components/zip321/Cargo.toml   |    2 +-
 supply-chain/audits.toml       |  131 +++
 supply-chain/config.toml       |   74 +-
 supply-chain/imports.lock      |  180 ++--
 11 files changed, 2085 insertions(+), 125 deletions(-)
 create mode 100644 components/eip681/CHANGELOG.md
 create mode 100644 components/eip681/Cargo.toml
 create mode 100644 components/eip681/README.md
 create mode 100644 components/eip681/src/lib.rs
 create mode 100644 components/eip681/src/parse.rs

diff --git a/Cargo.lock b/Cargo.lock
index 1435a829e6..5feb4dcbee 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -155,9 +155,9 @@ checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
 
 [[package]]
 name = "anyhow"
-version = "1.0.83"
+version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3"
+checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
 
 [[package]]
 name = "arrayref"
@@ -1069,12 +1069,12 @@ dependencies = [
 
 [[package]]
 name = "darling"
-version = "0.20.10"
+version = "0.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
+checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0"
 dependencies = [
- "darling_core 0.20.10",
- "darling_macro 0.20.10",
+ "darling_core 0.21.3",
+ "darling_macro 0.21.3",
 ]
 
 [[package]]
@@ -1093,9 +1093,9 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.10"
+version = "0.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
+checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4"
 dependencies = [
  "fnv",
  "ident_case",
@@ -1118,11 +1118,11 @@ dependencies = [
 
 [[package]]
 name = "darling_macro"
-version = "0.20.10"
+version = "0.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
+checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
 dependencies = [
- "darling_core 0.20.10",
+ "darling_core 0.21.3",
  "quote",
  "syn 2.0.100",
 ]
@@ -1286,6 +1286,12 @@ dependencies = [
  "unicode-xid",
 ]
 
+[[package]]
+name = "diff"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
+
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -1464,6 +1470,21 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "eip681"
+version = "0.1.0"
+dependencies = [
+ "base64",
+ "ens-normalize-rs",
+ "nom",
+ "percent-encoding",
+ "pretty_assertions",
+ "proptest",
+ "snafu",
+ "zcash_address",
+ "zcash_protocol",
+]
+
 [[package]]
 name = "either"
 version = "1.13.0"
@@ -1501,6 +1522,25 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d"
 
+[[package]]
+name = "ens-normalize-rs"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0712f972f7320be5977fb2f4be0312ab3e5b1e8906cb9b3ee5f988ef4dc9590f"
+dependencies = [
+ "anyhow",
+ "itertools 0.13.0",
+ "lazy_static",
+ "regex",
+ "serde",
+ "serde-aux",
+ "serde_json",
+ "serde_plain",
+ "serde_with",
+ "thiserror 2.0.12",
+ "unicode-normalization",
+]
+
 [[package]]
 name = "enum-ordinalize"
 version = "3.1.15"
@@ -3366,6 +3406,16 @@ version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
+[[package]]
+name = "pretty_assertions"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
+dependencies = [
+ "diff",
+ "yansi",
+]
+
 [[package]]
 name = "prettyplease"
 version = "0.2.20"
@@ -3746,6 +3796,26 @@ dependencies = [
  "thiserror 2.0.12",
 ]
 
+[[package]]
+name = "ref-cast"
+version = "1.0.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d"
+dependencies = [
+ "ref-cast-impl",
+]
+
+[[package]]
+name = "ref-cast-impl"
+version = "1.0.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.100",
+]
+
 [[package]]
 name = "regex"
 version = "1.11.1"
@@ -4088,6 +4158,30 @@ dependencies = [
  "zip32",
 ]
 
+[[package]]
+name = "schemars"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f"
+dependencies = [
+ "dyn-clone",
+ "ref-cast",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "schemars"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9558e172d4e8533736ba97870c4b2cd63f84b382a3d6eb063da41b91cce17289"
+dependencies = [
+ "dyn-clone",
+ "ref-cast",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "schemerz"
 version = "0.2.0"
@@ -4186,6 +4280,18 @@ dependencies = [
  "serde_derive",
 ]
 
+[[package]]
+name = "serde-aux"
+version = "4.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "207f67b28fe90fb596503a9bf0bf1ea5e831e21307658e177c5dfcdfc3ab8a0a"
+dependencies = [
+ "chrono",
+ "serde",
+ "serde-value",
+ "serde_json",
+]
+
 [[package]]
 name = "serde-value"
 version = "0.7.0"
@@ -4227,13 +4333,24 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.120"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
 dependencies = [
  "itoa",
+ "memchr",
  "ryu",
  "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "serde_plain"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce1fc6db65a611022b23a0dec6975d63fb80a302cb3388835ff02c097258d50"
+dependencies = [
+ "serde",
 ]
 
 [[package]]
@@ -4256,17 +4373,18 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.8.1"
+version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20"
+checksum = "10574371d41b0d9b2cff89418eda27da52bcaff2cc8741db26382a77c29131f1"
 dependencies = [
  "base64",
  "chrono",
  "hex",
  "indexmap 1.9.3",
  "indexmap 2.12.0",
- "serde",
- "serde_derive",
+ "schemars 0.9.0",
+ "schemars 1.1.0",
+ "serde_core",
  "serde_json",
  "serde_with_macros",
  "time",
@@ -4274,11 +4392,11 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.8.1"
+version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2"
+checksum = "08a72d8216842fdd57820dc78d840bef99248e35fb2554ff923319e60f2d686b"
 dependencies = [
- "darling 0.20.10",
+ "darling 0.21.3",
  "proc-macro2",
  "quote",
  "syn 2.0.100",
@@ -4442,6 +4560,27 @@ version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
+[[package]]
+name = "snafu"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e84b3f4eacbf3a1ce05eac6763b4d629d60cbc94d632e4092c54ade71f1e1a2"
+dependencies = [
+ "snafu-derive",
+]
+
+[[package]]
+name = "snafu-derive"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1c97747dbf44bb1ca44a561ece23508e99cb592e862f22222dcf42f51d1e451"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.100",
+]
+
 [[package]]
 name = "socket2"
 version = "0.5.9"
@@ -6872,6 +7011,12 @@ dependencies = [
  "lzma-sys",
 ]
 
+[[package]]
+name = "yansi"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
+
 [[package]]
 name = "zcash"
 version = "0.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index 6d07849d9a..7ce1114fcd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-members = [
+members = [ "components/eip681",
     "components/equihash",
     "components/f4jumble",
     "components/zcash_address",
@@ -99,13 +99,14 @@ sha2 = { version = "0.10", default-features = false }
 # Documentation
 document-features = "0.2"
 
-# Encodings
+# Encodings and Parsing
 base64 = "0.22"
 bech32 = { version = "0.11", default-features = false, features = ["alloc"] }
 bitflags = "2"
 bs58 = { version = "0.5", default-features = false, features = ["alloc", "check"] }
 byteorder = "1"
 hex = { version = "0.4", default-features = false, features = ["alloc"] }
+nom = "7"
 percent-encoding = "2.1.0"
 postcard = { version = "1", default-features = false, features = ["alloc"] }
 serde = { version = "1", default-features = false, features = ["derive"] }
diff --git a/components/eip681/CHANGELOG.md b/components/eip681/CHANGELOG.md
new file mode 100644
index 0000000000..efda2fa12d
--- /dev/null
+++ b/components/eip681/CHANGELOG.md
@@ -0,0 +1,14 @@
+# Changelog
+
+All notable changes to this library will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this library adheres to Rust's notion of
+[Semantic Versioning](https://semver.org/spec/v2.0.0.html). Future releases are
+indicated by the `PLANNED` status in order to make it possible to correctly
+represent the transitive `semver` implications of changes within the enclosing
+workspace.
+
+## Unreleased
+
+- Initial commit.
diff --git a/components/eip681/Cargo.toml b/components/eip681/Cargo.toml
new file mode 100644
index 0000000000..414a65dfbc
--- /dev/null
+++ b/components/eip681/Cargo.toml
@@ -0,0 +1,40 @@
+[package]
+name = "eip681"
+description = "Parsing functions and data types for Ethereum EIP 681 Payment Request URIs"
+version = "0.1.0"
+authors = [
+    "Schell Scivally <schell@electriccoin.co>"
+]
+homepage = "https://github.com/zcash/librustzcash"
+edition.workspace = true
+readme = "README.md"
+rust-version.workspace = true
+repository.workspace = true
+license.workspace = true
+categories.workspace = true
+
+[dependencies]
+# - Error handling
+snafu = "0.8.6"
+
+# - Parsing and Encoding
+base64.workspace = true
+ens-normalize-rs = "0.1.1"
+nom.workspace = true
+percent-encoding.workspace = true
+
+# - Test dependencies
+proptest = { workspace = true, optional = true }
+
+[dev-dependencies]
+zcash_address = { workspace = true, features = ["test-dependencies"] }
+zcash_protocol = { workspace = true, features = ["std", "test-dependencies"] }
+pretty_assertions = "1.4.1"
+proptest.workspace = true
+
+[features]
+## Exposes APIs that are useful for testing, such as `proptest` strategies.
+test-dependencies = ["dep:proptest"]
+
+[lints]
+workspace = true
diff --git a/components/eip681/README.md b/components/eip681/README.md
new file mode 100644
index 0000000000..1a6447e9a4
--- /dev/null
+++ b/components/eip681/README.md
@@ -0,0 +1,21 @@
+# eip681
+
+This library contains Rust parsing functions and data types for working
+with [Ethereum EIP 681 Payment Request URIs](https://eips.ethereum.org/EIPS/eip-681).
+
+## License
+
+Licensed under either of
+
+ * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
+   http://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
+
+at your discretion.
+
+### Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally
+submitted for inclusion in the work by you, as defined in the Apache-2.0
+license, shall be dual licensed as above, without any additional terms or
+conditions.
diff --git a/components/eip681/src/lib.rs b/components/eip681/src/lib.rs
new file mode 100644
index 0000000000..11a38119ce
--- /dev/null
+++ b/components/eip681/src/lib.rs
@@ -0,0 +1,25 @@
+//! Parser for [EIP-681](https://eips.ethereum.org/EIPS/eip-681) transaction requests.
+//!
+//! The top level of the parsing tree is the type [`EthereumTransactionRequest`].
+//!
+//! ## ABNF Syntax
+//!
+//! ```abnf
+//! request          = schema_prefix target_address [ "@" chain_id ] [ "/" function_name ] [ "?" parameters ]
+//! schema_prefix    = "ethereum" ":" [ "pay-" ]
+//! target_address   = ethereum_address
+//! chain_id         = 1*DIGIT
+//! function_name    = STRING
+//! ethereum_address = ( "0x" 40*HEXDIG ) / ENS_NAME
+//! parameters       = parameter *( "&" parameter )
+//! parameter        = key "=" value
+//! key              = "value" / "gas" / "gasLimit" / "gasPrice" / TYPE
+//! value            = number / ethereum_address / STRING
+//! number           = [ "-" / "+" ] *DIGIT [ "." 1*DIGIT ] [ ( "e" / "E" ) [ 1*DIGIT ] ]
+//! ```
+
+mod parse;
+pub use parse::{
+    Digits, EnsName, EthereumAbiTypeName, EthereumAddress, EthereumTransactionRequest, HexDigits,
+    Key, Number, Parameter, Parameters, SchemaPrefix, UrlEncodedUnicodeString, Value,
+};
diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
new file mode 100644
index 0000000000..cf0442a57c
--- /dev/null
+++ b/components/eip681/src/parse.rs
@@ -0,0 +1,1533 @@
+//! Types and functions used for parsing.
+
+use std::borrow::Cow;
+
+use nom::{AsChar, Parser};
+use snafu::prelude::*;
+
+#[derive(Debug, Snafu)]
+pub enum ParseError<'a> {
+    /// A parsing error generated by `nom`.
+    #[snafu(display("{}", nom::error::Error::to_string(&nom::error::Error {
+        input: *input, code: *code
+    })))]
+    Nom {
+        input: &'a str,
+        code: nom::error::ErrorKind,
+        other: Option<String>,
+    },
+
+    /// The number of digits did not match or exceed the expected minimum.
+    #[snafu(display(
+        "Expected at least {min} digits, saw {} before {}",
+        digits.len(),
+        input.split_at(10).0
+    ))]
+    DigitsMinimum {
+        min: usize,
+        digits: Vec<u8>,
+        input: &'a str,
+    },
+
+    /// The ENS name was expected and missing.
+    #[snafu(display("Missing ENS name"))]
+    EnsMissing,
+
+    /// The ENS name was not a valid domain.
+    #[snafu(display("Not a domain"))]
+    EnsDomain,
+
+    /// The ENS name could not be normalized.
+    #[snafu(display("{source}"))]
+    EnsNormalization {
+        source: ens_normalize_rs::ProcessError,
+    },
+
+    /// The ENS should be normalized, but wasn't.
+    #[snafu(display("ENS name must be normalized. Expected '{expected}' but saw '{seen}'"))]
+    NotNormalized { expected: String, seen: String },
+
+    /// A parameter value had an unexpected value.
+    #[snafu(display("Invalid parameter value. Expected a {ty}."))]
+    InvalidParameterValue { ty: String },
+}
+
+impl<'a> nom::error::ParseError<&'a str> for ParseError<'a> {
+    fn from_error_kind(input: &'a str, code: nom::error::ErrorKind) -> Self {
+        NomSnafu {
+            input,
+            code,
+            other: None,
+        }
+        .build()
+    }
+
+    fn append(input: &'a str, code: nom::error::ErrorKind, other: Self) -> Self {
+        NomSnafu {
+            input,
+            code,
+            other: Some(other.to_string()),
+        }
+        .build()
+    }
+}
+
+impl<'a> From<ParseError<'a>> for nom::Err<ParseError<'a>> {
+    fn from(value: ParseError<'a>) -> Self {
+        if value.is_recoverable() {
+            nom::Err::Error(value)
+        } else {
+            nom::Err::Failure(value)
+        }
+    }
+}
+
+impl ParseError<'_> {
+    pub fn is_recoverable(&self) -> bool {
+        true
+    }
+}
+
+#[derive(Debug, Snafu, PartialEq)]
+pub enum ValidationError {
+    #[snafu(display("Exponent is too small, expected at least {expected}, saw {seen}"))]
+    SmallExponent { expected: usize, seen: u64 },
+
+    #[snafu(display("Exponent is too large, expected at most {expected}, saw {seen}"))]
+    LargeExponent { expected: usize, seen: u64 },
+
+    #[snafu(display("Number {seen} is too big and has saturated"))]
+    Saturation { seen: Number },
+
+    #[snafu(display(
+        "Arithmetic operation resulted in an overflow, exceeding the allowable range"
+    ))]
+    Overflow,
+
+    #[snafu(display("Could not decode url-encoded string: {source}"))]
+    UrlEncoding { source: std::str::Utf8Error },
+}
+
+/// Zero or more consecutive digits.
+///
+/// ```abnf
+/// *DIGIT
+/// ```
+#[derive(Debug, Clone, PartialEq)]
+pub struct Digits {
+    places: Vec<u8>,
+}
+
+impl core::fmt::Display for Digits {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        for n in self.places.iter() {
+            f.write_fmt(format_args!("{n}"))?;
+        }
+        Ok(())
+    }
+}
+
+impl Digits {
+    #[cfg(any(test, feature = "test-dependencies"))]
+    pub const MAX_PLACES: usize = u64::MAX.ilog10() as usize;
+
+    /// Returns the `u64` representation.
+    ///
+    /// ## Errors
+    /// Errors if internal arithmetic operations overflow.
+    pub fn as_u64(&self) -> Result<u64, ValidationError> {
+        let mut total = 0u64;
+        for (mag, digit) in self.places.iter().rev().enumerate() {
+            let increment = (*digit as u64)
+                .checked_mul(10u64.checked_pow(mag as u32).context(OverflowSnafu)?)
+                .context(OverflowSnafu)?;
+            total = total.checked_add(increment).context(OverflowSnafu)?;
+        }
+        Ok(total)
+    }
+
+    /// Returns the digits as a ratio, where prefixed zeros
+    /// are treated as a denominator.
+    pub fn as_decimal_ratio(&self) -> Result<(u64, u64), ValidationError> {
+        let denominator = 10u64
+            .checked_pow(self.places.len() as u32)
+            .context(OverflowSnafu)?;
+        let mut numerator = 0u64;
+
+        for digit in self.places.iter() {
+            numerator = numerator
+                .checked_mul(10)
+                .context(OverflowSnafu)?
+                .checked_add(*digit as u64)
+                .context(OverflowSnafu)?;
+        }
+
+        Ok((numerator, denominator))
+    }
+
+    pub fn from_u64(mut v: u64) -> Self {
+        if v == 0 {
+            return Digits { places: vec![0] };
+        }
+
+        let mut places: Vec<u8> = vec![];
+        while v > 0 {
+            places.push((v % 10) as u8);
+            v /= 10;
+        }
+        places.reverse();
+        Digits { places }
+    }
+
+    /// Parse at least `min` digits.
+    pub fn parse_min(i: &str, min: usize) -> nom::IResult<&str, Self, ParseError<'_>> {
+        let (i, places) = parse_min(i, min, false)?;
+        Ok((i, Digits { places }))
+    }
+}
+
+/// Parse at least `min` digits.
+pub fn parse_min(i: &str, min: usize, is_hex: bool) -> nom::IResult<&str, Vec<u8>, ParseError<'_>> {
+    let radix = if is_hex { 16 } else { 10 };
+    let (i, chars) = nom::bytes::complete::take_while(|c: char| c.is_digit(radix))(i)?;
+    let data = chars
+        .chars()
+        .map(|c| {
+            c.to_digit(radix)
+                .expect("we already checked that this char was a digit") as u8
+        })
+        .collect::<Vec<_>>();
+    snafu::ensure!(
+        data.len() >= min,
+        DigitsMinimumSnafu {
+            min,
+            digits: data,
+            input: i
+        }
+    );
+    Ok((i, data))
+}
+
+/// Zero or more consecutive hexadecimal digits.
+///
+/// ```abnf
+/// *HEXDIG
+/// ```
+#[derive(Clone, Debug, PartialEq)]
+pub struct HexDigits {
+    places: Vec<u8>,
+}
+
+impl core::fmt::Display for HexDigits {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        for n in self.places.iter() {
+            f.write_fmt(format_args!("{n:x}"))?;
+        }
+        Ok(())
+    }
+}
+
+impl HexDigits {
+    /// Parse at least `min` digits.
+    pub fn parse_min(i: &str, min: usize) -> nom::IResult<&str, Self, ParseError<'_>> {
+        let (i, places) = parse_min(i, min, true)?;
+        Ok((i, HexDigits { places }))
+    }
+}
+
+/// A parsed number.
+///
+/// ```abnf
+/// number = [ "-" / "+" ] *DIGIT [ "." 1*DIGIT ] [ ( "e" / "E" ) [ 1*DIGIT ] ]
+/// ```
+///
+/// A number can be expressed in scientific notation, with a
+/// multiplier of a power of 10. Only integer numbers are allowed, so the
+/// exponent MUST be greater or equal to the number of decimals after the point.
+///
+/// ## Note
+/// This ABNF notation doesn't seem correct, as it allows for quite a few
+/// cases that don't make sense - for example:
+///
+/// 1. `*DIGIT` is missing and `[ "." 1*DIGIT ]` is present while `[ ( "e" / "E" ) [ 1*DIGIT] ]`
+///    is not
+/// 2. `[ ( "e" / "E" ) [ 1*DIGIT] ]` is missing the `[ 1*DIGIT ]` (eg, just "e")
+/// 3. only `"-" / "+"` is present
+///
+/// For this reason, in this library, parsing is separate from validation.
+///
+/// Other implementations use regular expressions instead of parsing, and only
+/// support very specific values.
+#[derive(Clone, Debug, PartialEq)]
+pub struct Number {
+    /// true for "+", false for "-"
+    signum: Option<bool>,
+    integer: Digits,
+    decimal: Option<Digits>,
+    exponent: Option<(
+        // true for "e", false for "E"
+        bool,
+        Option<Digits>,
+    )>,
+}
+
+impl core::fmt::Display for Number {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let this = &self;
+        let Number {
+            signum,
+            integer,
+            decimal,
+            exponent,
+        } = this;
+        if let Some(signum) = signum {
+            f.write_str(if *signum { "+" } else { "-" })?;
+        }
+        integer.fmt(f)?;
+        if let Some(dec) = decimal {
+            f.write_fmt(format_args!(".{dec}"))?;
+        };
+        if let Some((little_e, maybe_exp)) = exponent {
+            f.write_str(if *little_e { "e" } else { "E" })?;
+            if let Some(exp) = maybe_exp {
+                exp.fmt(f)?;
+            }
+        }
+        Ok(())
+    }
+}
+
+impl Number {
+    /// Parse a `Number`.
+    ///
+    /// /// ```abnf
+    /// number = [ "-" / "+" ] *DIGIT [ "." 1*DIGIT ] [ ( "e" / "E" ) [ 1*DIGIT ] ]
+    /// ```
+    pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
+        // Parse [ "-" / "+" ]
+        let parse_signum_pos = nom::character::complete::char('+').map(|_| true);
+        let parse_signum_neg = nom::character::complete::char('-').map(|_| false);
+        let parse_signum = parse_signum_pos.or(parse_signum_neg);
+        let (i, signum) = nom::combinator::opt(parse_signum)(i)?;
+
+        // Parse *DIGIT
+        let (i, integer) = Digits::parse_min(i, 0)?;
+
+        // Parse [ "." 1*DIGIT ]
+        fn parse_decimal(i: &str) -> nom::IResult<&str, Digits, ParseError<'_>> {
+            let (i, _dot) = nom::character::complete::char('.')(i)?;
+            let (i, digits) = Digits::parse_min(i, 1)?;
+            Ok((i, digits))
+        }
+        let (i, decimal) = nom::combinator::opt(parse_decimal)(i)?;
+
+        // Parse [ ( "e" / "E" ) [ 1*DIGIT ] ]
+        fn parse_exponent(i: &str) -> nom::IResult<&str, (bool, Option<Digits>), ParseError<'_>> {
+            // Parse ( "e" / "E" )
+            let parse_little_e = nom::character::complete::char('e').map(|_| true);
+            let parse_big_e = nom::character::complete::char('E').map(|_| false);
+            let mut parse_e = parse_little_e.or(parse_big_e);
+            let (i, little_e) = parse_e.parse(i)?;
+
+            // Parse [ 1*DIGIT ]
+            let (i, maybe_exp) = nom::combinator::opt(|i| Digits::parse_min(i, 1))(i)?;
+
+            Ok((i, (little_e, maybe_exp)))
+        }
+        let (i, exponent) = nom::combinator::opt(parse_exponent)(i)?;
+
+        Ok((
+            i,
+            Self {
+                signum,
+                integer,
+                decimal,
+                exponent,
+            },
+        ))
+    }
+
+    /// Returns the value of the integer portion of the number.
+    ///
+    /// ## Errors
+    /// Errors if internal arithmetic operations overflow.
+    pub fn integer(&self) -> Result<u64, ValidationError> {
+        self.integer.as_u64()
+    }
+
+    /// Returns the value of the decimal portion of the number as a ratio
+    /// of `u64`s.
+    pub fn decimal(&self) -> Result<(u64, u64), ValidationError> {
+        Ok(self
+            .decimal
+            .as_ref()
+            .map(|d| d.as_decimal_ratio())
+            .transpose()?
+            .unwrap_or((0, 1)))
+    }
+
+    /// Convert this [`Number`] into an i128, if possible.
+    ///
+    /// ## Errors
+    /// Errors if internal arithmetic operations overflow.
+    pub fn as_i128(&self) -> Result<i128, ValidationError> {
+        let signum = self
+            .signum
+            .map(|is_positive| if is_positive { 1 } else { -1 })
+            .unwrap_or(1i128);
+        let integer = self.integer()?;
+        let (decimal_numerator, decimal_denominator) = self.decimal()?;
+        let exp = self
+            .exponent
+            .as_ref()
+            .and_then(|(_, maybe_exp)| maybe_exp.as_ref().map(|digits| digits.as_u64()))
+            .transpose()?
+            .unwrap_or_default() as u32;
+        let multiplier = 10i128.checked_pow(exp).context(LargeExponentSnafu {
+            expected: u128::MAX.ilog10() as usize,
+            seen: exp as u64,
+        })?;
+        let modulo = multiplier
+            .checked_rem(decimal_denominator as i128)
+            .context(OverflowSnafu)?;
+        snafu::ensure!(
+            modulo == 0 || decimal_numerator == 0,
+            SmallExponentSnafu {
+                expected: decimal_denominator.ilog10() as usize,
+                seen: exp
+            }
+        );
+        let multiplied_integer = (integer as i128)
+            .checked_mul(multiplier)
+            .with_context(|| SaturationSnafu { seen: self.clone() })?;
+        let decimal_multiplier = multiplier
+            .checked_div(decimal_denominator as i128)
+            .context(OverflowSnafu)?;
+        let multiplied_decimal = (decimal_numerator as i128)
+            .checked_mul(decimal_multiplier)
+            .with_context(|| SaturationSnafu { seen: self.clone() })?;
+        let value = multiplied_integer
+            .checked_add(multiplied_decimal)
+            .context(OverflowSnafu)?;
+        signum.checked_mul(value).context(OverflowSnafu)
+    }
+}
+
+/// Ethereum Name Service name.
+///
+/// See [EIP-137](https://eips.ethereum.org/EIPS/eip-137).
+///
+/// Examples:
+/// * dao.eth
+/// * linea.eth
+///
+/// Uses:
+/// * https://crates.io/crates/ens-normalize-rs
+///
+/// ENS names must conform to the following syntax:
+///
+/// ## Name Syntax
+///
+/// ```not_abnf
+/// <domain> ::= <label> | <domain> "." <label>
+/// <label> ::= any valid string label per [UTS46](https://unicode.org/reports/tr46/)
+/// ```
+///
+/// In short, names consist of a series of dot-separated labels.
+///
+/// ## Note
+/// There's nothing in the spec that says an ENS name _must_ contain a '.', but for the
+/// purposes of this library it is required.
+#[derive(Clone, Debug, PartialEq)]
+pub struct EnsName(String);
+
+impl core::fmt::Display for EnsName {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.0.fmt(f)
+    }
+}
+
+impl EnsName {
+    /// These delimiters are implicit in the ABNF syntax because they mark the
+    /// start of optional sections after the possible ENS name. There's nothing
+    /// in the spec that says these characters _cannot_ occur within an ENS name,
+    /// as the EIP-137 spec defers to the Unicode Technical Standard #46 to define
+    /// what valid labels are, and that pulls from
+    /// [this table](https://unicode.org/reports/tr46/#Table_Base_Valid_Set), which
+    /// specifically says "Add all ASCII except for '.'".
+    ///
+    /// But it's clear at a quick look that these delimiters _must_ end parsing of
+    /// an ENS name because if they did not, the parser would eat all optional sections.
+    ///
+    /// Also we must add '&' because an address could be used as the value of a parameter.
+    const DELIMITERS: &[char] = &['@', '/', '?', '&'];
+
+    /// Parse an `EnsName`.
+    pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
+        fn continue_parsing(c: char) -> bool {
+            !c.is_whitespace() && !EnsName::DELIMITERS.contains(&c)
+        }
+
+        let (i, name) = nom::bytes::complete::take_till(|c| !continue_parsing(c))(i)?;
+        snafu::ensure!(!name.is_empty(), EnsMissingSnafu);
+        snafu::ensure!(name.contains('.'), EnsDomainSnafu);
+
+        // Now we have our name, normalize
+        let normalized_name = ens_normalize_rs::normalize(name).context(EnsNormalizationSnafu)?;
+        // According to <https://eips.ethereum.org/EIPS/eip-137#name-syntax> each label in a name
+        // must be a valid, normalized label, so the input `name` should match `normalized_name`.
+        snafu::ensure!(
+            normalized_name == name,
+            NotNormalizedSnafu {
+                expected: normalized_name,
+                seen: name.to_string(),
+            }
+        );
+
+        Ok((i, EnsName(normalized_name)))
+    }
+}
+
+/// An Ethereum address.
+///
+/// ```abnf
+/// ethereum_address = ( "0x" 40*HEXDIG ) / ENS_NAME
+/// ```
+///
+/// Where `ENS_NAME` is [`EnsName`].
+#[derive(Clone, Debug, PartialEq)]
+pub enum EthereumAddress {
+    Hex(HexDigits),
+    Name(EnsName),
+}
+
+impl core::fmt::Display for EthereumAddress {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            EthereumAddress::Hex(digits) => f.write_fmt(format_args!("0x{digits}")),
+            EthereumAddress::Name(name) => name.fmt(f),
+        }
+    }
+}
+
+impl EthereumAddress {
+    /// Parse an `EthereumAddress`.
+    pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
+        // Parse "0x" and then 40+ hex digits
+        fn parse_40plus_hex(i: &str) -> nom::IResult<&str, EthereumAddress, ParseError<'_>> {
+            let (i, _) = nom::bytes::complete::tag("0x")(i)?;
+            let (i, digits) = HexDigits::parse_min(i, 40)?;
+            Ok((i, EthereumAddress::Hex(digits)))
+        }
+        let parse_ens = EnsName::parse.map(EthereumAddress::Name);
+        let mut parse_address = parse_40plus_hex.or(parse_ens);
+        let (i, address) = parse_address.parse(i)?;
+        Ok((i, address))
+    }
+}
+
+/// A URL-encoded unicode string of arbitrary length, where delimiters and the
+/// percentage symbol are mandatorily hex-encoded with a `%` prefix.
+#[derive(Debug, PartialEq)]
+pub struct UrlEncodedUnicodeString(String);
+
+impl core::fmt::Display for UrlEncodedUnicodeString {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.0.fmt(f)
+    }
+}
+
+impl UrlEncodedUnicodeString {
+    pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
+        fn should_continue_parsing(c: char) -> bool {
+            c.is_alphanumeric() || c == '%'
+        }
+        let (i, s) = nom::bytes::complete::take_while(should_continue_parsing)(i)?;
+        Ok((i, UrlEncodedUnicodeString(s.to_string())))
+    }
+
+    pub fn encode(input: impl AsRef<str>) -> Self {
+        let s = percent_encoding::utf8_percent_encode(
+            input.as_ref(),
+            percent_encoding::NON_ALPHANUMERIC,
+        );
+        UrlEncodedUnicodeString(s.to_string())
+    }
+
+    pub fn decode(&self) -> Result<Cow<'_, str>, ValidationError> {
+        let decoder = percent_encoding::percent_decode(self.0.as_bytes());
+        let cow = decoder.decode_utf8().context(UrlEncodingSnafu)?;
+        Ok(cow)
+    }
+}
+
+/// A parameter value.
+///
+/// ```abnf
+/// value = number / ethereum_address / STRING
+/// ```
+#[derive(Debug, PartialEq)]
+pub enum Value {
+    Number(Number),
+    Address(EthereumAddress),
+    String(UrlEncodedUnicodeString),
+}
+
+impl core::fmt::Display for Value {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Value::Number(n) => n.fmt(f),
+            Value::Address(a) => a.fmt(f),
+            Value::String(s) => s.fmt(f),
+        }
+    }
+}
+
+impl Value {
+    /// Parse a `Value`.
+    ///
+    /// ```abnf
+    /// value = number / ethereum_address / STRING
+    /// ```
+    pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
+        let mut number = Number::parse.map(Value::Number);
+        let mut ethereum_address = EthereumAddress::parse.map(Value::Address);
+        let mut string = UrlEncodedUnicodeString::parse.map(Value::String);
+
+        // Here there are some interesting corner cases:
+        //
+        // 1. In `number`'s spec, absolutely everything is optional, so it _never_ fails.
+        // 2. `ethereum_address` may be prefixed with `0` in the hex-address case, so both number
+        //   and address could be parsed. Because of 1, `number` always wins if it comes first, but
+        //   even if the minimum was 1 digit `number` would still win by parsing "0", so
+        //   we can't simply apply them with `number`.or(`address`).
+        // 3. `string` will always match a valid `number`.
+        //
+        // To solve all of these cases we run all three parsers and then return whichever one
+        // consumed the most input.
+        //
+        // In practice this should be fine because values either end with `&` (in the case of
+        // more parameters after it) or with the end of the input.
+
+        let mut results = [number.parse(i), ethereum_address.parse(i), string.parse(i)];
+        results.sort_by_key(|a| {
+            // Sort by the amount of input left over, smallest first
+            a.as_ref().ok().map(|(i, _)| i.len()).unwrap_or(usize::MAX)
+        });
+        results
+            .into_iter()
+            .next()
+            .expect("safe because this was an array of 3")
+    }
+
+    /// Return the value as a [`Number`], if possible.
+    pub fn as_number(&self) -> Option<&Number> {
+        match self {
+            Value::Number(n) => Some(n),
+            _ => None,
+        }
+    }
+}
+
+/// An Ethereum ABI type name.
+///
+/// See [Solidity ABI types](https://docs.soliditylang.org/en/develop/abi-spec.html#types)
+/// for more info.
+///
+/// ## Note
+/// Instead of parsing [`EthereumAbiTypeName`] as a nested syntax tree, we
+/// instead only parse the _name_.
+// TODO(schell): If we do end up wanting a syntax tree representing the type, I
+// have the start of one on the branch `feat/eip-681-tx-req-parser-solidity-types`
+#[derive(Clone, Debug, PartialEq)]
+pub struct EthereumAbiTypeName {
+    name: String,
+}
+
+impl core::fmt::Display for EthereumAbiTypeName {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.name.fmt(f)
+    }
+}
+
+impl EthereumAbiTypeName {
+    /// Parse a `Type`.
+    pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
+        fn is_type_char(c: char) -> bool {
+            let chars = &[
+                '[', ']', // Arrays
+                '<', '>', // Type constructors
+                '(', ')', ',', // Tuples
+            ];
+            c.is_alphanum() || chars.contains(&c)
+        }
+        let (i, s) = nom::bytes::complete::take_while1(is_type_char)(i)?;
+        Ok((i, EthereumAbiTypeName { name: s.to_owned() }))
+    }
+}
+
+/// A parameter key.
+///
+/// ```abnf
+/// key = "value" / "gas" / "gasLimit" / "gasPrice" / TYPE
+/// ```
+#[derive(Clone, Debug, PartialEq)]
+pub enum Key {
+    Value,
+    Gas,
+    GasLimit,
+    GasPrice,
+    Type(EthereumAbiTypeName),
+}
+
+impl core::fmt::Display for Key {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Key::Value => f.write_str("value"),
+            Key::Gas => f.write_str("gas"),
+            Key::GasLimit => f.write_str("gasLimit"),
+            Key::GasPrice => f.write_str("gasPrice"),
+            Key::Type(ty) => ty.fmt(f),
+        }
+    }
+}
+
+impl Key {
+    pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
+        let parse_value = nom::bytes::complete::tag("value").map(|_| Key::Value);
+        let parse_gas = nom::bytes::complete::tag("gas").map(|_| Key::Gas);
+        let parse_gas_limit = nom::bytes::complete::tag("gasLimit").map(|_| Key::GasLimit);
+        let parse_gas_price = nom::bytes::complete::tag("gasPrice").map(|_| Key::GasPrice);
+
+        nom::branch::alt((
+            parse_value,
+            parse_gas_limit,
+            parse_gas_price,
+            parse_gas,
+            EthereumAbiTypeName::parse.map(Key::Type),
+        ))(i)
+    }
+}
+
+/// A key-value pair.
+#[derive(Debug, PartialEq)]
+pub struct Parameter {
+    key: Key,
+    value: Value,
+}
+
+impl core::fmt::Display for Parameter {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_fmt(format_args!("{}={}", self.key, self.value))
+    }
+}
+
+impl Parameter {
+    pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
+        let (i, key) = Key::parse(i)?;
+        let (i, _eq) = nom::character::complete::char('=')(i)?;
+        // If key in the parameter list is value, gasLimit, gasPrice or gas then
+        // value MUST be a number. Otherwise, it must correspond to the TYPE
+        // string used as key.
+        let (i, value) = match &key {
+            Key::Value | Key::Gas | Key::GasLimit | Key::GasPrice => Number::parse
+                .map(Value::Number)
+                .parse(i)
+                .map_err(|_| ParseError::InvalidParameterValue {
+                    ty: "Number".to_string(),
+                })?,
+            Key::Type(type_name) => {
+                Value::parse(i).map_err(|_| ParseError::InvalidParameterValue {
+                    ty: type_name.to_string(),
+                })?
+            }
+        };
+        Ok((i, Parameter { key, value }))
+    }
+}
+
+/// A collection of [`Parameter`].
+#[derive(Debug, PartialEq)]
+pub struct Parameters(Vec<Parameter>);
+
+impl core::fmt::Display for Parameters {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let mut iter = self.0.iter();
+        if let Some(first) = iter.next() {
+            first.fmt(f)?;
+            for other in iter {
+                f.write_str("&")?;
+                other.fmt(f)?;
+            }
+        }
+        Ok(())
+    }
+}
+
+impl Parameters {
+    /// Parses zero or more parameters, separated by '&'.
+    ///
+    /// ## Note
+    /// This parser never fails.
+    pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
+        let (i, maybe_head) = nom::combinator::opt(Parameter::parse).parse(i)?;
+        if let Some(head) = maybe_head {
+            let parse_next_param =
+                nom::sequence::preceded(nom::bytes::complete::tag("&"), Parameter::parse);
+            let (i, tail) = nom::multi::many0(parse_next_param)(i)?;
+            let mut parameters = vec![head];
+            parameters.extend(tail);
+            Ok((i, Parameters(parameters)))
+        } else {
+            Ok((i, Parameters(vec![])))
+        }
+    }
+
+    /// Return the value of the parameter with the given `key`, if any.
+    pub fn get_value(&self, key: &Key) -> Option<&Value> {
+        for param in self.0.iter() {
+            if &param.key == key {
+                return Some(&param.value);
+            }
+        }
+        None
+    }
+}
+
+/// Schema prefix.
+///
+/// ```abnf
+/// schema_prefix = "ethereum" ":" [ "pay-" ]
+/// ```
+#[derive(Debug, PartialEq)]
+pub struct SchemaPrefix {
+    has_pay: bool,
+}
+
+impl core::fmt::Display for SchemaPrefix {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str("ethereum:")?;
+        if self.has_pay {
+            f.write_str("pay-")?;
+        }
+        Ok(())
+    }
+}
+
+impl SchemaPrefix {
+    pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
+        let (i, _) = nom::bytes::complete::tag("ethereum:")(i)?;
+        let (i, maybe_pay) = nom::combinator::opt(nom::bytes::complete::tag("pay-"))(i)?;
+        let has_pay = maybe_pay.is_some();
+        Ok((i, SchemaPrefix { has_pay }))
+    }
+}
+
+/// Ethereum transaction request.
+///
+/// ```abnf
+/// request = schema_prefix target_address [ "@" chain_id ] [ "/" function_name ] [ "?" parameters ]
+/// ```
+#[derive(Debug, PartialEq)]
+pub struct EthereumTransactionRequest {
+    pub schema_prefix: SchemaPrefix,
+    pub target_address: EthereumAddress,
+    pub chain_id: Option<Digits>,
+    pub function_name: Option<UrlEncodedUnicodeString>,
+    pub parameters: Parameters,
+}
+
+impl core::fmt::Display for EthereumTransactionRequest {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let Self {
+            schema_prefix,
+            target_address,
+            chain_id,
+            function_name,
+            parameters,
+        } = self;
+        schema_prefix.fmt(f)?;
+        target_address.fmt(f)?;
+        if let Some(chain_id) = chain_id {
+            f.write_str("@")?;
+            chain_id.fmt(f)?;
+        }
+        if let Some(fn_name) = function_name {
+            f.write_str("/")?;
+            fn_name.fmt(f)?;
+        }
+        if !parameters.0.is_empty() {
+            f.write_str("?")?;
+            parameters.fmt(f)?;
+        }
+
+        Ok(())
+    }
+}
+
+impl EthereumTransactionRequest {
+    /// Parse a transaction request.
+    pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
+        let (i, schema_prefix) = SchemaPrefix::parse(i)?;
+        let (i, target_address) = EthereumAddress::parse(i)?;
+
+        let parse_chain_id =
+            nom::sequence::preceded(nom::bytes::complete::tag("@"), |i| Digits::parse_min(i, 1));
+        let (i, chain_id) = nom::combinator::opt(parse_chain_id)(i)?;
+
+        let parse_function_name = nom::sequence::preceded(
+            nom::bytes::complete::tag("/"),
+            UrlEncodedUnicodeString::parse,
+        );
+        let (i, function_name) = nom::combinator::opt(parse_function_name)(i)?;
+
+        let (i, _) = nom::combinator::opt(nom::bytes::complete::tag("?"))(i)?;
+        let (i, parameters) = Parameters::parse(i)?;
+        Ok((
+            i,
+            Self {
+                schema_prefix,
+                target_address,
+                chain_id,
+                function_name,
+                parameters,
+            },
+        ))
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use std::ops::RangeInclusive;
+
+    use super::*;
+
+    use prop::strategy::Union;
+    use proptest::prelude::*;
+
+    #[test]
+    fn digits_sanity() {
+        assert_eq!(
+            123,
+            Digits {
+                places: vec![1, 2, 3]
+            }
+            .as_u64()
+            .unwrap()
+        );
+        assert_eq!(vec![1, 2, 3], Digits::from_u64(123).places);
+    }
+
+    #[test]
+    fn digits_as_decimal_ratio() {
+        // 0.0123
+        let digits = Digits {
+            places: vec![0, 1, 2, 3],
+        };
+        assert_eq!((123, 10_000), digits.as_decimal_ratio().unwrap());
+
+        // 0.666
+        let digits = Digits {
+            places: vec![6, 6, 6],
+        };
+        assert_eq!((666, 1000), digits.as_decimal_ratio().unwrap());
+    }
+
+    fn arb_digits_in(size_range: RangeInclusive<usize>) -> impl Strategy<Value = Digits> {
+        prop::collection::vec(0..10u8, size_range).prop_map(|places| Digits { places })
+    }
+
+    fn arb_digits(min_digits: usize) -> impl Strategy<Value = Digits> {
+        arb_digits_in(min_digits..=Digits::MAX_PLACES)
+    }
+
+    fn arb_hex_digits(min_digits: usize, max_digits: usize) -> impl Strategy<Value = HexDigits> {
+        let size_range = min_digits..=max_digits;
+        prop::collection::vec(0..16u8, size_range).prop_map(|places| HexDigits { places })
+    }
+
+    proptest! {
+        #[test]
+        fn arb_digits_sanity(digits in arb_digits_in(2..=Digits::MAX_PLACES)) {
+            assert!(digits.places.len() >= 2, "digits: {digits:#?}");
+            assert!(digits.places.len() <= Digits::MAX_PLACES, "digits: {digits:#?}");
+        }
+    }
+
+    fn arb_digits_gte(min_value: u64, max_value: u64) -> impl Strategy<Value = Digits> {
+        (min_value..=max_value).prop_map(Digits::from_u64)
+    }
+
+    proptest! {
+        #[test]
+        fn arb_digits_gte_sanity(digits in arb_digits_gte(20, u64::MAX)) {
+            assert!(digits.as_u64().unwrap() >= 20);
+        }
+    }
+
+    #[test]
+    fn parse_digits_sanity() {
+        let (i, seen_digits) = Digits::parse_min("256", 0).unwrap();
+        assert!(i.is_empty());
+        assert_eq!(256, seen_digits.as_u64().unwrap())
+    }
+
+    proptest! {
+        #[test]
+        fn parse_digits(digits in arb_digits(1)) {
+            let s = digits.to_string();
+            let (i, seen_digits) = Digits::parse_min(&s, 1).unwrap();
+            assert_eq!("", i);
+            assert_eq!(digits, seen_digits);
+        }
+    }
+
+    #[test]
+    fn number_as_i128_sanity() {
+        let (_, n) = Number::parse("666.0").unwrap();
+        assert_eq!(666, n.as_i128().unwrap());
+    }
+
+    #[test]
+    fn number_as_signum_only_parses_to_zero() {
+        let (_, n) = Number::parse("-").unwrap();
+        assert_eq!(0, n.as_i128().unwrap());
+    }
+
+    fn arb_valid_number() -> impl Strategy<Value = Number> {
+        (
+            prop::option::of(any::<bool>()),
+            arb_digits(0),
+            any::<bool>(),
+            prop::option::of(arb_digits_in(1..=4)),
+        )
+            .prop_flat_map(|(signum, integer, little_e, decimal)| {
+                if let Some(dec) = decimal.as_ref() {
+                    // If there is a decimal, ensure that the exponent "covers" it
+                    let places_len = dec.places.len();
+                    (places_len..=places_len + 14)
+                        .prop_map(|n| Some(Digits::from_u64(n as u64)))
+                        .boxed()
+                } else {
+                    prop::option::of((0..=18).prop_map(|n| Digits::from_u64(n as u64))).boxed()
+                }
+                .prop_map(move |exponent| Number {
+                    signum,
+                    integer: integer.clone(),
+                    decimal: decimal.clone(),
+                    exponent: exponent.map(|exp| (little_e, Some(exp))),
+                })
+            })
+    }
+
+    /// Produce an arbitrary `Number` that may or may not be valid.
+    fn arb_any_number() -> impl Strategy<Value = Number> {
+        (
+            prop::option::of(any::<bool>()),
+            arb_digits(0),
+            prop::option::of(any::<bool>()),
+            prop::option::of(arb_digits(1)),
+            prop::option::of(arb_digits(1)),
+        )
+            .prop_map(|(signum, integer, little_e, decimal, exponent)| Number {
+                signum,
+                integer,
+                decimal,
+                exponent: little_e.map(|e| (e, exponent)),
+            })
+    }
+
+    proptest! {
+        #[test]
+        fn arb_valid_number_sanity(number in arb_valid_number()) {
+            assert!(number.as_i128().is_ok());
+        }
+    }
+
+    proptest! {
+        #[test]
+        fn parse_arb_valid_number(ns in arb_valid_number()) {
+            let s = ns.to_string();
+            let (i, seen_ns) = Number::parse(&s).unwrap();
+            assert!(i.is_empty());
+            assert_eq!(ns, seen_ns);
+            let result = seen_ns.as_i128();
+            assert!(result.is_ok(), "{}", result.unwrap_err());
+        }
+    }
+
+    proptest! {
+        #[test]
+        fn parse_any_number(ns in arb_any_number()) {
+            let s = ns.to_string();
+            let (i, seen_ns) = Number::parse(&s).unwrap();
+            assert!(i.is_empty());
+            assert_eq!(ns, seen_ns);
+        }
+    }
+
+    #[test]
+    fn parse_ens_name_sanity() {
+        let valid_ens_names = [
+            "luckyrabbits.meter",
+            "web3.web2.web1",
+            "kitty.cat",
+            "renderling.xyz",
+            "efnx.com",
+            "takt.com",
+        ];
+        for input in valid_ens_names {
+            let (i, name) = EnsName::parse(input).unwrap();
+            assert_eq!("", i);
+            assert_eq!(EnsName(input.to_string()), name);
+        }
+    }
+
+    /// Produces rather exhaustive `EnsName`s that may not be parseable because:
+    ///
+    /// * includes unicode that doesn't pass normalization
+    /// * only has one label, ie doesn't contain any '.' - eg "notadomain"
+    /// * is zero length
+    ///
+    /// This produces a lot of cases, as a result `parse_arb_ens_name` takes about
+    /// 7 seconds on a mac M4Max machine.
+    fn arb_any_ens_name() -> impl Strategy<Value = EnsName> {
+        proptest::string::string_regex("[^\\s\\t@/?]{0,255}")
+            .unwrap()
+            .prop_map(EnsName)
+    }
+
+    /// Produces "happy path" `EnsName`s that are guaranteed to be parseable,
+    /// but are not exhaustive.
+    ///
+    /// Being exhaustive _and_ happy is hard here, because labels are almost
+    /// arbitrary Unicode, but there are "recommendations" about what makes a
+    /// good name. For added security we also validate the name after parsing
+    /// to ensure it is properly normalized, but synthesizing Unicode that
+    /// is guaranteed normalizable is outside the scope of this testsuite, for
+    /// now.
+    fn arb_happy_ens_name() -> impl Strategy<Value = EnsName> {
+        /// Creates a "happy path" label according to
+        /// [EIP-137](https://eips.ethereum.org/EIPS/eip-137):
+        ///
+        /// > Labels and domains may be of any length, but for compatibility with
+        /// > legacy DNS, it is recommended that labels be restricted to no more than
+        /// > 64 characters each, and complete ENS names to no more than 255
+        /// > characters. For the same reason, it is recommended that labels do not
+        /// > start or end with hyphens, or start with digits.
+        ///
+        fn arb_happy_label() -> impl Strategy<Value = String> {
+            proptest::string::string_regex("[a-z][a-z0-9]{1,62}[a-z0-9]?").unwrap()
+        }
+
+        fn arb_happy_label_maybe() -> impl Strategy<Value = Option<String>> {
+            (any::<bool>(), arb_happy_label()).prop_map(|(is_some, label)| is_some.then_some(label))
+        }
+
+        fn arb_happy_label_list() -> impl Strategy<Value = [Option<String>; 4]> {
+            [
+                // We require the ENS name to have at least two labels
+                arb_happy_label().prop_map(Some).boxed(),
+                arb_happy_label().prop_map(Some).boxed(),
+                arb_happy_label_maybe().boxed(),
+                arb_happy_label_maybe().boxed(),
+            ]
+        }
+
+        arb_happy_label_list()
+            .prop_map(|list| EnsName(list.into_iter().flatten().collect::<Vec<_>>().join(".")))
+    }
+
+    #[test]
+    fn parsing_ens_name_without_dot_fails() {
+        let name = "hellogarbagestuff";
+        let result = EnsName::parse(name);
+        assert!(result.is_err(), "Parsed bad ENS name: {result:#?}");
+    }
+
+    proptest! {
+        #[test]
+        /// Meant to test not-necessarily-happy path ENS names, to ensure
+        /// that they either fail to parse predictably, or parse to an equivalent name
+        fn parse_arb_ens_name(expected in arb_any_ens_name()) {
+            let input = expected.to_string();
+            match EnsName::parse(&input) {
+                Ok((i, seen)) => {
+                    if i.is_empty() {
+                        // The entirety was parsed, ensure they match
+                        assert_eq!(expected, seen);
+                    } else {
+                        // Only a portion was matched, meaning it ran into a terminator,
+                        // an encounter which few humans survive.
+                    }
+                }
+                // The input was empty, fine
+                Err(nom::Err::Error(ParseError::EnsMissing)) => {}
+                // The input was not a valid domain
+                Err(nom::Err::Error(ParseError::EnsDomain)) => {}
+                // The input didn't normalize, fine since we don't know how to
+                // construct a strategy via regex that is exhaustive of normalized input
+                Err(nom::Err::Error(ParseError::EnsNormalization { .. })) => {}
+                // The input was not normalized to begin with, which is also fine because
+                // of the aformentioned scenario
+                Err(nom::Err::Error(ParseError::NotNormalized {..})) => {}
+                // Anything else panic because it's unexpected and should be fixed
+                Err(e) => panic!("{e}"),
+
+            }
+        }
+    }
+
+    #[test]
+    fn hex_address_zero_sanity() {
+        let input = "0x0000000000000000000000000000000000000000";
+        let (output, addy) = EthereumAddress::parse(input).unwrap();
+        assert_eq!("", output, "output was not fully consumed");
+        assert_eq!(
+            EthereumAddress::Hex(HexDigits {
+                places: [0; 40].to_vec()
+            }),
+            addy
+        );
+        assert_eq!(input, &format!("{addy}"));
+    }
+
+    fn arb_eth_addy() -> impl Strategy<Value = EthereumAddress> {
+        let hexes: BoxedStrategy<EthereumAddress> = arb_hex_digits(40, 40)
+            .prop_map(EthereumAddress::Hex)
+            .boxed();
+        let names: BoxedStrategy<EthereumAddress> =
+            arb_happy_ens_name().prop_map(EthereumAddress::Name).boxed();
+        hexes.prop_union(names)
+    }
+
+    proptest! {
+        #[test]
+        fn parse_arb_eth_address(expected in arb_eth_addy()) {
+            let input = expected.to_string();
+            let (rest, seen) = EthereumAddress::parse(&input).unwrap();
+            assert_eq!("", rest);
+            assert_eq!(expected, seen);
+        }
+    }
+
+    #[test]
+    fn url_encoding_sanity() {
+        let s = "hello@blah/blah?blah blah🫠blah";
+        let encoded = UrlEncodedUnicodeString::encode(s);
+        assert_eq!(
+            "hello%40blah%2Fblah%3Fblah%20blah%F0%9F%AB%A0blah",
+            &encoded.0.to_string()
+        );
+    }
+
+    fn arb_unicode(min: usize, max: usize) -> impl Strategy<Value = String> {
+        proptest::string::string_regex(&format!(".{{{min},{max}}}")).unwrap()
+    }
+
+    fn arb_non_numeric_unicode(min: usize, max: usize) -> impl Strategy<Value = String> {
+        proptest::string::string_regex(&format!("[^\\d]{{{min},{max}}}")).unwrap()
+    }
+
+    fn arb_url_encoded_string() -> impl Strategy<Value = UrlEncodedUnicodeString> {
+        arb_unicode(1, 1024).prop_map(UrlEncodedUnicodeString::encode)
+    }
+
+    fn arb_non_numeric_url_encoded_string() -> impl Strategy<Value = UrlEncodedUnicodeString> {
+        arb_non_numeric_unicode(1, 1024).prop_map(UrlEncodedUnicodeString::encode)
+    }
+
+    proptest! {
+        #[test]
+        fn parse_arb_url_encoded_unicode_string(expected in arb_url_encoded_string()) {
+            let input = &expected.0;
+            let (output, seen) = UrlEncodedUnicodeString::parse(input).unwrap();
+            assert_eq!("", output);
+            assert_eq!(expected, seen);
+        }
+    }
+
+    fn arb_eth_type_name(recursions_max: usize) -> impl Strategy<Value = EthereumAbiTypeName> {
+        fn arb_eth_base_type_name() -> impl Strategy<Value = EthereumAbiTypeName> {
+            fn one_offs() -> impl Strategy<Value = EthereumAbiTypeName> {
+                proptest::strategy::Union::new(
+                    [
+                        "uint", "int", "address", "bool", "fixed", "ufixed", "function", "bytes",
+                        "string",
+                    ]
+                    .map(|s| proptest::strategy::Just(EthereumAbiTypeName { name: s.to_owned() })),
+                )
+            }
+            fn arb_uint_or_int() -> impl Strategy<Value = EthereumAbiTypeName> {
+                // 0 < M <= 256, M % 8 == 0
+                ((0u32..=256 / 8), any::<bool>()).prop_map(|(n, is_uint)| EthereumAbiTypeName {
+                    name: format!("{}{}", if is_uint { "uint" } else { "int" }, n * 8),
+                })
+            }
+            fn arb_fixed_or_ufixed() -> impl Strategy<Value = EthereumAbiTypeName> {
+                // 8 <= M <= 256, M % 8 == 0
+                let m = 1u32..=256 / 8;
+                // 0 < N <= 80
+                let n = 1..=80;
+                (m, n, any::<bool>()).prop_map(|(m, n, is_fixed)| EthereumAbiTypeName {
+                    name: format!("{}{m}{n}", if is_fixed { "fixed" } else { "ufixed" }),
+                })
+            }
+            fn arb_bytes() -> impl Strategy<Value = EthereumAbiTypeName> {
+                // 0 < M <= 32
+                (1..=32).prop_map(|m| EthereumAbiTypeName {
+                    name: format!("bytes{m}"),
+                })
+            }
+
+            proptest::strategy::Union::new([
+                one_offs().boxed(),
+                arb_uint_or_int().boxed(),
+                arb_fixed_or_ufixed().boxed(),
+                arb_bytes().boxed(),
+            ])
+        }
+
+        // Don't allow infinite recursion, but ensure that we return _something_
+        if recursions_max == 0 {
+            return arb_eth_base_type_name().boxed();
+        }
+
+        fn arb_eth_array_type_name(
+            recursions_max: usize,
+        ) -> impl Strategy<Value = EthereumAbiTypeName> {
+            // M >= 0 but we also have to cover variable-length arrays
+            (
+                (0u32..),
+                arb_eth_type_name(recursions_max.saturating_sub(1)),
+            )
+                .prop_map(|(m, ty)| EthereumAbiTypeName {
+                    name: format!(
+                        "<{ty}>[{}]",
+                        if m > 0 { m.to_string() } else { String::new() }
+                    ),
+                })
+        }
+
+        fn arb_eth_n_tuple(
+            recursions_max: usize,
+            n_tuple: usize,
+        ) -> impl Strategy<Value = EthereumAbiTypeName> {
+            proptest::collection::vec(arb_eth_type_name(recursions_max.saturating_sub(1)), n_tuple)
+                .prop_map(|types| EthereumAbiTypeName {
+                    name: format!(
+                        "({})",
+                        types
+                            .into_iter()
+                            .map(|ty| ty.name)
+                            .collect::<Vec<_>>()
+                            .join(",")
+                    ),
+                })
+        }
+
+        fn arb_eth_tuple(recursions_max: usize) -> impl Strategy<Value = EthereumAbiTypeName> {
+            (0usize..10)
+                .prop_flat_map(move |n| arb_eth_n_tuple(recursions_max.saturating_sub(1), n))
+        }
+
+        proptest::strategy::Union::new([
+            arb_eth_base_type_name().boxed(),
+            arb_eth_array_type_name(recursions_max - 1).boxed(),
+            arb_eth_tuple(recursions_max - 1).boxed(),
+        ])
+        .boxed()
+    }
+
+    const TYPE_RECURSIONS: usize = 4;
+    proptest! {
+        #[test]
+        fn parse_arb_eth_type_name(expected in arb_eth_type_name(TYPE_RECURSIONS)) {
+            let input = &expected.name;
+            let (output, seen) = EthereumAbiTypeName::parse(input).unwrap();
+            assert_eq!("", output);
+            assert_eq!(expected, seen);
+        }
+    }
+
+    fn arb_key() -> impl Strategy<Value = Key> {
+        fn type_keys() -> impl Strategy<Value = Key> {
+            arb_eth_type_name(TYPE_RECURSIONS).prop_map(Key::Type)
+        }
+        fn one_offs() -> impl Strategy<Value = Key> {
+            Union::new([Key::Value, Key::Gas, Key::GasLimit, Key::GasPrice].map(Just))
+        }
+        Union::new([one_offs().boxed(), type_keys().boxed()])
+    }
+
+    proptest! {
+        #[test]
+        fn parse_arb_key(expected in arb_key()) {
+            let input = expected.to_string();
+            let (output, seen) = Key::parse(&input).unwrap();
+            assert_eq!("", output);
+            assert_eq!(expected, seen);
+        }
+    }
+
+    fn arb_value() -> impl Strategy<Value = Value> {
+        Union::new([
+            arb_valid_number().prop_map(Value::Number).boxed(),
+            arb_eth_addy().prop_map(Value::Address).boxed(),
+            arb_url_encoded_string().prop_map(Value::String).boxed(),
+        ])
+    }
+
+    fn arb_non_number_value() -> impl Strategy<Value = Value> {
+        Union::new([
+            arb_eth_addy().prop_map(Value::Address).boxed(),
+            arb_non_numeric_url_encoded_string()
+                .prop_map(Value::String)
+                .boxed(),
+        ])
+    }
+
+    #[test]
+    fn parse_value_url_encoded_space() {
+        let expected = Value::String(UrlEncodedUnicodeString("%20".to_owned()));
+        let input = expected.to_string();
+        assert_eq!("%20", &input);
+        let (output, seen) = Value::parse(&input).unwrap();
+        assert_eq!(
+            "", output,
+            "`input` was not fully consumed. Parsed '{seen:?}' from '{input}'"
+        );
+        assert_eq!(expected, seen);
+    }
+
+    #[test]
+    /// Parsing a value as an ENS name consumes more input than as a string, so ENS name should
+    /// win.
+    fn parse_value_ens_name_over_string() {
+        let expected = Value::Address(EthereumAddress::Name(EnsName("aa.a0".to_string())));
+        let input = expected.to_string();
+        let (_output, seen) = Value::parse(&input).unwrap();
+        pretty_assertions::assert_eq!(expected, seen);
+    }
+
+    proptest! {
+        #[test]
+        fn parse_arb_value(expected in arb_value()) {
+            let input = expected.to_string();
+            let (output, seen) = Value::parse(&input).unwrap();
+            assert_eq!(
+                "",
+                output,
+                "`input` was not fully consumed. Parsed '{seen:?}' from input '{input}'"
+            );
+            assert_eq!(expected, seen);
+        }
+    }
+
+    fn arb_parameter() -> impl Strategy<Value = Parameter> {
+        arb_key().prop_flat_map(|key| {
+            if matches!(key, Key::Value | Key::Gas | Key::GasLimit | Key::GasPrice) {
+                arb_valid_number()
+                    .prop_map(move |n| Parameter {
+                        key: key.clone(),
+                        value: Value::Number(n),
+                    })
+                    .boxed()
+            } else {
+                arb_non_number_value()
+                    .prop_map(move |v| Parameter {
+                        key: key.clone(),
+                        value: v,
+                    })
+                    .boxed()
+            }
+        })
+    }
+
+    proptest! {
+        #[test]
+        fn parse_arb_parameter(expected in arb_parameter()) {
+            let input = expected.to_string();
+            let (output, seen) = Parameter::parse(&input).unwrap();
+            assert_eq!("", output, "`input` was not fully consumed. Parsed '{seen}'");
+            pretty_assertions::assert_eq!(expected, seen);
+        }
+    }
+
+    fn arb_parameters() -> impl Strategy<Value = Parameters> {
+        proptest::collection::vec(arb_parameter(), 0..10).prop_map(Parameters)
+    }
+
+    proptest! {
+        #[test]
+        fn parse_arb_parameters(expected in arb_parameters()) {
+            let input = expected.to_string();
+            let (output, seen) = Parameters::parse(&input).unwrap();
+            assert_eq!("", output, "`input` was not fully consumed. Parsed '{seen}' from '{input}'");
+            assert_eq!(expected, seen);
+        }
+    }
+
+    fn arb_schema_prefix() -> impl Strategy<Value = SchemaPrefix> {
+        any::<bool>().prop_map(|has_pay| SchemaPrefix { has_pay })
+    }
+
+    proptest! {
+    #[test]
+    fn parse_arb_schema_prefix(expected in arb_schema_prefix()) {
+            let input = expected.to_string();
+            let (output, seen) = SchemaPrefix::parse(&input).unwrap();
+            assert_eq!("", output);
+            assert_eq!(expected, seen);
+        }
+    }
+
+    fn arb_request() -> impl Strategy<Value = EthereumTransactionRequest> {
+        (
+            arb_schema_prefix(),
+            arb_eth_addy(),
+            prop::option::of(arb_digits(1)),
+            prop::option::of(arb_url_encoded_string()),
+            prop::option::of(arb_parameters()),
+        )
+            .prop_map(
+                |(schema_prefix, target_address, chain_id, function_name, paramaters)| {
+                    EthereumTransactionRequest {
+                        schema_prefix,
+                        target_address,
+                        chain_id,
+                        function_name,
+                        parameters: paramaters.unwrap_or(Parameters(vec![])),
+                    }
+                },
+            )
+    }
+
+    proptest! {
+        #[test]
+        fn parse_arb_request(expected in arb_request()) {
+            let input = expected.to_string();
+            let (_, seen) = EthereumTransactionRequest::parse(&input).unwrap();
+            pretty_assertions::assert_str_eq!(input, seen.to_string().as_str());
+            pretty_assertions::assert_eq!(expected, seen);
+        }
+    }
+
+    #[test]
+    fn test_vectors_eip_681() {
+        let input = "ethereum:0xfb6916095ca1df60bb79Ce92ce3ea74c37c5d359?value=2.014e18";
+        let (_, seen) = EthereumTransactionRequest::parse(input).unwrap();
+        pretty_assertions::assert_eq!(
+            "0xfb6916095ca1df60bb79ce92ce3ea74c37c5d359",
+            seen.target_address.to_string()
+        );
+        let value = seen
+            .parameters
+            .get_value(&Key::Value)
+            .unwrap()
+            .as_number()
+            .unwrap();
+        assert_eq!(2, value.integer().unwrap());
+        assert_eq!(2.014e18 as i128, value.as_i128().unwrap());
+    }
+}
diff --git a/components/zip321/Cargo.toml b/components/zip321/Cargo.toml
index 4245e76acd..703bfda82e 100644
--- a/components/zip321/Cargo.toml
+++ b/components/zip321/Cargo.toml
@@ -18,7 +18,7 @@ zcash_address.workspace = true
 zcash_protocol = { workspace = true, features = ["std"] }
 
 # - Parsing and Encoding
-nom = "7"
+nom.workspace = true
 base64.workspace = true
 percent-encoding.workspace = true
 
diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
index 192b0a61fa..4a46305737 100644
--- a/supply-chain/audits.toml
+++ b/supply-chain/audits.toml
@@ -18,6 +18,12 @@ who = "Daira-Emma Hopwood <daira@jacaranda.org>"
 criteria = "safe-to-deploy"
 delta = "1.0.82 -> 1.0.83"
 
+[[audits.anyhow]]
+who = "Schell Carl Scivally <efsubenovex@gmail.com>"
+criteria = "safe-to-deploy"
+delta = "1.0.97 -> 1.0.100"
+notes = "Contains mostly configuration for no_std support and conditionally generating backtraces."
+
 [[audits.arti-client]]
 who = "Jack Grigg <jack@electriccoin.co>"
 criteria = "safe-to-deploy"
@@ -173,16 +179,34 @@ who = "Jack Grigg <jack@electriccoin.co>"
 criteria = "safe-to-deploy"
 delta = "0.20.9 -> 0.20.10"
 
+[[audits.darling]]
+who = "Schell Carl Scivally <efsubenovex@gmail.com>"
+criteria = "safe-to-deploy"
+delta = "0.20.10 -> 0.21.3"
+notes = "Mostly added tests and documentation. The bulk of the changes were made to `darling_core`."
+
 [[audits.darling_core]]
 who = "Jack Grigg <jack@electriccoin.co>"
 criteria = "safe-to-deploy"
 delta = "0.20.9 -> 0.20.10"
 
+[[audits.darling_core]]
+who = "Schell Carl Scivally <efsubenovex@gmail.com>"
+criteria = "safe-to-deploy"
+delta = "0.20.10 -> 0.21.3"
+notes = "No unsafe, just helpers for proc-macros."
+
 [[audits.darling_macro]]
 who = "Jack Grigg <jack@electriccoin.co>"
 criteria = "safe-to-deploy"
 delta = "0.20.9 -> 0.20.10"
 
+[[audits.darling_macro]]
+who = "Schell Carl Scivally <efsubenovex@gmail.com>"
+criteria = "safe-to-deploy"
+delta = "0.20.10 -> 0.20.11"
+notes = "Only includes changes to cargo packaging, the library source itself is unchanged."
+
 [[audits.derive-deftly]]
 who = "Jack Grigg <jack@electriccoin.co>"
 criteria = "safe-to-deploy"
@@ -785,6 +809,17 @@ who = "Jack Grigg <jack@electriccoin.co>"
 criteria = "safe-to-deploy"
 delta = "0.4.8 -> 0.6.0"
 
+[[audits.schemars]]
+who = "Schell Carl Scivally <efsubenovex@gmail.com>"
+criteria = "safe-to-deploy"
+delta = "0.8.12 -> 0.9.0"
+
+[[audits.schemars]]
+who = "Schell Carl Scivally <efsubenovex@gmail.com>"
+criteria = "safe-to-deploy"
+delta = "0.9.0 -> 1.1.0"
+notes = "These changes improve security by forbidding unsafe code."
+
 [[audits.secp256k1]]
 who = "Jack Grigg <jack@electriccoin.co>"
 criteria = ["safe-to-deploy", "crypto-reviewed"]
@@ -841,6 +876,18 @@ who = "Jack Grigg <jack@electriccoin.co>"
 criteria = "safe-to-deploy"
 delta = "0.6.8 -> 1.0.3"
 
+[[audits.serde_with]]
+who = "Schell Carl Scivally <efsubenovex@gmail.com>"
+criteria = "safe-to-deploy"
+delta = "3.8.1 -> 3.16.0"
+notes = "No new unsafe, no new IO."
+
+[[audits.serde_with_macros]]
+who = "Schell Carl Scivally <efsubenovex@gmail.com>"
+criteria = "safe-to-deploy"
+delta = "3.8.1 -> 3.16.0"
+notes = "No new IO, mostly just machinery for deriving serde traits from Display."
+
 [[audits.slotmap-careful]]
 who = "Jack Grigg <jack@electriccoin.co>"
 criteria = "safe-to-deploy"
@@ -1820,6 +1867,18 @@ who = "Daira-Emma Hopwood <daira@jacaranda.org>"
 criteria = "safe-to-deploy"
 delta = "1.6.0 -> 1.7.0"
 
+[[trusted.async-trait]]
+criteria = "safe-to-deploy"
+user-id = 3618 # David Tolnay (dtolnay)
+start = "2019-07-23"
+end = "2026-11-23"
+
+[[trusted.dyn-clone]]
+criteria = "safe-to-deploy"
+user-id = 3618 # David Tolnay (dtolnay)
+start = "2019-12-23"
+end = "2026-11-23"
+
 [[trusted.equihash]]
 criteria = "safe-to-deploy"
 user-id = 6289 # Jack Grigg (str4d)
@@ -1898,6 +1957,12 @@ user-id = 169181 # Kris Nuttycombe (nuttycom)
 start = "2024-09-25"
 end = "2025-10-02"
 
+[[trusted.inventory]]
+criteria = "safe-to-deploy"
+user-id = 3618 # David Tolnay (dtolnay)
+start = "2019-08-15"
+end = "2026-11-23"
+
 [[trusted.memuse]]
 criteria = "safe-to-deploy"
 user-id = 6289 # Jack Grigg (str4d)
@@ -1934,6 +1999,12 @@ user-id = 169181 # Kris Nuttycombe (nuttycom)
 start = "2024-08-12"
 end = "2025-08-12"
 
+[[trusted.paste]]
+criteria = "safe-to-deploy"
+user-id = 3618 # David Tolnay (dtolnay)
+start = "2019-03-19"
+end = "2026-11-23"
+
 [[trusted.pczt]]
 criteria = "safe-to-deploy"
 user-id = 6289 # Jack Grigg (str4d)
@@ -1946,12 +2017,42 @@ user-id = 169181 # Kris Nuttycombe (nuttycom)
 start = "2024-12-17"
 end = "2025-12-17"
 
+[[trusted.prettyplease]]
+criteria = "safe-to-deploy"
+user-id = 3618 # David Tolnay (dtolnay)
+start = "2022-01-04"
+end = "2026-11-23"
+
+[[trusted.proc-macro2]]
+criteria = "safe-to-deploy"
+user-id = 3618 # David Tolnay (dtolnay)
+start = "2019-04-23"
+end = "2026-11-23"
+
 [[trusted.redjubjub]]
 criteria = "safe-to-deploy"
 user-id = 199950 # Daira-Emma Hopwood (daira)
 start = "2023-03-30"
 end = "2026-02-21"
 
+[[trusted.ref-cast]]
+criteria = "safe-to-deploy"
+user-id = 3618 # David Tolnay (dtolnay)
+start = "2019-05-05"
+end = "2026-11-23"
+
+[[trusted.ref-cast-impl]]
+criteria = "safe-to-deploy"
+user-id = 3618 # David Tolnay (dtolnay)
+start = "2019-05-05"
+end = "2026-11-23"
+
+[[trusted.ryu]]
+criteria = "safe-to-deploy"
+user-id = 3618 # David Tolnay (dtolnay)
+start = "2019-05-02"
+end = "2026-11-23"
+
 [[trusted.sapling-crypto]]
 criteria = "safe-to-deploy"
 user-id = 6289 # Jack Grigg (str4d)
@@ -1988,6 +2089,18 @@ user-id = 6289 # Jack Grigg (str4d)
 start = "2024-10-15"
 end = "2026-10-26"
 
+[[trusted.serde_ignored]]
+criteria = "safe-to-deploy"
+user-id = 3618 # David Tolnay (dtolnay)
+start = "2019-08-18"
+end = "2026-11-23"
+
+[[trusted.serde_json]]
+criteria = "safe-to-deploy"
+user-id = 3618 # David Tolnay (dtolnay)
+start = "2019-02-28"
+end = "2026-11-23"
+
 [[trusted.shardtree]]
 criteria = "safe-to-deploy"
 user-id = 169181 # Kris Nuttycombe (nuttycom)
@@ -2000,6 +2113,24 @@ user-id = 6289 # Jack Grigg (str4d)
 start = "2024-12-13"
 end = "2025-12-16"
 
+[[trusted.syn]]
+criteria = "safe-to-deploy"
+user-id = 3618 # David Tolnay (dtolnay)
+start = "2019-03-01"
+end = "2026-11-23"
+
+[[trusted.thiserror]]
+criteria = "safe-to-deploy"
+user-id = 3618 # David Tolnay (dtolnay)
+start = "2019-10-09"
+end = "2026-11-23"
+
+[[trusted.thiserror-impl]]
+criteria = "safe-to-deploy"
+user-id = 3618 # David Tolnay (dtolnay)
+start = "2019-10-09"
+end = "2026-11-23"
+
 [[trusted.windows]]
 criteria = "safe-to-deploy"
 user-id = 64539 # Kenny Kerr (kennykerr)
diff --git a/supply-chain/config.toml b/supply-chain/config.toml
index 4f7bb149ed..3fa60c3485 100644
--- a/supply-chain/config.toml
+++ b/supply-chain/config.toml
@@ -143,10 +143,6 @@ criteria = "safe-to-deploy"
 version = "0.4.11"
 criteria = "safe-to-deploy"
 
-[[exemptions.async-trait]]
-version = "0.1.78"
-criteria = "safe-to-deploy"
-
 [[exemptions.async_executors]]
 version = "0.7.0"
 criteria = "safe-to-deploy"
@@ -423,6 +419,10 @@ criteria = "safe-to-deploy"
 version = "2.0.1"
 criteria = "safe-to-deploy"
 
+[[exemptions.diff]]
+version = "0.1.13"
+criteria = "safe-to-run"
+
 [[exemptions.digest]]
 version = "0.9.0"
 criteria = "safe-to-deploy"
@@ -447,10 +447,6 @@ criteria = "safe-to-deploy"
 version = "2.0.1"
 criteria = "safe-to-deploy"
 
-[[exemptions.dyn-clone]]
-version = "1.0.17"
-criteria = "safe-to-deploy"
-
 [[exemptions.dynosaur]]
 version = "0.1.1"
 criteria = "safe-to-deploy"
@@ -479,6 +475,10 @@ criteria = "safe-to-deploy"
 version = "0.13.8"
 criteria = "safe-to-deploy"
 
+[[exemptions.ens-normalize-rs]]
+version = "0.1.1"
+criteria = "safe-to-deploy"
+
 [[exemptions.enum-ordinalize]]
 version = "3.1.15"
 criteria = "safe-to-deploy"
@@ -687,10 +687,6 @@ criteria = "safe-to-deploy"
 version = "0.1.5"
 criteria = "safe-to-deploy"
 
-[[exemptions.inventory]]
-version = "0.3.15"
-criteria = "safe-to-deploy"
-
 [[exemptions.itertools]]
 version = "0.10.5"
 criteria = "safe-to-deploy"
@@ -879,10 +875,6 @@ criteria = "safe-to-deploy"
 version = "0.5.1"
 criteria = "safe-to-deploy"
 
-[[exemptions.paste]]
-version = "1.0.15"
-criteria = "safe-to-deploy"
-
 [[exemptions.pbkdf2]]
 version = "0.12.2"
 criteria = "safe-to-deploy"
@@ -959,9 +951,9 @@ criteria = "safe-to-run"
 version = "0.2.17"
 criteria = "safe-to-deploy"
 
-[[exemptions.prettyplease]]
-version = "0.2.15"
-criteria = "safe-to-deploy"
+[[exemptions.pretty_assertions]]
+version = "1.4.1"
+criteria = "safe-to-run"
 
 [[exemptions.primeorder]]
 version = "0.13.6"
@@ -987,10 +979,6 @@ criteria = "safe-to-deploy"
 version = "2.0.1"
 criteria = "safe-to-deploy"
 
-[[exemptions.proc-macro2]]
-version = "1.0.103"
-criteria = "safe-to-deploy"
-
 [[exemptions.proptest]]
 version = "1.3.1"
 criteria = "safe-to-deploy"
@@ -1139,10 +1127,6 @@ criteria = "safe-to-deploy"
 version = "0.3.0"
 criteria = "safe-to-deploy"
 
-[[exemptions.ryu]]
-version = "1.0.18"
-criteria = "safe-to-deploy"
-
 [[exemptions.safelog]]
 version = "0.4.0"
 criteria = "safe-to-deploy"
@@ -1179,12 +1163,12 @@ criteria = "safe-to-deploy"
 version = "0.8.0"
 criteria = "safe-to-deploy"
 
-[[exemptions.serde_ignored]]
-version = "0.1.10"
+[[exemptions.serde-aux]]
+version = "4.7.0"
 criteria = "safe-to-deploy"
 
-[[exemptions.serde_json]]
-version = "1.0.117"
+[[exemptions.serde_plain]]
+version = "1.0.2"
 criteria = "safe-to-deploy"
 
 [[exemptions.serde_spanned]]
@@ -1223,6 +1207,14 @@ criteria = "safe-to-deploy"
 version = "0.2.3"
 criteria = "safe-to-deploy"
 
+[[exemptions.snafu]]
+version = "0.8.9"
+criteria = "safe-to-deploy"
+
+[[exemptions.snafu-derive]]
+version = "0.8.9"
+criteria = "safe-to-deploy"
+
 [[exemptions.socket2]]
 version = "0.5.9"
 criteria = "safe-to-deploy"
@@ -1267,14 +1259,6 @@ criteria = "safe-to-run"
 version = "12.13.3"
 criteria = "safe-to-run"
 
-[[exemptions.syn]]
-version = "1.0.96"
-criteria = "safe-to-deploy"
-
-[[exemptions.syn]]
-version = "2.0.100"
-criteria = "safe-to-deploy"
-
 [[exemptions.sync_wrapper]]
 version = "0.1.2"
 criteria = "safe-to-deploy"
@@ -1287,14 +1271,6 @@ criteria = "safe-to-deploy"
 version = "3.8.1"
 criteria = "safe-to-deploy"
 
-[[exemptions.thiserror]]
-version = "2.0.12"
-criteria = "safe-to-deploy"
-
-[[exemptions.thiserror-impl]]
-version = "2.0.12"
-criteria = "safe-to-deploy"
-
 [[exemptions.time]]
 version = "0.3.23"
 criteria = "safe-to-deploy"
@@ -1659,6 +1635,10 @@ criteria = "safe-to-deploy"
 version = "0.1.7"
 criteria = "safe-to-deploy"
 
+[[exemptions.yansi]]
+version = "1.0.1"
+criteria = "safe-to-run"
+
 [[exemptions.zeroize]]
 version = "1.6.0"
 criteria = "safe-to-deploy"
diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index 313d140f59..4d602f9962 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -1,6 +1,13 @@
 
 # cargo-vet imports lock
 
+[[publisher.async-trait]]
+version = "0.1.81"
+when = "2024-07-07"
+user-id = 3618
+user-login = "dtolnay"
+user-name = "David Tolnay"
+
 [[publisher.bumpalo]]
 version = "3.16.0"
 when = "2024-04-08"
@@ -15,6 +22,13 @@ user-id = 5946
 user-login = "jrmuizel"
 user-name = "Jeff Muizelaar"
 
+[[publisher.dyn-clone]]
+version = "1.0.17"
+when = "2024-02-26"
+user-id = 3618
+user-login = "dtolnay"
+user-name = "David Tolnay"
+
 [[publisher.equihash]]
 version = "0.2.2"
 when = "2025-03-05"
@@ -71,6 +85,13 @@ user-id = 169181
 user-login = "nuttycom"
 user-name = "Kris Nuttycombe"
 
+[[publisher.inventory]]
+version = "0.3.15"
+when = "2024-01-26"
+user-id = 3618
+user-login = "dtolnay"
+user-name = "David Tolnay"
+
 [[publisher.memuse]]
 version = "0.2.2"
 when = "2024-12-13"
@@ -85,6 +106,13 @@ user-id = 6289
 user-login = "str4d"
 user-name = "Jack Grigg"
 
+[[publisher.paste]]
+version = "1.0.15"
+when = "2024-05-07"
+user-id = 3618
+user-login = "dtolnay"
+user-name = "David Tolnay"
+
 [[publisher.pczt]]
 version = "0.5.0"
 when = "2025-11-05"
@@ -92,6 +120,41 @@ user-id = 169181
 user-login = "nuttycom"
 user-name = "Kris Nuttycombe"
 
+[[publisher.prettyplease]]
+version = "0.2.20"
+when = "2024-05-07"
+user-id = 3618
+user-login = "dtolnay"
+user-name = "David Tolnay"
+
+[[publisher.proc-macro2]]
+version = "1.0.103"
+when = "2025-10-23"
+user-id = 3618
+user-login = "dtolnay"
+user-name = "David Tolnay"
+
+[[publisher.ref-cast]]
+version = "1.0.25"
+when = "2025-09-28"
+user-id = 3618
+user-login = "dtolnay"
+user-name = "David Tolnay"
+
+[[publisher.ref-cast-impl]]
+version = "1.0.25"
+when = "2025-09-28"
+user-id = 3618
+user-login = "dtolnay"
+user-name = "David Tolnay"
+
+[[publisher.ryu]]
+version = "1.0.18"
+when = "2024-05-07"
+user-id = 3618
+user-login = "dtolnay"
+user-name = "David Tolnay"
+
 [[publisher.sapling-crypto]]
 version = "0.6.0"
 when = "2025-12-05"
@@ -113,6 +176,20 @@ user-id = 6289
 user-login = "str4d"
 user-name = "Jack Grigg"
 
+[[publisher.serde_ignored]]
+version = "0.1.10"
+when = "2024-01-02"
+user-id = 3618
+user-login = "dtolnay"
+user-name = "David Tolnay"
+
+[[publisher.serde_json]]
+version = "1.0.145"
+when = "2025-09-14"
+user-id = 3618
+user-login = "dtolnay"
+user-name = "David Tolnay"
+
 [[publisher.shardtree]]
 version = "0.6.1"
 when = "2025-01-31"
@@ -127,6 +204,34 @@ user-id = 6289
 user-login = "str4d"
 user-name = "Jack Grigg"
 
+[[publisher.syn]]
+version = "1.0.109"
+when = "2023-02-24"
+user-id = 3618
+user-login = "dtolnay"
+user-name = "David Tolnay"
+
+[[publisher.syn]]
+version = "2.0.100"
+when = "2025-03-09"
+user-id = 3618
+user-login = "dtolnay"
+user-name = "David Tolnay"
+
+[[publisher.thiserror]]
+version = "2.0.12"
+when = "2025-03-03"
+user-id = 3618
+user-login = "dtolnay"
+user-name = "David Tolnay"
+
+[[publisher.thiserror-impl]]
+version = "2.0.12"
+when = "2025-03-03"
+user-id = 3618
+user-login = "dtolnay"
+user-name = "David Tolnay"
+
 [[publisher.unicode-normalization]]
 version = "0.1.24"
 when = "2024-09-17"
@@ -1115,6 +1220,12 @@ who = "Johan Andersson <opensource@embark-studios.com>"
 criteria = "safe-to-deploy"
 delta = "0.6.1 -> 0.7.0"
 
+[[audits.embark-studios.audits.schemars]]
+who = "Johan Andersson <opensource@embark-studios.com>"
+criteria = "safe-to-deploy"
+version = "0.8.12"
+notes = "No unsafe usage (forbidden) or ambient capabilities"
+
 [[audits.embark-studios.audits.tap]]
 who = "Johan Andersson <opensource@embark-studios.com>"
 criteria = "safe-to-deploy"
@@ -2516,6 +2627,12 @@ criteria = "safe-to-deploy"
 delta = "1.0.68 -> 1.0.69"
 aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
 
+[[audits.mozilla.audits.anyhow]]
+who = "Jan-Erik Rediger <jrediger@mozilla.com>"
+criteria = "safe-to-deploy"
+delta = "1.0.71 -> 1.0.95"
+aggregated-from = "https://raw.githubusercontent.com/mozilla/glean/main/supply-chain/audits.toml"
+
 [[audits.mozilla.audits.ascii]]
 who = "Glenn Watson <git@chillybin.org>"
 criteria = "safe-to-deploy"
@@ -3067,18 +3184,6 @@ version = "2.5.0"
 notes = "The goal is to provide some constant-time correctness for cryptographic implementations. The approach is reasonable, it is known to be insufficient but this is pointed out in the documentation."
 aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
 
-[[audits.mozilla.audits.syn]]
-who = "Mike Hommey <mh+mozilla@glandium.org>"
-criteria = "safe-to-deploy"
-delta = "1.0.96 -> 1.0.99"
-aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
-
-[[audits.mozilla.audits.syn]]
-who = "Mike Hommey <mh+mozilla@glandium.org>"
-criteria = "safe-to-deploy"
-delta = "1.0.99 -> 1.0.107"
-aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
-
 [[audits.mozilla.audits.time]]
 who = "Alex Franchuk <afranchuk@mozilla.com>"
 criteria = "safe-to-deploy"
@@ -3264,42 +3369,8 @@ aggregated-from = "https://raw.githubusercontent.com/zcash/zcash/master/qa/suppl
 [[audits.zcash.audits.anyhow]]
 who = "Jack Grigg <jack@electriccoin.co>"
 criteria = "safe-to-deploy"
-delta = "1.0.71 -> 1.0.75"
-notes = """
-`unsafe` changes are migrating from `core::any::Demand` to `std::error::Request` when the
-nightly features are available.
-"""
-aggregated-from = "https://raw.githubusercontent.com/zcash/zcash/master/qa/supply-chain/audits.toml"
-
-[[audits.zcash.audits.anyhow]]
-who = "Jack Grigg <jack@electriccoin.co>"
-criteria = "safe-to-deploy"
-delta = "1.0.75 -> 1.0.77"
-notes = """
-- Build script changes are to rerun cargo if the `RUSTC_BOOTSTRAP` env variable
-  changes, and enable a few more `rustc` config flags.
-- Some `unsafe fn`s were altered to add `unsafe` blocks, to make the safety
-  contracts in the code clearer (instead of using the `unsafe fn`'s implicit
-  `unsafe` block); no actual `unsafe` changes were made.
-"""
-aggregated-from = "https://raw.githubusercontent.com/zcash/zcash/master/qa/supply-chain/audits.toml"
-
-[[audits.zcash.audits.anyhow]]
-who = "Jack Grigg <jack@electriccoin.co>"
-criteria = "safe-to-deploy"
-delta = "1.0.77 -> 1.0.79"
-notes = """
-Build script changes are to refactor the existing probe into a separate file
-(which removes a filesystem write), and adjust how it gets rerun in response to
-changes in the build environment.
-"""
-aggregated-from = "https://raw.githubusercontent.com/zcash/zcash/master/qa/supply-chain/audits.toml"
-
-[[audits.zcash.audits.anyhow]]
-who = "Daira-Emma Hopwood <daira@jacaranda.org>"
-criteria = "safe-to-deploy"
-delta = "1.0.79 -> 1.0.82"
-aggregated-from = "https://raw.githubusercontent.com/zcash/zcash/master/qa/supply-chain/audits.toml"
+delta = "1.0.95 -> 1.0.97"
+aggregated-from = "https://raw.githubusercontent.com/zcash/wallet/main/supply-chain/audits.toml"
 
 [[audits.zcash.audits.arrayref]]
 who = "Sean Bowe <ewillbefull@gmail.com>"
@@ -3440,6 +3511,12 @@ criteria = "safe-to-deploy"
 delta = "0.1.0 -> 0.1.1"
 aggregated-from = "https://raw.githubusercontent.com/zcash/zcash/master/qa/supply-chain/audits.toml"
 
+[[audits.zcash.audits.darling_macro]]
+who = "Jack Grigg <jack@electriccoin.co>"
+criteria = "safe-to-deploy"
+delta = "0.20.11 -> 0.21.3"
+aggregated-from = "https://raw.githubusercontent.com/zcash/wallet/main/supply-chain/audits.toml"
+
 [[audits.zcash.audits.der]]
 who = "Daira-Emma Hopwood <daira@jacaranda.org>"
 criteria = "safe-to-deploy"
@@ -3878,13 +3955,6 @@ delta = "0.3.11 -> 1.0.1"
 notes = "No code changes, just stabilising the code in SemVer."
 aggregated-from = "https://raw.githubusercontent.com/zcash/zcash/master/qa/supply-chain/audits.toml"
 
-[[audits.zcash.audits.syn]]
-who = "Jack Grigg <jack@electriccoin.co>"
-criteria = "safe-to-deploy"
-delta = "1.0.107 -> 1.0.109"
-notes = "Fixes string literal parsing to only skip specified whitespace characters."
-aggregated-from = "https://raw.githubusercontent.com/zcash/zcash/master/qa/supply-chain/audits.toml"
-
 [[audits.zcash.audits.tempfile]]
 who = "Jack Grigg <jack@electriccoin.co>"
 criteria = "safe-to-deploy"

From f799eeea26d46c188754910362afbda8cc18415e Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Thu, 4 Dec 2025 14:37:21 +1300
Subject: [PATCH 067/263] EIP681: move errors to their own module

---
 components/eip681/src/error.rs | 113 +++++++++++++++++++++++++++++++++
 components/eip681/src/lib.rs   |   1 +
 components/eip681/src/parse.rs | 105 +-----------------------------
 3 files changed, 116 insertions(+), 103 deletions(-)
 create mode 100644 components/eip681/src/error.rs

diff --git a/components/eip681/src/error.rs b/components/eip681/src/error.rs
new file mode 100644
index 0000000000..eade5d9872
--- /dev/null
+++ b/components/eip681/src/error.rs
@@ -0,0 +1,113 @@
+//! Any and all errors encountered during parsing and validation.
+
+use snafu::prelude::*;
+
+use crate::Number;
+
+/// Errors discovered during parsing.
+#[derive(Debug, Snafu)]
+#[snafu(visibility(pub(crate)))]
+pub enum ParseError<'a> {
+    /// A parsing error generated by `nom`.
+    #[snafu(display("{}", nom::error::Error::to_string(&nom::error::Error {
+        input: *input, code: *code
+    })))]
+    Nom {
+        input: &'a str,
+        code: nom::error::ErrorKind,
+        other: Option<String>,
+    },
+
+    /// The number of digits did not match or exceed the expected minimum.
+    #[snafu(display(
+        "Expected at least {min} digits, saw {} before {}",
+        digits.len(),
+        input.split_at(10).0
+    ))]
+    DigitsMinimum {
+        min: usize,
+        digits: Vec<u8>,
+        input: &'a str,
+    },
+
+    /// The ENS name was expected and missing.
+    #[snafu(display("Missing ENS name"))]
+    EnsMissing,
+
+    /// The ENS name was not a valid domain.
+    #[snafu(display("Not a domain"))]
+    EnsDomain,
+
+    /// The ENS name could not be normalized.
+    #[snafu(display("{source}"))]
+    EnsNormalization {
+        source: ens_normalize_rs::ProcessError,
+    },
+
+    /// The ENS should be normalized, but wasn't.
+    #[snafu(display("ENS name must be normalized. Expected '{expected}' but saw '{seen}'"))]
+    NotNormalized { expected: String, seen: String },
+
+    /// A parameter value had an unexpected value.
+    #[snafu(display("Invalid parameter value. Expected a {ty}."))]
+    InvalidParameterValue { ty: String },
+}
+
+impl<'a> nom::error::ParseError<&'a str> for ParseError<'a> {
+    fn from_error_kind(input: &'a str, code: nom::error::ErrorKind) -> Self {
+        NomSnafu {
+            input,
+            code,
+            other: None,
+        }
+        .build()
+    }
+
+    fn append(input: &'a str, code: nom::error::ErrorKind, other: Self) -> Self {
+        NomSnafu {
+            input,
+            code,
+            other: Some(other.to_string()),
+        }
+        .build()
+    }
+}
+
+impl<'a> From<ParseError<'a>> for nom::Err<ParseError<'a>> {
+    fn from(value: ParseError<'a>) -> Self {
+        if value.is_recoverable() {
+            nom::Err::Error(value)
+        } else {
+            nom::Err::Failure(value)
+        }
+    }
+}
+
+impl ParseError<'_> {
+    pub fn is_recoverable(&self) -> bool {
+        true
+    }
+}
+
+/// Errors discovered after parsing, usually when attempting to convert parsed
+/// types into numeric types.
+#[derive(Debug, Snafu, PartialEq)]
+#[snafu(visibility(pub(crate)))]
+pub enum ValidationError {
+    #[snafu(display("Exponent is too small, expected at least {expected}, saw {seen}"))]
+    SmallExponent { expected: usize, seen: u64 },
+
+    #[snafu(display("Exponent is too large, expected at most {expected}, saw {seen}"))]
+    LargeExponent { expected: usize, seen: u64 },
+
+    #[snafu(display("Number {seen} is too big and has saturated"))]
+    Saturation { seen: Number },
+
+    #[snafu(display(
+        "Arithmetic operation resulted in an overflow, exceeding the allowable range"
+    ))]
+    Overflow,
+
+    #[snafu(display("Could not decode url-encoded string: {source}"))]
+    UrlEncoding { source: std::str::Utf8Error },
+}
diff --git a/components/eip681/src/lib.rs b/components/eip681/src/lib.rs
index 11a38119ce..522dee9d06 100644
--- a/components/eip681/src/lib.rs
+++ b/components/eip681/src/lib.rs
@@ -18,6 +18,7 @@
 //! number           = [ "-" / "+" ] *DIGIT [ "." 1*DIGIT ] [ ( "e" / "E" ) [ 1*DIGIT ] ]
 //! ```
 
+pub mod error;
 mod parse;
 pub use parse::{
     Digits, EnsName, EthereumAbiTypeName, EthereumAddress, EthereumTransactionRequest, HexDigits,
diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index cf0442a57c..d1855c6984 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -3,110 +3,9 @@
 use std::borrow::Cow;
 
 use nom::{AsChar, Parser};
-use snafu::prelude::*;
-
-#[derive(Debug, Snafu)]
-pub enum ParseError<'a> {
-    /// A parsing error generated by `nom`.
-    #[snafu(display("{}", nom::error::Error::to_string(&nom::error::Error {
-        input: *input, code: *code
-    })))]
-    Nom {
-        input: &'a str,
-        code: nom::error::ErrorKind,
-        other: Option<String>,
-    },
-
-    /// The number of digits did not match or exceed the expected minimum.
-    #[snafu(display(
-        "Expected at least {min} digits, saw {} before {}",
-        digits.len(),
-        input.split_at(10).0
-    ))]
-    DigitsMinimum {
-        min: usize,
-        digits: Vec<u8>,
-        input: &'a str,
-    },
-
-    /// The ENS name was expected and missing.
-    #[snafu(display("Missing ENS name"))]
-    EnsMissing,
-
-    /// The ENS name was not a valid domain.
-    #[snafu(display("Not a domain"))]
-    EnsDomain,
-
-    /// The ENS name could not be normalized.
-    #[snafu(display("{source}"))]
-    EnsNormalization {
-        source: ens_normalize_rs::ProcessError,
-    },
-
-    /// The ENS should be normalized, but wasn't.
-    #[snafu(display("ENS name must be normalized. Expected '{expected}' but saw '{seen}'"))]
-    NotNormalized { expected: String, seen: String },
-
-    /// A parameter value had an unexpected value.
-    #[snafu(display("Invalid parameter value. Expected a {ty}."))]
-    InvalidParameterValue { ty: String },
-}
-
-impl<'a> nom::error::ParseError<&'a str> for ParseError<'a> {
-    fn from_error_kind(input: &'a str, code: nom::error::ErrorKind) -> Self {
-        NomSnafu {
-            input,
-            code,
-            other: None,
-        }
-        .build()
-    }
+use snafu::{OptionExt, ResultExt};
 
-    fn append(input: &'a str, code: nom::error::ErrorKind, other: Self) -> Self {
-        NomSnafu {
-            input,
-            code,
-            other: Some(other.to_string()),
-        }
-        .build()
-    }
-}
-
-impl<'a> From<ParseError<'a>> for nom::Err<ParseError<'a>> {
-    fn from(value: ParseError<'a>) -> Self {
-        if value.is_recoverable() {
-            nom::Err::Error(value)
-        } else {
-            nom::Err::Failure(value)
-        }
-    }
-}
-
-impl ParseError<'_> {
-    pub fn is_recoverable(&self) -> bool {
-        true
-    }
-}
-
-#[derive(Debug, Snafu, PartialEq)]
-pub enum ValidationError {
-    #[snafu(display("Exponent is too small, expected at least {expected}, saw {seen}"))]
-    SmallExponent { expected: usize, seen: u64 },
-
-    #[snafu(display("Exponent is too large, expected at most {expected}, saw {seen}"))]
-    LargeExponent { expected: usize, seen: u64 },
-
-    #[snafu(display("Number {seen} is too big and has saturated"))]
-    Saturation { seen: Number },
-
-    #[snafu(display(
-        "Arithmetic operation resulted in an overflow, exceeding the allowable range"
-    ))]
-    Overflow,
-
-    #[snafu(display("Could not decode url-encoded string: {source}"))]
-    UrlEncoding { source: std::str::Utf8Error },
-}
+use crate::error::*;
 
 /// Zero or more consecutive digits.
 ///

From c9cdd9d802a634dbe155f62f68c4fd060d3f331f Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Thu, 4 Dec 2025 15:22:29 +1300
Subject: [PATCH 068/263] EIP681: Parameter value is dependent upon the key

---
 components/eip681/src/lib.rs   |   2 +-
 components/eip681/src/parse.rs | 122 ++++++++++++++++++++++-----------
 2 files changed, 82 insertions(+), 42 deletions(-)

diff --git a/components/eip681/src/lib.rs b/components/eip681/src/lib.rs
index 522dee9d06..c19c25f5f2 100644
--- a/components/eip681/src/lib.rs
+++ b/components/eip681/src/lib.rs
@@ -22,5 +22,5 @@ pub mod error;
 mod parse;
 pub use parse::{
     Digits, EnsName, EthereumAbiTypeName, EthereumAddress, EthereumTransactionRequest, HexDigits,
-    Key, Number, Parameter, Parameters, SchemaPrefix, UrlEncodedUnicodeString, Value,
+    Number, Parameter, Parameters, SchemaPrefix, UrlEncodedUnicodeString, Value,
 };
diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index d1855c6984..03f9b34c5f 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -427,7 +427,7 @@ impl EthereumAddress {
 
 /// A URL-encoded unicode string of arbitrary length, where delimiters and the
 /// percentage symbol are mandatorily hex-encoded with a `%` prefix.
-#[derive(Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq)]
 pub struct UrlEncodedUnicodeString(String);
 
 impl core::fmt::Display for UrlEncodedUnicodeString {
@@ -465,7 +465,7 @@ impl UrlEncodedUnicodeString {
 /// ```abnf
 /// value = number / ethereum_address / STRING
 /// ```
-#[derive(Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq)]
 pub enum Value {
     Number(Number),
     Address(EthereumAddress),
@@ -565,11 +565,17 @@ impl EthereumAbiTypeName {
     }
 }
 
-/// A parameter key.
+/// A key-value pair.
+///
+/// The type of the value is dependent upon the key.
 ///
 /// ```abnf
 /// key = "value" / "gas" / "gasLimit" / "gasPrice" / TYPE
 /// ```
+///
+/// > If _key_ in the parameter list is "value", "gasLimit", "gasPrice" or "gas" then
+/// _value_ MUST be a number. Otherwise, it must correspond to the TYPE string
+/// used as key.
 #[derive(Clone, Debug, PartialEq)]
 pub enum Key {
     Value,
@@ -608,40 +614,78 @@ impl Key {
     }
 }
 
-/// A key-value pair.
+/// A key-value pair, where the the type of the value depends upon the key.
 #[derive(Debug, PartialEq)]
-pub struct Parameter {
-    key: Key,
-    value: Value,
+pub enum Parameter {
+    Value(Number),
+    Gas(Number),
+    GasLimit(Number),
+    GasPrice(Number),
+    Type(EthereumAbiTypeName, Value),
 }
 
 impl core::fmt::Display for Parameter {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_fmt(format_args!("{}={}", self.key, self.value))
+        f.write_fmt(format_args!("{}={}", self.key(), self.value()))
     }
 }
 
 impl Parameter {
+    /// Returns just the key of this parameter.
+    pub fn key(&self) -> Key {
+        match self {
+            Parameter::Value(_) => Key::Value,
+            Parameter::Gas(_) => Key::Gas,
+            Parameter::GasLimit(_) => Key::GasLimit,
+            Parameter::GasPrice(_) => Key::GasPrice,
+            Parameter::Type(ethereum_abi_type_name, _) => Key::Type(ethereum_abi_type_name.clone()),
+        }
+    }
+
+    /// Returns just the value of this parameter.
+    pub fn value(&self) -> Value {
+        match self {
+            Parameter::Value(number) => Value::Number(number.clone()),
+            Parameter::Gas(number) => Value::Number(number.clone()),
+            Parameter::GasLimit(number) => Value::Number(number.clone()),
+            Parameter::GasPrice(number) => Value::Number(number.clone()),
+            Parameter::Type(_, value) => value.clone(),
+        }
+    }
+
     pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
         let (i, key) = Key::parse(i)?;
         let (i, _eq) = nom::character::complete::char('=')(i)?;
+
+        fn parse_number(
+            i: &str,
+            f: fn(Number) -> Parameter,
+        ) -> nom::IResult<&str, Parameter, ParseError<'_>> {
+            let (i, number) =
+                Number::parse
+                    .parse(i)
+                    .map_err(|_| ParseError::InvalidParameterValue {
+                        ty: "Number".to_string(),
+                    })?;
+            Ok((i, f(number)))
+        }
+
         // If key in the parameter list is value, gasLimit, gasPrice or gas then
         // value MUST be a number. Otherwise, it must correspond to the TYPE
         // string used as key.
-        let (i, value) = match &key {
-            Key::Value | Key::Gas | Key::GasLimit | Key::GasPrice => Number::parse
-                .map(Value::Number)
-                .parse(i)
-                .map_err(|_| ParseError::InvalidParameterValue {
-                    ty: "Number".to_string(),
-                })?,
+        match key {
+            Key::Value => parse_number(i, Parameter::Value),
+            Key::Gas => parse_number(i, Parameter::Gas),
+            Key::GasLimit => parse_number(i, Parameter::GasLimit),
+            Key::GasPrice => parse_number(i, Parameter::GasPrice),
             Key::Type(type_name) => {
-                Value::parse(i).map_err(|_| ParseError::InvalidParameterValue {
-                    ty: type_name.to_string(),
-                })?
+                let (i, value) =
+                    Value::parse(i).map_err(|_| ParseError::InvalidParameterValue {
+                        ty: type_name.to_string(),
+                    })?;
+                Ok((i, Parameter::Type(type_name, value)))
             }
-        };
-        Ok((i, Parameter { key, value }))
+        }
     }
 }
 
@@ -683,10 +727,10 @@ impl Parameters {
     }
 
     /// Return the value of the parameter with the given `key`, if any.
-    pub fn get_value(&self, key: &Key) -> Option<&Value> {
+    pub fn get_value(&self, key: &Key) -> Option<Value> {
         for param in self.0.iter() {
-            if &param.key == key {
-                return Some(&param.value);
+            if &param.key() == key {
+                return Some(param.value());
             }
         }
         None
@@ -1325,18 +1369,18 @@ mod test {
 
     fn arb_parameter() -> impl Strategy<Value = Parameter> {
         arb_key().prop_flat_map(|key| {
-            if matches!(key, Key::Value | Key::Gas | Key::GasLimit | Key::GasPrice) {
-                arb_valid_number()
-                    .prop_map(move |n| Parameter {
-                        key: key.clone(),
-                        value: Value::Number(n),
-                    })
+            if let Key::Type(name) = key {
+                arb_non_number_value()
+                    .prop_map(move |value| Parameter::Type(name.clone(), value))
                     .boxed()
             } else {
-                arb_non_number_value()
-                    .prop_map(move |v| Parameter {
-                        key: key.clone(),
-                        value: v,
+                arb_valid_number()
+                    .prop_map(move |n| match key {
+                        Key::Value => Parameter::Value(n),
+                        Key::Gas => Parameter::Gas(n),
+                        Key::GasLimit => Parameter::GasLimit(n),
+                        Key::GasPrice => Parameter::GasPrice(n),
+                        Key::Type(_) => unreachable!("we checked this is not TYPE"),
                     })
                     .boxed()
             }
@@ -1420,13 +1464,9 @@ mod test {
             "0xfb6916095ca1df60bb79ce92ce3ea74c37c5d359",
             seen.target_address.to_string()
         );
-        let value = seen
-            .parameters
-            .get_value(&Key::Value)
-            .unwrap()
-            .as_number()
-            .unwrap();
-        assert_eq!(2, value.integer().unwrap());
-        assert_eq!(2.014e18 as i128, value.as_i128().unwrap());
+        let value = seen.parameters.get_value(&Key::Value).unwrap();
+        let number = value.as_number().unwrap();
+        assert_eq!(2, number.integer().unwrap());
+        assert_eq!(2.014e18 as i128, number.as_i128().unwrap());
     }
 }

From 923630e8d5c400c4d224472578c076a1f34bbd2c Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Thu, 4 Dec 2025 15:39:48 +1300
Subject: [PATCH 069/263] EIP681: docs and version

---
 Cargo.lock                     |  2 +-
 components/eip681/Cargo.toml   |  2 +-
 components/eip681/src/parse.rs | 48 ++++++++++++++++++++++------------
 3 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5feb4dcbee..d085724f96 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1472,7 +1472,7 @@ dependencies = [
 
 [[package]]
 name = "eip681"
-version = "0.1.0"
+version = "0.0.0"
 dependencies = [
  "base64",
  "ens-normalize-rs",
diff --git a/components/eip681/Cargo.toml b/components/eip681/Cargo.toml
index 414a65dfbc..e3f102b8d5 100644
--- a/components/eip681/Cargo.toml
+++ b/components/eip681/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "eip681"
 description = "Parsing functions and data types for Ethereum EIP 681 Payment Request URIs"
-version = "0.1.0"
+version = "0.0.0"
 authors = [
     "Schell Scivally <schell@electriccoin.co>"
 ]
diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index 03f9b34c5f..2b640af04d 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -565,17 +565,7 @@ impl EthereumAbiTypeName {
     }
 }
 
-/// A key-value pair.
-///
-/// The type of the value is dependent upon the key.
-///
-/// ```abnf
-/// key = "value" / "gas" / "gasLimit" / "gasPrice" / TYPE
-/// ```
-///
-/// > If _key_ in the parameter list is "value", "gasLimit", "gasPrice" or "gas" then
-/// _value_ MUST be a number. Otherwise, it must correspond to the TYPE string
-/// used as key.
+/// The key of a parameter.
 #[derive(Clone, Debug, PartialEq)]
 pub enum Key {
     Value,
@@ -615,13 +605,35 @@ impl Key {
 }
 
 /// A key-value pair, where the the type of the value depends upon the key.
+///
+/// ```abnf
+/// key = "value" / "gas" / "gasLimit" / "gasPrice" / TYPE
+/// ```
+///
+/// > If _key_ in the parameter list is "value", "gasLimit", "gasPrice" or "gas" then
+///   _value_ MUST be a number. Otherwise, it must correspond to the TYPE string
+///   used as key.
+///
+/// > ... gasLimit and gasPrice are suggested user-editable values for gas
+///   limit and gas price, respectively, for the requested transaction. It is
+///   acceptable to abbreviate gasLimit as gas, the two are treated synonymously.
 #[derive(Debug, PartialEq)]
 pub enum Parameter {
+    /// The amount to be paid, in the atomic unit of the native token of the blockchain.
+    ///
+    /// In most cases this will denote wei on the ether blockchain, but it depends on
+    /// context outside the scope of this library.
     Value(Number),
+    /// Gas number value.
     Gas(Number),
+    /// Synonym for "gas".
     GasLimit(Number),
+    /// Synonym for "gas".
     GasPrice(Number),
-    Type(EthereumAbiTypeName, Value),
+    /// A "type" parameter denotes a positional parameter provided to the function
+    /// named by `function_name`. For information about `function_name` see the ABNF
+    /// spec in the module-level docs.
+    AbiType(EthereumAbiTypeName, Value),
 }
 
 impl core::fmt::Display for Parameter {
@@ -638,7 +650,9 @@ impl Parameter {
             Parameter::Gas(_) => Key::Gas,
             Parameter::GasLimit(_) => Key::GasLimit,
             Parameter::GasPrice(_) => Key::GasPrice,
-            Parameter::Type(ethereum_abi_type_name, _) => Key::Type(ethereum_abi_type_name.clone()),
+            Parameter::AbiType(ethereum_abi_type_name, _) => {
+                Key::Type(ethereum_abi_type_name.clone())
+            }
         }
     }
 
@@ -649,7 +663,7 @@ impl Parameter {
             Parameter::Gas(number) => Value::Number(number.clone()),
             Parameter::GasLimit(number) => Value::Number(number.clone()),
             Parameter::GasPrice(number) => Value::Number(number.clone()),
-            Parameter::Type(_, value) => value.clone(),
+            Parameter::AbiType(_, value) => value.clone(),
         }
     }
 
@@ -683,7 +697,7 @@ impl Parameter {
                     Value::parse(i).map_err(|_| ParseError::InvalidParameterValue {
                         ty: type_name.to_string(),
                     })?;
-                Ok((i, Parameter::Type(type_name, value)))
+                Ok((i, Parameter::AbiType(type_name, value)))
             }
         }
     }
@@ -726,7 +740,7 @@ impl Parameters {
         }
     }
 
-    /// Return the value of the parameter with the given `key`, if any.
+    /// Return the _first_ value of the parameter with the given `key`, if any.
     pub fn get_value(&self, key: &Key) -> Option<Value> {
         for param in self.0.iter() {
             if &param.key() == key {
@@ -1371,7 +1385,7 @@ mod test {
         arb_key().prop_flat_map(|key| {
             if let Key::Type(name) = key {
                 arb_non_number_value()
-                    .prop_map(move |value| Parameter::Type(name.clone(), value))
+                    .prop_map(move |value| Parameter::AbiType(name.clone(), value))
                     .boxed()
             } else {
                 arb_valid_number()

From a61ae571f4d21ac3929c1e79d565060073329b74 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Thu, 4 Dec 2025 15:52:04 +1300
Subject: [PATCH 070/263] EIP681: cargo vet - add exemptions instead of
 trusting dtolnay

---
 Cargo.toml                |   3 +-
 supply-chain/audits.toml  |  84 -----------------------------
 supply-chain/config.toml  |  60 +++++++++++++++++++++
 supply-chain/imports.lock | 111 +++-----------------------------------
 4 files changed, 68 insertions(+), 190 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 7ce1114fcd..d3b43369a1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,6 @@
 [workspace]
-members = [ "components/eip681",
+members = [
+    "components/eip681",
     "components/equihash",
     "components/f4jumble",
     "components/zcash_address",
diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
index 4a46305737..02f4d6608d 100644
--- a/supply-chain/audits.toml
+++ b/supply-chain/audits.toml
@@ -1867,18 +1867,6 @@ who = "Daira-Emma Hopwood <daira@jacaranda.org>"
 criteria = "safe-to-deploy"
 delta = "1.6.0 -> 1.7.0"
 
-[[trusted.async-trait]]
-criteria = "safe-to-deploy"
-user-id = 3618 # David Tolnay (dtolnay)
-start = "2019-07-23"
-end = "2026-11-23"
-
-[[trusted.dyn-clone]]
-criteria = "safe-to-deploy"
-user-id = 3618 # David Tolnay (dtolnay)
-start = "2019-12-23"
-end = "2026-11-23"
-
 [[trusted.equihash]]
 criteria = "safe-to-deploy"
 user-id = 6289 # Jack Grigg (str4d)
@@ -1957,12 +1945,6 @@ user-id = 169181 # Kris Nuttycombe (nuttycom)
 start = "2024-09-25"
 end = "2025-10-02"
 
-[[trusted.inventory]]
-criteria = "safe-to-deploy"
-user-id = 3618 # David Tolnay (dtolnay)
-start = "2019-08-15"
-end = "2026-11-23"
-
 [[trusted.memuse]]
 criteria = "safe-to-deploy"
 user-id = 6289 # Jack Grigg (str4d)
@@ -1999,12 +1981,6 @@ user-id = 169181 # Kris Nuttycombe (nuttycom)
 start = "2024-08-12"
 end = "2025-08-12"
 
-[[trusted.paste]]
-criteria = "safe-to-deploy"
-user-id = 3618 # David Tolnay (dtolnay)
-start = "2019-03-19"
-end = "2026-11-23"
-
 [[trusted.pczt]]
 criteria = "safe-to-deploy"
 user-id = 6289 # Jack Grigg (str4d)
@@ -2017,42 +1993,12 @@ user-id = 169181 # Kris Nuttycombe (nuttycom)
 start = "2024-12-17"
 end = "2025-12-17"
 
-[[trusted.prettyplease]]
-criteria = "safe-to-deploy"
-user-id = 3618 # David Tolnay (dtolnay)
-start = "2022-01-04"
-end = "2026-11-23"
-
-[[trusted.proc-macro2]]
-criteria = "safe-to-deploy"
-user-id = 3618 # David Tolnay (dtolnay)
-start = "2019-04-23"
-end = "2026-11-23"
-
 [[trusted.redjubjub]]
 criteria = "safe-to-deploy"
 user-id = 199950 # Daira-Emma Hopwood (daira)
 start = "2023-03-30"
 end = "2026-02-21"
 
-[[trusted.ref-cast]]
-criteria = "safe-to-deploy"
-user-id = 3618 # David Tolnay (dtolnay)
-start = "2019-05-05"
-end = "2026-11-23"
-
-[[trusted.ref-cast-impl]]
-criteria = "safe-to-deploy"
-user-id = 3618 # David Tolnay (dtolnay)
-start = "2019-05-05"
-end = "2026-11-23"
-
-[[trusted.ryu]]
-criteria = "safe-to-deploy"
-user-id = 3618 # David Tolnay (dtolnay)
-start = "2019-05-02"
-end = "2026-11-23"
-
 [[trusted.sapling-crypto]]
 criteria = "safe-to-deploy"
 user-id = 6289 # Jack Grigg (str4d)
@@ -2089,18 +2035,6 @@ user-id = 6289 # Jack Grigg (str4d)
 start = "2024-10-15"
 end = "2026-10-26"
 
-[[trusted.serde_ignored]]
-criteria = "safe-to-deploy"
-user-id = 3618 # David Tolnay (dtolnay)
-start = "2019-08-18"
-end = "2026-11-23"
-
-[[trusted.serde_json]]
-criteria = "safe-to-deploy"
-user-id = 3618 # David Tolnay (dtolnay)
-start = "2019-02-28"
-end = "2026-11-23"
-
 [[trusted.shardtree]]
 criteria = "safe-to-deploy"
 user-id = 169181 # Kris Nuttycombe (nuttycom)
@@ -2113,24 +2047,6 @@ user-id = 6289 # Jack Grigg (str4d)
 start = "2024-12-13"
 end = "2025-12-16"
 
-[[trusted.syn]]
-criteria = "safe-to-deploy"
-user-id = 3618 # David Tolnay (dtolnay)
-start = "2019-03-01"
-end = "2026-11-23"
-
-[[trusted.thiserror]]
-criteria = "safe-to-deploy"
-user-id = 3618 # David Tolnay (dtolnay)
-start = "2019-10-09"
-end = "2026-11-23"
-
-[[trusted.thiserror-impl]]
-criteria = "safe-to-deploy"
-user-id = 3618 # David Tolnay (dtolnay)
-start = "2019-10-09"
-end = "2026-11-23"
-
 [[trusted.windows]]
 criteria = "safe-to-deploy"
 user-id = 64539 # Kenny Kerr (kennykerr)
diff --git a/supply-chain/config.toml b/supply-chain/config.toml
index 3fa60c3485..433ba9c1df 100644
--- a/supply-chain/config.toml
+++ b/supply-chain/config.toml
@@ -143,6 +143,10 @@ criteria = "safe-to-deploy"
 version = "0.4.11"
 criteria = "safe-to-deploy"
 
+[[exemptions.async-trait]]
+version = "0.1.81"
+criteria = "safe-to-deploy"
+
 [[exemptions.async_executors]]
 version = "0.7.0"
 criteria = "safe-to-deploy"
@@ -447,6 +451,10 @@ criteria = "safe-to-deploy"
 version = "2.0.1"
 criteria = "safe-to-deploy"
 
+[[exemptions.dyn-clone]]
+version = "1.0.17"
+criteria = "safe-to-deploy"
+
 [[exemptions.dynosaur]]
 version = "0.1.1"
 criteria = "safe-to-deploy"
@@ -687,6 +695,10 @@ criteria = "safe-to-deploy"
 version = "0.1.5"
 criteria = "safe-to-deploy"
 
+[[exemptions.inventory]]
+version = "0.3.15"
+criteria = "safe-to-deploy"
+
 [[exemptions.itertools]]
 version = "0.10.5"
 criteria = "safe-to-deploy"
@@ -875,6 +887,10 @@ criteria = "safe-to-deploy"
 version = "0.5.1"
 criteria = "safe-to-deploy"
 
+[[exemptions.paste]]
+version = "1.0.10"
+criteria = "safe-to-deploy"
+
 [[exemptions.pbkdf2]]
 version = "0.12.2"
 criteria = "safe-to-deploy"
@@ -955,6 +971,10 @@ criteria = "safe-to-deploy"
 version = "1.4.1"
 criteria = "safe-to-run"
 
+[[exemptions.prettyplease]]
+version = "0.2.20"
+criteria = "safe-to-deploy"
+
 [[exemptions.primeorder]]
 version = "0.13.6"
 criteria = "safe-to-deploy"
@@ -979,6 +999,10 @@ criteria = "safe-to-deploy"
 version = "2.0.1"
 criteria = "safe-to-deploy"
 
+[[exemptions.proc-macro2]]
+version = "1.0.103"
+criteria = "safe-to-deploy"
+
 [[exemptions.proptest]]
 version = "1.3.1"
 criteria = "safe-to-deploy"
@@ -1039,6 +1063,14 @@ criteria = "safe-to-deploy"
 version = "0.4.3"
 criteria = "safe-to-deploy"
 
+[[exemptions.ref-cast]]
+version = "1.0.25"
+criteria = "safe-to-deploy"
+
+[[exemptions.ref-cast-impl]]
+version = "1.0.25"
+criteria = "safe-to-deploy"
+
 [[exemptions.regex]]
 version = "1.11.1"
 criteria = "safe-to-deploy"
@@ -1127,6 +1159,10 @@ criteria = "safe-to-deploy"
 version = "0.3.0"
 criteria = "safe-to-deploy"
 
+[[exemptions.ryu]]
+version = "1.0.18"
+criteria = "safe-to-deploy"
+
 [[exemptions.safelog]]
 version = "0.4.0"
 criteria = "safe-to-deploy"
@@ -1167,6 +1203,14 @@ criteria = "safe-to-deploy"
 version = "4.7.0"
 criteria = "safe-to-deploy"
 
+[[exemptions.serde_ignored]]
+version = "0.1.10"
+criteria = "safe-to-deploy"
+
+[[exemptions.serde_json]]
+version = "1.0.145"
+criteria = "safe-to-deploy"
+
 [[exemptions.serde_plain]]
 version = "1.0.2"
 criteria = "safe-to-deploy"
@@ -1259,6 +1303,14 @@ criteria = "safe-to-run"
 version = "12.13.3"
 criteria = "safe-to-run"
 
+[[exemptions.syn]]
+version = "1.0.109"
+criteria = "safe-to-deploy"
+
+[[exemptions.syn]]
+version = "2.0.100"
+criteria = "safe-to-deploy"
+
 [[exemptions.sync_wrapper]]
 version = "0.1.2"
 criteria = "safe-to-deploy"
@@ -1271,6 +1323,14 @@ criteria = "safe-to-deploy"
 version = "3.8.1"
 criteria = "safe-to-deploy"
 
+[[exemptions.thiserror]]
+version = "2.0.12"
+criteria = "safe-to-deploy"
+
+[[exemptions.thiserror-impl]]
+version = "2.0.12"
+criteria = "safe-to-deploy"
+
 [[exemptions.time]]
 version = "0.3.23"
 criteria = "safe-to-deploy"
diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index 4d602f9962..46b36ccdac 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -1,13 +1,6 @@
 
 # cargo-vet imports lock
 
-[[publisher.async-trait]]
-version = "0.1.81"
-when = "2024-07-07"
-user-id = 3618
-user-login = "dtolnay"
-user-name = "David Tolnay"
-
 [[publisher.bumpalo]]
 version = "3.16.0"
 when = "2024-04-08"
@@ -22,13 +15,6 @@ user-id = 5946
 user-login = "jrmuizel"
 user-name = "Jeff Muizelaar"
 
-[[publisher.dyn-clone]]
-version = "1.0.17"
-when = "2024-02-26"
-user-id = 3618
-user-login = "dtolnay"
-user-name = "David Tolnay"
-
 [[publisher.equihash]]
 version = "0.2.2"
 when = "2025-03-05"
@@ -85,13 +71,6 @@ user-id = 169181
 user-login = "nuttycom"
 user-name = "Kris Nuttycombe"
 
-[[publisher.inventory]]
-version = "0.3.15"
-when = "2024-01-26"
-user-id = 3618
-user-login = "dtolnay"
-user-name = "David Tolnay"
-
 [[publisher.memuse]]
 version = "0.2.2"
 when = "2024-12-13"
@@ -106,13 +85,6 @@ user-id = 6289
 user-login = "str4d"
 user-name = "Jack Grigg"
 
-[[publisher.paste]]
-version = "1.0.15"
-when = "2024-05-07"
-user-id = 3618
-user-login = "dtolnay"
-user-name = "David Tolnay"
-
 [[publisher.pczt]]
 version = "0.5.0"
 when = "2025-11-05"
@@ -120,41 +92,6 @@ user-id = 169181
 user-login = "nuttycom"
 user-name = "Kris Nuttycombe"
 
-[[publisher.prettyplease]]
-version = "0.2.20"
-when = "2024-05-07"
-user-id = 3618
-user-login = "dtolnay"
-user-name = "David Tolnay"
-
-[[publisher.proc-macro2]]
-version = "1.0.103"
-when = "2025-10-23"
-user-id = 3618
-user-login = "dtolnay"
-user-name = "David Tolnay"
-
-[[publisher.ref-cast]]
-version = "1.0.25"
-when = "2025-09-28"
-user-id = 3618
-user-login = "dtolnay"
-user-name = "David Tolnay"
-
-[[publisher.ref-cast-impl]]
-version = "1.0.25"
-when = "2025-09-28"
-user-id = 3618
-user-login = "dtolnay"
-user-name = "David Tolnay"
-
-[[publisher.ryu]]
-version = "1.0.18"
-when = "2024-05-07"
-user-id = 3618
-user-login = "dtolnay"
-user-name = "David Tolnay"
-
 [[publisher.sapling-crypto]]
 version = "0.6.0"
 when = "2025-12-05"
@@ -176,20 +113,6 @@ user-id = 6289
 user-login = "str4d"
 user-name = "Jack Grigg"
 
-[[publisher.serde_ignored]]
-version = "0.1.10"
-when = "2024-01-02"
-user-id = 3618
-user-login = "dtolnay"
-user-name = "David Tolnay"
-
-[[publisher.serde_json]]
-version = "1.0.145"
-when = "2025-09-14"
-user-id = 3618
-user-login = "dtolnay"
-user-name = "David Tolnay"
-
 [[publisher.shardtree]]
 version = "0.6.1"
 when = "2025-01-31"
@@ -204,34 +127,6 @@ user-id = 6289
 user-login = "str4d"
 user-name = "Jack Grigg"
 
-[[publisher.syn]]
-version = "1.0.109"
-when = "2023-02-24"
-user-id = 3618
-user-login = "dtolnay"
-user-name = "David Tolnay"
-
-[[publisher.syn]]
-version = "2.0.100"
-when = "2025-03-09"
-user-id = 3618
-user-login = "dtolnay"
-user-name = "David Tolnay"
-
-[[publisher.thiserror]]
-version = "2.0.12"
-when = "2025-03-03"
-user-id = 3618
-user-login = "dtolnay"
-user-name = "David Tolnay"
-
-[[publisher.thiserror-impl]]
-version = "2.0.12"
-when = "2025-03-03"
-user-id = 3618
-user-login = "dtolnay"
-user-name = "David Tolnay"
-
 [[publisher.unicode-normalization]]
 version = "0.1.24"
 when = "2024-09-17"
@@ -3023,6 +2918,12 @@ criteria = "safe-to-deploy"
 version = "0.2.0"
 aggregated-from = "https://raw.githubusercontent.com/mozilla/cargo-vet/main/supply-chain/audits.toml"
 
+[[audits.mozilla.audits.paste]]
+who = "Jan-Erik Rediger <jrediger@mozilla.com>"
+criteria = "safe-to-deploy"
+delta = "1.0.10 -> 1.0.15"
+aggregated-from = "https://raw.githubusercontent.com/mozilla/glean/main/supply-chain/audits.toml"
+
 [[audits.mozilla.audits.percent-encoding]]
 who = "Valentin Gosu <valentin.gosu@gmail.com>"
 criteria = "safe-to-deploy"

From 66209cc3dfea95cc522b1d6d95c0bedce04b406d Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Mon, 8 Dec 2025 17:31:41 +1300
Subject: [PATCH 071/263] don't cast usize to u32, convert

---
 components/eip681/src/error.rs |  4 ++++
 components/eip681/src/parse.rs | 16 +++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/components/eip681/src/error.rs b/components/eip681/src/error.rs
index eade5d9872..10e08cde5b 100644
--- a/components/eip681/src/error.rs
+++ b/components/eip681/src/error.rs
@@ -110,4 +110,8 @@ pub enum ValidationError {
 
     #[snafu(display("Could not decode url-encoded string: {source}"))]
     UrlEncoding { source: std::str::Utf8Error },
+
+    /// An attempt to convert an integer failed.
+    #[snafu(display("Integer conversion failed: {source}"))]
+    Integer { source: std::num::TryFromIntError },
 }
diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index 2b640af04d..9a09c46437 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -38,7 +38,11 @@ impl Digits {
         let mut total = 0u64;
         for (mag, digit) in self.places.iter().rev().enumerate() {
             let increment = (*digit as u64)
-                .checked_mul(10u64.checked_pow(mag as u32).context(OverflowSnafu)?)
+                .checked_mul(
+                    10u64
+                        .checked_pow(u32::try_from(mag).context(IntegerSnafu)?)
+                        .context(OverflowSnafu)?,
+                )
                 .context(OverflowSnafu)?;
             total = total.checked_add(increment).context(OverflowSnafu)?;
         }
@@ -47,9 +51,9 @@ impl Digits {
 
     /// Returns the digits as a ratio, where prefixed zeros
     /// are treated as a denominator.
-    pub fn as_decimal_ratio(&self) -> Result<(u64, u64), ValidationError> {
+    fn as_decimal_ratio(&self) -> Result<(u64, u64), ValidationError> {
         let denominator = 10u64
-            .checked_pow(self.places.len() as u32)
+            .checked_pow(u32::try_from(self.places.len()).context(IntegerSnafu)?)
             .context(OverflowSnafu)?;
         let mut numerator = 0u64;
 
@@ -256,7 +260,7 @@ impl Number {
 
     /// Returns the value of the decimal portion of the number as a ratio
     /// of `u64`s.
-    pub fn decimal(&self) -> Result<(u64, u64), ValidationError> {
+    fn decimal(&self) -> Result<(u64, u64), ValidationError> {
         Ok(self
             .decimal
             .as_ref()
@@ -281,7 +285,9 @@ impl Number {
             .as_ref()
             .and_then(|(_, maybe_exp)| maybe_exp.as_ref().map(|digits| digits.as_u64()))
             .transpose()?
-            .unwrap_or_default() as u32;
+            .unwrap_or_default()
+            .try_into()
+            .context(IntegerSnafu)?;
         let multiplier = 10i128.checked_pow(exp).context(LargeExponentSnafu {
             expected: u128::MAX.ilog10() as usize,
             seen: exp as u64,

From a17222d3e048ee15b802f44d90ca06b31d118d01 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Wed, 10 Dec 2025 14:38:29 +1300
Subject: [PATCH 072/263] feat: enable test support in rust-analyzer
 configuration

---
 .helix/languages.toml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.helix/languages.toml b/.helix/languages.toml
index 3e2488ee55..6f055e7ea0 100644
--- a/.helix/languages.toml
+++ b/.helix/languages.toml
@@ -1,5 +1,19 @@
 [language-server.rust-analyzer.config.cargo]
 features = "all"
 
+[language-server.rust-analyzer.config]
+# Ensure tests are enabled for rust-analyzer
+# See: https://rust-analyzer.github.io/manual.html#configuration
+# This enables test discovery and code lenses for tests.
+# If you want to further customize, see rust-analyzer docs.
+cargo = { features = "all" }
+# Enable test support
+# (This is the default, but we set it explicitly for clarity)
+# You can also set "runnables.command" if you want to use a custom test runner.
+# For more options, see rust-analyzer docs.
+# https://rust-analyzer.github.io/manual.html#configuration
+# test = true is default, but we set it explicitly.
+test = true
+
 [language-server.rust-analyzer.config.server.extraEnv]
 RUSTUP_TOOLCHAIN = "stable"

From 6cd4d7fa8e09aaccef5ed6902113ab6d0d2b7985 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Thu, 11 Dec 2025 12:46:01 +1300
Subject: [PATCH 073/263] chore: remove test-dependencies from EIP681
 Cargo.toml

---
 components/eip681/Cargo.toml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/components/eip681/Cargo.toml b/components/eip681/Cargo.toml
index e3f102b8d5..46ba0ed562 100644
--- a/components/eip681/Cargo.toml
+++ b/components/eip681/Cargo.toml
@@ -27,14 +27,12 @@ percent-encoding.workspace = true
 proptest = { workspace = true, optional = true }
 
 [dev-dependencies]
-zcash_address = { workspace = true, features = ["test-dependencies"] }
-zcash_protocol = { workspace = true, features = ["std", "test-dependencies"] }
 pretty_assertions = "1.4.1"
 proptest.workspace = true
 
 [features]
 ## Exposes APIs that are useful for testing, such as `proptest` strategies.
-test-dependencies = ["dep:proptest"]
+# test-dependencies = ["dep:proptest"]
 
 [lints]
 workspace = true

From b17a2ee7ef1d4226f3d1f894391c972039ef5855 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Thu, 11 Dec 2025 14:46:33 +1300
Subject: [PATCH 074/263] eip681: parse outer structure as blobs first, better
 parameter handling

---
 .helix/languages.toml          |  14 --
 Cargo.lock                     |   2 -
 components/eip681/Cargo.toml   |   2 +-
 components/eip681/src/error.rs |  18 +-
 components/eip681/src/parse.rs | 329 +++++++++++++++++++--------------
 5 files changed, 209 insertions(+), 156 deletions(-)

diff --git a/.helix/languages.toml b/.helix/languages.toml
index 6f055e7ea0..3e2488ee55 100644
--- a/.helix/languages.toml
+++ b/.helix/languages.toml
@@ -1,19 +1,5 @@
 [language-server.rust-analyzer.config.cargo]
 features = "all"
 
-[language-server.rust-analyzer.config]
-# Ensure tests are enabled for rust-analyzer
-# See: https://rust-analyzer.github.io/manual.html#configuration
-# This enables test discovery and code lenses for tests.
-# If you want to further customize, see rust-analyzer docs.
-cargo = { features = "all" }
-# Enable test support
-# (This is the default, but we set it explicitly for clarity)
-# You can also set "runnables.command" if you want to use a custom test runner.
-# For more options, see rust-analyzer docs.
-# https://rust-analyzer.github.io/manual.html#configuration
-# test = true is default, but we set it explicitly.
-test = true
-
 [language-server.rust-analyzer.config.server.extraEnv]
 RUSTUP_TOOLCHAIN = "stable"
diff --git a/Cargo.lock b/Cargo.lock
index d085724f96..c5edb3ccac 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1481,8 +1481,6 @@ dependencies = [
  "pretty_assertions",
  "proptest",
  "snafu",
- "zcash_address",
- "zcash_protocol",
 ]
 
 [[package]]
diff --git a/components/eip681/Cargo.toml b/components/eip681/Cargo.toml
index 46ba0ed562..6d68cdb096 100644
--- a/components/eip681/Cargo.toml
+++ b/components/eip681/Cargo.toml
@@ -32,7 +32,7 @@ proptest.workspace = true
 
 [features]
 ## Exposes APIs that are useful for testing, such as `proptest` strategies.
-# test-dependencies = ["dep:proptest"]
+test-dependencies = ["dep:proptest"]
 
 [lints]
 workspace = true
diff --git a/components/eip681/src/error.rs b/components/eip681/src/error.rs
index 10e08cde5b..0c750af7f5 100644
--- a/components/eip681/src/error.rs
+++ b/components/eip681/src/error.rs
@@ -2,7 +2,7 @@
 
 use snafu::prelude::*;
 
-use crate::Number;
+use crate::{Number, Value};
 
 /// Errors discovered during parsing.
 #[derive(Debug, Snafu)]
@@ -51,6 +51,14 @@ pub enum ParseError<'a> {
     /// A parameter value had an unexpected value.
     #[snafu(display("Invalid parameter value. Expected a {ty}."))]
     InvalidParameterValue { ty: String },
+
+    /// A parameter key had an unexpected value.
+    #[snafu(display("Invalid parameter key '{key}'."))]
+    InvalidParameterKey { key: String },
+
+    /// Unexpected leftover parsing input.
+    #[snafu(display("Unexpected leftover parsing input '{input}'"))]
+    UnexpectedLeftoverInput { input: &'a str },
 }
 
 impl<'a> nom::error::ParseError<&'a str> for ParseError<'a> {
@@ -114,4 +122,12 @@ pub enum ValidationError {
     /// An attempt to convert an integer failed.
     #[snafu(display("Integer conversion failed: {source}"))]
     Integer { source: std::num::TryFromIntError },
+
+    /// More than one value exists in a parameter list with a key
+    /// that denotes a single value.
+    #[snafu(display("More than one parameter by the key '{key}', saw: [{}]", values.iter().map(|v| v.to_string()).collect::<Vec<_>>().join(", ")))]
+    MultipleParameterValues {
+        key: &'static str,
+        values: Vec<Value>,
+    },
 }
diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index 9a09c46437..f435e4d742 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -502,7 +502,7 @@ impl Value {
         // Here there are some interesting corner cases:
         //
         // 1. In `number`'s spec, absolutely everything is optional, so it _never_ fails.
-        // 2. `ethereum_address` may be prefixed with `0` in the hex-address case, so both number
+        // 2. `ethereum_address` may be prefixed with `0` (in the hex-address case), so both number
         //   and address could be parsed. Because of 1, `number` always wins if it comes first, but
         //   even if the minimum was 1 digit `number` would still win by parsing "0", so
         //   we can't simply apply them with `number`.or(`address`).
@@ -571,44 +571,20 @@ impl EthereumAbiTypeName {
     }
 }
 
-/// The key of a parameter.
-#[derive(Clone, Debug, PartialEq)]
-pub enum Key {
-    Value,
-    Gas,
-    GasLimit,
-    GasPrice,
-    Type(EthereumAbiTypeName),
-}
-
-impl core::fmt::Display for Key {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Key::Value => f.write_str("value"),
-            Key::Gas => f.write_str("gas"),
-            Key::GasLimit => f.write_str("gasLimit"),
-            Key::GasPrice => f.write_str("gasPrice"),
-            Key::Type(ty) => ty.fmt(f),
-        }
-    }
-}
-
-impl Key {
-    pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
-        let parse_value = nom::bytes::complete::tag("value").map(|_| Key::Value);
-        let parse_gas = nom::bytes::complete::tag("gas").map(|_| Key::Gas);
-        let parse_gas_limit = nom::bytes::complete::tag("gasLimit").map(|_| Key::GasLimit);
-        let parse_gas_price = nom::bytes::complete::tag("gasPrice").map(|_| Key::GasPrice);
-
-        nom::branch::alt((
-            parse_value,
-            parse_gas_limit,
-            parse_gas_price,
-            parse_gas,
-            EthereumAbiTypeName::parse.map(Key::Type),
-        ))(i)
-    }
-}
+// pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
+//     let parse_value = nom::bytes::complete::tag("value").map(|_| Key::Value);
+//     let parse_gas = nom::bytes::complete::tag("gas").map(|_| Key::Gas);
+//     let parse_gas_limit = nom::bytes::complete::tag("gasLimit").map(|_| Key::GasLimit);
+//     let parse_gas_price = nom::bytes::complete::tag("gasPrice").map(|_| Key::GasPrice);
+
+//     nom::branch::alt((
+//         parse_value,
+//         parse_gas_limit,
+//         parse_gas_price,
+//         parse_gas,
+//         EthereumAbiTypeName::parse.map(Key::Type),
+//     ))(i)
+// }
 
 /// A key-value pair, where the the type of the value depends upon the key.
 ///
@@ -630,9 +606,9 @@ pub enum Parameter {
     /// In most cases this will denote wei on the ether blockchain, but it depends on
     /// context outside the scope of this library.
     Value(Number),
-    /// Gas number value.
+    /// Synonym for [`Self::GasLimit`].
     Gas(Number),
-    /// Synonym for "gas".
+    /// Suggested user-editable value for the gas limit of the transaction.
     GasLimit(Number),
     /// Synonym for "gas".
     GasPrice(Number),
@@ -649,16 +625,13 @@ impl core::fmt::Display for Parameter {
 }
 
 impl Parameter {
-    /// Returns just the key of this parameter.
-    pub fn key(&self) -> Key {
+    fn key(&self) -> String {
         match self {
-            Parameter::Value(_) => Key::Value,
-            Parameter::Gas(_) => Key::Gas,
-            Parameter::GasLimit(_) => Key::GasLimit,
-            Parameter::GasPrice(_) => Key::GasPrice,
-            Parameter::AbiType(ethereum_abi_type_name, _) => {
-                Key::Type(ethereum_abi_type_name.clone())
-            }
+            Parameter::Value(_) => "value".to_string(),
+            Parameter::Gas(_) => "gas".to_string(),
+            Parameter::GasLimit(_) => "gasLimit".to_string(),
+            Parameter::GasPrice(_) => "gasPrice".to_string(),
+            Parameter::AbiType(ethereum_abi_type_name, _) => format!("{ethereum_abi_type_name}"),
         }
     }
 
@@ -674,8 +647,9 @@ impl Parameter {
     }
 
     pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
-        let (i, key) = Key::parse(i)?;
-        let (i, _eq) = nom::character::complete::char('=')(i)?;
+        // Parse the key blob
+        let (i, key_blob) = nom::bytes::complete::take_till1(|c| c == '=')(i)?;
+        let (i, _) = nom::bytes::complete::tag("=")(i)?;
 
         fn parse_number(
             i: &str,
@@ -689,23 +663,29 @@ impl Parameter {
                     })?;
             Ok((i, f(number)))
         }
-
         // If key in the parameter list is value, gasLimit, gasPrice or gas then
         // value MUST be a number. Otherwise, it must correspond to the TYPE
         // string used as key.
-        match key {
-            Key::Value => parse_number(i, Parameter::Value),
-            Key::Gas => parse_number(i, Parameter::Gas),
-            Key::GasLimit => parse_number(i, Parameter::GasLimit),
-            Key::GasPrice => parse_number(i, Parameter::GasPrice),
-            Key::Type(type_name) => {
+        Ok(match key_blob {
+            "value" => parse_number(i, Parameter::Value)?,
+            "gas" => parse_number(i, Parameter::Gas)?,
+            "gasLimit" => parse_number(i, Parameter::GasLimit)?,
+            "gasPrice" => parse_number(i, Parameter::GasPrice)?,
+            other_key_blob => {
+                let (remaining_name_input, type_name) = EthereumAbiTypeName::parse(other_key_blob)?;
+                snafu::ensure!(
+                    remaining_name_input.is_empty(),
+                    InvalidParameterKeySnafu {
+                        key: other_key_blob.to_string()
+                    }
+                );
                 let (i, value) =
                     Value::parse(i).map_err(|_| ParseError::InvalidParameterValue {
                         ty: type_name.to_string(),
                     })?;
-                Ok((i, Parameter::AbiType(type_name, value)))
+                (i, Parameter::AbiType(type_name, value))
             }
-        }
+        })
     }
 }
 
@@ -727,33 +707,114 @@ impl core::fmt::Display for Parameters {
     }
 }
 
+impl IntoIterator for Parameters {
+    type Item = Parameter;
+
+    type IntoIter = <Vec<Parameter> as IntoIterator>::IntoIter;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.0.into_iter()
+    }
+}
+
 impl Parameters {
     /// Parses zero or more parameters, separated by '&'.
     ///
     /// ## Note
     /// This parser never fails.
     pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
-        let (i, maybe_head) = nom::combinator::opt(Parameter::parse).parse(i)?;
-        if let Some(head) = maybe_head {
-            let parse_next_param =
-                nom::sequence::preceded(nom::bytes::complete::tag("&"), Parameter::parse);
-            let (i, tail) = nom::multi::many0(parse_next_param)(i)?;
-            let mut parameters = vec![head];
-            parameters.extend(tail);
-            Ok((i, Parameters(parameters)))
-        } else {
-            Ok((i, Parameters(vec![])))
+        // First parse into parameter "blobs", separated by '&'
+        let (i, blobs) = nom::multi::separated_list0(
+            nom::bytes::complete::tag("&"),
+            nom::bytes::complete::take_till1(|c| c == '&'),
+        )(i)?;
+        let mut params = vec![];
+        for blob in blobs.into_iter() {
+            let (j, param) = Parameter::parse(blob)?;
+            snafu::ensure!(j.is_empty(), UnexpectedLeftoverInputSnafu { input: i });
+            params.push(param);
         }
+        Ok((i, Parameters(params)))
     }
 
-    /// Return the _first_ value of the parameter with the given `key`, if any.
-    pub fn get_value(&self, key: &Key) -> Option<Value> {
-        for param in self.0.iter() {
-            if &param.key() == key {
-                return Some(param.value());
+    /// Return an iterator over all parameters.
+    pub fn iter(&self) -> impl Iterator<Item = &Parameter> {
+        self.0.iter()
+    }
+
+    /// Returns the number value of the parameter with the "value" key, if any.
+    ///
+    /// ## Errors
+    /// Errors if there are more than one parameter with the key "value".
+    pub fn value(&self) -> Result<Option<Number>, ValidationError> {
+        let mut values = self
+            .iter()
+            .filter_map(|p| match p {
+                Parameter::Value(n) => Some(n.clone()),
+                _ => None,
+            })
+            .collect::<Vec<_>>();
+        snafu::ensure!(
+            values.len() <= 1,
+            MultipleParameterValuesSnafu {
+                key: "value",
+                values: values.into_iter().map(Value::Number).collect::<Vec<_>>(),
             }
-        }
-        None
+        );
+        Ok(values.pop())
+    }
+
+    /// Returns the number value of the parameter with the "gas" or "gasLimit" key, if any.
+    ///
+    /// ## Errors
+    /// Errors if there are more than one parameter with the key "gas" or "gas_limit".
+    pub fn gas_limit(&self) -> Result<Option<Number>, ValidationError> {
+        let mut values = self
+            .iter()
+            .filter_map(|p| match p {
+                Parameter::Gas(n) => Some(n.clone()),
+                Parameter::GasLimit(n) => Some(n.clone()),
+                _ => None,
+            })
+            .collect::<Vec<_>>();
+        snafu::ensure!(
+            values.len() <= 1,
+            MultipleParameterValuesSnafu {
+                key: "gasLimit",
+                values: values.into_iter().map(Value::Number).collect::<Vec<_>>(),
+            }
+        );
+        Ok(values.pop())
+    }
+
+    /// Returns the number value of the parameter with the "gasPrice" key, if any.
+    ///
+    /// ## Errors
+    /// Errors if there are more than one parameter with the key "gasPrice".
+    pub fn gas_price(&self) -> Result<Option<Number>, ValidationError> {
+        let mut values = self
+            .iter()
+            .filter_map(|p| match p {
+                Parameter::GasPrice(n) => Some(n.clone()),
+                _ => None,
+            })
+            .collect::<Vec<_>>();
+        snafu::ensure!(
+            values.len() <= 1,
+            MultipleParameterValuesSnafu {
+                key: "gasLimit",
+                values: values.into_iter().map(Value::Number).collect::<Vec<_>>(),
+            }
+        );
+        Ok(values.pop())
+    }
+
+    /// Returns an iterator over all ABI type parameters.
+    pub fn abi_parameters(&self) -> impl Iterator<Item = (&EthereumAbiTypeName, &Value)> {
+        self.iter().filter_map(|p| match p {
+            Parameter::AbiType(name, value) => Some((name, value)),
+            _ => None,
+        })
     }
 }
 
@@ -832,7 +893,14 @@ impl EthereumTransactionRequest {
     /// Parse a transaction request.
     pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
         let (i, schema_prefix) = SchemaPrefix::parse(i)?;
-        let (i, target_address) = EthereumAddress::parse(i)?;
+        let (i, address_blob) = nom::bytes::complete::is_not("@/?")(i)?;
+        let (remaining_address_input, target_address) = EthereumAddress::parse(address_blob)?;
+        snafu::ensure!(
+            remaining_address_input.is_empty(),
+            UnexpectedLeftoverInputSnafu {
+                input: remaining_address_input
+            }
+        );
 
         let parse_chain_id =
             nom::sequence::preceded(nom::bytes::complete::tag("@"), |i| Digits::parse_min(i, 1));
@@ -960,7 +1028,7 @@ mod test {
     fn arb_valid_number() -> impl Strategy<Value = Number> {
         (
             prop::option::of(any::<bool>()),
-            arb_digits(0),
+            arb_digits(1),
             any::<bool>(),
             prop::option::of(arb_digits_in(1..=4)),
         )
@@ -1188,18 +1256,10 @@ mod test {
         proptest::string::string_regex(&format!(".{{{min},{max}}}")).unwrap()
     }
 
-    fn arb_non_numeric_unicode(min: usize, max: usize) -> impl Strategy<Value = String> {
-        proptest::string::string_regex(&format!("[^\\d]{{{min},{max}}}")).unwrap()
-    }
-
     fn arb_url_encoded_string() -> impl Strategy<Value = UrlEncodedUnicodeString> {
         arb_unicode(1, 1024).prop_map(UrlEncodedUnicodeString::encode)
     }
 
-    fn arb_non_numeric_url_encoded_string() -> impl Strategy<Value = UrlEncodedUnicodeString> {
-        arb_non_numeric_unicode(1, 1024).prop_map(UrlEncodedUnicodeString::encode)
-    }
-
     proptest! {
         #[test]
         fn parse_arb_url_encoded_unicode_string(expected in arb_url_encoded_string()) {
@@ -1313,26 +1373,6 @@ mod test {
         }
     }
 
-    fn arb_key() -> impl Strategy<Value = Key> {
-        fn type_keys() -> impl Strategy<Value = Key> {
-            arb_eth_type_name(TYPE_RECURSIONS).prop_map(Key::Type)
-        }
-        fn one_offs() -> impl Strategy<Value = Key> {
-            Union::new([Key::Value, Key::Gas, Key::GasLimit, Key::GasPrice].map(Just))
-        }
-        Union::new([one_offs().boxed(), type_keys().boxed()])
-    }
-
-    proptest! {
-        #[test]
-        fn parse_arb_key(expected in arb_key()) {
-            let input = expected.to_string();
-            let (output, seen) = Key::parse(&input).unwrap();
-            assert_eq!("", output);
-            assert_eq!(expected, seen);
-        }
-    }
-
     fn arb_value() -> impl Strategy<Value = Value> {
         Union::new([
             arb_valid_number().prop_map(Value::Number).boxed(),
@@ -1341,15 +1381,6 @@ mod test {
         ])
     }
 
-    fn arb_non_number_value() -> impl Strategy<Value = Value> {
-        Union::new([
-            arb_eth_addy().prop_map(Value::Address).boxed(),
-            arb_non_numeric_url_encoded_string()
-                .prop_map(Value::String)
-                .boxed(),
-        ])
-    }
-
     #[test]
     fn parse_value_url_encoded_space() {
         let expected = Value::String(UrlEncodedUnicodeString("%20".to_owned()));
@@ -1387,24 +1418,47 @@ mod test {
         }
     }
 
+    fn arb_eth_abi_parameter() -> impl Strategy<Value = Parameter> {
+        (arb_eth_type_name(TYPE_RECURSIONS), arb_value())
+            .prop_map(|(name, value)| Parameter::AbiType(name, value))
+    }
+
+    fn arb_non_eth_abi_parameter() -> impl Strategy<Value = Parameter> {
+        arb_valid_number()
+            .prop_map(Parameter::Value)
+            .boxed()
+            .prop_union(arb_valid_number().prop_map(Parameter::Gas).boxed())
+            .boxed()
+            .prop_union(arb_valid_number().prop_map(Parameter::GasLimit).boxed())
+            .boxed()
+            .prop_union(arb_valid_number().prop_map(Parameter::GasPrice).boxed())
+            .boxed()
+    }
+
     fn arb_parameter() -> impl Strategy<Value = Parameter> {
-        arb_key().prop_flat_map(|key| {
-            if let Key::Type(name) = key {
-                arb_non_number_value()
-                    .prop_map(move |value| Parameter::AbiType(name.clone(), value))
-                    .boxed()
-            } else {
-                arb_valid_number()
-                    .prop_map(move |n| match key {
-                        Key::Value => Parameter::Value(n),
-                        Key::Gas => Parameter::Gas(n),
-                        Key::GasLimit => Parameter::GasLimit(n),
-                        Key::GasPrice => Parameter::GasPrice(n),
-                        Key::Type(_) => unreachable!("we checked this is not TYPE"),
-                    })
-                    .boxed()
-            }
-        })
+        arb_eth_abi_parameter()
+            .boxed()
+            .prop_union(arb_non_eth_abi_parameter().boxed())
+    }
+
+    #[test]
+    fn sanity_uint_eq_zero_parameter() {
+        let expected = Parameter::AbiType(
+            EthereumAbiTypeName {
+                name: "uint".to_string(),
+            },
+            Value::Number(Number {
+                signum: None,
+                integer: Digits { places: vec![0] },
+                decimal: None,
+                exponent: None,
+            }),
+        );
+        let expected_string = expected.to_string();
+        assert_eq!("uint=0", expected_string);
+
+        let (_i, parsed) = Parameter::parse(&expected_string).unwrap();
+        pretty_assertions::assert_eq!(expected, parsed);
     }
 
     proptest! {
@@ -1470,8 +1524,8 @@ mod test {
         #[test]
         fn parse_arb_request(expected in arb_request()) {
             let input = expected.to_string();
-            let (_, seen) = EthereumTransactionRequest::parse(&input).unwrap();
-            pretty_assertions::assert_str_eq!(input, seen.to_string().as_str());
+            let (i, seen) = EthereumTransactionRequest::parse(&input).unwrap();
+            pretty_assertions::assert_str_eq!(input, seen.to_string().as_str(), "input: {input}\ni: {i}");
             pretty_assertions::assert_eq!(expected, seen);
         }
     }
@@ -1484,8 +1538,7 @@ mod test {
             "0xfb6916095ca1df60bb79ce92ce3ea74c37c5d359",
             seen.target_address.to_string()
         );
-        let value = seen.parameters.get_value(&Key::Value).unwrap();
-        let number = value.as_number().unwrap();
+        let number = seen.parameters.value().unwrap().unwrap();
         assert_eq!(2, number.integer().unwrap());
         assert_eq!(2.014e18 as i128, number.as_i128().unwrap());
     }

From 513dc637b97d783f689a2d3767d7856b00e5fd34 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Mon, 15 Dec 2025 10:08:13 +1300
Subject: [PATCH 075/263] eip681: fixed doc clippys

---
 components/eip681/src/parse.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index f435e4d742..78261e93cf 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -593,12 +593,12 @@ impl EthereumAbiTypeName {
 /// ```
 ///
 /// > If _key_ in the parameter list is "value", "gasLimit", "gasPrice" or "gas" then
-///   _value_ MUST be a number. Otherwise, it must correspond to the TYPE string
-///   used as key.
+/// > _value_ MUST be a number. Otherwise, it must correspond to the TYPE string
+/// > used as key.
 ///
 /// > ... gasLimit and gasPrice are suggested user-editable values for gas
-///   limit and gas price, respectively, for the requested transaction. It is
-///   acceptable to abbreviate gasLimit as gas, the two are treated synonymously.
+/// > limit and gas price, respectively, for the requested transaction. It is
+/// > acceptable to abbreviate gasLimit as gas, the two are treated synonymously.
 #[derive(Debug, PartialEq)]
 pub enum Parameter {
     /// The amount to be paid, in the atomic unit of the native token of the blockchain.

From 4689ea70e43a303393260fb5528e55d87dbbe648 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Wed, 17 Dec 2025 13:46:32 -0700
Subject: [PATCH 076/263] zcash_transparent: fix missing transitive `std`
 feature deps

---
 zcash_transparent/CHANGELOG.md   |  8 +++++++-
 zcash_transparent/Cargo.toml     |  3 +++
 zcash_transparent/src/builder.rs |  2 +-
 zcash_transparent/src/keys.rs    | 24 +++++++++++++-----------
 zcash_transparent/src/lib.rs     |  2 +-
 5 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/zcash_transparent/CHANGELOG.md b/zcash_transparent/CHANGELOG.md
index 633d6abed2..fef877b9c2 100644
--- a/zcash_transparent/CHANGELOG.md
+++ b/zcash_transparent/CHANGELOG.md
@@ -8,12 +8,18 @@ indicated by the `PLANNED` status in order to make it possible to correctly
 represent the transitive `semver` implications of changes within the enclosing
 workspace.
 
-## [Unreleased]
+## [0.6.3] - PLANNED
 
 ### Added
 - `zcash_transparent::zip48`:
   - `FullViewingKey::derive_matching_account_priv_key`
 
+### Changed
+- Enabling the `std` feature now enables `zcash_address/std`, `zcash_script/std`,
+  and `secp256k1?/std`. This change is intended to improve the ergonomics for
+  downstream users of this crate, to eliminate the need for users to manually
+  enable the `std` feature of those dependencies.
+
 ## [0.6.2] - 2025-12-12
 
 ### Added
diff --git a/zcash_transparent/Cargo.toml b/zcash_transparent/Cargo.toml
index e9792afc7a..92e23ade46 100644
--- a/zcash_transparent/Cargo.toml
+++ b/zcash_transparent/Cargo.toml
@@ -72,6 +72,9 @@ zcash_protocol = { workspace = true, features = ["test-dependencies"] }
 default = ["std"]
 std = [
     "dep:document-features",
+    "secp256k1?/std",
+    "zcash_address/std",
+    "zcash_script/std",
 ]
 
 ## Enables spending transparent notes with the transaction builder.
diff --git a/zcash_transparent/src/builder.rs b/zcash_transparent/src/builder.rs
index c60c7fad4a..5687bde028 100644
--- a/zcash_transparent/src/builder.rs
+++ b/zcash_transparent/src/builder.rs
@@ -797,7 +797,7 @@ impl<'a> TransparentSignatureContext<'a, secp256k1::VerifyOnly> {
     }
 }
 
-#[cfg(test)]
+#[cfg(all(test, feature = "std"))]
 mod tests {
     use super::{Error, OutPoint, SignableInput, TransparentBuilder, TxOut};
     use crate::address::TransparentAddress;
diff --git a/zcash_transparent/src/keys.rs b/zcash_transparent/src/keys.rs
index 34398e7c60..54f83cbdf8 100644
--- a/zcash_transparent/src/keys.rs
+++ b/zcash_transparent/src/keys.rs
@@ -612,19 +612,21 @@ impl ExternalOvk {
 mod tests {
     use bip32::ChildNumber;
     use subtle::ConstantTimeEq;
-    use zcash_protocol::consensus::{NetworkConstants, MAIN_NETWORK};
 
-    use super::AccountPubKey;
-    use super::NonHardenedChildIndex;
-    #[allow(deprecated)]
-    use crate::{
-        address::TransparentAddress,
-        keys::{AccountPrivKey, IncomingViewingKey, TransparentKeyScope},
-        test_vectors,
+    use crate::keys::NonHardenedChildIndex;
+
+    #[cfg(feature = "transparent-inputs")]
+    use {
+        crate::{
+            address::TransparentAddress,
+            keys::{AccountPrivKey, AccountPubKey, IncomingViewingKey, TransparentKeyScope},
+            test_vectors,
+        },
+        zcash_protocol::consensus::{NetworkConstants, MAIN_NETWORK},
     };
 
     #[test]
-    #[allow(deprecated)]
+    #[cfg(feature = "transparent-inputs")]
     fn address_derivation() {
         let seed = [
             0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
@@ -643,7 +645,6 @@ mod tests {
             let address_pubkey = account_pubkey
                 .derive_address_pubkey(TransparentKeyScope::EXTERNAL, address_index)
                 .unwrap();
-            #[cfg(feature = "transparent-inputs")]
             assert_eq!(TransparentAddress::from_pubkey(&address_pubkey), address);
 
             let expected_path = [
@@ -689,7 +690,7 @@ mod tests {
     }
 
     #[test]
-    #[allow(deprecated)]
+    #[cfg(feature = "transparent-inputs")]
     fn bip_32_test_vectors() {
         let seed = [
             0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
@@ -727,6 +728,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg(feature = "transparent-inputs")]
     fn check_ovk_test_vectors() {
         for tv in test_vectors::transparent_ovk() {
             let mut key_bytes = [0u8; 65];
diff --git a/zcash_transparent/src/lib.rs b/zcash_transparent/src/lib.rs
index 05eb5c35e3..3c569e4053 100644
--- a/zcash_transparent/src/lib.rs
+++ b/zcash_transparent/src/lib.rs
@@ -19,7 +19,7 @@ pub mod sighash;
 #[cfg(feature = "transparent-inputs")]
 pub mod zip48;
 
-#[cfg(test)]
+#[cfg(all(test, feature = "transparent-inputs"))]
 mod test_vectors;
 
 #[macro_use]

From 572a91a0ff207d821016758f116c1923535ae62e Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Wed, 17 Dec 2025 17:29:41 -0700
Subject: [PATCH 077/263] Release zcash_transparent-0.6.3

---
 Cargo.lock                     | 2 +-
 supply-chain/imports.lock      | 4 ++++
 zcash_transparent/CHANGELOG.md | 2 +-
 zcash_transparent/Cargo.toml   | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bf9c3bf622..c2e3ab09db 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6744,7 +6744,7 @@ dependencies = [
 
 [[package]]
 name = "zcash_transparent"
-version = "0.6.2"
+version = "0.6.3"
 dependencies = [
  "bip32",
  "blake2b_simd",
diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index 15eb427cdd..f536eb6d20 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -1,6 +1,10 @@
 
 # cargo-vet imports lock
 
+[[unpublished.zcash_transparent]]
+version = "0.6.3"
+audited_as = "0.6.2"
+
 [[publisher.bumpalo]]
 version = "3.16.0"
 when = "2024-04-08"
diff --git a/zcash_transparent/CHANGELOG.md b/zcash_transparent/CHANGELOG.md
index fef877b9c2..4e168b50de 100644
--- a/zcash_transparent/CHANGELOG.md
+++ b/zcash_transparent/CHANGELOG.md
@@ -8,7 +8,7 @@ indicated by the `PLANNED` status in order to make it possible to correctly
 represent the transitive `semver` implications of changes within the enclosing
 workspace.
 
-## [0.6.3] - PLANNED
+## [0.6.3] - 2025-12-17
 
 ### Added
 - `zcash_transparent::zip48`:
diff --git a/zcash_transparent/Cargo.toml b/zcash_transparent/Cargo.toml
index 92e23ade46..a2eb8d8fcf 100644
--- a/zcash_transparent/Cargo.toml
+++ b/zcash_transparent/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "zcash_transparent"
 description = "Rust implementations of the Zcash transparent protocol"
-version = "0.6.2"
+version = "0.6.3"
 authors = [
     "Jack Grigg <jack@electriccoin.co>",
     "Kris Nuttycombe <kris@electriccoin.co>",

From 02f846a32ff640f6a9ca9e65d141cae4ba71a9da Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Wed, 17 Dec 2025 17:43:25 -0700
Subject: [PATCH 078/263] Update `cargo vet` metadata after
 `zcash_transparent-0.6.3` release.

---
 supply-chain/imports.lock | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index f536eb6d20..15eb427cdd 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -1,10 +1,6 @@
 
 # cargo-vet imports lock
 
-[[unpublished.zcash_transparent]]
-version = "0.6.3"
-audited_as = "0.6.2"
-
 [[publisher.bumpalo]]
 version = "3.16.0"
 when = "2024-04-08"

From 9133a372ae6c1363226027f1f6c83d1e34af074a Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Mon, 15 Dec 2025 17:19:56 -0700
Subject: [PATCH 079/263] zcash_primitives: Add transitivity of `std` to
 `orchard`, `sapling`, and `transparent` dependencies.

---
 zcash_primitives/CHANGELOG.md | 8 ++++++++
 zcash_primitives/Cargo.toml   | 8 +++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md
index 1c32d8476f..a406d52443 100644
--- a/zcash_primitives/CHANGELOG.md
+++ b/zcash_primitives/CHANGELOG.md
@@ -10,6 +10,14 @@ workspace.
 
 ## [Unreleased]
 
+## [0.26.4] - PLANNED
+
+### Changed
+- Enabling the `std` feature now enables `orchard/std`, `sapling/std`, and
+  `transparent/std`. This change is intended to improve the ergonomics for
+  downstream users of this crate, to eliminate the need for users to manually
+  enable the `std` feature of those dependencies.
+
 ## [0.26.3] - 2025-12-15
 
 ### Added
diff --git a/zcash_primitives/Cargo.toml b/zcash_primitives/Cargo.toml
index b2865775bc..5b14bfe6c5 100644
--- a/zcash_primitives/Cargo.toml
+++ b/zcash_primitives/Cargo.toml
@@ -114,7 +114,13 @@ pprof = { version = "0.14", features = ["criterion", "flamegraph"] }
 
 [features]
 default = ["multicore", "std", "circuits"]
-std = ["document-features", "redjubjub/std"]
+std = [
+    "document-features",
+    "redjubjub/std",
+    "sapling/std",
+    "orchard/std",
+    "transparent/std",
+]
 zip-233 = []
 
 ## Enables creating proofs

From 2504da2c5161fdf3dcf85d4eee7df7d812cff6fb Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Mon, 15 Dec 2025 17:30:41 -0700
Subject: [PATCH 080/263] zcash_primitives: Remove an overly restrictive bound
 from the `Builder` type.

---
 zcash_primitives/CHANGELOG.md               |  3 +++
 zcash_primitives/src/transaction/builder.rs | 10 +++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md
index a406d52443..45e55e589c 100644
--- a/zcash_primitives/CHANGELOG.md
+++ b/zcash_primitives/CHANGELOG.md
@@ -17,6 +17,9 @@ workspace.
   `transparent/std`. This change is intended to improve the ergonomics for
   downstream users of this crate, to eliminate the need for users to manually
   enable the `std` feature of those dependencies.
+- The bound of the progress notifier type in `zcash_primitives::transaction::builder::Builder`
+  on `sapling_crypto::builder::ProverProgress` has been relaxed; it is now retained
+  only for the `build` and `build_zfuture` methods.
 
 ## [0.26.3] - 2025-12-15
 
diff --git a/zcash_primitives/src/transaction/builder.rs b/zcash_primitives/src/transaction/builder.rs
index d82b01f781..c53d658450 100644
--- a/zcash_primitives/src/transaction/builder.rs
+++ b/zcash_primitives/src/transaction/builder.rs
@@ -304,7 +304,7 @@ pub struct PcztParts<P: Parameters> {
 }
 
 /// Generates a [`Transaction`] from its inputs and outputs.
-pub struct Builder<'a, P, U: sapling::builder::ProverProgress> {
+pub struct Builder<'a, P, U> {
     params: P,
     build_config: BuildConfig,
     target_height: BlockHeight,
@@ -325,7 +325,7 @@ pub struct Builder<'a, P, U: sapling::builder::ProverProgress> {
     _progress_notifier: U,
 }
 
-impl<P, U: sapling::builder::ProverProgress> Builder<'_, P, U> {
+impl<P, U> Builder<'_, P, U> {
     /// Returns the network parameters that the builder has been configured for.
     pub fn params(&self) -> &P {
         &self.params
@@ -461,7 +461,7 @@ impl<'a, P: consensus::Parameters> Builder<'a, P, ()> {
     }
 }
 
-impl<P: consensus::Parameters, U: sapling::builder::ProverProgress> Builder<'_, P, U> {
+impl<P: consensus::Parameters, U> Builder<'_, P, U> {
     /// Adds an Orchard note to be spent in this bundle.
     ///
     /// Returns an error if the given Merkle path does not have the required anchor for
@@ -726,7 +726,9 @@ impl<P: consensus::Parameters, U: sapling::builder::ProverProgress> Builder<'_,
     pub fn set_zip233_amount(&mut self, zip233_amount: Zatoshis) {
         self.zip233_amount = zip233_amount;
     }
+}
 
+impl<P: consensus::Parameters, U: sapling::builder::ProverProgress> Builder<'_, P, U> {
     /// Builds a transaction from the configured spends and outputs.
     ///
     /// Upon success, returns a [`BuildResult`] containing:
@@ -1090,7 +1092,9 @@ impl<P: consensus::Parameters, U: sapling::builder::ProverProgress> Builder<'_,
             orchard_meta,
         })
     }
+}
 
+impl<P: consensus::Parameters, U> Builder<'_, P, U> {
     /// Builds a PCZT from the configured spends and outputs.
     ///
     /// Upon success, returns a struct containing the PCZT components, and the

From 643a78f531f43ae8445729785b10c00fcef4d7d4 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Wed, 17 Dec 2025 17:00:19 -0700
Subject: [PATCH 081/263] zcash_primitives: Fix missing/incorrect feature
 flagging.

---
 zcash_primitives/src/transaction/builder.rs | 36 +++++++++++----------
 zcash_primitives/src/transaction/mod.rs     |  1 +
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/zcash_primitives/src/transaction/builder.rs b/zcash_primitives/src/transaction/builder.rs
index c53d658450..a6b8bda729 100644
--- a/zcash_primitives/src/transaction/builder.rs
+++ b/zcash_primitives/src/transaction/builder.rs
@@ -1242,7 +1242,7 @@ impl<'a, P: consensus::Parameters, U: sapling::builder::ProverProgress> Extensio
     }
 }
 
-#[cfg(any(test, feature = "test-dependencies"))]
+#[cfg(all(any(test, feature = "test-dependencies"), feature = "circuits"))]
 mod testing {
     use rand::RngCore;
     use rand_core::CryptoRng;
@@ -1300,22 +1300,22 @@ mod testing {
 
 #[cfg(test)]
 mod tests {
-    use core::convert::Infallible;
-
-    use assert_matches::assert_matches;
-    use ff::Field;
-    use incrementalmerkletree::{frontier::CommitmentTree, witness::IncrementalWitness};
-    use rand_core::OsRng;
-
-    use super::{Builder, Error};
-    use crate::transaction::builder::BuildConfig;
-
-    use ::sapling::{zip32::ExtendedSpendingKey, Node, Rseed};
-    use ::transparent::{address::TransparentAddress, builder::TransparentSigningSet};
-    use zcash_protocol::{
-        consensus::{NetworkUpgrade, Parameters, TEST_NETWORK},
-        memo::MemoBytes,
-        value::{BalanceError, ZatBalance, Zatoshis},
+    #[cfg(feature = "circuits")]
+    use {
+        super::{Builder, Error},
+        crate::transaction::builder::BuildConfig,
+        ::sapling::{zip32::ExtendedSpendingKey, Node, Rseed},
+        ::transparent::{address::TransparentAddress, builder::TransparentSigningSet},
+        assert_matches::assert_matches,
+        core::convert::Infallible,
+        ff::Field,
+        incrementalmerkletree::{frontier::CommitmentTree, witness::IncrementalWitness},
+        rand_core::OsRng,
+        zcash_protocol::{
+            consensus::{NetworkUpgrade, Parameters, TEST_NETWORK},
+            memo::MemoBytes,
+            value::{BalanceError, ZatBalance, Zatoshis},
+        },
     };
 
     #[cfg(zcash_unstable = "zfuture")]
@@ -1403,6 +1403,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg(feature = "circuits")]
     fn binding_sig_present_if_shielded_spend() {
         let extsk = ExtendedSpendingKey::master(&[]);
         let dfvk = extsk.to_diversifiable_full_viewing_key();
@@ -1449,6 +1450,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg(feature = "circuits")]
     fn fails_on_negative_change() {
         use crate::transaction::fees::zip317::MINIMUM_FEE;
 
diff --git a/zcash_primitives/src/transaction/mod.rs b/zcash_primitives/src/transaction/mod.rs
index e3752e7cb5..3cd4675f56 100644
--- a/zcash_primitives/src/transaction/mod.rs
+++ b/zcash_primitives/src/transaction/mod.rs
@@ -286,6 +286,7 @@ impl Authorization for Unauthorized {
 }
 
 /// [`Authorization`] marker type for coinbase transactions without authorization data.
+#[cfg(feature = "circuits")]
 struct Coinbase;
 
 #[cfg(feature = "circuits")]

From c3425f9c3c7f6deb20720bb78b18f35fbbed8edd Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Mon, 15 Dec 2025 17:37:58 -0700
Subject: [PATCH 082/263] Release zcash_primitives-0.26.4

---
 Cargo.lock                    | 2 +-
 supply-chain/audits.toml      | 2 +-
 supply-chain/imports.lock     | 8 ++++++--
 zcash_primitives/CHANGELOG.md | 2 +-
 zcash_primitives/Cargo.toml   | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7d3bedae4b..f8e367237b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6634,7 +6634,7 @@ dependencies = [
 
 [[package]]
 name = "zcash_primitives"
-version = "0.26.3"
+version = "0.26.4"
 dependencies = [
  "assert_matches",
  "bip32",
diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
index a471bd3de8..7f0b55fd8b 100644
--- a/supply-chain/audits.toml
+++ b/supply-chain/audits.toml
@@ -1338,7 +1338,7 @@ end = "2025-12-16"
 criteria = "safe-to-deploy"
 user-id = 169181 # Kris Nuttycombe (nuttycom)
 start = "2024-12-17"
-end = "2025-12-17"
+end = "2026-12-18"
 
 [[trusted.zip32]]
 criteria = "safe-to-deploy"
diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index 29d70096fe..e8d8e9b0b6 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -1,6 +1,10 @@
 
 # cargo-vet imports lock
 
+[[unpublished.zcash_primitives]]
+version = "0.26.4"
+audited_as = "0.26.3"
+
 [[publisher.bumpalo]]
 version = "3.16.0"
 when = "2024-04-08"
@@ -372,8 +376,8 @@ user-login = "daira"
 user-name = "Daira-Emma Hopwood"
 
 [[publisher.zcash_transparent]]
-version = "0.6.2"
-when = "2025-12-12"
+version = "0.6.3"
+when = "2025-12-18"
 user-id = 169181
 user-login = "nuttycom"
 user-name = "Kris Nuttycombe"
diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md
index 45e55e589c..9a26093952 100644
--- a/zcash_primitives/CHANGELOG.md
+++ b/zcash_primitives/CHANGELOG.md
@@ -10,7 +10,7 @@ workspace.
 
 ## [Unreleased]
 
-## [0.26.4] - PLANNED
+## [0.26.4] - 2025-12-17
 
 ### Changed
 - Enabling the `std` feature now enables `orchard/std`, `sapling/std`, and
diff --git a/zcash_primitives/Cargo.toml b/zcash_primitives/Cargo.toml
index 5b14bfe6c5..98df704641 100644
--- a/zcash_primitives/Cargo.toml
+++ b/zcash_primitives/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "zcash_primitives"
 description = "Rust implementations of the Zcash primitives"
-version = "0.26.3"
+version = "0.26.4"
 authors = [
     "Jack Grigg <jack@z.cash>",
     "Kris Nuttycombe <kris@electriccoin.co>"

From dee418ccadaf5bcdb171ef2af29a07b0adce2136 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Wed, 17 Dec 2025 18:02:27 -0700
Subject: [PATCH 083/263] Update `cargo vet` metadata after
 `zcash_primitives-0.26.4` release

---
 supply-chain/imports.lock | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index e8d8e9b0b6..130024a382 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -1,10 +1,6 @@
 
 # cargo-vet imports lock
 
-[[unpublished.zcash_primitives]]
-version = "0.26.4"
-audited_as = "0.26.3"
-
 [[publisher.bumpalo]]
 version = "3.16.0"
 when = "2024-04-08"
@@ -341,8 +337,8 @@ user-login = "str4d"
 user-name = "Jack Grigg"
 
 [[publisher.zcash_primitives]]
-version = "0.26.3"
-when = "2025-12-15"
+version = "0.26.4"
+when = "2025-12-18"
 user-id = 169181
 user-login = "nuttycom"
 user-name = "Kris Nuttycombe"

From 01e7883d0cf7067fdfaf84f892cabdbca0d7cf92 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Wed, 17 Dec 2025 18:28:39 -0700
Subject: [PATCH 084/263] Fix a mis-merge in the `zcash_transparent` CHANGELOG

The replacement of the [Unreleased] tag with the [0.6.3] line on the
maintenance branch allowed a no-conflict merge to occur that resulted in
CHANGELOG entries being in the wrong order on `main`. I have modified
the `Unreleased` line for `zcash_transparent` and `zcash_primitives` to
use `-PENDING` release versions to help prevent this sort of error in
the future. In general, we should probably not use [Unreleased] for this
reason.
---
 zcash_primitives/CHANGELOG.md  |  2 +-
 zcash_transparent/CHANGELOG.md | 24 +++++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md
index f0bfb55794..1909e400ca 100644
--- a/zcash_primitives/CHANGELOG.md
+++ b/zcash_primitives/CHANGELOG.md
@@ -8,7 +8,7 @@ indicated by the `PLANNED` status in order to make it possible to correctly
 represent the transitive `semver` implications of changes within the enclosing
 workspace.
 
-## [Unreleased]
+## [0.27.0] - PENDING
 
 ### Added
 - `zcash_primitives::transaction::builder`:
diff --git a/zcash_transparent/CHANGELOG.md b/zcash_transparent/CHANGELOG.md
index 34272d36f6..d2b540b571 100644
--- a/zcash_transparent/CHANGELOG.md
+++ b/zcash_transparent/CHANGELOG.md
@@ -8,17 +8,7 @@ indicated by the `PLANNED` status in order to make it possible to correctly
 represent the transitive `semver` implications of changes within the enclosing
 workspace.
 
-## [0.6.3] - 2025-12-17
-
-### Added
-- `zcash_transparent::zip48`:
-  - `FullViewingKey::derive_matching_account_priv_key`
-
-### Changed
-- Enabling the `std` feature now enables `zcash_address/std`, `zcash_script/std`,
-  and `secp256k1?/std`. This change is intended to improve the ergonomics for
-  downstream users of this crate, to eliminate the need for users to manually
-  enable the `std` feature of those dependencies.
+## [0.7.0] - PENDING
 
 ### Added
 - `zcash_transparent::pczt`:
@@ -36,6 +26,18 @@ workspace.
     - `MissingPreimage`
     - `UnsupportedPubkey`
 
+## [0.6.3] - 2025-12-17
+
+### Added
+- `zcash_transparent::zip48`:
+  - `FullViewingKey::derive_matching_account_priv_key`
+
+### Changed
+- Enabling the `std` feature now enables `zcash_address/std`, `zcash_script/std`,
+  and `secp256k1?/std`. This change is intended to improve the ergonomics for
+  downstream users of this crate, to eliminate the need for users to manually
+  enable the `std` feature of those dependencies.
+
 ## [0.6.2] - 2025-12-12
 
 ### Added

From fd77aa70b04a3dd48d6cc10b6566843bf0bf4914 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Wed, 17 Dec 2025 10:44:38 +1300
Subject: [PATCH 085/263] eip681: don't generate arbitrary url encoded strings
 that are also numbers

---
 components/eip681/src/parse.rs | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index 78261e93cf..460f01efbe 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -276,8 +276,7 @@ impl Number {
     pub fn as_i128(&self) -> Result<i128, ValidationError> {
         let signum = self
             .signum
-            .map(|is_positive| if is_positive { 1 } else { -1 })
-            .unwrap_or(1i128);
+            .map_or(1i128, |is_positive| if is_positive { 1 } else { -1 });
         let integer = self.integer()?;
         let (decimal_numerator, decimal_denominator) = self.decimal()?;
         let exp = self
@@ -285,7 +284,7 @@ impl Number {
             .as_ref()
             .and_then(|(_, maybe_exp)| maybe_exp.as_ref().map(|digits| digits.as_u64()))
             .transpose()?
-            .unwrap_or_default()
+            .unwrap_or(0)
             .try_into()
             .context(IntegerSnafu)?;
         let multiplier = 10i128.checked_pow(exp).context(LargeExponentSnafu {
@@ -731,7 +730,7 @@ impl Parameters {
         let mut params = vec![];
         for blob in blobs.into_iter() {
             let (j, param) = Parameter::parse(blob)?;
-            snafu::ensure!(j.is_empty(), UnexpectedLeftoverInputSnafu { input: i });
+            snafu::ensure!(j.is_empty(), UnexpectedLeftoverInputSnafu { input: j });
             params.push(param);
         }
         Ok((i, Parameters(params)))
@@ -1256,6 +1255,25 @@ mod test {
         proptest::string::string_regex(&format!(".{{{min},{max}}}")).unwrap()
     }
 
+    /// Used to produce url encoded unicode strings that are **not** numbers.
+    ///
+    /// This is used for arbitrary unicode values that should not roundtrip to a number.
+    ///
+    /// Imagine this scenario:
+    ///
+    /// 1. arb_url_encoded_string produces `input = UrlEncodedString(0)`.
+    /// 2. serialize to "0"
+    /// 3. parse from "0" produces `output = Number(0)`
+    /// 4. input != output
+    fn arb_non_numeric_url_encoded_string() -> impl Strategy<Value = UrlEncodedUnicodeString> {
+        {
+            let min = 1;
+            let max = 1024;
+            proptest::string::string_regex(&format!("[^\\d]{{{min},{max}}}")).unwrap()
+        }
+        .prop_map(UrlEncodedUnicodeString::encode)
+    }
+
     fn arb_url_encoded_string() -> impl Strategy<Value = UrlEncodedUnicodeString> {
         arb_unicode(1, 1024).prop_map(UrlEncodedUnicodeString::encode)
     }
@@ -1377,7 +1395,9 @@ mod test {
         Union::new([
             arb_valid_number().prop_map(Value::Number).boxed(),
             arb_eth_addy().prop_map(Value::Address).boxed(),
-            arb_url_encoded_string().prop_map(Value::String).boxed(),
+            arb_non_numeric_url_encoded_string()
+                .prop_map(Value::String)
+                .boxed(),
         ])
     }
 
@@ -1524,7 +1544,7 @@ mod test {
         #[test]
         fn parse_arb_request(expected in arb_request()) {
             let input = expected.to_string();
-            let (i, seen) = EthereumTransactionRequest::parse(&input).unwrap();
+            let (i, seen) = EthereumTransactionRequest::parse(&input).unwrap_or_else(|e| panic!("could not parse '{input}': {e}"));
             pretty_assertions::assert_str_eq!(input, seen.to_string().as_str(), "input: {input}\ni: {i}");
             pretty_assertions::assert_eq!(expected, seen);
         }

From 5bff17ef8a7283bd6e9e87c77689541ef15e0784 Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@electriccoin.co>
Date: Thu, 18 Dec 2025 15:02:01 +0000
Subject: [PATCH 086/263] zcash_client_backend: Don't rebuild protobufs on
 Windows

Closes zcash/librustzcash#2084.
---
 zcash_client_backend/build.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/zcash_client_backend/build.rs b/zcash_client_backend/build.rs
index afc52c3b6b..a35b8233ff 100644
--- a/zcash_client_backend/build.rs
+++ b/zcash_client_backend/build.rs
@@ -15,6 +15,11 @@ fn main() -> io::Result<()> {
     // - We check for the existence of protoc in the same way as prost_build, so that
     //   people building from source do not need to have protoc installed. If they make
     //   changes to the proto files, the discrepancy will be caught by CI.
+    // - We don't build on Windows because the protobufs are symlinks to the actual files,
+    //   which don't resolve by default in Windows clones of the git repository. This can
+    //   be worked around with `git config core.symlinks true` but that's additional
+    //   hassle, and it's easier to just make any protobuf updates on *nix dev machines.
+    #[cfg(not(windows))]
     if Path::new(COMPACT_FORMATS_PROTO).exists()
         && env::var_os("PROTOC")
             .map(PathBuf::from)

From 5f93ca0b655d8d864e65fd3f8e43aac98e76068c Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Wed, 17 Dec 2025 13:46:32 -0700
Subject: [PATCH 087/263] `zcash_keys`: Fix missing `std` feature dependencies.

`zcash_keys/std` now implies `orchard?/std`, `sapling?/std`,
`transparent/std`, and `zcash_address/std`. In addition, downstream
crates of `zcash_keys` within this workspace now must explicitly
enable `zcash_keys/std` if its features are required.
---
 Cargo.toml                      |  2 +-
 zcash_client_backend/Cargo.toml |  2 +-
 zcash_keys/CHANGELOG.md         |  2 ++
 zcash_keys/Cargo.toml           | 16 ++++++++++++----
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 6d07849d9a..463713086a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,7 +39,7 @@ equihash = { version = "0.2", path = "components/equihash", default-features = f
 zcash_address = { version = "0.10", path = "components/zcash_address", default-features = false }
 zcash_client_backend = { version = "0.21", path = "zcash_client_backend" }
 zcash_encoding = { version = "0.3", path = "components/zcash_encoding", default-features = false }
-zcash_keys = { version = "0.12", path = "zcash_keys" }
+zcash_keys = { version = "0.12", path = "zcash_keys", default-features = false  }
 zcash_protocol = { version = "0.7.2", path = "components/zcash_protocol", default-features = false }
 zip321 = { version = "0.6", path = "components/zip321" }
 
diff --git a/zcash_client_backend/Cargo.toml b/zcash_client_backend/Cargo.toml
index 716ab473b6..b87097c157 100644
--- a/zcash_client_backend/Cargo.toml
+++ b/zcash_client_backend/Cargo.toml
@@ -27,7 +27,7 @@ rustdoc-args = ["--cfg", "docsrs"]
 [dependencies]
 zcash_address.workspace = true
 zcash_encoding.workspace = true
-zcash_keys = { workspace = true, features = ["sapling"] }
+zcash_keys = { workspace = true, features = ["std", "sapling"] }
 zcash_note_encryption.workspace = true
 zcash_primitives = { workspace = true, features = ["std", "circuits"] }
 zcash_protocol.workspace = true
diff --git a/zcash_keys/CHANGELOG.md b/zcash_keys/CHANGELOG.md
index 43e556bf01..a714a58c9f 100644
--- a/zcash_keys/CHANGELOG.md
+++ b/zcash_keys/CHANGELOG.md
@@ -16,6 +16,8 @@ workspace.
 ### Changed
 - MSRV is now 1.85.1.
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`.
+- `zcash_keys/std` now implies `orchard?/std`, `sapling?/std`,
+  `transparent/std`, and `zcash_address/std`.
 
 ## [0.12.0] - 2025-10-13
 
diff --git a/zcash_keys/Cargo.toml b/zcash_keys/Cargo.toml
index 11a7ddccab..0ee42bda5d 100644
--- a/zcash_keys/Cargo.toml
+++ b/zcash_keys/Cargo.toml
@@ -89,17 +89,25 @@ zcash_script.workspace = true
 
 [features]
 default = ["std"]
-std = ["dep:document-features"]
+std = [
+    "dep:document-features",
+    "orchard?/std",
+    "sapling?/std",
+    "transparent/std",
+    "zcash_address/std",
+]
 
 ## Enables use of transparent key parts and addresses
 transparent-inputs = [
-  "dep:bip32",
-  "transparent/transparent-inputs",
+    "dep:bip32",
+    "transparent/transparent-inputs",
 ]
 
 ## Enables use of zcashd-derived secp256k1 secret key encodings.
 transparent-key-encoding = [
-  "transparent-inputs", "dep:secp256k1", "dep:zeroize"
+    "transparent-inputs",
+    "dep:secp256k1",
+    "dep:zeroize",
 ]
 
 ## Enables use of Orchard key parts and addresses

From 9c1579a359bd6079502a9b54b8be12f9de941773 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Thu, 18 Dec 2025 18:20:02 -0700
Subject: [PATCH 088/263] zcash_client_backend: Add `fees::MetaSource` trait.

This trait is introduced in order to make it possible to implement
`ChangeStrategy` for a type where the `fetch_wallet_meta` method
provably ignores its `meta_source` argument. This is useful for
circumstances when no input source is available.
---
 zcash_client_backend/CHANGELOG.md       |  4 +++
 zcash_client_backend/src/fees.rs        | 40 ++++++++++++++++++++-----
 zcash_client_backend/src/fees/zip317.rs | 10 +++----
 3 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index 3958f36f6c..0b778b7060 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -22,6 +22,7 @@ workspace.
   - `LightdInfo` has added fields `upgrade_name`, `upgrade_height`, and `lighwallet_protocol_version`
   - `GetMempoolTxRequest` (previously named `Exclude`) has added field `pool_types`
 - `impl From<zcash_client_backend::proposal::ProposalError> for zcash_client_backend::data_api::wallet::input_selection::InputSelectorError<...>`
+- `zcash_client_backend::fees::MetaSource`
 
 ### Changed
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`, `zip321 0.7`
@@ -51,6 +52,9 @@ workspace.
     IVK.
 - `zcash_client_backend::data_api::WalletRead` has added method `get_received_outputs`.
 - `zcash_client_backend::proposal::ProposalError` has added variant `PaymentAmountMissing`
+- The associated type `zcash_client_backend::fees::ChangeStrategy::MetaSource` is now
+  bounded on the newly added `MetaSource` type instead of
+  `zcash_client_backend::data_api::InputSource`.
 
 ## [0.21.0] - 2025-11-05
 
diff --git a/zcash_client_backend/src/fees.rs b/zcash_client_backend/src/fees.rs
index bf53714b5e..5ab6c47c53 100644
--- a/zcash_client_backend/src/fees.rs
+++ b/zcash_client_backend/src/fees.rs
@@ -1,4 +1,5 @@
 use std::{
+    convert::Infallible,
     fmt::{self, Debug, Display},
     num::{NonZeroU64, NonZeroUsize},
 };
@@ -483,6 +484,32 @@ impl EphemeralBalance {
     }
 }
 
+/// A trait that defines a set of types used in wallet metadata retrieval. Ordinarily, this will
+/// correspond to a type that implements [`InputSource`], and a blanket implementation of this
+/// trait is provided for all types that implement [`InputSource`].
+///
+/// If more capabilities are required of the backend than are exposed in the [`InputSource`] trait,
+/// the implementer of this trait should define their own trait that descends from [`InputSource`]
+/// and adds the required capabilities there, and then implement that trait for their desired
+/// database backend.
+pub trait MetaSource {
+    type Error;
+    type AccountId;
+    type NoteRef;
+}
+
+impl MetaSource for Infallible {
+    type Error = Infallible;
+    type AccountId = Infallible;
+    type NoteRef = Infallible;
+}
+
+impl<I: InputSource> MetaSource for I {
+    type Error = I::Error;
+    type AccountId = I::AccountId;
+    type NoteRef = I::NoteRef;
+}
+
 /// A trait that represents the ability to compute the suggested change and fees that must be paid
 /// by a transaction having a specified set of inputs and outputs.
 pub trait ChangeStrategy {
@@ -490,11 +517,8 @@ pub trait ChangeStrategy {
     type Error: From<<Self::FeeRule as FeeRule>::Error>;
 
     /// The type of metadata source that this change strategy requires in order to be able to
-    /// retrieve required wallet metadata. If more capabilities are required of the backend than
-    /// are exposed in the [`InputSource`] trait, the implementer of this trait should define their
-    /// own trait that descends from [`InputSource`] and adds the required capabilities there, and
-    /// then implement that trait for their desired database backend.
-    type MetaSource: InputSource;
+    /// retrieve required wallet metadata.
+    type MetaSource: MetaSource;
 
     /// Tye type of wallet metadata that this change strategy relies upon in order to compute
     /// change.
@@ -509,10 +533,10 @@ pub trait ChangeStrategy {
     fn fetch_wallet_meta(
         &self,
         meta_source: &Self::MetaSource,
-        account: <Self::MetaSource as InputSource>::AccountId,
+        account: <Self::MetaSource as MetaSource>::AccountId,
         target_height: TargetHeight,
-        exclude: &[<Self::MetaSource as InputSource>::NoteRef],
-    ) -> Result<Self::AccountMetaT, <Self::MetaSource as InputSource>::Error>;
+        exclude: &[<Self::MetaSource as MetaSource>::NoteRef],
+    ) -> Result<Self::AccountMetaT, <Self::MetaSource as MetaSource>::Error>;
 
     /// Computes the totals of inputs, suggested change amounts, and fees given the
     /// provided inputs and outputs being used to construct a transaction.
diff --git a/zcash_client_backend/src/fees/zip317.rs b/zcash_client_backend/src/fees/zip317.rs
index 95ec74aa72..d923fce38e 100644
--- a/zcash_client_backend/src/fees/zip317.rs
+++ b/zcash_client_backend/src/fees/zip317.rs
@@ -19,7 +19,7 @@ use crate::{
 };
 
 use super::{
-    ChangeError, ChangeStrategy, DustOutputPolicy, EphemeralBalance, SplitPolicy,
+    ChangeError, ChangeStrategy, DustOutputPolicy, EphemeralBalance, MetaSource, SplitPolicy,
     TransactionBalance,
     common::{SinglePoolBalanceConfig, single_pool_output_balance},
     sapling as sapling_fees,
@@ -95,7 +95,7 @@ impl<R, I> SingleOutputChangeStrategy<R, I> {
 impl<R, I> ChangeStrategy for SingleOutputChangeStrategy<R, I>
 where
     R: Zip317FeeRule + Clone,
-    I: InputSource,
+    I: MetaSource,
     <R as FeeRule>::Error: From<BalanceError>,
 {
     type FeeRule = R;
@@ -110,10 +110,10 @@ where
     fn fetch_wallet_meta(
         &self,
         _meta_source: &Self::MetaSource,
-        _account: <Self::MetaSource as InputSource>::AccountId,
+        _account: <Self::MetaSource as MetaSource>::AccountId,
         _target_height: TargetHeight,
-        _exclude: &[<Self::MetaSource as InputSource>::NoteRef],
-    ) -> Result<Self::AccountMetaT, <Self::MetaSource as InputSource>::Error> {
+        _exclude: &[<Self::MetaSource as MetaSource>::NoteRef],
+    ) -> Result<Self::AccountMetaT, <Self::MetaSource as MetaSource>::Error> {
         Ok(())
     }
 

From 2303fa43338b6c518038a4cc0e7fb2e1d4273d52 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Fri, 19 Dec 2025 11:23:14 -0700
Subject: [PATCH 089/263] zcash_transparent: Expose builder parts required for
 fee calculation.

In order to use zcash_client_backend::fees::ChangeStrategy when
preparing a spend of transparent coins, it is necessary to be able to
accurately compute fees. At present, the fee computation logic in
`zcash_client_backend` only functions in the context of spending p2pkh
inputs. Instead of reimplementing script size computation externally,
this commit exposes enough information from the `zcash_transparent`
builder to enable the script size computation used by the builder to
also be used externally.
---
 pczt/tests/end_to_end.rs                      |   2 +-
 zcash_client_backend/src/data_api/wallet.rs   |   8 +-
 .../init/migrations/receiving_key_scopes.rs   |   2 +-
 zcash_primitives/CHANGELOG.md                 |   1 +
 zcash_primitives/src/transaction/builder.rs   |   6 +-
 zcash_transparent/CHANGELOG.md                |   6 +
 zcash_transparent/src/builder.rs              | 170 ++++++++++--------
 7 files changed, 114 insertions(+), 81 deletions(-)

diff --git a/pczt/tests/end_to_end.rs b/pczt/tests/end_to_end.rs
index 6150cc4702..ba4615f04a 100644
--- a/pczt/tests/end_to_end.rs
+++ b/pczt/tests/end_to_end.rs
@@ -88,7 +88,7 @@ fn transparent_to_orchard() {
         },
     );
     builder
-        .add_transparent_input(transparent_pubkey, utxo, coin.clone())
+        .add_transparent_p2pkh_input(transparent_pubkey, utxo, coin.clone())
         .unwrap();
     builder
         .add_orchard_output::<zip317::FeeRule>(
diff --git a/zcash_client_backend/src/data_api/wallet.rs b/zcash_client_backend/src/data_api/wallet.rs
index a737ce48ed..02709701f2 100644
--- a/zcash_client_backend/src/data_api/wallet.rs
+++ b/zcash_client_backend/src/data_api/wallet.rs
@@ -1299,7 +1299,7 @@ where
     #[cfg(feature = "transparent-inputs")]
     let utxos_spent = {
         let mut utxos_spent: Vec<OutPoint> = vec![];
-        let mut add_transparent_input =
+        let mut add_transparent_p2pkh_input =
             |builder: &mut Builder<_, _>,
              utxos_spent: &mut Vec<_>,
              recipient_address: &TransparentAddress,
@@ -1320,13 +1320,13 @@ where
                 };
 
                 utxos_spent.push(outpoint.clone());
-                builder.add_transparent_input(pubkey, outpoint, txout)?;
+                builder.add_transparent_p2pkh_input(pubkey, outpoint, txout)?;
 
                 Ok(())
             };
 
         for utxo in proposal_step.transparent_inputs() {
-            add_transparent_input(
+            add_transparent_p2pkh_input(
                 &mut builder,
                 &mut utxos_spent,
                 utxo.recipient_address(),
@@ -1349,7 +1349,7 @@ where
                 .ok_or(ProposalError::ReferenceError(*input_ref))?
                 .vout[outpoint.n() as usize];
 
-            add_transparent_input(
+            add_transparent_p2pkh_input(
                 &mut builder,
                 &mut utxos_spent,
                 &address,
diff --git a/zcash_client_sqlite/src/wallet/init/migrations/receiving_key_scopes.rs b/zcash_client_sqlite/src/wallet/init/migrations/receiving_key_scopes.rs
index 1e56825fd6..79025b2fee 100644
--- a/zcash_client_sqlite/src/wallet/init/migrations/receiving_key_scopes.rs
+++ b/zcash_client_sqlite/src/wallet/init/migrations/receiving_key_scopes.rs
@@ -369,7 +369,7 @@ mod tests {
         );
         let mut transparent_signing_set = TransparentSigningSet::new();
         builder
-            .add_transparent_input(
+            .add_transparent_p2pkh_input(
                 transparent_signing_set.add_key(
                     usk0.transparent()
                         .derive_external_secret_key(NonHardenedChildIndex::ZERO)
diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md
index 1909e400ca..cf6a611a16 100644
--- a/zcash_primitives/CHANGELOG.md
+++ b/zcash_primitives/CHANGELOG.md
@@ -21,6 +21,7 @@ workspace.
   - `Error` has a new `Coinbase` variant.
   - `Builder::add_orchard_output`'s `value` parameter now has type `Zatoshis`
     instead of `u64`.
+  - `Builder::add_transparent_input` has been renamed to `add_transparent_p2pkh_input`.
   - `BuildConfig`:
     -  The `Coinbase` variant now includes an `Option<zcash_script::opcode::PushValue>` payload.
     -  No longer implements `Copy`.
diff --git a/zcash_primitives/src/transaction/builder.rs b/zcash_primitives/src/transaction/builder.rs
index ff2155026f..6707e1de38 100644
--- a/zcash_primitives/src/transaction/builder.rs
+++ b/zcash_primitives/src/transaction/builder.rs
@@ -553,13 +553,13 @@ impl<P: consensus::Parameters, U> Builder<'_, P, U> {
 
     /// Adds a transparent P2PKH coin to be spent in this transaction.
     #[cfg(feature = "transparent-inputs")]
-    pub fn add_transparent_input(
+    pub fn add_transparent_p2pkh_input(
         &mut self,
         pubkey: secp256k1::PublicKey,
         utxo: transparent::bundle::OutPoint,
         coin: TxOut,
     ) -> Result<(), transparent::builder::Error> {
-        self.transparent_builder.add_input(pubkey, utxo, coin)
+        self.transparent_builder.add_p2pkh_input(pubkey, utxo, coin)
     }
 
     /// Adds a transparent P2SH coin to be spent in this transaction.
@@ -1383,7 +1383,7 @@ mod tests {
                 .into(),
         );
         builder
-            .add_transparent_input(pubkey, OutPoint::fake(), prev_coin)
+            .add_transparent_p2pkh_input(pubkey, OutPoint::fake(), prev_coin)
             .unwrap();
 
         // Create a tx with only t output. No binding_sig should be present
diff --git a/zcash_transparent/CHANGELOG.md b/zcash_transparent/CHANGELOG.md
index d2b540b571..4023966de9 100644
--- a/zcash_transparent/CHANGELOG.md
+++ b/zcash_transparent/CHANGELOG.md
@@ -17,6 +17,9 @@ workspace.
 - `impl core::error::Error` for:
   -` zcash_transparent::builder::Error`
   - `zcash_transparent::coinbase::Error`
+- `zcash_transparent::builder::SpendInfo`
+- `zcash_transparent::builder::TransparentInputInfo::{from_parts, spend_info}`
+- `zcash_transparent::builder::Builder::add_p2pkh_input`
 
 ### Changed
 - MSRV is now 1.85.1.
@@ -25,6 +28,9 @@ workspace.
     - `InvalidExternalSignature`
     - `MissingPreimage`
     - `UnsupportedPubkey`
+- `zcash_transparent::builder::Builder::add_input` now takes a `TransparentInputInfo`
+  instead of its constituent parts. Use `Builder::add_p2pkh_input` if you need the
+  previous API.
 
 ## [0.6.3] - 2025-12-17
 
diff --git a/zcash_transparent/src/builder.rs b/zcash_transparent/src/builder.rs
index 6880cbcebb..c863f77e09 100644
--- a/zcash_transparent/src/builder.rs
+++ b/zcash_transparent/src/builder.rs
@@ -155,32 +155,97 @@ fn construct_script_sig(
     ])
 }
 
+/// Information required to spend a transparent coin; the secp256k public key when spending a p2pkh
+/// output, or the redeem script when spending a p2sh output.
 #[cfg(feature = "transparent-inputs")]
 #[derive(Debug, Clone)]
-enum InputKind {
+pub enum SpendInfo {
     P2pkh { pubkey: secp256k1::PublicKey },
     P2sh { redeem_script: script::FromChain },
 }
 
-// TODO: This feature gate can be removed.
+/// Information required for adding a transparent input to the builder and computing fees: the
+/// outpoint referencing the coin to be spent, the original coin data, and the [`SpendInfo`]
+/// required to spend the output.
 #[cfg(feature = "transparent-inputs")]
 #[derive(Debug, Clone)]
 pub struct TransparentInputInfo {
-    kind: InputKind,
     utxo: OutPoint,
     coin: TxOut,
+    spend_info: SpendInfo,
 }
 
 #[cfg(feature = "transparent-inputs")]
 impl TransparentInputInfo {
+    /// Constructs a [`TransparentInputInfo`] value from its constituent parts.
+    pub fn from_parts(utxo: OutPoint, coin: TxOut, spend_info: SpendInfo) -> Result<Self, Error> {
+        match &spend_info {
+            SpendInfo::P2pkh { pubkey } => {
+                let script_pubkey = script::PubKey::parse(&coin.script_pubkey().0)
+                    .map_err(|_| Error::UnsupportedScript)?;
+
+                // Ensure that the RIPEMD-160 digest of the public key associated with the
+                // provided secret key matches that of the address to which the provided
+                // output may be spent.
+                match TransparentAddress::from_script_pubkey(&script_pubkey) {
+                    Some(TransparentAddress::PublicKeyHash(hash)) => {
+                        use ripemd::Ripemd160;
+                        use sha2::Sha256;
+
+                        if hash[..] != Ripemd160::digest(Sha256::digest(pubkey.serialize()))[..] {
+                            return Err(Error::InvalidAddress);
+                        }
+                    }
+                    _ => return Err(Error::InvalidAddress),
+                }
+            }
+            SpendInfo::P2sh { redeem_script } => {
+                // Ensure that the RIPEMD-160 digest of the public key associated with the
+                // provided secret key matches that of the address to which the provided
+                // output may be spent.
+                match script::PubKey::parse(&coin.script_pubkey().0)
+                    .ok()
+                    .as_ref()
+                    .and_then(TransparentAddress::from_script_pubkey)
+                {
+                    Some(TransparentAddress::ScriptHash(hash)) => {
+                        use ripemd::Ripemd160;
+                        use sha2::Sha256;
+                        use zcash_script::script::Evaluable;
+
+                        if hash[..]
+                            != Ripemd160::digest(Sha256::digest(redeem_script.to_bytes()))[..]
+                        {
+                            return Err(Error::InvalidAddress);
+                        }
+                    }
+                    _ => return Err(Error::InvalidAddress),
+                }
+            }
+        }
+
+        Ok(TransparentInputInfo {
+            utxo,
+            coin,
+            spend_info,
+        })
+    }
+
+    /// Returns the pointer to the input being spent.
     pub fn outpoint(&self) -> &OutPoint {
         &self.utxo
     }
 
+    /// Returns the original coin data that is pointed to by [`Self::outpoint`].
     pub fn coin(&self) -> &TxOut {
         &self.coin
     }
 
+    /// Returns the [`SpendInfo`] required to spend the output.
+    pub fn spend_info(&self) -> &SpendInfo {
+        &self.spend_info
+    }
+
     /// The size of this transparent input in a transaction, as used in [ZIP 317].
     ///
     /// Returns `None` if we cannot determine the size. (TODO: Remove this case)
@@ -190,8 +255,8 @@ impl TransparentInputInfo {
         // PushData(secp256k1::ecdsa::serialized_signature::MAX_LEN + 1)
         let fake_sig = pv::push_value(&[0; 72 + 1]).expect("short enough");
 
-        let script_len = match &self.kind {
-            InputKind::P2pkh { .. } => {
+        let script_len = match &self.spend_info {
+            SpendInfo::P2pkh { .. } => {
                 // P2PKH `script_sig` format is:
                 // - PushData(signature || sigtype)
                 // - PushData(pubkey)
@@ -199,13 +264,13 @@ impl TransparentInputInfo {
                     .expect("short enough");
                 Some(script::Component(vec![fake_sig, fake_pubkey]).byte_len())
             }
-            InputKind::P2sh { redeem_script } => {
+            SpendInfo::P2sh { redeem_script } => {
                 redeem_script
                     .refine()
                     .ok()
                     .as_ref()
                     .and_then(solver::standard)
-                    .and_then(|kind| match kind {
+                    .and_then(|spend_info| match spend_info {
                         solver::ScriptKind::MultiSig { required, .. } => {
                             // P2MS-in-P2SH `script_sig` format is:
                             // - Dummy OP_0 to bypass OP_CHECKMULTISIG bug.
@@ -321,39 +386,23 @@ impl TransparentBuilder {
         &self.vout
     }
 
+    /// Adds an input (the output of a previous transaction) to be spent in the transaction.
+    #[cfg(feature = "transparent-inputs")]
+    pub fn add_input(&mut self, input: TransparentInputInfo) {
+        self.inputs.push(input);
+    }
+
     /// Adds a P2PKH coin (the output of a previous transaction) to be spent in the
     /// transaction.
     #[cfg(feature = "transparent-inputs")]
-    pub fn add_input(
+    pub fn add_p2pkh_input(
         &mut self,
         pubkey: secp256k1::PublicKey,
         utxo: OutPoint,
         coin: TxOut,
     ) -> Result<(), Error> {
-        let script_pubkey =
-            script::PubKey::parse(&coin.script_pubkey().0).map_err(|_| Error::UnsupportedScript)?;
-
-        // Ensure that the RIPEMD-160 digest of the public key associated with the
-        // provided secret key matches that of the address to which the provided
-        // output may be spent.
-        match TransparentAddress::from_script_pubkey(&script_pubkey) {
-            Some(TransparentAddress::PublicKeyHash(hash)) => {
-                use ripemd::Ripemd160;
-                use sha2::Sha256;
-
-                if hash[..] != Ripemd160::digest(Sha256::digest(pubkey.serialize()))[..] {
-                    return Err(Error::InvalidAddress);
-                }
-            }
-            _ => return Err(Error::InvalidAddress),
-        }
-
-        self.inputs.push(TransparentInputInfo {
-            kind: InputKind::P2pkh { pubkey },
-            utxo,
-            coin,
-        });
-
+        let input = TransparentInputInfo::from_parts(utxo, coin, SpendInfo::P2pkh { pubkey })?;
+        self.inputs.push(input);
         Ok(())
     }
 
@@ -370,32 +419,9 @@ impl TransparentBuilder {
         utxo: OutPoint,
         coin: TxOut,
     ) -> Result<(), Error> {
-        // Ensure that the RIPEMD-160 digest of the public key associated with the
-        // provided secret key matches that of the address to which the provided
-        // output may be spent.
-        match script::PubKey::parse(&coin.script_pubkey().0)
-            .ok()
-            .as_ref()
-            .and_then(TransparentAddress::from_script_pubkey)
-        {
-            Some(TransparentAddress::ScriptHash(hash)) => {
-                use ripemd::Ripemd160;
-                use sha2::Sha256;
-                use zcash_script::script::Evaluable;
-
-                if hash[..] != Ripemd160::digest(Sha256::digest(redeem_script.to_bytes()))[..] {
-                    return Err(Error::InvalidAddress);
-                }
-            }
-            _ => return Err(Error::InvalidAddress),
-        }
-
-        self.inputs.push(TransparentInputInfo {
-            kind: InputKind::P2sh { redeem_script },
-            utxo,
-            coin,
-        });
-
+        let input =
+            TransparentInputInfo::from_parts(utxo, coin, SpendInfo::P2sh { redeem_script })?;
+        self.inputs.push(input);
         Ok(())
     }
 
@@ -491,9 +517,9 @@ impl TransparentBuilder {
                 value: i.coin.value(),
                 script_pubkey: script::FromChain::parse(&i.coin.script_pubkey().0)
                     .expect("checked by builder when input was added"),
-                redeem_script: match i.kind {
-                    InputKind::P2pkh { .. } => None,
-                    InputKind::P2sh { redeem_script } => Some(redeem_script),
+                redeem_script: match i.spend_info {
+                    SpendInfo::P2pkh { .. } => None,
+                    SpendInfo::P2sh { redeem_script } => Some(redeem_script),
                 },
                 partial_signatures: BTreeMap::new(),
                 sighash_type: SighashType::ALL,
@@ -603,8 +629,8 @@ impl Bundle<Unauthorized> {
             .iter()
             .enumerate()
             .map(|(index, info)| {
-                match info.kind {
-                    InputKind::P2pkh { pubkey } => {
+                match info.spend_info {
+                    SpendInfo::P2pkh { pubkey } => {
                         // Find the matching signing key.
                         let (sk, _) = signing_set
                             .keys
@@ -634,7 +660,7 @@ impl Bundle<Unauthorized> {
                         ]))
                     }
                     // P2SH is unsupported here; use the PCZT workflow instead.
-                    InputKind::P2sh { .. } => Err(Error::InvalidAddress),
+                    SpendInfo::P2sh { .. } => Err(Error::InvalidAddress),
                 }
             });
 
@@ -750,7 +776,7 @@ impl TransparentSignatureContext<'_, secp256k1::VerifyOnly> {
             let sighash_msg = secp256k1::Message::from_digest(self.sighashes[input_idx]);
 
             // We only support external signatures for P2PKH inputs.
-            if let InputKind::P2pkh { pubkey } = &input_info.kind {
+            if let SpendInfo::P2pkh { pubkey } = &input_info.spend_info {
                 if self
                     .secp_ctx
                     .verify_ecdsa(&sighash_msg, signature, pubkey)
@@ -862,8 +888,8 @@ mod tests {
 
         // Create a builder and add the inputs and a dummy output
         let mut builder = TransparentBuilder::empty();
-        builder.add_input(pk1, utxo1, coin1).unwrap();
-        builder.add_input(pk2, utxo2, coin2).unwrap();
+        builder.add_p2pkh_input(pk1, utxo1, coin1).unwrap();
+        builder.add_p2pkh_input(pk2, utxo2, coin2).unwrap();
         builder
             .add_output(&taddr, Zatoshis::from_u64(5000).unwrap())
             .unwrap();
@@ -915,7 +941,7 @@ mod tests {
         // Create one input with a known secret key
         let (_sk1, pk1, coin1, utxo1) = new_p2pkh_spend_with_key([1; 32]);
         let mut builder = TransparentBuilder::empty();
-        builder.add_input(pk1, utxo1, coin1).unwrap();
+        builder.add_p2pkh_input(pk1, utxo1, coin1).unwrap();
         let bundle = builder.build().unwrap();
 
         // Prepare the signing context
@@ -952,9 +978,9 @@ mod tests {
 
         let mut builder = TransparentBuilder::empty();
         // Add the first input associated with pk.
-        builder.add_input(pk, utxo1, coin.clone()).unwrap();
+        builder.add_p2pkh_input(pk, utxo1, coin.clone()).unwrap();
         // Add the second, distinct input that is also associated with pk.
-        builder.add_input(pk, utxo2, coin).unwrap();
+        builder.add_p2pkh_input(pk, utxo2, coin).unwrap();
 
         let bundle = builder.build().unwrap();
 
@@ -983,8 +1009,8 @@ mod tests {
         let (_sk2, pk2, coin2, utxo2) = new_p2pkh_spend_with_key([2; 32]);
 
         let mut builder = TransparentBuilder::empty();
-        builder.add_input(pk1, utxo1, coin1).unwrap();
-        builder.add_input(pk2, utxo2, coin2).unwrap();
+        builder.add_p2pkh_input(pk1, utxo1, coin1).unwrap();
+        builder.add_p2pkh_input(pk2, utxo2, coin2).unwrap();
         let bundle = builder.build().unwrap();
 
         // Prepare the signing context

From 77c422f1bd56400c9647f089c87f3776e16fd212 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Fri, 19 Dec 2025 15:18:02 -0700
Subject: [PATCH 090/263] zcash_primitives: Adapt builder API to use
 `TransparentInputInfo` directly.

---
 zcash_primitives/CHANGELOG.md               | 5 ++++-
 zcash_primitives/src/transaction/builder.rs | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md
index cf6a611a16..fd5a32b0fd 100644
--- a/zcash_primitives/CHANGELOG.md
+++ b/zcash_primitives/CHANGELOG.md
@@ -13,6 +13,7 @@ workspace.
 ### Added
 - `zcash_primitives::transaction::builder`:
   - `impl<FE> From<coinbase::Error> for Error<FE>`
+  - `Builder::add_transparent_p2pkh_input`
 
 ### Changed
 - MSRV is now 1.85.1.
@@ -21,7 +22,9 @@ workspace.
   - `Error` has a new `Coinbase` variant.
   - `Builder::add_orchard_output`'s `value` parameter now has type `Zatoshis`
     instead of `u64`.
-  - `Builder::add_transparent_input` has been renamed to `add_transparent_p2pkh_input`.
+  - `Builder::add_transparent_input` now takes a `zcash_transparent::builder::TransparentInputInfo`
+    instead of its constituent parts. Use `Builder::add_transparent_p2pkh_input` if you need the
+    previous API.
   - `BuildConfig`:
     -  The `Coinbase` variant now includes an `Option<zcash_script::opcode::PushValue>` payload.
     -  No longer implements `Copy`.
diff --git a/zcash_primitives/src/transaction/builder.rs b/zcash_primitives/src/transaction/builder.rs
index 6707e1de38..3e8d6612b8 100644
--- a/zcash_primitives/src/transaction/builder.rs
+++ b/zcash_primitives/src/transaction/builder.rs
@@ -551,6 +551,12 @@ impl<P: consensus::Parameters, U> Builder<'_, P, U> {
             .map_err(Error::SaplingBuild)
     }
 
+    /// Adds a transparent coin to be spent in this transaction.
+    #[cfg(feature = "transparent-inputs")]
+    pub fn add_transparent_input(&mut self, input: TransparentInputInfo) {
+        self.transparent_builder.add_input(input)
+    }
+
     /// Adds a transparent P2PKH coin to be spent in this transaction.
     #[cfg(feature = "transparent-inputs")]
     pub fn add_transparent_p2pkh_input(

From 9303994d1a955ed2bebda779460a276be6d2b545 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Fri, 19 Dec 2025 15:43:26 -0700
Subject: [PATCH 091/263] Apply suggestions from code review

Co-authored-by: Jack Grigg <jack@electriccoin.co>
---
 zcash_transparent/src/builder.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zcash_transparent/src/builder.rs b/zcash_transparent/src/builder.rs
index c863f77e09..4123a9e70e 100644
--- a/zcash_transparent/src/builder.rs
+++ b/zcash_transparent/src/builder.rs
@@ -155,8 +155,8 @@ fn construct_script_sig(
     ])
 }
 
-/// Information required to spend a transparent coin; the secp256k public key when spending a p2pkh
-/// output, or the redeem script when spending a p2sh output.
+/// Information required to spend a transparent coin; the secp256k1 public key when spending a P2PKH
+/// output, or the redeem script when spending a P2SH output.
 #[cfg(feature = "transparent-inputs")]
 #[derive(Debug, Clone)]
 pub enum SpendInfo {

From 97b7b82e45f15551afa3921a3ba4a1a179661dbc Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Fri, 2 Jan 2026 08:34:38 +1300
Subject: [PATCH 092/263] eip681: error enum is non_exhaustive

---
 components/eip681/src/error.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/eip681/src/error.rs b/components/eip681/src/error.rs
index 0c750af7f5..485505d9f2 100644
--- a/components/eip681/src/error.rs
+++ b/components/eip681/src/error.rs
@@ -7,6 +7,7 @@ use crate::{Number, Value};
 /// Errors discovered during parsing.
 #[derive(Debug, Snafu)]
 #[snafu(visibility(pub(crate)))]
+#[non_exhaustive]
 pub enum ParseError<'a> {
     /// A parsing error generated by `nom`.
     #[snafu(display("{}", nom::error::Error::to_string(&nom::error::Error {

From ce41e78b74e5420a93e9a6bf9b632fe28049f52f Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Fri, 2 Jan 2026 08:37:07 +1300
Subject: [PATCH 093/263] eip681: all parse errors are recoverable

---
 components/eip681/src/error.rs | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/components/eip681/src/error.rs b/components/eip681/src/error.rs
index 485505d9f2..7699e28a61 100644
--- a/components/eip681/src/error.rs
+++ b/components/eip681/src/error.rs
@@ -84,17 +84,7 @@ impl<'a> nom::error::ParseError<&'a str> for ParseError<'a> {
 
 impl<'a> From<ParseError<'a>> for nom::Err<ParseError<'a>> {
     fn from(value: ParseError<'a>) -> Self {
-        if value.is_recoverable() {
-            nom::Err::Error(value)
-        } else {
-            nom::Err::Failure(value)
-        }
-    }
-}
-
-impl ParseError<'_> {
-    pub fn is_recoverable(&self) -> bool {
-        true
+        nom::Err::Error(value)
     }
 }
 

From c00c42e608867d17e221c89134f8b3e98624fd63 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Fri, 2 Jan 2026 08:39:25 +1300
Subject: [PATCH 094/263] eip681: simplify counting digits

---
 components/eip681/src/parse.rs | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index 460f01efbe..25bb4c58b1 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -36,15 +36,12 @@ impl Digits {
     /// Errors if internal arithmetic operations overflow.
     pub fn as_u64(&self) -> Result<u64, ValidationError> {
         let mut total = 0u64;
-        for (mag, digit) in self.places.iter().rev().enumerate() {
-            let increment = (*digit as u64)
-                .checked_mul(
-                    10u64
-                        .checked_pow(u32::try_from(mag).context(IntegerSnafu)?)
-                        .context(OverflowSnafu)?,
-                )
+        for digit in &self.places {
+            total = total
+                .checked_mul(10)
+                .context(OverflowSnafu)?
+                .checked_add(*digit as u64)
                 .context(OverflowSnafu)?;
-            total = total.checked_add(increment).context(OverflowSnafu)?;
         }
         Ok(total)
     }

From 6802f1c149770fe3a8b40adece768485387ee414 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Fri, 2 Jan 2026 08:58:31 +1300
Subject: [PATCH 095/263] eip681: fix gas price documentation

---
 components/eip681/src/parse.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index 25bb4c58b1..9903f01624 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -606,7 +606,7 @@ pub enum Parameter {
     Gas(Number),
     /// Suggested user-editable value for the gas limit of the transaction.
     GasLimit(Number),
-    /// Synonym for "gas".
+    /// Suggested user-editable value for the gas price of the transaction.
     GasPrice(Number),
     /// A "type" parameter denotes a positional parameter provided to the function
     /// named by `function_name`. For information about `function_name` see the ABNF

From e3e08b333eb2fd0894d920436fa1e0ba94dfd6a6 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Fri, 2 Jan 2026 09:54:15 +1300
Subject: [PATCH 096/263] eip681: refactor simplifications

---
 components/eip681/src/error.rs |  1 +
 components/eip681/src/parse.rs | 21 ++++++++++-----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/components/eip681/src/error.rs b/components/eip681/src/error.rs
index 7699e28a61..9ea34941e3 100644
--- a/components/eip681/src/error.rs
+++ b/components/eip681/src/error.rs
@@ -91,6 +91,7 @@ impl<'a> From<ParseError<'a>> for nom::Err<ParseError<'a>> {
 /// Errors discovered after parsing, usually when attempting to convert parsed
 /// types into numeric types.
 #[derive(Debug, Snafu, PartialEq)]
+#[non_exhaustive]
 #[snafu(visibility(pub(crate)))]
 pub enum ValidationError {
     #[snafu(display("Exponent is too small, expected at least {expected}, saw {seen}"))]
diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index 9903f01624..47e9801ab0 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -52,17 +52,7 @@ impl Digits {
         let denominator = 10u64
             .checked_pow(u32::try_from(self.places.len()).context(IntegerSnafu)?)
             .context(OverflowSnafu)?;
-        let mut numerator = 0u64;
-
-        for digit in self.places.iter() {
-            numerator = numerator
-                .checked_mul(10)
-                .context(OverflowSnafu)?
-                .checked_add(*digit as u64)
-                .context(OverflowSnafu)?;
-        }
-
-        Ok((numerator, denominator))
+        Ok((self.as_u64()?, denominator))
     }
 
     pub fn from_u64(mut v: u64) -> Self {
@@ -1559,4 +1549,13 @@ mod test {
         assert_eq!(2, number.integer().unwrap());
         assert_eq!(2.014e18 as i128, number.as_i128().unwrap());
     }
+
+    #[test]
+    fn digits_as_decimal_ratio_sanity() {
+        let input = "0001234";
+        let (_, digits) = Digits::parse_min(input, 1).unwrap();
+        let ratio = digits.as_decimal_ratio().unwrap();
+        assert_eq!((1234, 10_000_000), ratio);
+        assert_eq!(0.0001234, ratio.0 as f32 / ratio.1 as f32);
+    }
 }

From 64d9c1012293de9fc428a49cb6b067c5ea105116 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Fri, 2 Jan 2026 10:13:59 +1300
Subject: [PATCH 097/263] eip681: allow multiple identical parameter values

---
 components/eip681/src/parse.rs | 36 +++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index 47e9801ab0..a21a09c160 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -12,7 +12,7 @@ use crate::error::*;
 /// ```abnf
 /// *DIGIT
 /// ```
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Digits {
     places: Vec<u8>,
 }
@@ -148,7 +148,7 @@ impl HexDigits {
 ///
 /// Other implementations use regular expressions instead of parsing, and only
 /// support very specific values.
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub struct Number {
     /// true for "+", false for "-"
     signum: Option<bool>,
@@ -731,15 +731,16 @@ impl Parameters {
     /// Returns the number value of the parameter with the "value" key, if any.
     ///
     /// ## Errors
-    /// Errors if there are more than one parameter with the key "value".
+    /// Errors if there are more than one parameter with the key "value", and the
+    /// values of those parameters are not equal.
     pub fn value(&self) -> Result<Option<Number>, ValidationError> {
-        let mut values = self
+        let values = self
             .iter()
             .filter_map(|p| match p {
                 Parameter::Value(n) => Some(n.clone()),
                 _ => None,
             })
-            .collect::<Vec<_>>();
+            .collect::<std::collections::HashSet<_>>();
         snafu::ensure!(
             values.len() <= 1,
             MultipleParameterValuesSnafu {
@@ -747,22 +748,22 @@ impl Parameters {
                 values: values.into_iter().map(Value::Number).collect::<Vec<_>>(),
             }
         );
-        Ok(values.pop())
+        Ok(values.into_iter().next())
     }
 
     /// Returns the number value of the parameter with the "gas" or "gasLimit" key, if any.
     ///
     /// ## Errors
-    /// Errors if there are more than one parameter with the key "gas" or "gas_limit".
+    /// Errors if there are more than one parameter with the key "gas_limit", and those
+    /// values are not equal.
     pub fn gas_limit(&self) -> Result<Option<Number>, ValidationError> {
-        let mut values = self
+        let values = self
             .iter()
             .filter_map(|p| match p {
-                Parameter::Gas(n) => Some(n.clone()),
                 Parameter::GasLimit(n) => Some(n.clone()),
                 _ => None,
             })
-            .collect::<Vec<_>>();
+            .collect::<std::collections::HashSet<_>>();
         snafu::ensure!(
             values.len() <= 1,
             MultipleParameterValuesSnafu {
@@ -770,21 +771,24 @@ impl Parameters {
                 values: values.into_iter().map(Value::Number).collect::<Vec<_>>(),
             }
         );
-        Ok(values.pop())
+        Ok(values.into_iter().next())
     }
 
-    /// Returns the number value of the parameter with the "gasPrice" key, if any.
+    /// Returns the number value of the parameter with the "gasPrice" or "gas" key,
+    /// if any.
     ///
     /// ## Errors
-    /// Errors if there are more than one parameter with the key "gasPrice".
+    /// Errors if there are more than one parameter with the key "gasPrice"
+    /// or "gas", and the values of those parameters are not equal.
     pub fn gas_price(&self) -> Result<Option<Number>, ValidationError> {
-        let mut values = self
+        let values = self
             .iter()
             .filter_map(|p| match p {
+                Parameter::Gas(n) => Some(n.clone()),
                 Parameter::GasPrice(n) => Some(n.clone()),
                 _ => None,
             })
-            .collect::<Vec<_>>();
+            .collect::<std::collections::HashSet<_>>();
         snafu::ensure!(
             values.len() <= 1,
             MultipleParameterValuesSnafu {
@@ -792,7 +796,7 @@ impl Parameters {
                 values: values.into_iter().map(Value::Number).collect::<Vec<_>>(),
             }
         );
-        Ok(values.pop())
+        Ok(values.into_iter().next())
     }
 
     /// Returns an iterator over all ABI type parameters.

From d0581a1660cba8a0eaf426c3175fdc4fed4eb75d Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Fri, 2 Jan 2026 10:15:15 +1300
Subject: [PATCH 098/263] Update supply-chain/audits.toml

Co-authored-by: Jack Grigg <jack@electriccoin.co>
---
 supply-chain/audits.toml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
index 02f4d6608d..c31056b62a 100644
--- a/supply-chain/audits.toml
+++ b/supply-chain/audits.toml
@@ -19,10 +19,19 @@ criteria = "safe-to-deploy"
 delta = "1.0.82 -> 1.0.83"
 
 [[audits.anyhow]]
-who = "Schell Carl Scivally <efsubenovex@gmail.com>"
+who = "Jack Grigg <jack@electriccoin.co>"
 criteria = "safe-to-deploy"
 delta = "1.0.97 -> 1.0.100"
-notes = "Contains mostly configuration for no_std support and conditionally generating backtraces."
+notes = """
+Changes to the build script are to enable reusing the probe file within the crate, enable
+more features on newer Rust versions, and catch more errors.
+
+Most of the changes to `unsafe` code are refactors to surrounding safe code, and not
+actually altering the `unsafe` blocks. The new instances of `unsafe` are to allow errors
+to be converted to `Box<dyn std::error:Error>` in a way that supports downcasting (at the
+cost of backtraces), via a new vtable method. The `unsafe` blocks in the new code appear
+to match how boxing and downcasting logic is done in other existing vtable methods.
+"""
 
 [[audits.arti-client]]
 who = "Jack Grigg <jack@electriccoin.co>"

From c35fd801f8622c9483a44082fc9fd34e06c31cd4 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Fri, 2 Jan 2026 11:03:21 +1300
Subject: [PATCH 099/263] eip681: re-audit schemars

---
 supply-chain/audits.toml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
index c31056b62a..e49bbe5e81 100644
--- a/supply-chain/audits.toml
+++ b/supply-chain/audits.toml
@@ -822,12 +822,21 @@ delta = "0.4.8 -> 0.6.0"
 who = "Schell Carl Scivally <efsubenovex@gmail.com>"
 criteria = "safe-to-deploy"
 delta = "0.8.12 -> 0.9.0"
+notes = """
+The changes are primarily API refactoring and simplification, dependency updates, new type implementations, and feature flag reorganization.
+The crate changed from #![forbid(unsafe_code)] (line 9347) to #![deny(unsafe_code)] (line 9348), to accommodate the ref-cast crate integration which requires #[allow(unsafe_code)] on specific functions.
+The only notable change is the ref-cast usage which is a sound pattern for creating transparent newtype wrappers.
+"""
 
 [[audits.schemars]]
 who = "Schell Carl Scivally <efsubenovex@gmail.com>"
 criteria = "safe-to-deploy"
 delta = "0.9.0 -> 1.1.0"
-notes = "These changes improve security by forbidding unsafe code."
+notes = """
+This update contains no unsafe code, no ambient capability usage, and no changes that could be exploited by untrusted input.
+The changes are purely schema generation logic improvements, API refinements, and dependency updates.
+This reverts a previous change that lowered #[forbid(unsafe_code)] to #[deny(unsafe_code)].
+"""
 
 [[audits.secp256k1]]
 who = "Jack Grigg <jack@electriccoin.co>"

From 168a9d7f97466016a67520003b52e01b1590a262 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Fri, 2 Jan 2026 11:05:07 +1300
Subject: [PATCH 100/263] eip681: re-use Overflow error and remove Saturation

---
 components/eip681/src/error.rs | 5 +----
 components/eip681/src/parse.rs | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/components/eip681/src/error.rs b/components/eip681/src/error.rs
index 9ea34941e3..8fb8123296 100644
--- a/components/eip681/src/error.rs
+++ b/components/eip681/src/error.rs
@@ -2,7 +2,7 @@
 
 use snafu::prelude::*;
 
-use crate::{Number, Value};
+use crate::Value;
 
 /// Errors discovered during parsing.
 #[derive(Debug, Snafu)]
@@ -100,9 +100,6 @@ pub enum ValidationError {
     #[snafu(display("Exponent is too large, expected at most {expected}, saw {seen}"))]
     LargeExponent { expected: usize, seen: u64 },
 
-    #[snafu(display("Number {seen} is too big and has saturated"))]
-    Saturation { seen: Number },
-
     #[snafu(display(
         "Arithmetic operation resulted in an overflow, exceeding the allowable range"
     ))]
diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index a21a09c160..325275627b 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -290,13 +290,13 @@ impl Number {
         );
         let multiplied_integer = (integer as i128)
             .checked_mul(multiplier)
-            .with_context(|| SaturationSnafu { seen: self.clone() })?;
+            .with_context(|| OverflowSnafu)?;
         let decimal_multiplier = multiplier
             .checked_div(decimal_denominator as i128)
             .context(OverflowSnafu)?;
         let multiplied_decimal = (decimal_numerator as i128)
             .checked_mul(decimal_multiplier)
-            .with_context(|| SaturationSnafu { seen: self.clone() })?;
+            .with_context(|| OverflowSnafu)?;
         let value = multiplied_integer
             .checked_add(multiplied_decimal)
             .context(OverflowSnafu)?;

From a523daf78c204c7d16da7cb71068bff9fa5d3ce3 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Fri, 2 Jan 2026 11:18:01 +1300
Subject: [PATCH 101/263] eip681: docs mention core rules of ABNF, EIP-137

---
 components/eip681/src/lib.rs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/components/eip681/src/lib.rs b/components/eip681/src/lib.rs
index c19c25f5f2..3d54f3d671 100644
--- a/components/eip681/src/lib.rs
+++ b/components/eip681/src/lib.rs
@@ -17,6 +17,18 @@
 //! value            = number / ethereum_address / STRING
 //! number           = [ "-" / "+" ] *DIGIT [ "." 1*DIGIT ] [ ( "e" / "E" ) [ 1*DIGIT ] ]
 //! ```
+//!
+//! Where `TYPE` is a standard ABI type name, as defined in Ethereum Contract
+//! ABI specification. `STRING` is a URL-encoded unicode string of arbitrary
+//! length, where delimiters and the percentage symbol (%) are mandatorily
+//! hex-encoded with a % prefix.
+//!
+//! For the syntax of `ENS_NAME`, please consult
+//! [ERC-137](https://eips.ethereum.org/EIPS/eip-137) defining Ethereum Name Service.
+//!
+//! See
+//! [ABNF core rules](https://en.wikipedia.org/wiki/Augmented_Backus%E2%80%93Naur_form#Core_rules)
+//! for general information about the `ABNF` format.
 
 pub mod error;
 mod parse;

From f07f454d7451b184d8dc96299ed702f95a457f86 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Jan 2026 05:02:49 +0000
Subject: [PATCH 102/263] build(deps): bump astral-sh/setup-uv from 7.1.2 to
 7.2.0

Bumps [astral-sh/setup-uv](https://github.com/astral-sh/setup-uv) from 7.1.2 to 7.2.0.
- [Release notes](https://github.com/astral-sh/setup-uv/releases)
- [Commits](https://github.com/astral-sh/setup-uv/compare/85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41...61cb8a9741eeb8a550a1b8544337180c0fc8476b)

---
updated-dependencies:
- dependency-name: astral-sh/setup-uv
  dependency-version: 7.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/zizmor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml
index 221d6ac104..4b4bc61950 100644
--- a/.github/workflows/zizmor.yml
+++ b/.github/workflows/zizmor.yml
@@ -19,7 +19,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
+        uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
       - name: Run zizmor 🌈
         run: uvx zizmor --format sarif . > results.sarif
         env:

From d47a5fcd871d3a1fa141ae6f4c8f25278e0a1f02 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 9 Jan 2026 05:38:20 +0000
Subject: [PATCH 103/263] build(deps): bump EmbarkStudios/cargo-deny-action
 from 2.0.14 to 2.0.15

Bumps [EmbarkStudios/cargo-deny-action](https://github.com/embarkstudios/cargo-deny-action) from 2.0.14 to 2.0.15.
- [Release notes](https://github.com/embarkstudios/cargo-deny-action/releases)
- [Commits](https://github.com/embarkstudios/cargo-deny-action/compare/76cd80eb775d7bbbd2d80292136d74d39e1b4918...3fd3802e88374d3fe9159b834c7714ec57d6c979)

---
updated-dependencies:
- dependency-name: EmbarkStudios/cargo-deny-action
  dependency-version: 2.0.15
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/audits.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/audits.yml b/.github/workflows/audits.yml
index 8466d951fd..976af26be2 100644
--- a/.github/workflows/audits.yml
+++ b/.github/workflows/audits.yml
@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
-      - uses: EmbarkStudios/cargo-deny-action@76cd80eb775d7bbbd2d80292136d74d39e1b4918 # v2.0.14
+      - uses: EmbarkStudios/cargo-deny-action@3fd3802e88374d3fe9159b834c7714ec57d6c979 # v2.0.15
         with:
           command: check licenses
 

From 2f4ae00cbe070a3c7049e2abe65be686aeb18a53 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Fri, 9 Jan 2026 16:13:08 -0700
Subject: [PATCH 104/263] Minor improvement to `std` transitivity CHANGELOG
 message.

Co-authored-by: Jack Grigg <jack@electriccoin.co>
---
 zcash_keys/CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zcash_keys/CHANGELOG.md b/zcash_keys/CHANGELOG.md
index a714a58c9f..dfcd895450 100644
--- a/zcash_keys/CHANGELOG.md
+++ b/zcash_keys/CHANGELOG.md
@@ -16,8 +16,8 @@ workspace.
 ### Changed
 - MSRV is now 1.85.1.
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`.
-- `zcash_keys/std` now implies `orchard?/std`, `sapling?/std`,
-  `transparent/std`, and `zcash_address/std`.
+- The `std` feature flag now enables the equivalent flag on the dependencies
+  `orchard`, `sapling-crypto`, `zcash_transparent`, and `zcash_address`.
 
 ## [0.12.0] - 2025-10-13
 

From e439f1c754c0853f005903bbefb83552a8194686 Mon Sep 17 00:00:00 2001
From: John Boyd <john@coldnoise.net>
Date: Wed, 21 Jan 2026 11:23:51 -0600
Subject: [PATCH 105/263] fix: Fix cargo-vet store format errors

---
 supply-chain/audits.toml  | 12 ++++++------
 supply-chain/imports.lock | 14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
index a7900ffad1..c7c04d4a07 100644
--- a/supply-chain/audits.toml
+++ b/supply-chain/audits.toml
@@ -721,13 +721,13 @@ delta = "0.21.8 -> 0.21.12"
 notes = """
 A comment in get_sni_extension asks whether the behaviour of parsing an IPv4 or IPv6 address
 in a host_name field of a server_name extension, but then ignoring the extension (because
-'Literal IPv4 and IPv6 addresses are not permitted in \"HostName\"'), as the server, is
+'Literal IPv4 and IPv6 addresses are not permitted in "HostName"'), as the server, is
 compliant with RFC 6066. As an original author of RFC 3546 which has very similar wording,
 I can speak to the intent: yes this is fine. The client is clearly nonconformant in this
 case, but the server isn't.
 
-RFC 3546 said \"If the server understood the client hello extension but does not recognize
-the server name, it SHOULD send an \"unrecognized_name\" alert (which MAY be fatal).\"
+RFC 3546 said "If the server understood the client hello extension but does not recognize
+the server name, it SHOULD send an "unrecognized_name" alert (which MAY be fatal)."
 This wording was preserved in RFC 5746, and then updated in RFC 6066 to:
 
    If the server understood the ClientHello extension but
@@ -745,9 +745,9 @@ This wording was preserved in RFC 5746, and then updated in RFC 6066 to:
 
 To me it's clear that it is reasonable to consider an IP address as a name that the
 server does not recognize. And so the server SHOULD *either* send a fatal unrecognized_name
-alert, *or* continue the handshake and let the client application decide when it \"performs
-the server endpoint identification\". There's no conformance requirement for the server to
-take any notice of a host_name that is \"not permitted\". (It would have been clearer to
+alert, *or* continue the handshake and let the client application decide when it "performs
+the server endpoint identification". There's no conformance requirement for the server to
+take any notice of a host_name that is "not permitted". (It would have been clearer to
 express this by specifying the allowed client and server behaviour separately, i.e. saying
 that the client MUST NOT send an IP address in host_name, and then explicitly specifying
 the server behaviour if it does so anyway. That's how I would write it now. But honestly
diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index 52487240a4..7616852b0f 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -809,7 +809,7 @@ delta = "0.3.27 -> 0.3.31"
 who = "Pat Hickey <pat@moreproductive.org>"
 criteria = "safe-to-deploy"
 delta = "0.3.27 -> 0.3.31"
-notes = "New waker_ref module contains \"FIXME: panics on Arc::clone / refcount changes could wreak havoc...\" comment, but this corner case feels low risk."
+notes = 'New waker_ref module contains "FIXME: panics on Arc::clone / refcount changes could wreak havoc..." comment, but this corner case feels low risk.'
 
 [[audits.bytecode-alliance.audits.hashbrown]]
 who = "Chris Fallin <chris@cfallin.org>"
@@ -1593,8 +1593,8 @@ who = "Lukasz Anforowicz <lukasza@chromium.org>"
 criteria = "safe-to-deploy"
 version = "1.0.35"
 notes = """
-Grepped for \"unsafe\", \"crypt\", \"cipher\", \"fs\", \"net\" - there were no hits
-(except for benign \"net\" hit in tests and \"fs\" hit in README.md)
+Grepped for "unsafe", "crypt", "cipher", "fs", "net" - there were no hits
+(except for benign "net" hit in tests and "fs" hit in README.md)
 """
 aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT"
 
@@ -1656,7 +1656,7 @@ and there were no hits except for:
 * Using `unsafe` in a string:
 
     ```
-    src/constfn.rs:            \"unsafe\" => Qualifiers::Unsafe,
+    src/constfn.rs:            "unsafe" => Qualifiers::Unsafe,
     ```
 
 * Using `std::fs` in `build/build.rs` to write `${OUT_DIR}/version.expr`
@@ -1798,7 +1798,7 @@ aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_p
 who = "Lukasz Anforowicz <lukasza@chromium.org>"
 criteria = "safe-to-deploy"
 version = "1.0.197"
-notes = "Grepped for \"unsafe\", \"crypt\", \"cipher\", \"fs\", \"net\" - there were no hits"
+notes = 'Grepped for "unsafe", "crypt", "cipher", "fs", "net" - there were no hits'
 aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT"
 
 [[audits.google.audits.serde_derive]]
@@ -1811,7 +1811,7 @@ aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_p
 who = "Lukasz Anforowicz <lukasza@chromium.org>"
 criteria = "safe-to-deploy"
 delta = "1.0.202 -> 1.0.203"
-notes = "Grepped for \"unsafe\", \"crypt\", \"cipher\", \"fs\", \"net\" - there were no hits"
+notes = 'Grepped for "unsafe", "crypt", "cipher", "fs", "net" - there were no hits'
 aggregated-from = "https://chromium.googlesource.com/chromium/src/+/main/third_party/rust/chromium_crates_io/supply-chain/audits.toml?format=TEXT"
 
 [[audits.google.audits.serde_derive]]
@@ -3538,7 +3538,7 @@ Uses `unsafe` blocks to interact with `windows-sys` crate.
 - The slice constructed from the `PWSTR` correctly goes out of scope before
   `guard` is dropped.
 - A code comment says that `path_ptr` is valid for `len` bytes, but `PCWSTR` is
-  a `*const u16` and `lstrlenW` returns its length \"in characters\" (which the
+  a `*const u16` and `lstrlenW` returns its length "in characters" (which the
   Windows documentation confirms means the number of `WCHAR` values). This is
   likely a typo; the code checks that `len * size_of::<u16>() <= isize::MAX`.
 """

From 83ef1dbdf33e4a160d9324614c3513b0f9668a88 Mon Sep 17 00:00:00 2001
From: John Boyd <john@coldnoise.net>
Date: Tue, 20 Jan 2026 16:10:43 -0600
Subject: [PATCH 106/263] fix: Fix github-pages build

cargo-doc was failing due to doc references to modules behind feature
gates. This commit enables all features when building docs for the
gitbook.
---
 .github/workflows/book.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/book.yml b/.github/workflows/book.yml
index 03ef63dde8..3b160cffd4 100644
--- a/.github/workflows/book.yml
+++ b/.github/workflows/book.yml
@@ -14,6 +14,8 @@ jobs:
           persist-credentials: false
       - id: prepare
         uses: ./.github/actions/prepare
+        with:
+          all-features: true
       - uses: dtolnay/rust-toolchain@nightly
         id: toolchain
       - run: rustup override set "${TOOLCHAIN}"

From 95bd1ea3cc7bc54dc1ae42e27ce77608cf2c5471 Mon Sep 17 00:00:00 2001
From: John Boyd <john@coldnoise.net>
Date: Wed, 21 Jan 2026 13:52:23 -0600
Subject: [PATCH 107/263] fix: Collect prepare-all flags when deploying

The 'prepare' action forgets to collect the output from the
`prepare-all` step, causing the `--all-features` flag to get lost.
---
 .github/actions/prepare/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/prepare/action.yml b/.github/actions/prepare/action.yml
index 567b3e259c..e055cf1fff 100644
--- a/.github/actions/prepare/action.yml
+++ b/.github/actions/prepare/action.yml
@@ -28,7 +28,7 @@ inputs:
 outputs:
   feature-flags:
     description: 'Feature flags'
-    value: ${{ steps.prepare.outputs.flags }}
+    value: ${{ steps.prepare.outputs.flags || steps.prepare-all.outputs.flags }}
 runs:
   using: 'composite'
   steps:

From cf8022fc4a968bca5feb9f1ca229945847f5ea28 Mon Sep 17 00:00:00 2001
From: John Boyd <john@coldnoise.net>
Date: Thu, 22 Jan 2026 13:14:06 -0600
Subject: [PATCH 108/263] Fix failing zip_0233 test

Test was failing due to a type mismatch:

```
error[E0308]: mismatched types
   --> zcash_primitives/src/transaction/tests.rs:410:29
    |
410 |             .map(|s| Script(s.clone()))
    |                      ------ ^^^^^^^^^ expected `Code`, found `Vec<u8>`
    |                      |
    |                      arguments to this struct are incorrect
    |
    = note: expected struct `Code`
               found struct `Vec<u8>`
```
---
 zcash_primitives/src/transaction/tests.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zcash_primitives/src/transaction/tests.rs b/zcash_primitives/src/transaction/tests.rs
index fcbfdbbfd8..84fbd44bbc 100644
--- a/zcash_primitives/src/transaction/tests.rs
+++ b/zcash_primitives/src/transaction/tests.rs
@@ -407,7 +407,7 @@ fn zip_0233() {
         let input_scriptpubkeys = tv
             .script_pubkeys
             .iter()
-            .map(|s| Script(s.clone()))
+            .map(|s| Script(script::Code(s.clone())))
             .collect();
 
         let test_bundle = txdata

From 63cecac2539d2ce57fa87e312f2b9a0ba0376648 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 05:42:03 +0000
Subject: [PATCH 109/263] build(deps): bump github/codeql-action from 4.31.0 to
 4.31.11

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.0 to 4.31.11.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/4e94bd11f71e507f7f87df81788dff88d1dacbfb...19b2f06db2b6f5108140aeb04014ef02b648f789)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.11
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/zizmor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml
index 221d6ac104..59aea9b3b8 100644
--- a/.github/workflows/zizmor.yml
+++ b/.github/workflows/zizmor.yml
@@ -25,7 +25,7 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
+        uses: github/codeql-action/upload-sarif@19b2f06db2b6f5108140aeb04014ef02b648f789 # v4.31.11
         with:
           sarif_file: results.sarif
           category: zizmor

From 1a909ab917815bb931fa5e76b50f970014617ec5 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Mon, 26 Jan 2026 15:58:50 +0000
Subject: [PATCH 110/263] CI: Migrate to pinned `actions/checkout@v6.0.2`

---
 .github/workflows/audits.yml |  4 ++--
 .github/workflows/book.yml   |  2 +-
 .github/workflows/ci.yml     | 30 +++++++++++++++---------------
 .github/workflows/zizmor.yml |  2 +-
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/audits.yml b/.github/workflows/audits.yml
index 976af26be2..cb4543fc39 100644
--- a/.github/workflows/audits.yml
+++ b/.github/workflows/audits.yml
@@ -13,7 +13,7 @@ jobs:
     name: Vet Rust dependencies
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
       - uses: dtolnay/rust-toolchain@stable
@@ -28,7 +28,7 @@ jobs:
     name: Check licenses
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
       - uses: EmbarkStudios/cargo-deny-action@3fd3802e88374d3fe9159b834c7714ec57d6c979 # v2.0.15
diff --git a/.github/workflows/book.yml b/.github/workflows/book.yml
index 3b160cffd4..a210d9faf7 100644
--- a/.github/workflows/book.yml
+++ b/.github/workflows/book.yml
@@ -9,7 +9,7 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
       - id: prepare
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4d8a7ffdb1..c06405d08e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,7 +48,7 @@ jobs:
       RUSTDOCFLAGS: ${{ matrix.rustflags }}
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
       - id: prepare
@@ -122,7 +122,7 @@ jobs:
       RUSTDOCFLAGS: ${{ matrix.rustflags }}
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
       - id: prepare
@@ -184,7 +184,7 @@ jobs:
       RUSTDOCFLAGS: ${{ matrix.rustflags }}
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
       - id: prepare
@@ -246,7 +246,7 @@ jobs:
       RUSTDOCFLAGS: ${{ matrix.rustflags }}
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
       - id: prepare
@@ -280,7 +280,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
       - id: prepare
@@ -324,7 +324,7 @@ jobs:
             build_deps: >
               gcc-multilib
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           path: crates
@@ -370,7 +370,7 @@ jobs:
             build_deps: >
               gcc-arm-none-eabi
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           path: crates
@@ -415,7 +415,7 @@ jobs:
     name: Bitrot check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
       # Build benchmarks to prevent bitrot
@@ -428,7 +428,7 @@ jobs:
     permissions:
       checks: write
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
       # We can't currently use only the common feature set (to exclude checking of
@@ -452,7 +452,7 @@ jobs:
       checks: write
     continue-on-error: true
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
       # We can't currently use only the common feature set (to exclude checking of
@@ -485,7 +485,7 @@ jobs:
       options: --security-opt seccomp=unconfined
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
       - id: prepare
@@ -518,7 +518,7 @@ jobs:
     name: Intra-doc links
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
       - id: prepare
@@ -544,7 +544,7 @@ jobs:
     name: Rustfmt
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
       - name: Check formatting
@@ -554,7 +554,7 @@ jobs:
     name: protobuf consistency
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
       - id: prepare
@@ -580,7 +580,7 @@ jobs:
     name: UUID validity
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
       - name: Extract UUIDs
diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml
index 62afa955e2..acc89eebcd 100644
--- a/.github/workflows/zizmor.yml
+++ b/.github/workflows/zizmor.yml
@@ -15,7 +15,7 @@ jobs:
       security-events: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
       - name: Install the latest version of uv

From 56d962d533e8a061f0237c5ec4cabd4bc2750de3 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Mon, 26 Jan 2026 16:00:38 +0000
Subject: [PATCH 111/263] CI: Migrate to `zizmorcore/zizmor-action`

---
 .github/workflows/zizmor.yml | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml
index acc89eebcd..24352f0ef1 100644
--- a/.github/workflows/zizmor.yml
+++ b/.github/workflows/zizmor.yml
@@ -4,28 +4,21 @@ on:
   push:
     branches: ["main"]
   pull_request:
-    branches: ["*"]
+    branches: ["**"]
+
+permissions: {}
 
 jobs:
   zizmor:
-    name: zizmor latest via Cargo
+    name: Run zizmor 🌈
     runs-on: ubuntu-latest
     permissions:
-      contents: read
-      security-events: write
+      security-events: write # Required for upload-sarif (used by zizmor-action) to upload SARIF files.
     steps:
       - name: Checkout repository
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
-      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
+
       - name: Run zizmor 🌈
-        run: uvx zizmor --format sarif . > results.sarif
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@19b2f06db2b6f5108140aeb04014ef02b648f789 # v4.31.11
-        with:
-          sarif_file: results.sarif
-          category: zizmor
+        uses: zizmorcore/zizmor-action@135698455da5c3b3e55f73f4419e481ab68cdd95 # v0.4.1

From 87cdcc319cfb516677c303adbb9399fb125afd2a Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Mon, 26 Jan 2026 16:03:47 +0000
Subject: [PATCH 112/263] CI: Migrate to pinned `actions/cache@v5.0.2`

---
 .github/workflows/ci.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c06405d08e..8449869876 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -59,7 +59,7 @@ jobs:
           all-pools: ${{ matrix.all-pools || false }}
           all-features: ${{ matrix.all-features || false }}
           extra-features: ${{ matrix.extra_flags || '' }}
-      - uses: actions/cache@v4
+      - uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
         with:
           path: |
             ~/.cargo/bin/
@@ -133,7 +133,7 @@ jobs:
           all-pools: ${{ matrix.all-pools || false }}
           all-features: ${{ matrix.all-features || false }}
           extra-features: ${{ matrix.extra_flags || '' }}
-      - uses: actions/cache@v4
+      - uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
         with:
           path: |
             ~/.cargo/bin/
@@ -195,7 +195,7 @@ jobs:
           all-pools: false
           all-features: ${{ matrix.all-features || false }}
           extra-features: ${{ matrix.extra_flags || '' }}
-      - uses: actions/cache@v4
+      - uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
         with:
           path: |
             ~/.cargo/bin/
@@ -254,7 +254,7 @@ jobs:
         with:
           all-features: ${{ matrix.all-features || false }}
           extra-features: ${{ matrix.extra_flags || '' }}
-      - uses: actions/cache@v4
+      - uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
         with:
           path: |
             ~/.cargo/bin/
@@ -285,7 +285,7 @@ jobs:
           persist-credentials: false
       - id: prepare
         uses: ./.github/actions/prepare
-      - uses: actions/cache@v4
+      - uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
         with:
           path: |
             ~/.cargo/bin/
@@ -490,7 +490,7 @@ jobs:
           persist-credentials: false
       - id: prepare
         uses: ./.github/actions/prepare
-      - uses: actions/cache@v4
+      - uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
         with:
           path: |
             ~/.cargo/bin/

From a6a55cdfcda1bede382bf55ea392418de8590596 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Tue, 27 Jan 2026 07:34:25 +1300
Subject: [PATCH 113/263] Update components/eip681/src/parse.rs

Co-authored-by: Daira-Emma Hopwood <daira@jacaranda.org>
---
 components/eip681/src/parse.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index 325275627b..5b8aec9d23 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -46,8 +46,8 @@ impl Digits {
         Ok(total)
     }
 
-    /// Returns the digits as a ratio, where prefixed zeros
-    /// are treated as a denominator.
+    /// Returns the ratio corresponding to the decimal number `0.<digits>`,
+    /// i.e. the denominator will be `10^len(digits)`.
     fn as_decimal_ratio(&self) -> Result<(u64, u64), ValidationError> {
         let denominator = 10u64
             .checked_pow(u32::try_from(self.places.len()).context(IntegerSnafu)?)

From 0fb8b6d6818bf022ebd1fd8b6c50daa1e8c609de Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Tue, 27 Jan 2026 07:35:17 +1300
Subject: [PATCH 114/263] Update components/eip681/src/parse.rs

Co-authored-by: Jack Grigg <thestr4d@gmail.com>
---
 components/eip681/src/parse.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index 5b8aec9d23..e8a441de9a 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -241,7 +241,7 @@ impl Number {
     ///
     /// ## Errors
     /// Errors if internal arithmetic operations overflow.
-    pub fn integer(&self) -> Result<u64, ValidationError> {
+    fn integer(&self) -> Result<u64, ValidationError> {
         self.integer.as_u64()
     }
 

From 90e3cf4bd9698f7c2df99cacce700ad9ef459792 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Tue, 27 Jan 2026 07:44:46 +1300
Subject: [PATCH 115/263] fix: 'gas' is not a synonym for 'gasPrice'

---
 components/eip681/src/parse.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index e8a441de9a..57524a0535 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -774,7 +774,7 @@ impl Parameters {
         Ok(values.into_iter().next())
     }
 
-    /// Returns the number value of the parameter with the "gasPrice" or "gas" key,
+    /// Returns the number value of the parameter with the "gasPrice",
     /// if any.
     ///
     /// ## Errors
@@ -784,7 +784,6 @@ impl Parameters {
         let values = self
             .iter()
             .filter_map(|p| match p {
-                Parameter::Gas(n) => Some(n.clone()),
                 Parameter::GasPrice(n) => Some(n.clone()),
                 _ => None,
             })
@@ -792,7 +791,7 @@ impl Parameters {
         snafu::ensure!(
             values.len() <= 1,
             MultipleParameterValuesSnafu {
-                key: "gasLimit",
+                key: "gasPrice",
                 values: values.into_iter().map(Value::Number).collect::<Vec<_>>(),
             }
         );

From 1bace606268f6ad5513543fcdc272c78077def36 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Tue, 27 Jan 2026 08:22:15 +1300
Subject: [PATCH 116/263] fix: better Parameters documentation and duplicate
 handling

---
 components/eip681/src/error.rs |  7 ++-
 components/eip681/src/parse.rs | 78 ++++++++++++++++++++--------------
 2 files changed, 51 insertions(+), 34 deletions(-)

diff --git a/components/eip681/src/error.rs b/components/eip681/src/error.rs
index 8fb8123296..be3ed5d68f 100644
--- a/components/eip681/src/error.rs
+++ b/components/eip681/src/error.rs
@@ -114,9 +114,12 @@ pub enum ValidationError {
 
     /// More than one value exists in a parameter list with a key
     /// that denotes a single value.
-    #[snafu(display("More than one parameter by the key '{key}', saw: [{}]", values.iter().map(|v| v.to_string()).collect::<Vec<_>>().join(", ")))]
+    #[snafu(display(
+        "More than one parameter by the key '{key}', saw: [{}]",
+        values.iter().map(|(k, v)| format!("{k}={}", v.to_string())).collect::<Vec<_>>().join(", ")
+    ))]
     MultipleParameterValues {
         key: &'static str,
-        values: Vec<Value>,
+        values: Vec<(&'static str, Value)>,
     },
 }
diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index 57524a0535..1dd9a20948 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -1,6 +1,6 @@
 //! Types and functions used for parsing.
 
-use std::borrow::Cow;
+use std::{borrow::Cow, collections::BTreeMap};
 
 use nom::{AsChar, Parser};
 use snafu::{OptionExt, ResultExt};
@@ -732,46 +732,56 @@ impl Parameters {
     ///
     /// ## Errors
     /// Errors if there are more than one parameter with the key "value", and the
-    /// values of those parameters are not equal.
+    /// values of those parameters are not semantically equal.
     pub fn value(&self) -> Result<Option<Number>, ValidationError> {
-        let values = self
-            .iter()
-            .filter_map(|p| match p {
-                Parameter::Value(n) => Some(n.clone()),
-                _ => None,
-            })
-            .collect::<std::collections::HashSet<_>>();
+        let mut values = BTreeMap::default();
+        for p in self.iter() {
+            let (number, n) = match p {
+                Parameter::Value(n) => (n.as_i128()?, n),
+                _ => continue,
+            };
+            values.insert(("value", number), n.clone());
+        }
         snafu::ensure!(
             values.len() <= 1,
             MultipleParameterValuesSnafu {
                 key: "value",
-                values: values.into_iter().map(Value::Number).collect::<Vec<_>>(),
+                values: values
+                    .into_iter()
+                    .map(|((k, _), n)| (k, Value::Number(n)))
+                    .collect::<Vec<_>>(),
             }
         );
-        Ok(values.into_iter().next())
+        Ok(values.into_iter().next().map(|(_, n)| n))
     }
 
     /// Returns the number value of the parameter with the "gas" or "gasLimit" key, if any.
     ///
     /// ## Errors
-    /// Errors if there are more than one parameter with the key "gas_limit", and those
-    /// values are not equal.
+    /// Errors if there are more than one parameter with the key "gas" or "gasLimit", and those
+    /// values are not semantically equal.
     pub fn gas_limit(&self) -> Result<Option<Number>, ValidationError> {
-        let values = self
-            .iter()
-            .filter_map(|p| match p {
-                Parameter::GasLimit(n) => Some(n.clone()),
-                _ => None,
-            })
-            .collect::<std::collections::HashSet<_>>();
+        let mut values = BTreeMap::default();
+        for p in self.iter() {
+            let (k, number, n) = match p {
+                Parameter::Gas(n) => ("gas", n.as_i128()?, n),
+                Parameter::GasLimit(n) => ("gasLimit", n.as_i128()?, n),
+                _ => continue,
+            };
+            // Also return the actual key for error reporting
+            values.insert(("gasLimit", number), (k, n.clone()));
+        }
         snafu::ensure!(
             values.len() <= 1,
             MultipleParameterValuesSnafu {
                 key: "gasLimit",
-                values: values.into_iter().map(Value::Number).collect::<Vec<_>>(),
+                values: values
+                    .into_iter()
+                    .map(|(_, (k, n))| (k, Value::Number(n)))
+                    .collect::<Vec<_>>(),
             }
         );
-        Ok(values.into_iter().next())
+        Ok(values.into_iter().next().map(|(_, (_, n))| n))
     }
 
     /// Returns the number value of the parameter with the "gasPrice",
@@ -779,23 +789,27 @@ impl Parameters {
     ///
     /// ## Errors
     /// Errors if there are more than one parameter with the key "gasPrice"
-    /// or "gas", and the values of those parameters are not equal.
+    /// and the values of those parameters are not semantically equal.
     pub fn gas_price(&self) -> Result<Option<Number>, ValidationError> {
-        let values = self
-            .iter()
-            .filter_map(|p| match p {
-                Parameter::GasPrice(n) => Some(n.clone()),
-                _ => None,
-            })
-            .collect::<std::collections::HashSet<_>>();
+        let mut values = BTreeMap::default();
+        for p in self.iter() {
+            let (number, n) = match p {
+                Parameter::GasPrice(n) => (n.as_i128()?, n),
+                _ => continue,
+            };
+            values.insert(("gasPrice", number), n.clone());
+        }
         snafu::ensure!(
             values.len() <= 1,
             MultipleParameterValuesSnafu {
                 key: "gasPrice",
-                values: values.into_iter().map(Value::Number).collect::<Vec<_>>(),
+                values: values
+                    .into_iter()
+                    .map(|((k, _), n)| (k, Value::Number(n)))
+                    .collect::<Vec<_>>(),
             }
         );
-        Ok(values.into_iter().next())
+        Ok(values.into_iter().next().map(|(_, n)| n))
     }
 
     /// Returns an iterator over all ABI type parameters.

From e549c01cabe6a6fedaab0bd001dc63c53db725c1 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Tue, 27 Jan 2026 08:39:02 +1300
Subject: [PATCH 117/263] nit: move and document Digits fns

---
 components/eip681/src/parse.rs | 36 +++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index 1dd9a20948..160ee96c33 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -30,6 +30,21 @@ impl Digits {
     #[cfg(any(test, feature = "test-dependencies"))]
     pub const MAX_PLACES: usize = u64::MAX.ilog10() as usize;
 
+    /// Construct a new `Digits` from a `u64`.
+    pub fn from_u64(mut v: u64) -> Self {
+        if v == 0 {
+            return Digits { places: vec![0] };
+        }
+
+        let mut places: Vec<u8> = vec![];
+        while v > 0 {
+            places.push((v % 10) as u8);
+            v /= 10;
+        }
+        places.reverse();
+        Digits { places }
+    }
+
     /// Returns the `u64` representation.
     ///
     /// ## Errors
@@ -55,20 +70,6 @@ impl Digits {
         Ok((self.as_u64()?, denominator))
     }
 
-    pub fn from_u64(mut v: u64) -> Self {
-        if v == 0 {
-            return Digits { places: vec![0] };
-        }
-
-        let mut places: Vec<u8> = vec![];
-        while v > 0 {
-            places.push((v % 10) as u8);
-            v /= 10;
-        }
-        places.reverse();
-        Digits { places }
-    }
-
     /// Parse at least `min` digits.
     pub fn parse_min(i: &str, min: usize) -> nom::IResult<&str, Self, ParseError<'_>> {
         let (i, places) = parse_min(i, min, false)?;
@@ -288,6 +289,13 @@ impl Number {
                 seen: exp
             }
         );
+        // Since it may be hard to see what's going on here:
+        // ```
+        // signum * (
+        //     (integer * multiplier) +
+        //     (decimal_numerator * (multiplier / decimal_denominator))
+        // )
+        // ```
         let multiplied_integer = (integer as i128)
             .checked_mul(multiplier)
             .with_context(|| OverflowSnafu)?;

From 67e71abc1dceb71f8de953cc1e4223300b4d3327 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Tue, 27 Jan 2026 08:50:35 +1300
Subject: [PATCH 118/263] fix: simplify Number::as_i128

---
 components/eip681/src/parse.rs | 60 ++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index 160ee96c33..6bfb72c306 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -61,6 +61,7 @@ impl Digits {
         Ok(total)
     }
 
+    #[cfg(test)]
     /// Returns the ratio corresponding to the decimal number `0.<digits>`,
     /// i.e. the denominator will be `10^len(digits)`.
     fn as_decimal_ratio(&self) -> Result<(u64, u64), ValidationError> {
@@ -246,17 +247,6 @@ impl Number {
         self.integer.as_u64()
     }
 
-    /// Returns the value of the decimal portion of the number as a ratio
-    /// of `u64`s.
-    fn decimal(&self) -> Result<(u64, u64), ValidationError> {
-        Ok(self
-            .decimal
-            .as_ref()
-            .map(|d| d.as_decimal_ratio())
-            .transpose()?
-            .unwrap_or((0, 1)))
-    }
-
     /// Convert this [`Number`] into an i128, if possible.
     ///
     /// ## Errors
@@ -266,8 +256,20 @@ impl Number {
             .signum
             .map_or(1i128, |is_positive| if is_positive { 1 } else { -1 });
         let integer = self.integer()?;
-        let (decimal_numerator, decimal_denominator) = self.decimal()?;
-        let exp = self
+        let decimal_numerator = self
+            .decimal
+            .as_ref()
+            .map(|d| d.as_u64())
+            .transpose()?
+            .unwrap_or(0);
+        let decimal_places: u32 = self
+            .decimal
+            .as_ref()
+            .map(|d| d.places.len())
+            .unwrap_or(0)
+            .try_into()
+            .context(IntegerSnafu)?;
+        let exp: u32 = self
             .exponent
             .as_ref()
             .and_then(|(_, maybe_exp)| maybe_exp.as_ref().map(|digits| digits.as_u64()))
@@ -279,29 +281,29 @@ impl Number {
             expected: u128::MAX.ilog10() as usize,
             seen: exp as u64,
         })?;
-        let modulo = multiplier
-            .checked_rem(decimal_denominator as i128)
-            .context(OverflowSnafu)?;
-        snafu::ensure!(
-            modulo == 0 || decimal_numerator == 0,
-            SmallExponentSnafu {
-                expected: decimal_denominator.ilog10() as usize,
-                seen: exp
-            }
-        );
-        // Since it may be hard to see what's going on here:
+        // The exponent must be >= the number of decimal places to yield an integer result.
+        let decimal_exp = exp
+            .checked_sub(decimal_places)
+            .with_context(|| SmallExponentSnafu {
+                expected: decimal_places as usize,
+                seen: exp,
+            });
+        // Since it's hard to see through all the function chaining, this is
+        // what's going on here:
         // ```
         // signum * (
-        //     (integer * multiplier) +
-        //     (decimal_numerator * (multiplier / decimal_denominator))
+        //     (integer * 10^exp) +
+        //     (decimal_numerator * 10^(exp - decimal_places))
         // )
         // ```
         let multiplied_integer = (integer as i128)
             .checked_mul(multiplier)
             .with_context(|| OverflowSnafu)?;
-        let decimal_multiplier = multiplier
-            .checked_div(decimal_denominator as i128)
-            .context(OverflowSnafu)?;
+        let decimal_multiplier = match decimal_exp {
+            Ok(d) => 10i128.checked_pow(d).context(OverflowSnafu)?,
+            Err(_) if decimal_numerator == 0 => 0,
+            Err(e) => return Err(e),
+        };
         let multiplied_decimal = (decimal_numerator as i128)
             .checked_mul(decimal_multiplier)
             .with_context(|| OverflowSnafu)?;

From 802449ab89ba19655f90834a2370d323e2e83e64 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Tue, 27 Jan 2026 08:59:56 +1300
Subject: [PATCH 119/263] clippy

---
 components/eip681/src/error.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/eip681/src/error.rs b/components/eip681/src/error.rs
index be3ed5d68f..8be9997e27 100644
--- a/components/eip681/src/error.rs
+++ b/components/eip681/src/error.rs
@@ -116,7 +116,7 @@ pub enum ValidationError {
     /// that denotes a single value.
     #[snafu(display(
         "More than one parameter by the key '{key}', saw: [{}]",
-        values.iter().map(|(k, v)| format!("{k}={}", v.to_string())).collect::<Vec<_>>().join(", ")
+        values.iter().map(|(k, v)| format!("{k}={v}")).collect::<Vec<_>>().join(", ")
     ))]
     MultipleParameterValues {
         key: &'static str,

From e3d99822198a4bb3a812c0bc051be1ee7dd8c896 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Tue, 27 Jan 2026 10:42:58 -0700
Subject: [PATCH 120/263] Minor naming clarifications to private functions &
 variable names.

---
 zcash_client_backend/src/data_api/wallet.rs    |  9 +++++----
 zcash_primitives/src/transaction/sighash_v4.rs | 18 +++++++++---------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/zcash_client_backend/src/data_api/wallet.rs b/zcash_client_backend/src/data_api/wallet.rs
index 02709701f2..15f3545b69 100644
--- a/zcash_client_backend/src/data_api/wallet.rs
+++ b/zcash_client_backend/src/data_api/wallet.rs
@@ -1267,14 +1267,15 @@ where
     }
 
     #[cfg(feature = "transparent-inputs")]
-    let mut cache = HashMap::<TransparentAddress, TransparentAddressMetadata>::new();
+    let mut transparent_input_addresses =
+        HashMap::<TransparentAddress, TransparentAddressMetadata>::new();
 
     #[cfg(feature = "transparent-inputs")]
     let mut metadata_from_address = |addr: &TransparentAddress| -> Result<
         TransparentAddressMetadata,
         CreateErrT<DbT, InputsErrT, FeeRuleT, ChangeErrT, N>,
     > {
-        match cache.get(addr) {
+        match transparent_input_addresses.get(addr) {
             Some(result) => Ok(result.clone()),
             None => {
                 // `wallet_db.get_transparent_address_metadata` includes reserved ephemeral
@@ -1290,7 +1291,7 @@ where
                     .map_err(InputSelectorError::DataSource)?
                     .ok_or(Error::AddressNotRecognized(*addr))?;
 
-                cache.insert(*addr, result.clone());
+                transparent_input_addresses.insert(*addr, result.clone());
                 Ok(result)
             }
         }
@@ -1610,7 +1611,7 @@ where
         step_index,
         builder,
         #[cfg(feature = "transparent-inputs")]
-        transparent_input_addresses: cache,
+        transparent_input_addresses,
         #[cfg(feature = "orchard")]
         orchard_output_meta,
         sapling_output_meta,
diff --git a/zcash_primitives/src/transaction/sighash_v4.rs b/zcash_primitives/src/transaction/sighash_v4.rs
index 3442d8dc32..bf94095dc3 100644
--- a/zcash_primitives/src/transaction/sighash_v4.rs
+++ b/zcash_primitives/src/transaction/sighash_v4.rs
@@ -98,13 +98,13 @@ fn joinsplits_hash(
         .hash(&data)
 }
 
-fn shielded_spends_hash<
+fn sapling_spends_hash<
     A: sapling::bundle::Authorization<SpendProof = GrothProofBytes, OutputProof = GrothProofBytes>,
 >(
-    shielded_spends: &[SpendDescription<A>],
+    spends: &[SpendDescription<A>],
 ) -> Blake2bHash {
-    let mut data = Vec::with_capacity(shielded_spends.len() * 384);
-    for s_spend in shielded_spends {
+    let mut data = Vec::with_capacity(spends.len() * 384);
+    for s_spend in spends {
         data.extend_from_slice(&s_spend.cv().to_bytes());
         data.extend_from_slice(s_spend.anchor().to_repr().as_ref());
         data.extend_from_slice(s_spend.nullifier().as_ref());
@@ -117,9 +117,9 @@ fn shielded_spends_hash<
         .hash(&data)
 }
 
-fn shielded_outputs_hash(shielded_outputs: &[OutputDescription<GrothProofBytes>]) -> Blake2bHash {
-    let mut data = Vec::with_capacity(shielded_outputs.len() * 948);
-    for s_out in shielded_outputs {
+fn sapling_outputs_hash(outputs: &[OutputDescription<GrothProofBytes>]) -> Blake2bHash {
+    let mut data = Vec::with_capacity(outputs.len() * 948);
+    for s_out in outputs {
         sapling_serialization::write_output_v4(&mut data, s_out).unwrap();
     }
     Blake2bParams::new()
@@ -212,14 +212,14 @@ pub fn v4_signature_hash<
                 !tx.sapling_bundle
                     .as_ref()
                     .is_none_or(|b| b.shielded_spends().is_empty()),
-                shielded_spends_hash(tx.sapling_bundle.as_ref().unwrap().shielded_spends())
+                sapling_spends_hash(tx.sapling_bundle.as_ref().unwrap().shielded_spends())
             );
             update_hash!(
                 h,
                 !tx.sapling_bundle
                     .as_ref()
                     .is_none_or(|b| b.shielded_outputs().is_empty()),
-                shielded_outputs_hash(tx.sapling_bundle.as_ref().unwrap().shielded_outputs())
+                sapling_outputs_hash(tx.sapling_bundle.as_ref().unwrap().shielded_outputs())
             );
         }
         h.update(&tx.lock_time.to_le_bytes());

From 920006d184e5bfe80685f45b273d34fe7ed757ea Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Wed, 28 Jan 2026 12:37:36 +1300
Subject: [PATCH 121/263] fix: eip681 ethereum addresses case-sensitive, ERC-55
 validation function

---
 Cargo.lock                     |   2 +
 components/eip681/Cargo.toml   |   2 +
 components/eip681/src/error.rs |  18 ++-
 components/eip681/src/lib.rs   |   4 +-
 components/eip681/src/parse.rs | 251 ++++++++++++++++++++++++++++-----
 5 files changed, 239 insertions(+), 38 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 413f9c7d20..a9e8ed5102 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1476,10 +1476,12 @@ version = "0.0.0"
 dependencies = [
  "base64",
  "ens-normalize-rs",
+ "hex",
  "nom",
  "percent-encoding",
  "pretty_assertions",
  "proptest",
+ "sha3",
  "snafu",
 ]
 
diff --git a/components/eip681/Cargo.toml b/components/eip681/Cargo.toml
index 6d68cdb096..7a770f75d8 100644
--- a/components/eip681/Cargo.toml
+++ b/components/eip681/Cargo.toml
@@ -20,8 +20,10 @@ snafu = "0.8.6"
 # - Parsing and Encoding
 base64.workspace = true
 ens-normalize-rs = "0.1.1"
+hex.workspace = true
 nom.workspace = true
 percent-encoding.workspace = true
+sha3 = "0.10.8"
 
 # - Test dependencies
 proptest = { workspace = true, optional = true }
diff --git a/components/eip681/src/error.rs b/components/eip681/src/error.rs
index 8be9997e27..1855818551 100644
--- a/components/eip681/src/error.rs
+++ b/components/eip681/src/error.rs
@@ -21,16 +21,19 @@ pub enum ParseError<'a> {
 
     /// The number of digits did not match or exceed the expected minimum.
     #[snafu(display(
-        "Expected at least {min} digits, saw {} before {}",
-        digits.len(),
+        "Expected at least {min} digits, saw {digits_len} before {}",
         input.split_at(10).0
     ))]
     DigitsMinimum {
         min: usize,
-        digits: Vec<u8>,
+        digits_len: usize,
         input: &'a str,
     },
 
+    /// The character is not a hexadecimal digit.
+    #[snafu(display("The character '{character}' was expected to be hexadecimal, but isn't."))]
+    NotAHexDigit { character: char },
+
     /// The ENS name was expected and missing.
     #[snafu(display("Missing ENS name"))]
     EnsMissing,
@@ -94,6 +97,11 @@ impl<'a> From<ParseError<'a>> for nom::Err<ParseError<'a>> {
 #[non_exhaustive]
 #[snafu(visibility(pub(crate)))]
 pub enum ValidationError {
+    #[snafu(display(
+        "Incorrect number of digits for an ethereum address. Expected 40, saw {len}."
+    ))]
+    IncorrectEthAddressLen { len: usize },
+
     #[snafu(display("Exponent is too small, expected at least {expected}, saw {seen}"))]
     SmallExponent { expected: usize, seen: u64 },
 
@@ -122,4 +130,8 @@ pub enum ValidationError {
         key: &'static str,
         values: Vec<(&'static str, Value)>,
     },
+
+    /// An Ethereum address failed ERC-55 checksum validation.
+    #[snafu(display("ERC-55 checksum validation failure."))]
+    Erc55Validation,
 }
diff --git a/components/eip681/src/lib.rs b/components/eip681/src/lib.rs
index 3d54f3d671..6d34587d98 100644
--- a/components/eip681/src/lib.rs
+++ b/components/eip681/src/lib.rs
@@ -33,6 +33,6 @@
 pub mod error;
 mod parse;
 pub use parse::{
-    Digits, EnsName, EthereumAbiTypeName, EthereumAddress, EthereumTransactionRequest, HexDigits,
-    Number, Parameter, Parameters, SchemaPrefix, UrlEncodedUnicodeString, Value,
+    Digits, EnsName, EthereumAbiTypeName, EthereumAddressOrEnsName, EthereumTransactionRequest,
+    HexDigits, Number, Parameter, Parameters, SchemaPrefix, UrlEncodedUnicodeString, Value,
 };
diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index 6bfb72c306..73adf61f6c 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -3,6 +3,7 @@
 use std::{borrow::Cow, collections::BTreeMap};
 
 use nom::{AsChar, Parser};
+use sha3::{Digest, Keccak256};
 use snafu::{OptionExt, ResultExt};
 
 use crate::error::*;
@@ -93,27 +94,121 @@ pub fn parse_min(i: &str, min: usize, is_hex: bool) -> nom::IResult<&str, Vec<u8
         data.len() >= min,
         DigitsMinimumSnafu {
             min,
-            digits: data,
+            digits_len: data.len(),
             input: i
         }
     );
     Ok((i, data))
 }
 
-/// Zero or more consecutive hexadecimal digits.
+/// One case-sensitive hexadecimal digit.
+#[repr(u8)]
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum CaseSensitiveHexDigit {
+    Zero = 0,
+    One = 1,
+    Two = 2,
+    Three = 3,
+    Four = 4,
+    Five = 5,
+    Six = 6,
+    Seven = 7,
+    Eight = 8,
+    Nine = 9,
+    A { is_upper: bool } = 10,
+    B { is_upper: bool } = 11,
+    C { is_upper: bool } = 12,
+    D { is_upper: bool } = 13,
+    E { is_upper: bool } = 14,
+    F { is_upper: bool } = 15,
+}
+
+impl core::fmt::Display for CaseSensitiveHexDigit {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str(match self {
+            CaseSensitiveHexDigit::Zero => "0",
+            CaseSensitiveHexDigit::One => "1",
+            CaseSensitiveHexDigit::Two => "2",
+            CaseSensitiveHexDigit::Three => "3",
+            CaseSensitiveHexDigit::Four => "4",
+            CaseSensitiveHexDigit::Five => "5",
+            CaseSensitiveHexDigit::Six => "6",
+            CaseSensitiveHexDigit::Seven => "7",
+            CaseSensitiveHexDigit::Eight => "8",
+            CaseSensitiveHexDigit::Nine => "9",
+            CaseSensitiveHexDigit::A { is_upper: false } => "a",
+            CaseSensitiveHexDigit::B { is_upper: false } => "b",
+            CaseSensitiveHexDigit::C { is_upper: false } => "c",
+            CaseSensitiveHexDigit::D { is_upper: false } => "d",
+            CaseSensitiveHexDigit::E { is_upper: false } => "e",
+            CaseSensitiveHexDigit::F { is_upper: false } => "f",
+            CaseSensitiveHexDigit::A { is_upper: true } => "A",
+            CaseSensitiveHexDigit::B { is_upper: true } => "B",
+            CaseSensitiveHexDigit::C { is_upper: true } => "C",
+            CaseSensitiveHexDigit::D { is_upper: true } => "D",
+            CaseSensitiveHexDigit::E { is_upper: true } => "E",
+            CaseSensitiveHexDigit::F { is_upper: true } => "F",
+        })
+    }
+}
+
+impl CaseSensitiveHexDigit {
+    /// Attempt to create a new `CaseSensitiveHexDigit` from a character.
+    ///
+    /// Fails if `c` is not in `0..=9`, `a..=f` or `A..=F`.
+    pub fn from_char(c: char) -> Result<Self, ParseError<'static>> {
+        Ok(match c {
+            '0' => CaseSensitiveHexDigit::Zero,
+            '1' => CaseSensitiveHexDigit::One,
+            '2' => CaseSensitiveHexDigit::Two,
+            '3' => CaseSensitiveHexDigit::Three,
+            '4' => CaseSensitiveHexDigit::Four,
+            '5' => CaseSensitiveHexDigit::Five,
+            '6' => CaseSensitiveHexDigit::Six,
+            '7' => CaseSensitiveHexDigit::Seven,
+            '8' => CaseSensitiveHexDigit::Eight,
+            '9' => CaseSensitiveHexDigit::Nine,
+            'a' => CaseSensitiveHexDigit::A { is_upper: false },
+            'b' => CaseSensitiveHexDigit::B { is_upper: false },
+            'c' => CaseSensitiveHexDigit::C { is_upper: false },
+            'd' => CaseSensitiveHexDigit::D { is_upper: false },
+            'e' => CaseSensitiveHexDigit::E { is_upper: false },
+            'f' => CaseSensitiveHexDigit::F { is_upper: false },
+            'A' => CaseSensitiveHexDigit::A { is_upper: true },
+            'B' => CaseSensitiveHexDigit::B { is_upper: true },
+            'C' => CaseSensitiveHexDigit::C { is_upper: true },
+            'D' => CaseSensitiveHexDigit::D { is_upper: true },
+            'E' => CaseSensitiveHexDigit::E { is_upper: true },
+            'F' => CaseSensitiveHexDigit::F { is_upper: true },
+            character => NotAHexDigitSnafu { character }.fail()?,
+        })
+    }
+}
+
+/// ERC-55 validation result.
+pub enum Erc55Result {
+    /// The input was validated.
+    Validated,
+    /// The input could not be validated because it was all lowercase.
+    NotValidatedAllLowercase,
+    /// The input could not be validated because it was all uppercase.
+    NotValidatedAllUppercase,
+}
+
+/// Zero or more consecutive and case-sensitive hexadecimal digits.
 ///
 /// ```abnf
 /// *HEXDIG
 /// ```
 #[derive(Clone, Debug, PartialEq)]
 pub struct HexDigits {
-    places: Vec<u8>,
+    places: Vec<CaseSensitiveHexDigit>,
 }
 
 impl core::fmt::Display for HexDigits {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         for n in self.places.iter() {
-            f.write_fmt(format_args!("{n:x}"))?;
+            f.write_fmt(format_args!("{n}"))?;
         }
         Ok(())
     }
@@ -122,9 +217,86 @@ impl core::fmt::Display for HexDigits {
 impl HexDigits {
     /// Parse at least `min` digits.
     pub fn parse_min(i: &str, min: usize) -> nom::IResult<&str, Self, ParseError<'_>> {
-        let (i, places) = parse_min(i, min, true)?;
+        let (i, data) = nom::bytes::complete::take_while(|c: char| c.is_ascii_hexdigit())(i)?;
+        snafu::ensure!(
+            data.len() >= min,
+            DigitsMinimumSnafu {
+                min,
+                digits_len: data.len(),
+                input: i
+            }
+        );
+        let mut places = vec![];
+        for c in data.chars() {
+            let digit = CaseSensitiveHexDigit::from_char(c)?;
+            places.push(digit);
+        }
         Ok((i, HexDigits { places }))
     }
+
+    /// Returns whether all alphabetic digits are lowercase.
+    pub fn is_all_lowercase(&self) -> bool {
+        for digit in self.places.iter() {
+            match digit {
+                CaseSensitiveHexDigit::A { is_upper: true } => return false,
+                CaseSensitiveHexDigit::B { is_upper: true } => return false,
+                CaseSensitiveHexDigit::C { is_upper: true } => return false,
+                CaseSensitiveHexDigit::D { is_upper: true } => return false,
+                CaseSensitiveHexDigit::E { is_upper: true } => return false,
+                CaseSensitiveHexDigit::F { is_upper: true } => return false,
+                _ => {}
+            }
+        }
+        true
+    }
+
+    /// Returns whether all alphabetic digits are uppercase.
+    pub fn is_all_uppercase(&self) -> bool {
+        for digit in self.places.iter() {
+            match digit {
+                CaseSensitiveHexDigit::A { is_upper: false } => return false,
+                CaseSensitiveHexDigit::B { is_upper: false } => return false,
+                CaseSensitiveHexDigit::C { is_upper: false } => return false,
+                CaseSensitiveHexDigit::D { is_upper: false } => return false,
+                CaseSensitiveHexDigit::E { is_upper: false } => return false,
+                CaseSensitiveHexDigit::F { is_upper: false } => return false,
+                _ => {}
+            }
+        }
+        true
+    }
+
+    /// Validates the digits as an Ethereum address according to ERC-55, if possible.   
+    pub fn validate_erc55(&self) -> Result<Erc55Result, ValidationError> {
+        snafu::ensure!(
+            self.places.len() == 40,
+            IncorrectEthAddressLenSnafu {
+                len: self.places.len()
+            }
+        );
+
+        // If all the digits are lowercase or all are uppercase, we can validate anything besides
+        // the length.
+        if self.is_all_lowercase() {
+            return Ok(Erc55Result::NotValidatedAllLowercase);
+        }
+        if self.is_all_uppercase() {
+            return Ok(Erc55Result::NotValidatedAllUppercase);
+        }
+
+        // Otherwise mixed casing denotes a checksum, try decoding as an ERC-55 address
+        let hex_string = self.to_string();
+        let hashed_address = hex::encode(Keccak256::digest(hex_string.to_ascii_lowercase()));
+        if hex_string.chars().enumerate().all(|(i, c)| {
+            c.is_ascii_digit()
+                || (u8::from_str_radix(&hashed_address[i..i + 1], 16).unwrap() >= 8)
+                    == c.is_ascii_uppercase()
+        }) {
+            Ok(Erc55Result::Validated)
+        } else {
+            Erc55ValidationSnafu.fail()
+        }
+    }
 }
 
 /// A parsed number.
@@ -389,7 +561,7 @@ impl EnsName {
     }
 }
 
-/// An Ethereum address.
+/// An Ethereum address, or an ENS name.
 ///
 /// ```abnf
 /// ethereum_address = ( "0x" 40*HEXDIG ) / ENS_NAME
@@ -397,30 +569,32 @@ impl EnsName {
 ///
 /// Where `ENS_NAME` is [`EnsName`].
 #[derive(Clone, Debug, PartialEq)]
-pub enum EthereumAddress {
-    Hex(HexDigits),
+pub enum EthereumAddressOrEnsName {
+    Address(HexDigits),
     Name(EnsName),
 }
 
-impl core::fmt::Display for EthereumAddress {
+impl core::fmt::Display for EthereumAddressOrEnsName {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            EthereumAddress::Hex(digits) => f.write_fmt(format_args!("0x{digits}")),
-            EthereumAddress::Name(name) => name.fmt(f),
+            EthereumAddressOrEnsName::Address(digits) => f.write_fmt(format_args!("0x{digits}")),
+            EthereumAddressOrEnsName::Name(name) => name.fmt(f),
         }
     }
 }
 
-impl EthereumAddress {
+impl EthereumAddressOrEnsName {
     /// Parse an `EthereumAddress`.
     pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
         // Parse "0x" and then 40+ hex digits
-        fn parse_40plus_hex(i: &str) -> nom::IResult<&str, EthereumAddress, ParseError<'_>> {
+        fn parse_40plus_hex(
+            i: &str,
+        ) -> nom::IResult<&str, EthereumAddressOrEnsName, ParseError<'_>> {
             let (i, _) = nom::bytes::complete::tag("0x")(i)?;
             let (i, digits) = HexDigits::parse_min(i, 40)?;
-            Ok((i, EthereumAddress::Hex(digits)))
+            Ok((i, EthereumAddressOrEnsName::Address(digits)))
         }
-        let parse_ens = EnsName::parse.map(EthereumAddress::Name);
+        let parse_ens = EnsName::parse.map(EthereumAddressOrEnsName::Name);
         let mut parse_address = parse_40plus_hex.or(parse_ens);
         let (i, address) = parse_address.parse(i)?;
         Ok((i, address))
@@ -470,7 +644,7 @@ impl UrlEncodedUnicodeString {
 #[derive(Clone, Debug, PartialEq)]
 pub enum Value {
     Number(Number),
-    Address(EthereumAddress),
+    Address(EthereumAddressOrEnsName),
     String(UrlEncodedUnicodeString),
 }
 
@@ -492,7 +666,7 @@ impl Value {
     /// ```
     pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
         let mut number = Number::parse.map(Value::Number);
-        let mut ethereum_address = EthereumAddress::parse.map(Value::Address);
+        let mut ethereum_address = EthereumAddressOrEnsName::parse.map(Value::Address);
         let mut string = UrlEncodedUnicodeString::parse.map(Value::String);
 
         // Here there are some interesting corner cases:
@@ -868,7 +1042,7 @@ impl SchemaPrefix {
 #[derive(Debug, PartialEq)]
 pub struct EthereumTransactionRequest {
     pub schema_prefix: SchemaPrefix,
-    pub target_address: EthereumAddress,
+    pub target_address: EthereumAddressOrEnsName,
     pub chain_id: Option<Digits>,
     pub function_name: Option<UrlEncodedUnicodeString>,
     pub parameters: Parameters,
@@ -907,7 +1081,8 @@ impl EthereumTransactionRequest {
     pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
         let (i, schema_prefix) = SchemaPrefix::parse(i)?;
         let (i, address_blob) = nom::bytes::complete::is_not("@/?")(i)?;
-        let (remaining_address_input, target_address) = EthereumAddress::parse(address_blob)?;
+        let (remaining_address_input, target_address) =
+            EthereumAddressOrEnsName::parse(address_blob)?;
         snafu::ensure!(
             remaining_address_input.is_empty(),
             UnexpectedLeftoverInputSnafu {
@@ -985,9 +1160,17 @@ mod test {
         arb_digits_in(min_digits..=Digits::MAX_PLACES)
     }
 
+    fn arb_case_sensitive_hex_digit() -> impl Strategy<Value = CaseSensitiveHexDigit> {
+        const HEX_CHARS: &[RangeInclusive<char>] = &['0'..='9', 'a'..='f', 'A'..='F'];
+        prop::char::ranges(Cow::Borrowed(HEX_CHARS)).prop_map(|c| {
+            CaseSensitiveHexDigit::from_char(c).expect("always valid within these ranges")
+        })
+    }
+
     fn arb_hex_digits(min_digits: usize, max_digits: usize) -> impl Strategy<Value = HexDigits> {
         let size_range = min_digits..=max_digits;
-        prop::collection::vec(0..16u8, size_range).prop_map(|places| HexDigits { places })
+        prop::collection::vec(arb_case_sensitive_hex_digit(), size_range)
+            .prop_map(|places| HexDigits { places })
     }
 
     proptest! {
@@ -1225,23 +1408,24 @@ mod test {
     #[test]
     fn hex_address_zero_sanity() {
         let input = "0x0000000000000000000000000000000000000000";
-        let (output, addy) = EthereumAddress::parse(input).unwrap();
+        let (output, addy) = EthereumAddressOrEnsName::parse(input).unwrap();
         assert_eq!("", output, "output was not fully consumed");
         assert_eq!(
-            EthereumAddress::Hex(HexDigits {
-                places: [0; 40].to_vec()
+            EthereumAddressOrEnsName::Address(HexDigits {
+                places: [CaseSensitiveHexDigit::from_char('0').expect("always valid"); 40].to_vec()
             }),
             addy
         );
         assert_eq!(input, &format!("{addy}"));
     }
 
-    fn arb_eth_addy() -> impl Strategy<Value = EthereumAddress> {
-        let hexes: BoxedStrategy<EthereumAddress> = arb_hex_digits(40, 40)
-            .prop_map(EthereumAddress::Hex)
+    fn arb_eth_addy() -> impl Strategy<Value = EthereumAddressOrEnsName> {
+        let hexes: BoxedStrategy<EthereumAddressOrEnsName> = arb_hex_digits(40, 40)
+            .prop_map(EthereumAddressOrEnsName::Address)
+            .boxed();
+        let names: BoxedStrategy<EthereumAddressOrEnsName> = arb_happy_ens_name()
+            .prop_map(EthereumAddressOrEnsName::Name)
             .boxed();
-        let names: BoxedStrategy<EthereumAddress> =
-            arb_happy_ens_name().prop_map(EthereumAddress::Name).boxed();
         hexes.prop_union(names)
     }
 
@@ -1249,7 +1433,7 @@ mod test {
         #[test]
         fn parse_arb_eth_address(expected in arb_eth_addy()) {
             let input = expected.to_string();
-            let (rest, seen) = EthereumAddress::parse(&input).unwrap();
+            let (rest, seen) = EthereumAddressOrEnsName::parse(&input).unwrap();
             assert_eq!("", rest);
             assert_eq!(expected, seen);
         }
@@ -1432,7 +1616,7 @@ mod test {
     /// Parsing a value as an ENS name consumes more input than as a string, so ENS name should
     /// win.
     fn parse_value_ens_name_over_string() {
-        let expected = Value::Address(EthereumAddress::Name(EnsName("aa.a0".to_string())));
+        let expected = Value::Address(EthereumAddressOrEnsName::Name(EnsName("aa.a0".to_string())));
         let input = expected.to_string();
         let (_output, seen) = Value::parse(&input).unwrap();
         pretty_assertions::assert_eq!(expected, seen);
@@ -1524,8 +1708,8 @@ mod test {
     }
 
     proptest! {
-    #[test]
-    fn parse_arb_schema_prefix(expected in arb_schema_prefix()) {
+        #[test]
+        fn parse_arb_schema_prefix(expected in arb_schema_prefix()) {
             let input = expected.to_string();
             let (output, seen) = SchemaPrefix::parse(&input).unwrap();
             assert_eq!("", output);
@@ -1568,8 +1752,9 @@ mod test {
     fn test_vectors_eip_681() {
         let input = "ethereum:0xfb6916095ca1df60bb79Ce92ce3ea74c37c5d359?value=2.014e18";
         let (_, seen) = EthereumTransactionRequest::parse(input).unwrap();
+        // Ensure the address is case-sensitive
         pretty_assertions::assert_eq!(
-            "0xfb6916095ca1df60bb79ce92ce3ea74c37c5d359",
+            "0xfb6916095ca1df60bb79Ce92ce3ea74c37c5d359",
             seen.target_address.to_string()
         );
         let number = seen.parameters.value().unwrap().unwrap();

From af945baaec4347fdee63714c5eed39a8a4ef2d05 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Fri, 30 Jan 2026 12:51:59 +1300
Subject: [PATCH 122/263] eip681: validate_erc55 fails on all lower or all
 upper that don't checksum, added ERC-55 test vectors

---
 components/eip681/src/error.rs |  18 ++++-
 components/eip681/src/parse.rs | 127 +++++++++++++++++++++++++--------
 2 files changed, 112 insertions(+), 33 deletions(-)

diff --git a/components/eip681/src/error.rs b/components/eip681/src/error.rs
index 1855818551..4013ff652a 100644
--- a/components/eip681/src/error.rs
+++ b/components/eip681/src/error.rs
@@ -91,6 +91,18 @@ impl<'a> From<ParseError<'a>> for nom::Err<ParseError<'a>> {
     }
 }
 
+/// All the reasons an ERC-55 check-summed address might fail validation.
+#[derive(Debug, PartialEq)]
+#[non_exhaustive]
+pub enum Erc55ValidationFailureReason {
+    /// The input failed validation, but is all lowercase, and may not have been check-summed.
+    AllLowercase,
+    /// The input failed validation, but is all upper, and may not have been check-summed.
+    AllUppercase,
+    /// The input failed validation.
+    ChecksumDoesNotMatch { expected: String, saw: String },
+}
+
 /// Errors discovered after parsing, usually when attempting to convert parsed
 /// types into numeric types.
 #[derive(Debug, Snafu, PartialEq)]
@@ -132,6 +144,8 @@ pub enum ValidationError {
     },
 
     /// An Ethereum address failed ERC-55 checksum validation.
-    #[snafu(display("ERC-55 checksum validation failure."))]
-    Erc55Validation,
+    #[snafu(display("ERC-55 checksum validation failure: {reason:?}"))]
+    Erc55Validation {
+        reason: Erc55ValidationFailureReason,
+    },
 }
diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index 73adf61f6c..0b531c740e 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -185,16 +185,6 @@ impl CaseSensitiveHexDigit {
     }
 }
 
-/// ERC-55 validation result.
-pub enum Erc55Result {
-    /// The input was validated.
-    Validated,
-    /// The input could not be validated because it was all lowercase.
-    NotValidatedAllLowercase,
-    /// The input could not be validated because it was all uppercase.
-    NotValidatedAllUppercase,
-}
-
 /// Zero or more consecutive and case-sensitive hexadecimal digits.
 ///
 /// ```abnf
@@ -267,7 +257,7 @@ impl HexDigits {
     }
 
     /// Validates the digits as an Ethereum address according to ERC-55, if possible.   
-    pub fn validate_erc55(&self) -> Result<Erc55Result, ValidationError> {
+    pub fn validate_erc55(&self) -> Result<(), ValidationError> {
         snafu::ensure!(
             self.places.len() == 40,
             IncorrectEthAddressLenSnafu {
@@ -275,27 +265,49 @@ impl HexDigits {
             }
         );
 
-        // If all the digits are lowercase or all are uppercase, we can validate anything besides
-        // the length.
-        if self.is_all_lowercase() {
-            return Ok(Erc55Result::NotValidatedAllLowercase);
-        }
-        if self.is_all_uppercase() {
-            return Ok(Erc55Result::NotValidatedAllUppercase);
-        }
+        // Construct an ERC-55 checksummed address and compare that to the input
+        let address_input = self.to_string();
+        let address_lowercase = address_input.to_ascii_lowercase();
+        let address_hashed = hex::encode(Keccak256::digest(&address_lowercase));
+        let address_checksummed = address_lowercase
+            .chars()
+            .enumerate()
+            .map(|(i, c)| {
+                if c.is_ascii_digit() {
+                    c
+                } else {
+                    let should_uppercase = u8::from_str_radix(&address_hashed[i..i + 1], 16)
+                        .expect("Always a hexadecimal ASCII char")
+                        >= 8;
+                    if should_uppercase {
+                        c.to_uppercase().next().expect("Always the char")
+                    } else {
+                        c
+                    }
+                }
+            })
+            .collect::<String>();
+        snafu::ensure!(
+            address_input == address_checksummed,
+            Erc55ValidationSnafu {
+                reason: {
+                    // It's possible that this was not a checksummed address. It's pretty rare that a checksummed
+                    // address is all lowercase or all uppercase (a probability of 0.0004942706034105575)
+                    if self.is_all_lowercase() {
+                        Erc55ValidationFailureReason::AllLowercase
+                    } else if self.is_all_uppercase() {
+                        Erc55ValidationFailureReason::AllUppercase
+                    } else {
+                        Erc55ValidationFailureReason::ChecksumDoesNotMatch {
+                            expected: address_checksummed,
+                            saw: address_input,
+                        }
+                    }
+                }
+            }
+        );
 
-        // Otherwise mixed casing denotes a checksum, try decoding as an ERC-55 address
-        let hex_string = self.to_string();
-        let hashed_address = hex::encode(Keccak256::digest(hex_string.to_ascii_lowercase()));
-        if hex_string.chars().enumerate().all(|(i, c)| {
-            c.is_ascii_digit()
-                || (u8::from_str_radix(&hashed_address[i..i + 1], 16).unwrap() >= 8)
-                    == c.is_ascii_uppercase()
-        }) {
-            Ok(Erc55Result::Validated)
-        } else {
-            Erc55ValidationSnafu.fail()
-        }
+        Ok(())
     }
 }
 
@@ -1762,6 +1774,59 @@ mod test {
         assert_eq!(2.014e18 as i128, number.as_i128().unwrap());
     }
 
+    #[test]
+    /// ERC-55 checksum test vectors
+    fn test_vectors_erc_55() {
+        // From https://eips.ethereum.org/EIPS/eip-55#test-cases
+        let addresses = [
+            // All caps
+            "52908400098527886E0F7030069857D2E4169EE7",
+            "8617E340B3D01FA5F11F306F4090FD50E238070D",
+            // All Lower
+            "de709f2102306220921060314715629080e2fb77",
+            "27b1fdb04752bbc536007a920d24acb045561c26",
+            // Normal
+            "5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed",
+            "fB6916095ca1df60bB79Ce92cE3Ea74c37c5d359",
+            "dbF03B407c01E7cD3CBea99509d93f8DDDC8C6FB",
+            "D1220A0cf47c7B9Be7A2E6BA89F429762e7b9aDb",
+        ];
+
+        for addy in addresses {
+            let (i, hexdigits) = HexDigits::parse_min(addy, 40).unwrap();
+            assert!(i.is_empty(), "Should consume all input");
+            let validation_result = hexdigits.validate_erc55();
+            assert!(
+                validation_result.is_ok(),
+                "ERC-55 validation failed: {}",
+                validation_result.err().unwrap()
+            );
+        }
+
+        // These should fail, as they are the "Normal" cases above, with borked casing
+        let borked_cases = [
+            // Select chars with changed case
+            "5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAEd",
+            "fb6916095ca1df60bB79Ce92cE3Ea74c37c5d359",
+            "dbF03B407C01E7cD3CBea99509d93f8DDDC8C6FB",
+            "D1220A0cf47c7B9BE7A2E6Ba89F429762e7b9aDb",
+            // All lower
+            "d1220a0cf47c7b9be7a2e6ba89f429762e7b9adb",
+            // All upper
+            "d1220a0cf47c7b9be7a2e6ba89f429762e7b9adb",
+        ];
+
+        for addy in borked_cases {
+            let (i, hexdigits) = HexDigits::parse_min(addy, 40).unwrap();
+            assert!(i.is_empty(), "Should consume all input");
+            let validation_result = hexdigits.validate_erc55();
+            assert!(
+                validation_result.is_err(),
+                "ERC-55 validation should have failed",
+            );
+        }
+    }
+
     #[test]
     fn digits_as_decimal_ratio_sanity() {
         let input = "0001234";

From 5615af41bedd757d3bef0f9e0fe054360a0280a6 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Sat, 31 Jan 2026 08:39:59 +1300
Subject: [PATCH 123/263] eip681: CaseSensitiveHexDigit encodes all uppercase
 and lowercase variants without boolean

---
 components/eip681/src/parse.rs | 110 ++++++++++++++++-----------------
 1 file changed, 53 insertions(+), 57 deletions(-)

diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index 0b531c740e..7bacce419c 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -103,24 +103,30 @@ pub fn parse_min(i: &str, min: usize, is_hex: bool) -> nom::IResult<&str, Vec<u8
 
 /// One case-sensitive hexadecimal digit.
 #[repr(u8)]
-#[derive(Clone, Copy, Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq, PartialOrd)]
 pub enum CaseSensitiveHexDigit {
-    Zero = 0,
-    One = 1,
-    Two = 2,
-    Three = 3,
-    Four = 4,
-    Five = 5,
-    Six = 6,
-    Seven = 7,
-    Eight = 8,
-    Nine = 9,
-    A { is_upper: bool } = 10,
-    B { is_upper: bool } = 11,
-    C { is_upper: bool } = 12,
-    D { is_upper: bool } = 13,
-    E { is_upper: bool } = 14,
-    F { is_upper: bool } = 15,
+    Zero,
+    One,
+    Two,
+    Three,
+    Four,
+    Five,
+    Six,
+    Seven,
+    Eight,
+    Nine,
+    UpperA,
+    UpperB,
+    UpperC,
+    UpperD,
+    UpperE,
+    UpperF,
+    LowerA,
+    LowerB,
+    LowerC,
+    LowerD,
+    LowerE,
+    LowerF,
 }
 
 impl core::fmt::Display for CaseSensitiveHexDigit {
@@ -136,18 +142,18 @@ impl core::fmt::Display for CaseSensitiveHexDigit {
             CaseSensitiveHexDigit::Seven => "7",
             CaseSensitiveHexDigit::Eight => "8",
             CaseSensitiveHexDigit::Nine => "9",
-            CaseSensitiveHexDigit::A { is_upper: false } => "a",
-            CaseSensitiveHexDigit::B { is_upper: false } => "b",
-            CaseSensitiveHexDigit::C { is_upper: false } => "c",
-            CaseSensitiveHexDigit::D { is_upper: false } => "d",
-            CaseSensitiveHexDigit::E { is_upper: false } => "e",
-            CaseSensitiveHexDigit::F { is_upper: false } => "f",
-            CaseSensitiveHexDigit::A { is_upper: true } => "A",
-            CaseSensitiveHexDigit::B { is_upper: true } => "B",
-            CaseSensitiveHexDigit::C { is_upper: true } => "C",
-            CaseSensitiveHexDigit::D { is_upper: true } => "D",
-            CaseSensitiveHexDigit::E { is_upper: true } => "E",
-            CaseSensitiveHexDigit::F { is_upper: true } => "F",
+            CaseSensitiveHexDigit::LowerA => "a",
+            CaseSensitiveHexDigit::LowerB => "b",
+            CaseSensitiveHexDigit::LowerC => "c",
+            CaseSensitiveHexDigit::LowerD => "d",
+            CaseSensitiveHexDigit::LowerE => "e",
+            CaseSensitiveHexDigit::LowerF => "f",
+            CaseSensitiveHexDigit::UpperA => "A",
+            CaseSensitiveHexDigit::UpperB => "B",
+            CaseSensitiveHexDigit::UpperC => "C",
+            CaseSensitiveHexDigit::UpperD => "D",
+            CaseSensitiveHexDigit::UpperE => "E",
+            CaseSensitiveHexDigit::UpperF => "F",
         })
     }
 }
@@ -168,18 +174,18 @@ impl CaseSensitiveHexDigit {
             '7' => CaseSensitiveHexDigit::Seven,
             '8' => CaseSensitiveHexDigit::Eight,
             '9' => CaseSensitiveHexDigit::Nine,
-            'a' => CaseSensitiveHexDigit::A { is_upper: false },
-            'b' => CaseSensitiveHexDigit::B { is_upper: false },
-            'c' => CaseSensitiveHexDigit::C { is_upper: false },
-            'd' => CaseSensitiveHexDigit::D { is_upper: false },
-            'e' => CaseSensitiveHexDigit::E { is_upper: false },
-            'f' => CaseSensitiveHexDigit::F { is_upper: false },
-            'A' => CaseSensitiveHexDigit::A { is_upper: true },
-            'B' => CaseSensitiveHexDigit::B { is_upper: true },
-            'C' => CaseSensitiveHexDigit::C { is_upper: true },
-            'D' => CaseSensitiveHexDigit::D { is_upper: true },
-            'E' => CaseSensitiveHexDigit::E { is_upper: true },
-            'F' => CaseSensitiveHexDigit::F { is_upper: true },
+            'a' => CaseSensitiveHexDigit::LowerA,
+            'b' => CaseSensitiveHexDigit::LowerB,
+            'c' => CaseSensitiveHexDigit::LowerC,
+            'd' => CaseSensitiveHexDigit::LowerD,
+            'e' => CaseSensitiveHexDigit::LowerE,
+            'f' => CaseSensitiveHexDigit::LowerF,
+            'A' => CaseSensitiveHexDigit::UpperA,
+            'B' => CaseSensitiveHexDigit::UpperB,
+            'C' => CaseSensitiveHexDigit::UpperC,
+            'D' => CaseSensitiveHexDigit::UpperD,
+            'E' => CaseSensitiveHexDigit::UpperE,
+            'F' => CaseSensitiveHexDigit::UpperF,
             character => NotAHexDigitSnafu { character }.fail()?,
         })
     }
@@ -226,15 +232,10 @@ impl HexDigits {
 
     /// Returns whether all alphabetic digits are lowercase.
     pub fn is_all_lowercase(&self) -> bool {
+        let uppers = CaseSensitiveHexDigit::UpperA..=CaseSensitiveHexDigit::UpperF;
         for digit in self.places.iter() {
-            match digit {
-                CaseSensitiveHexDigit::A { is_upper: true } => return false,
-                CaseSensitiveHexDigit::B { is_upper: true } => return false,
-                CaseSensitiveHexDigit::C { is_upper: true } => return false,
-                CaseSensitiveHexDigit::D { is_upper: true } => return false,
-                CaseSensitiveHexDigit::E { is_upper: true } => return false,
-                CaseSensitiveHexDigit::F { is_upper: true } => return false,
-                _ => {}
+            if uppers.contains(digit) {
+                return false;
             }
         }
         true
@@ -242,15 +243,10 @@ impl HexDigits {
 
     /// Returns whether all alphabetic digits are uppercase.
     pub fn is_all_uppercase(&self) -> bool {
+        let lowers = CaseSensitiveHexDigit::LowerA..=CaseSensitiveHexDigit::LowerF;
         for digit in self.places.iter() {
-            match digit {
-                CaseSensitiveHexDigit::A { is_upper: false } => return false,
-                CaseSensitiveHexDigit::B { is_upper: false } => return false,
-                CaseSensitiveHexDigit::C { is_upper: false } => return false,
-                CaseSensitiveHexDigit::D { is_upper: false } => return false,
-                CaseSensitiveHexDigit::E { is_upper: false } => return false,
-                CaseSensitiveHexDigit::F { is_upper: false } => return false,
-                _ => {}
+            if lowers.contains(digit) {
+                return false;
             }
         }
         true

From bf811b6dca0d6664962a4253d51c0ba2bf3e4872 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Sat, 31 Jan 2026 08:45:38 +1300
Subject: [PATCH 124/263] eip681: all upper test case is uppercase

---
 components/eip681/src/parse.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index 7bacce419c..fbeb456790 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -1809,7 +1809,7 @@ mod test {
             // All lower
             "d1220a0cf47c7b9be7a2e6ba89f429762e7b9adb",
             // All upper
-            "d1220a0cf47c7b9be7a2e6ba89f429762e7b9adb",
+            "D1220A0CF47C7B9BE7A2E6BA89F429762E7B9ADB",
         ];
 
         for addy in borked_cases {

From ff2587366e51b590ceb88251a37c5dd746c5b17f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Feb 2026 05:40:22 +0000
Subject: [PATCH 125/263] build(deps): bump actions/cache from 5.0.2 to 5.0.3

Bumps [actions/cache](https://github.com/actions/cache) from 5.0.2 to 5.0.3.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/8b402f58fbc84540c8b491a91e594a4576fec3d7...cdf6c1fa76f9f475f3d7449005a359c84ca0f306)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-version: 5.0.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8449869876..8bbaae5f22 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -59,7 +59,7 @@ jobs:
           all-pools: ${{ matrix.all-pools || false }}
           all-features: ${{ matrix.all-features || false }}
           extra-features: ${{ matrix.extra_flags || '' }}
-      - uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+      - uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: |
             ~/.cargo/bin/
@@ -133,7 +133,7 @@ jobs:
           all-pools: ${{ matrix.all-pools || false }}
           all-features: ${{ matrix.all-features || false }}
           extra-features: ${{ matrix.extra_flags || '' }}
-      - uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+      - uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: |
             ~/.cargo/bin/
@@ -195,7 +195,7 @@ jobs:
           all-pools: false
           all-features: ${{ matrix.all-features || false }}
           extra-features: ${{ matrix.extra_flags || '' }}
-      - uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+      - uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: |
             ~/.cargo/bin/
@@ -254,7 +254,7 @@ jobs:
         with:
           all-features: ${{ matrix.all-features || false }}
           extra-features: ${{ matrix.extra_flags || '' }}
-      - uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+      - uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: |
             ~/.cargo/bin/
@@ -285,7 +285,7 @@ jobs:
           persist-credentials: false
       - id: prepare
         uses: ./.github/actions/prepare
-      - uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+      - uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: |
             ~/.cargo/bin/
@@ -490,7 +490,7 @@ jobs:
           persist-credentials: false
       - id: prepare
         uses: ./.github/actions/prepare
-      - uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+      - uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: |
             ~/.cargo/bin/

From 831ca3f97725c5d923b0c984c8883aee64168a11 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Mon, 10 Nov 2025 11:07:00 -0700
Subject: [PATCH 126/263] zcash_client_sqlite: Fix feature flagging error

Test functionality that is currently used under the `orchard` feature
flag is marked with `allow(dead_code)` because it should probably be
being used to test Sapling as well; this pragma can be removed once that
happens.
---
 zcash_client_sqlite/src/testing.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/zcash_client_sqlite/src/testing.rs b/zcash_client_sqlite/src/testing.rs
index 462b0e4d3f..e44852981d 100644
--- a/zcash_client_sqlite/src/testing.rs
+++ b/zcash_client_sqlite/src/testing.rs
@@ -43,13 +43,15 @@ impl BlockCache {
     }
 }
 
-pub struct BlockCacheInsertionResult {
+pub(crate) struct BlockCacheInsertionResult {
     txids: Vec<TxId>,
+    #[allow(dead_code)]
     note_commitments: NoteCommitments,
 }
 
 impl BlockCacheInsertionResult {
-    pub fn note_commitments(&self) -> &NoteCommitments {
+    #[allow(dead_code)]
+    pub(crate) fn note_commitments(&self) -> &NoteCommitments {
         &self.note_commitments
     }
 }

From d36daf7b04c104aae4cd8abcdd12fe815cea82a5 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Thu, 6 Nov 2025 06:38:34 -0700
Subject: [PATCH 127/263] zcash_client_backend: Move `GapMetadata` behind the
 `transparent-inputs` feature flag.

This was mistakenly made a part of the un-flagged public API, but it is
only relevant when the `transparent-inputs` feature is enabled
---
 zcash_client_backend/CHANGELOG.md  | 3 +++
 zcash_client_backend/src/wallet.rs | 1 +
 2 files changed, 4 insertions(+)

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index 0b778b7060..114186d1fa 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -55,6 +55,9 @@ workspace.
 - The associated type `zcash_client_backend::fees::ChangeStrategy::MetaSource` is now
   bounded on the newly added `MetaSource` type instead of
   `zcash_client_backend::data_api::InputSource`.
+- `zcash_client_backend::wallet::GapMetadata` has been moved behind the
+  `transparent-inputs` feature flag, as it is only useful in the context
+  of the wallet receiving transparent funds.
 
 ## [0.21.0] - 2025-11-05
 
diff --git a/zcash_client_backend/src/wallet.rs b/zcash_client_backend/src/wallet.rs
index bd81cf54dd..8cd2c4565b 100644
--- a/zcash_client_backend/src/wallet.rs
+++ b/zcash_client_backend/src/wallet.rs
@@ -643,6 +643,7 @@ impl OvkPolicy {
 
 /// Metadata describing the gap limit position of a transparent address.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[cfg(feature = "transparent-inputs")]
 pub enum GapMetadata {
     /// The address, or an address at a greater child index, has received transparent funds and
     /// will be discovered by wallet recovery by exploration over the space of

From 1b18ddadcfcaadc255ef8e7c3275aeac013f36c9 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Thu, 6 Nov 2025 06:38:34 -0700
Subject: [PATCH 128/263] zcash_client_backend: Move `GapLimits` from
 `zcash_client_sqlite` to `zcash_client_backend`

Previously, gap limit handling was a feature of backend implementations.
With the addition of the low-level data API, it will make sense to
provide gap limit handling utilities at the `zcash_client_backend` level
and to use a single `GapLimits` type.
---
 zcash_client_backend/CHANGELOG.md             |   6 +
 zcash_client_backend/src/data_api/testing.rs  |   6 +-
 .../src/data_api/testing/pool.rs              |  18 ++-
 .../src/data_api/testing/transparent.rs       |  31 +----
 zcash_client_backend/src/data_api/wallet.rs   |   8 +-
 zcash_client_backend/src/wallet.rs            |   3 +
 .../src/wallet/transparent.rs                 | 102 ++++++++++++++++
 zcash_client_memory/src/testing/mod.rs        |   4 +-
 zcash_client_sqlite/CHANGELOG.md              |   8 +-
 zcash_client_sqlite/src/lib.rs                | 109 +-----------------
 zcash_client_sqlite/src/testing/db.rs         |   6 +-
 zcash_client_sqlite/src/wallet/transparent.rs |  44 +++----
 zcash_transparent/CHANGELOG.md                |   1 +
 zcash_transparent/src/keys.rs                 |   2 +-
 14 files changed, 170 insertions(+), 178 deletions(-)
 create mode 100644 zcash_client_backend/src/wallet/transparent.rs

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index 114186d1fa..e46a46615a 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -23,6 +23,8 @@ workspace.
   - `GetMempoolTxRequest` (previously named `Exclude`) has added field `pool_types`
 - `impl From<zcash_client_backend::proposal::ProposalError> for zcash_client_backend::data_api::wallet::input_selection::InputSelectorError<...>`
 - `zcash_client_backend::fees::MetaSource`
+- `zcash_client_backend::wallet::transparent` module, behind the `transparent-inputs` feature flag.
+- `zcash_client_backend::data_api::ll`
 
 ### Changed
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`, `zip321 0.7`
@@ -59,6 +61,10 @@ workspace.
   `transparent-inputs` feature flag, as it is only useful in the context
   of the wallet receiving transparent funds.
 
+### Removed
+- `zcash_client_backend::data_api::testing::transparent::GapLimits` use
+  `zcash_client_backend::wallet::transparent::GapLimits` instead.
+
 ## [0.21.0] - 2025-11-05
 
 ### Added
diff --git a/zcash_client_backend/src/data_api/testing.rs b/zcash_client_backend/src/data_api/testing.rs
index 94ff07dfe9..b3d3fb9486 100644
--- a/zcash_client_backend/src/data_api/testing.rs
+++ b/zcash_client_backend/src/data_api/testing.rs
@@ -75,9 +75,11 @@ use crate::{
 #[cfg(feature = "transparent-inputs")]
 use {
     super::{TransactionsInvolvingAddress, wallet::input_selection::ShieldingSelector},
-    crate::{data_api::Balance, wallet::TransparentAddressMetadata},
+    crate::{
+        data_api::Balance,
+        wallet::{TransparentAddressMetadata, transparent::GapLimits},
+    },
     ::transparent::{address::TransparentAddress, keys::TransparentKeyScope},
-    transparent::GapLimits,
 };
 
 #[cfg(feature = "orchard")]
diff --git a/zcash_client_backend/src/data_api/testing/pool.rs b/zcash_client_backend/src/data_api/testing/pool.rs
index d278566b45..ab65b63f1c 100644
--- a/zcash_client_backend/src/data_api/testing/pool.rs
+++ b/zcash_client_backend/src/data_api/testing/pool.rs
@@ -1013,7 +1013,10 @@ pub fn spend_everything_multi_step_single_note_proposed_transfer<T: ShieldedPool
     Dsf: DataStoreFactory,
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    use crate::data_api::{MaxSpendMode, OutputOfSentTx, testing::transparent::GapLimits};
+    use crate::{
+        data_api::{MaxSpendMode, OutputOfSentTx},
+        wallet::transparent::GapLimits,
+    };
 
     let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache)
         .map(|builder| builder.with_gap_limits(GapLimits::new(10, 5, 3)))
@@ -1170,7 +1173,7 @@ pub fn spend_everything_multi_step_many_notes_proposed_transfer<T: ShieldedPoolT
     Dsf: DataStoreFactory,
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    use crate::data_api::{OutputOfSentTx, testing::transparent::GapLimits};
+    use crate::{data_api::OutputOfSentTx, wallet::transparent::GapLimits};
 
     let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache)
         .map(|builder| builder.with_gap_limits(GapLimits::new(10, 5, 3)))
@@ -1324,7 +1327,10 @@ pub fn spend_everything_multi_step_with_marginal_notes_proposed_transfer<
     Dsf: DataStoreFactory,
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    use crate::data_api::{MaxSpendMode, OutputOfSentTx, testing::transparent::GapLimits};
+    use crate::{
+        data_api::{MaxSpendMode, OutputOfSentTx},
+        wallet::transparent::GapLimits,
+    };
 
     let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache)
         .map(|builder| builder.with_gap_limits(GapLimits::new(10, 5, 3)))
@@ -1640,8 +1646,8 @@ pub fn send_multi_step_proposed_transfer<T: ShieldedPoolTester, Dsf>(
     Dsf: DataStoreFactory,
 {
     use crate::{
-        data_api::{OutputOfSentTx, TransactionStatus, testing::transparent::GapLimits},
-        wallet::{Exposure, TransparentAddressSource},
+        data_api::{OutputOfSentTx, TransactionStatus},
+        wallet::{Exposure, TransparentAddressSource, transparent::GapLimits},
     };
 
     let gap_limits = GapLimits::new(10, 5, 3);
@@ -2145,7 +2151,7 @@ pub fn spend_all_funds_multi_step_proposed_transfer<T: ShieldedPoolTester, Dsf>(
     Dsf: DataStoreFactory,
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    use crate::data_api::{OutputOfSentTx, testing::transparent::GapLimits};
+    use crate::{data_api::OutputOfSentTx, wallet::transparent::GapLimits};
 
     let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache)
         .map(|builder| builder.with_gap_limits(GapLimits::new(10, 5, 3)))
diff --git a/zcash_client_backend/src/data_api/testing/transparent.rs b/zcash_client_backend/src/data_api/testing/transparent.rs
index 06a0383d25..35776aad15 100644
--- a/zcash_client_backend/src/data_api/testing/transparent.rs
+++ b/zcash_client_backend/src/data_api/testing/transparent.rs
@@ -24,7 +24,7 @@ use crate::{
         },
     },
     fees::{DustOutputPolicy, StandardFeeRule, standard},
-    wallet::WalletTransparentOutput,
+    wallet::{WalletTransparentOutput, transparent::GapLimits},
 };
 
 /// Checks whether the transparent balance of the given test `account` is as `expected`
@@ -413,35 +413,6 @@ where
     );
 }
 
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub struct GapLimits {
-    external: u32,
-    internal: u32,
-    ephemeral: u32,
-}
-
-impl GapLimits {
-    pub fn new(external: u32, internal: u32, ephemeral: u32) -> Self {
-        Self {
-            external,
-            internal,
-            ephemeral,
-        }
-    }
-
-    pub fn external(&self) -> u32 {
-        self.external
-    }
-
-    pub fn internal(&self) -> u32 {
-        self.internal
-    }
-
-    pub fn ephemeral(&self) -> u32 {
-        self.ephemeral
-    }
-}
-
 pub fn gap_limits<DSF>(ds_factory: DSF, cache: impl TestCache, gap_limits: GapLimits)
 where
     DSF: DataStoreFactory,
diff --git a/zcash_client_backend/src/data_api/wallet.rs b/zcash_client_backend/src/data_api/wallet.rs
index 15f3545b69..5c1e8eb0ad 100644
--- a/zcash_client_backend/src/data_api/wallet.rs
+++ b/zcash_client_backend/src/data_api/wallet.rs
@@ -56,11 +56,13 @@ use crate::{
     proposal::{Proposal, ProposalError, Step, StepOutputIndex},
     wallet::{Note, OvkPolicy, Recipient},
 };
+use ::transparent::{
+    address::TransparentAddress, builder::TransparentSigningSet, bundle::OutPoint,
+};
 use sapling::{
     note_encryption::{PreparedIncomingViewingKey, try_sapling_note_decryption},
     prover::{OutputProver, SpendProver},
 };
-use transparent::{address::TransparentAddress, builder::TransparentSigningSet, bundle::OutPoint};
 use zcash_address::ZcashAddress;
 use zcash_keys::{
     address::Address,
@@ -88,15 +90,16 @@ use {
         proposal::StepOutput,
         wallet::{TransparentAddressMetadata, TransparentAddressSource},
     },
+    ::transparent::bundle::TxOut,
     core::convert::Infallible,
     input_selection::ShieldingSelector,
     std::collections::HashMap,
-    transparent::bundle::TxOut,
 };
 
 #[cfg(feature = "pczt")]
 use {
     crate::data_api::error::PcztError,
+    ::transparent::pczt::Bip32Derivation,
     bip32::ChildNumber,
     orchard::note_encryption::OrchardDomain,
     pczt::roles::{
@@ -105,7 +108,6 @@ use {
     },
     sapling::note_encryption::SaplingDomain,
     serde::{Deserialize, Serialize},
-    transparent::pczt::Bip32Derivation,
     zcash_note_encryption::try_output_recovery_with_pkd_esk,
     zcash_protocol::consensus::NetworkConstants,
 };
diff --git a/zcash_client_backend/src/wallet.rs b/zcash_client_backend/src/wallet.rs
index 8cd2c4565b..f37d501932 100644
--- a/zcash_client_backend/src/wallet.rs
+++ b/zcash_client_backend/src/wallet.rs
@@ -30,6 +30,9 @@ use {
     std::time::SystemTime,
 };
 
+#[cfg(feature = "transparent-inputs")]
+pub mod transparent;
+
 /// A unique identifier for a shielded transaction output
 #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct NoteId {
diff --git a/zcash_client_backend/src/wallet/transparent.rs b/zcash_client_backend/src/wallet/transparent.rs
new file mode 100644
index 0000000000..4de6ee9ef2
--- /dev/null
+++ b/zcash_client_backend/src/wallet/transparent.rs
@@ -0,0 +1,102 @@
+//! Types and operations specific to handling of transparent addresses and transparent outputs
+//! received by the wallet.
+use transparent::keys::TransparentKeyScope;
+
+/// Configuration for gap limits used in transparent address management.
+///
+/// A "gap limit" is the number of consecutive unused addresses that the wallet will generate
+/// before stopping. This concept comes from BIP-44 HD wallet standards: when scanning for
+/// funds, the wallet generates addresses sequentially and stops when it encounters a "gap"
+/// of unused addresses equal to this limit. In recovery, a wallet will discover funds
+/// belonging to generated addresses. Note that order of operations matters; if a wallet scans
+/// blocks for transparent outputs instead of querying the UTXO set, out-of-order scanning may
+/// result in funds not being found; as a result, wallets should still fall back to making
+/// temporally unlinkable, private queries to the UTXO set for each address controlled by the
+/// wallet at any time that a gap in scanned blocks is introduced by out-of-order scanning.
+///
+/// In Zcash, we define individual gap limits for the following address types:
+/// - **External addresses**: Addresses shared with external parties.
+/// - **Internal (change) addresses**: Used for transparent change outputs.
+/// - **Ephemeral addresses**: Used for single-use purposes like ZIP-320 TEX address transfers.
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub struct GapLimits {
+    external: u32,
+    internal: u32,
+    ephemeral: u32,
+}
+
+impl GapLimits {
+    /// Constructs a new `GapLimits` value from its constituent parts.
+    ///
+    /// The gap limits recommended for use with this crate are supplied by the [`Default`]
+    /// implementation for this type.
+    ///
+    /// This constructor is only available under the `unstable` feature, as it is not recommended
+    /// for general use.
+    #[cfg(any(test, feature = "test-dependencies", feature = "unstable"))]
+    pub fn new(external: u32, internal: u32, ephemeral: u32) -> Self {
+        Self {
+            external,
+            internal,
+            ephemeral,
+        }
+    }
+
+    /// Returns the gap limit for external-scoped addresses.
+    pub fn external(&self) -> u32 {
+        self.external
+    }
+
+    /// Returns the gap limit for internal-scoped addresses.
+    pub fn internal(&self) -> u32 {
+        self.internal
+    }
+
+    /// Returns the gap limit for ephemeral-scoped addresses.
+    pub fn ephemeral(&self) -> u32 {
+        self.ephemeral
+    }
+
+    /// Returns the gap limit for the given transparent key scope, or `None` if the key scope is
+    /// one for which gap limits are not managed by this type.
+    pub fn limit_for(&self, scope: TransparentKeyScope) -> Option<u32> {
+        match scope {
+            TransparentKeyScope::EXTERNAL => Some(self.external()),
+            TransparentKeyScope::INTERNAL => Some(self.internal()),
+            TransparentKeyScope::EPHEMERAL => Some(self.ephemeral()),
+            _ => None,
+        }
+    }
+}
+
+/// The default gap limits supported by this implementation are:
+///
+/// - external addresses: 10
+/// - transparent internal (change) addresses: 5
+/// - ephemeral addresses: 10
+///
+/// These limits are chosen with the following rationale:
+/// - At present, many wallets query light wallet servers with a set of addresses, because querying
+///   for each address independently and in a fashion that is not susceptible to clustering via
+///   timing correlation leads to undesirable delays in discovery of received funds. As such, it is
+///   desirable to minimize the number of addresses that can be "linked", i.e. understood by the
+///   light wallet server to all belong to the same wallet.
+/// - For transparent change addresses it is always expected that an address will receive funds
+///   immediately following its generation except in the case of wallet failure.
+/// - For externally-scoped transparent addresses and ephemeral addresses, it is desirable to use a
+///   slightly larger gap limit to account for addresses that were shared with counterparties never
+///   having been used. However, we don't want to use the full 20-address gap limit space because
+///   it's possible that in the future, changes to the light wallet protocol will obviate the need to
+///   query for UTXOs in a fashion that links those addresses to one another. In such a
+///   circumstance, the gap limit will be adjusted upward and address rotation should then choose
+///   an address that is outside the current gap limit; after that change, newly generated
+///   addresses will not be exposed as linked in the view of the light wallet server.
+impl Default for GapLimits {
+    fn default() -> Self {
+        Self {
+            external: 10,
+            internal: 5,
+            ephemeral: 10,
+        }
+    }
+}
diff --git a/zcash_client_memory/src/testing/mod.rs b/zcash_client_memory/src/testing/mod.rs
index a2f0258385..0b5d094e09 100644
--- a/zcash_client_memory/src/testing/mod.rs
+++ b/zcash_client_memory/src/testing/mod.rs
@@ -24,8 +24,8 @@ use crate::{Account, AccountId, Error, MemBlockCache, MemoryWalletDb, SentNoteId
 
 #[cfg(feature = "transparent-inputs")]
 use zcash_client_backend::{
-    data_api::{InputSource, WalletRead, testing::transparent::GapLimits, wallet::TargetHeight},
-    wallet::WalletTransparentOutput,
+    data_api::{InputSource, WalletRead, wallet::TargetHeight},
+    wallet::{WalletTransparentOutput, transparent::GapLimits},
 };
 
 pub mod pool;
diff --git a/zcash_client_sqlite/CHANGELOG.md b/zcash_client_sqlite/CHANGELOG.md
index a894dec9f4..6926dc1093 100644
--- a/zcash_client_sqlite/CHANGELOG.md
+++ b/zcash_client_sqlite/CHANGELOG.md
@@ -1,4 +1,4 @@
- Changelog
+# Changelog
 All notable changes to this library will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
@@ -20,6 +20,10 @@ workspace.
 ### Changed
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`.
 
+### Removed
+- `zcash_client_sqlite::GapLimits` use
+  `zcash_client_backend::wallet::transparent::GapLimits` instead.
+
 ## [0.18.11, 0.19.2] - 2026-01-30
 
 ### Fixed
@@ -52,7 +56,7 @@ workspace.
 
 ### Fixed
 - A bug was fixed in `WalletDb::get_transaction` that could cause transaction
-  retrieval to return an error instead of `None` for transactions for which the 
+  retrieval to return an error instead of `None` for transactions for which the
   raw transaction data was not available.
 
 ## [0.18.9] - 2025-10-22
diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs
index c5348913a8..e5b94cc86a 100644
--- a/zcash_client_sqlite/src/lib.rs
+++ b/zcash_client_sqlite/src/lib.rs
@@ -113,7 +113,7 @@ use {
     std::time::SystemTime,
     zcash_client_backend::{
         data_api::{Balance, TransactionsInvolvingAddress, WalletUtxo},
-        wallet::TransparentAddressMetadata,
+        wallet::{TransparentAddressMetadata, transparent::GapLimits},
     },
     zcash_keys::encoding::AddressCodec,
 };
@@ -272,113 +272,6 @@ struct TxRef(pub i64);
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 struct AddressRef(pub(crate) i64);
 
-/// A data structure that can be used to configure custom gap limits for use in transparent address
-/// rotation.
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-#[cfg(feature = "transparent-inputs")]
-pub struct GapLimits {
-    external: u32,
-    internal: u32,
-    ephemeral: u32,
-}
-
-#[cfg(feature = "transparent-inputs")]
-impl GapLimits {
-    /// Constructs a new `GapLimits` value from its constituent parts.
-    ///
-    /// The gap limits recommended for use with this crate are supplied by the [`Default`]
-    /// implementation for this type.
-    ///
-    /// This constructor is only available under the `unstable` feature, as it is not recommended
-    /// for general use.
-    #[cfg(any(test, feature = "test-dependencies", feature = "unstable"))]
-    pub fn from_parts(external: u32, internal: u32, ephemeral: u32) -> Self {
-        Self {
-            external,
-            internal,
-            ephemeral,
-        }
-    }
-
-    pub(crate) fn external(&self) -> u32 {
-        self.external
-    }
-
-    pub(crate) fn internal(&self) -> u32 {
-        self.internal
-    }
-
-    pub(crate) fn ephemeral(&self) -> u32 {
-        self.ephemeral
-    }
-
-    pub(crate) fn limit_for(&self, scope: KeyScope) -> Option<u32> {
-        match scope {
-            KeyScope::EXTERNAL => Some(self.external()),
-            KeyScope::INTERNAL => Some(self.internal()),
-            KeyScope::Ephemeral => Some(self.ephemeral()),
-            _ => None,
-        }
-    }
-}
-
-/// The default gap limits supported by this implementation are:
-///
-/// - external addresses: 10
-/// - transparent internal (change) addresses: 5
-/// - ephemeral addresses: 10
-///
-/// These limits are chosen with the following rationale:
-/// - At present, many wallets query light wallet servers with a set of addresses, because querying
-///   for each address independently and in a fashion that is not susceptible to clustering via
-///   timing correlation leads to undesirable delays in discovery of received funds. As such, it is
-///   desirable to minimize the number of addresses that can be "linked", i.e. understood by the
-///   light wallet server to all belong to the same wallet.
-/// - For transparent change addresses it is always expected that an address will receive funds
-///   immediately following its generation except in the case of wallet failure.
-/// - For externally-scoped transparent addresses and ephemeral addresses, it is desirable to use a
-///   slightly larger gap limit to account for addresses that were shared with counterparties never
-///   having been used. However, we don't want to use the full 20-address gap limit space because
-///   it's possible that in the future, changes to the light wallet protocol will obviate the need to
-///   query for UTXOs in a fashion that links those addresses to one another. In such a
-///   circumstance, the gap limit will be adjusted upward and address rotation should then choose
-///   an address that is outside the current gap limit; after that change, newly generated
-///   addresses will not be exposed as linked in the view of the light wallet server.
-#[cfg(feature = "transparent-inputs")]
-impl Default for GapLimits {
-    fn default() -> Self {
-        Self {
-            external: 10,
-            internal: 5,
-            ephemeral: 10,
-        }
-    }
-}
-
-#[cfg(all(
-    any(test, feature = "test-dependencies"),
-    feature = "transparent-inputs"
-))]
-impl From<GapLimits> for zcash_client_backend::data_api::testing::transparent::GapLimits {
-    fn from(value: GapLimits) -> Self {
-        zcash_client_backend::data_api::testing::transparent::GapLimits::new(
-            value.external,
-            value.internal,
-            value.ephemeral,
-        )
-    }
-}
-
-#[cfg(all(
-    any(test, feature = "test-dependencies"),
-    feature = "transparent-inputs"
-))]
-impl From<zcash_client_backend::data_api::testing::transparent::GapLimits> for GapLimits {
-    fn from(value: zcash_client_backend::data_api::testing::transparent::GapLimits) -> Self {
-        GapLimits::from_parts(value.external(), value.internal(), value.ephemeral())
-    }
-}
-
 /// A wrapper for the SQLite connection to the wallet database, along with a capability to read the
 /// system from the clock. A `WalletDb` encapsulates the full set of capabilities that are required
 /// in order to implement the [`WalletRead`], [`WalletWrite`] and [`WalletCommitmentTrees`] traits.
diff --git a/zcash_client_sqlite/src/testing/db.rs b/zcash_client_sqlite/src/testing/db.rs
index 2f3c4ddfa1..49950cc9f2 100644
--- a/zcash_client_sqlite/src/testing/db.rs
+++ b/zcash_client_sqlite/src/testing/db.rs
@@ -51,7 +51,7 @@ use {
         keys::{NonHardenedChildIndex, TransparentKeyScope},
     },
     core::ops::Range,
-    testing::transparent::GapLimits,
+    zcash_client_backend::wallet::transparent::GapLimits,
 };
 
 /// Tuesday, 25 February 2025 00:00:00Z (the day the clock code was added).
@@ -195,7 +195,7 @@ impl DataStoreFactory for TestDbFactory {
             WalletDb::for_path(data_file.path(), network, test_clock(), test_rng()).unwrap();
         #[cfg(feature = "transparent-inputs")]
         if let Some(gap_limits) = gap_limits {
-            db_data = db_data.with_gap_limits(gap_limits.into());
+            db_data = db_data.with_gap_limits(gap_limits);
         }
 
         let migrator = WalletMigrator::new();
@@ -225,7 +225,7 @@ impl Reset for TestDb {
                 .new_data_store(
                     network,
                     #[cfg(feature = "transparent-inputs")]
-                    Some(gap_limits.into()),
+                    Some(gap_limits),
                 )
                 .unwrap(),
         );
diff --git a/zcash_client_sqlite/src/wallet/transparent.rs b/zcash_client_sqlite/src/wallet/transparent.rs
index 6884f720c5..753a4274e0 100644
--- a/zcash_client_sqlite/src/wallet/transparent.rs
+++ b/zcash_client_sqlite/src/wallet/transparent.rs
@@ -22,6 +22,7 @@ use transparent::{
 };
 use zcash_address::unified::{Ivk, Typecode, Uivk};
 use zcash_client_backend::data_api::WalletUtxo;
+use zcash_client_backend::wallet::transparent::GapLimits;
 use zcash_client_backend::wallet::{Exposure, GapMetadata, TransparentAddressSource};
 use zcash_client_backend::{
     data_api::{
@@ -39,8 +40,7 @@ use zcash_keys::{
         UnifiedIncomingViewingKey,
     },
 };
-use zcash_primitives::transaction::builder::DEFAULT_TX_EXPIRY_DELTA;
-use zcash_primitives::transaction::fees::zip317;
+use zcash_primitives::transaction::{builder::DEFAULT_TX_EXPIRY_DELTA, fees::zip317};
 use zcash_protocol::{
     TxId,
     consensus::{self, BlockHeight},
@@ -61,7 +61,7 @@ use super::{
     get_account_ids, get_account_internal,
 };
 use crate::{
-    AccountRef, AccountUuid, AddressRef, GapLimits, TxRef, UtxoId,
+    AccountRef, AccountUuid, AddressRef, TxRef, UtxoId,
     error::SqliteClientError,
     util::Clock,
     wallet::{common::tx_unexpired_condition, get_account, mempool_height},
@@ -143,16 +143,15 @@ pub(crate) fn get_transparent_receivers<P: consensus::Parameters>(
     let gap_limit_starts = scopes
         .iter()
         .filter_map(|key_scope| {
-            gap_limits
-                .limit_for(*key_scope)
-                .zip(key_scope.as_transparent())
-                .and_then(|(limit, t_key_scope)| {
+            key_scope.as_transparent().and_then(|t_key_scope| {
+                gap_limits.limit_for(t_key_scope).and_then(|limit| {
                     find_gap_start(conn, account_id, t_key_scope, limit)
                         .transpose()
-                        .map(|res| res.map(|child_idx| (*key_scope, (limit, child_idx))))
+                        .map(|res| res.map(|child_idx| (t_key_scope, (limit, child_idx))))
                 })
+            })
         })
-        .collect::<Result<HashMap<KeyScope, (u32, NonHardenedChildIndex)>, SqliteClientError>>()?;
+        .collect::<Result<HashMap<TransparentKeyScope, (u32, NonHardenedChildIndex)>, SqliteClientError>>()?;
 
     // Get all addresses with the provided scopes.
     let mut addr_query = conn.prepare(
@@ -217,9 +216,11 @@ pub(crate) fn get_transparent_receivers<P: consensus::Parameters>(
             row.get::<_, Option<u32>>("exposed_at_height")?
                 .map_or(Exposure::Unknown, |h| Exposure::Exposed {
                     at_height: BlockHeight::from(h),
-                    gap_metadata: gap_limit_starts
-                        .get(&key_scope)
-                        .zip(address_index_opt)
+                    gap_metadata: key_scope
+                        .as_transparent()
+                        .and_then(|t_key_scope| {
+                            gap_limit_starts.get(&t_key_scope).zip(address_index_opt)
+                        })
                         .map_or(
                             GapMetadata::DerivationUnknown,
                             |((gap_limit, start), idx)| {
@@ -268,9 +269,10 @@ pub(crate) fn get_transparent_receivers<P: consensus::Parameters>(
                     TransparentAddressMetadata::standalone(pubkey, exposure, next_check_time)
                 }
                 derived => {
-                    let scope_opt = <Option<TransparentKeyScope>>::from(derived);
-                    let (scope, address_index) =
-                        scope_opt.zip(address_index_opt).ok_or_else(|| {
+                    let (scope, address_index) = derived
+                        .as_transparent()
+                        .zip(address_index_opt)
+                        .ok_or_else(|| {
                             SqliteClientError::CorruptedData(
                                 "Derived addresses must have derivation metadata present."
                                     .to_owned(),
@@ -1797,15 +1799,15 @@ pub(crate) fn get_transparent_address_metadata<P: consensus::Parameters>(
                     let address_index = address_index_from_diversifier_index_be(row.get("diversifier_index_be")?)?;
                     let exposed_at_height = row.get::<_, Option<u32>>("exposed_at_height")?.map(BlockHeight::from);
 
-                    match <Option<TransparentKeyScope>>::from(key_scope).zip(address_index) {
-                        Some((scope, address_index)) => {
+                    match key_scope.as_transparent().zip(address_index) {
+                        Some((t_key_scope, address_index)) => {
                             let exposure = exposed_at_height.map_or(
                                 Ok::<_, SqliteClientError>(Exposure::Unknown),
                                 |at_height| {
-                                    let gap_metadata = match gap_limits.limit_for(key_scope) {
+                                    let gap_metadata = match gap_limits.limit_for(t_key_scope) {
                                         None => GapMetadata::DerivationUnknown,
                                         Some(gap_limit) => {
-                                            find_gap_start(conn, account_id, scope, gap_limit)?.map_or(
+                                            find_gap_start(conn, account_id, t_key_scope, gap_limit)?.map_or(
                                                 GapMetadata::GapRecoverable { gap_limit },
                                                 |gap_start| {
                                                     if let Some(gap_position) = address_index.index().checked_sub(gap_start.index()) {
@@ -1829,7 +1831,7 @@ pub(crate) fn get_transparent_address_metadata<P: consensus::Parameters>(
                             )?;
 
                             Ok(TransparentAddressMetadata::derived(
-                                scope,
+                                t_key_scope,
                                 address_index,
                                 exposure,
                                 next_check_time
@@ -2212,7 +2214,7 @@ mod tests {
         zcash_client_backend::data_api::testing::transparent::gap_limits(
             TestDbFactory::default(),
             BlockCache::new(),
-            GapLimits::default().into(),
+            GapLimits::default(),
         );
     }
 
diff --git a/zcash_transparent/CHANGELOG.md b/zcash_transparent/CHANGELOG.md
index 4023966de9..ee6664dc12 100644
--- a/zcash_transparent/CHANGELOG.md
+++ b/zcash_transparent/CHANGELOG.md
@@ -20,6 +20,7 @@ workspace.
 - `zcash_transparent::builder::SpendInfo`
 - `zcash_transparent::builder::TransparentInputInfo::{from_parts, spend_info}`
 - `zcash_transparent::builder::Builder::add_p2pkh_input`
+- `impl Hash for zcash_transparent::keys::TransparentKeyScope`
 
 ### Changed
 - MSRV is now 1.85.1.
diff --git a/zcash_transparent/src/keys.rs b/zcash_transparent/src/keys.rs
index cde369f7f8..37a36316c2 100644
--- a/zcash_transparent/src/keys.rs
+++ b/zcash_transparent/src/keys.rs
@@ -22,7 +22,7 @@ use {
 ///
 /// This type can represent [`zip32`] internal and external scopes, as well as custom scopes that
 /// may be used in non-hardened derivation at the `change` level of the BIP 44 key path.
-#[derive(Clone, Copy, PartialEq, Eq)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash)]
 pub struct TransparentKeyScope(u32);
 
 impl TransparentKeyScope {

From feeda69714bc60b82a599d5a9d505ad881cad39c Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Thu, 6 Nov 2025 06:38:34 -0700
Subject: [PATCH 129/263] zcash_client_backend: Add low-level data API

This defines the database operations required for implementing
`zcash_client_sqlite::store_decrypted_tx` in a reusable,
backing-database independent fashion.
---
 zcash_client_backend/src/data_api.rs    |   1 +
 zcash_client_backend/src/data_api/ll.rs | 580 ++++++++++++++++++++++++
 zcash_transparent/src/bundle.rs         |   1 +
 3 files changed, 582 insertions(+)
 create mode 100644 zcash_client_backend/src/data_api/ll.rs

diff --git a/zcash_client_backend/src/data_api.rs b/zcash_client_backend/src/data_api.rs
index 714a7961f4..0af6afc591 100644
--- a/zcash_client_backend/src/data_api.rs
+++ b/zcash_client_backend/src/data_api.rs
@@ -125,6 +125,7 @@ use zcash_protocol::consensus::NetworkUpgrade;
 
 pub mod chain;
 pub mod error;
+pub mod ll;
 pub mod scanning;
 pub mod wallet;
 
diff --git a/zcash_client_backend/src/data_api/ll.rs b/zcash_client_backend/src/data_api/ll.rs
new file mode 100644
index 0000000000..ceaf8d1da2
--- /dev/null
+++ b/zcash_client_backend/src/data_api/ll.rs
@@ -0,0 +1,580 @@
+//! Low-level data API
+//!
+//! This module provides default implementations for several common client operations that rely on
+//! lower-level and more granular access to data. Client implementers should consider using the
+//! utility functions in this module when implementing traits such as [`WalletRead`] and
+//! [`WalletWrite`] in order to provide a consistent and robust user experience.
+//!
+//! [`WalletRead`]: super::WalletRead
+//! [`WalletWrite`]: super::WalletWrite
+
+use core::{fmt::Debug, hash::Hash};
+use std::collections::HashSet;
+
+use incrementalmerkletree::Position;
+use transparent::bundle::OutPoint;
+use zcash_address::ZcashAddress;
+use zcash_keys::address::Receiver;
+use zcash_primitives::transaction::{Transaction, TransactionData};
+use zcash_protocol::{
+    TxId,
+    consensus::BlockHeight,
+    memo::MemoBytes,
+    value::{BalanceError, Zatoshis},
+};
+use zip32::Scope;
+
+use super::{TransactionStatus, wallet::TargetHeight};
+use crate::{
+    DecryptedOutput, TransferType,
+    wallet::{Recipient, WalletSaplingOutput},
+};
+
+#[cfg(feature = "transparent-inputs")]
+use {
+    super::WalletUtxo,
+    transparent::{address::TransparentAddress, keys::TransparentKeyScope},
+    zcash_keys::keys::UnifiedAddressRequest,
+};
+
+#[cfg(feature = "orchard")]
+use crate::wallet::WalletOrchardOutput;
+
+/// A trait for types that can provide information about outputs spent by and fees that were paid
+/// for a given transaction.
+pub trait TxMeta {
+    /// Returns an iterator over the references to transparent outputs spent in this transaction.
+    #[cfg(feature = "transparent-inputs")]
+    fn transparent_spends(&self) -> impl Iterator<Item = &OutPoint>;
+
+    /// Returns an iterator over the nullifiers of Sapling notes spent in this transaction.
+    fn sapling_spent_note_nullifiers(&self) -> impl Iterator<Item = &::sapling::Nullifier>;
+
+    /// Returns an iterator over the nullifiers of Orchard notes spent in this transaction.
+    #[cfg(feature = "orchard")]
+    fn orchard_spent_note_nullifiers(&self) -> impl Iterator<Item = &::orchard::note::Nullifier>;
+
+    /// Returns the fee paid by this transaction, given a function that can retrieve the value of
+    /// prior transparent outputs spent in the transaction.
+    ///
+    /// Returns `Ok(None)` if insufficient information is available for computing the fee. This
+    /// can occur when:
+    /// - The transaction has transparent inputs whose values are not known to the wallet (e.g.,
+    ///   the wallet has not yet retrieved the transactions that created those outputs).
+    /// - The wallet scanned the chain using compact blocks, which do not include transparent
+    ///   input information. In this case, the wallet cannot determine whether the transaction
+    ///   has any transparent inputs, and thus cannot know if the fee is computable from
+    ///   shielded data alone.
+    fn fee_paid<E, F>(&self, get_prevout: F) -> Result<Option<Zatoshis>, E>
+    where
+        E: From<BalanceError>,
+        F: FnMut(&OutPoint) -> Result<Option<Zatoshis>, E>;
+}
+
+impl TxMeta for Transaction {
+    #[cfg(feature = "transparent-inputs")]
+    fn transparent_spends(&self) -> impl Iterator<Item = &OutPoint> {
+        self.transparent_bundle()
+            .into_iter()
+            .flat_map(|bundle| bundle.vin.iter().map(|txin| txin.prevout()))
+    }
+
+    fn sapling_spent_note_nullifiers(&self) -> impl Iterator<Item = &::sapling::Nullifier> {
+        self.sapling_bundle().into_iter().flat_map(|bundle| {
+            bundle
+                .shielded_spends()
+                .iter()
+                .map(|spend| spend.nullifier())
+        })
+    }
+
+    #[cfg(feature = "orchard")]
+    fn orchard_spent_note_nullifiers(&self) -> impl Iterator<Item = &::orchard::note::Nullifier> {
+        self.orchard_bundle()
+            .into_iter()
+            .flat_map(|bundle| bundle.actions().iter().map(|action| action.nullifier()))
+    }
+
+    fn fee_paid<E, F>(&self, get_prevout: F) -> Result<Option<Zatoshis>, E>
+    where
+        E: From<BalanceError>,
+        F: FnMut(&OutPoint) -> Result<Option<Zatoshis>, E>,
+    {
+        TransactionData::fee_paid(self, get_prevout)
+    }
+}
+
+/// A capability trait that provides low-level wallet database read operations. These operations
+/// are used to provide standard implementations for certain [`WalletWrite`] trait methods.
+///
+/// [`WalletWrite`]: super::WalletWrite
+pub trait LowLevelWalletRead {
+    /// The type of errors that may be generated when querying a wallet data store.
+    type Error: Debug;
+
+    /// The type of the account identifier.
+    ///
+    /// An account identifier corresponds to at most a single unified spending key's worth of spend
+    /// authority, such that both received notes and change spendable by that spending authority
+    /// will be interpreted as belonging to that account.
+    type AccountId: Debug + Copy + Eq + Hash;
+
+    /// A wallet-internal transaction identifier.
+    type TxRef: Copy + Eq;
+
+    /// Returns the set of account identifiers for accounts that spent notes and/or UTXOs in the
+    /// construction of the given transaction.
+    fn get_funding_accounts<T: TxMeta>(
+        &self,
+        tx: &T,
+    ) -> Result<HashSet<Self::AccountId>, Self::Error> {
+        let mut funding_accounts = HashSet::new();
+
+        #[cfg(feature = "transparent-inputs")]
+        funding_accounts.extend(self.detect_accounts_transparent(tx.transparent_spends())?);
+
+        funding_accounts.extend(self.detect_accounts_sapling(tx.sapling_spent_note_nullifiers())?);
+
+        #[cfg(feature = "orchard")]
+        funding_accounts.extend(self.detect_accounts_orchard(tx.orchard_spent_note_nullifiers())?);
+
+        Ok(funding_accounts)
+    }
+
+    /// Returns the most likely wallet address that corresponds to the protocol-level receiver of a
+    /// note or UTXO.
+    ///
+    /// If the wallet database has stored a wallet address that contains the given receiver, then
+    /// that address is returned; otherwise, a the most likely address containing that receiver
+    /// will be returned. The "most likely" address should be produced by generating the "standard"
+    /// address (a transparent address if the receiver is transparent, or the default Unified
+    /// address for the account) derived at the receiver's diviersifier index if the receiver is
+    /// for a shielded pool.
+    ///
+    /// Returns `Ok(None)` if the receiver cannot be determined to belong to an address produced by
+    /// this account.
+    fn select_receiving_address(
+        &self,
+        account: Self::AccountId,
+        receiver: &Receiver,
+    ) -> Result<Option<ZcashAddress>, Self::Error>;
+
+    /// Detects and returns the identifier for the account to which the address belongs, if any.
+    ///
+    /// In addition, for HD-derived addresses, the change-level key scope used to derive the
+    /// address is returned, so that the caller is able to determine whether any special handling
+    /// rules apply to the address for the purposes of preserving user privacy (by limiting address
+    /// linking, etc.).
+    #[cfg(feature = "transparent-inputs")]
+    #[allow(clippy::type_complexity)]
+    fn find_account_for_transparent_address(
+        &self,
+        address: &TransparentAddress,
+    ) -> Result<Option<(Self::AccountId, Option<TransparentKeyScope>)>, Self::Error>;
+
+    /// Detects the set of accounts that received transparent outputs corresponding to the provided
+    /// [`OutPoint`]s. This is used to determine which account(s) funded a given transaction.
+    ///
+    /// [`OutPoint`]: transparent::bundle::OutPoint
+    #[cfg(feature = "transparent-inputs")]
+    fn detect_accounts_transparent<'a>(
+        &self,
+        spends: impl Iterator<Item = &'a transparent::bundle::OutPoint>,
+    ) -> Result<HashSet<Self::AccountId>, Self::Error>;
+
+    /// Detects the set of accounts that received Sapling outputs that, when spent, reveal(ed) the
+    /// given [`Nullifier`]s. This is used to determine which account(s) funded a given
+    /// transaction.
+    ///
+    /// [`Nullifier`]: sapling::Nullifier
+    fn detect_accounts_sapling<'a>(
+        &self,
+        spends: impl Iterator<Item = &'a sapling::Nullifier>,
+    ) -> Result<HashSet<Self::AccountId>, Self::Error>;
+
+    /// Detects the set of accounts that received Orchard outputs that, when spent, reveal(ed) the
+    /// given [`Nullifier`]s. This is used to determine which account(s) funded a given
+    /// transaction.
+    ///
+    /// [`Nullifier`]: orchard::note::Nullifier
+    #[cfg(feature = "orchard")]
+    fn detect_accounts_orchard<'a>(
+        &self,
+        spends: impl Iterator<Item = &'a orchard::note::Nullifier>,
+    ) -> Result<HashSet<Self::AccountId>, Self::Error>;
+
+    /// Get information about a transparent output controlled by the wallet.
+    ///
+    /// # Parameters
+    /// - `outpoint`: The identifier for the output to be retrieved.
+    /// - `target_height`: The target height of a transaction under construction that will spend the
+    ///   returned output. If this is `None`, no spendability checks are performed.
+    #[cfg(feature = "transparent-inputs")]
+    fn get_wallet_transparent_output(
+        &self,
+        outpoint: &OutPoint,
+        target_height: Option<TargetHeight>,
+    ) -> Result<Option<WalletUtxo>, Self::Error>;
+
+    /// Returns the vector of transactions in the wallet that spend the transparent outputs of the
+    /// referenced transaction. This should include conflicted transactions and transactions that
+    /// have expired without having been mined.
+    ///
+    /// This is used as part of [`wallet::store_decrypted_tx`] to allow downstream transactions'
+    /// fee amounts to be updated once the value of all their inputs are known.
+    fn get_txs_spending_transparent_outputs_of(
+        &self,
+        tx_ref: Self::TxRef,
+    ) -> Result<Vec<(Self::TxRef, Transaction)>, Self::Error>;
+}
+
+/// A capability trait that provides low-level wallet write operations. These operations are used
+/// to provide standard implementations for certain [`WalletWrite`] trait methods.
+///
+/// [`WalletWrite`]: super::WalletWrite
+pub trait LowLevelWalletWrite: LowLevelWalletRead {
+    /// Adds the given transaction to the wallet.
+    ///
+    /// # Parameters
+    /// - `tx`: The transaction to store.
+    /// - `fee`: The fee paid by the transaction, if known. This may be `None` if the wallet
+    ///   does not have sufficient information to compute the fee (see [`TxMeta::fee_paid`]).
+    /// - `created_at`: The time the transaction was created, if known.
+    /// - `target_height`: The target height for the transaction, if it was created by this
+    ///   wallet.
+    /// - `observed_height`: The height at which the transaction was first observed. For mined
+    ///   transactions, this is the mined height; for unmined transactions, this is typically
+    ///   the chain tip height at the time of observation.
+    fn put_tx_data(
+        &mut self,
+        tx: &Transaction,
+        fee: Option<Zatoshis>,
+        created_at: Option<time::OffsetDateTime>,
+        target_height: Option<TargetHeight>,
+        observed_height: BlockHeight,
+    ) -> Result<Self::TxRef, Self::Error>;
+
+    /// Updates transaction metadata to reflect that the given transaction status has been
+    /// observed.
+    fn set_transaction_status(
+        &mut self,
+        txid: TxId,
+        status: TransactionStatus,
+    ) -> Result<(), Self::Error>;
+
+    /// Adds information about a received Sapling note to the wallet, or updates any existing
+    /// record for that output.
+    fn put_received_sapling_note<T: ReceivedSaplingOutput<AccountId = Self::AccountId>>(
+        &mut self,
+        output: &T,
+        tx_ref: Self::TxRef,
+        target_or_mined_height: Option<BlockHeight>,
+        spent_in: Option<Self::TxRef>,
+    ) -> Result<(), Self::Error>;
+
+    /// Adds information about a received Orchard note to the wallet, or updates any existing
+    /// record for that output.
+    #[cfg(feature = "orchard")]
+    fn put_received_orchard_note<T: ReceivedOrchardOutput<AccountId = Self::AccountId>>(
+        &mut self,
+        output: &T,
+        tx_ref: Self::TxRef,
+        target_or_mined_height: Option<BlockHeight>,
+        spent_in: Option<Self::TxRef>,
+    ) -> Result<(), Self::Error>;
+
+    /// Records information about a transaction output that your wallet created, from the constituent
+    /// properties of that output.
+    ///
+    /// - If `recipient` is a Unified address, `output_index` is an index into the outputs of the
+    ///   transaction within the bundle associated with the recipient's output pool.
+    /// - If `recipient` is a Sapling address, `output_index` is an index into the Sapling outputs of
+    ///   the transaction.
+    /// - If `recipient` is a transparent address, `output_index` is an index into the transparent
+    ///   outputs of the transaction.
+    /// - If `recipient` is an internal account, `output_index` is an index into the outputs of
+    ///   the transaction in the transaction bundle corresponding to the recipient pool.
+    fn put_sent_output(
+        &mut self,
+        from_account_uuid: Self::AccountId,
+        tx_ref: Self::TxRef,
+        output_index: usize,
+        recipient: &Recipient<Self::AccountId>,
+        value: Zatoshis,
+        memo: Option<&MemoBytes>,
+    ) -> Result<(), Self::Error>;
+
+    /// Updates the wallet's view of a transaction to indicate the miner's fee paid by the
+    /// transaction.
+    fn update_tx_fee(&mut self, tx_ref: Self::TxRef, fee: Zatoshis) -> Result<(), Self::Error>;
+
+    /// Adds a transparent output observed by the wallet to the data store, or updates any existing
+    /// record for that output.
+    ///
+    /// # Parameters
+    /// - `output`: The output data.
+    /// - `observation_height`: The chain tip height at the time that the update is made. Note that
+    ///   this is likely to differ from the height at which the output was mined (if any.)
+    /// - `known_unspent`: Set to `true` if the output is known to be a member of the UTXO set as
+    ///   of the given observation height.
+    #[cfg(feature = "transparent-inputs")]
+    fn put_transparent_output(
+        &mut self,
+        output: &crate::wallet::WalletTransparentOutput,
+        observation_height: BlockHeight,
+        known_unspent: bool,
+    ) -> Result<(Self::AccountId, Option<TransparentKeyScope>), Self::Error>;
+
+    /// Updates the backing store to indicate that the UTXO referred to by `outpoint` is spent
+    /// in the transaction referenced by `spent_in_tx`.
+    #[cfg(feature = "transparent-inputs")]
+    fn mark_transparent_utxo_spent(
+        &mut self,
+        outpoint: &OutPoint,
+        spent_in_tx: Self::TxRef,
+    ) -> Result<bool, Self::Error>;
+
+    /// Updates the wallet backend by generating and caching addresses for the given key scope such
+    /// that at least the backend's configured gap limit worth of addresses exist at indices
+    /// successive from that of the last address that received a mined transaction.
+    ///
+    /// # Parameters
+    /// - `account_id`: The ID of the account holding the UFVK from which addresses should be
+    ///   generated.
+    /// - `key_scope`: The transparent key scope for addresses to generate. Implementations may
+    ///   choose to only support the `external`, `internal`, and `ephemeral` key scopes and return
+    ///   an error if an unrecognized scope is used.
+    /// - `request`: A request for the Unified Address that will be generated with a diversifier
+    ///   index equal to the [`BIP 44`] `address_index` of each generated address.
+    ///
+    /// [`BIP 44`]: https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki
+    #[cfg(feature = "transparent-inputs")]
+    fn generate_transparent_gap_addresses(
+        &mut self,
+        account_id: Self::AccountId,
+        key_scope: TransparentKeyScope,
+        request: UnifiedAddressRequest,
+    ) -> Result<(), Self::Error>;
+
+    /// Adds a [`TransactionDataRequest::TransactionsInvolvingAddress`] request to the transaction
+    /// data request queue. When the transparetn output of `tx_ref` at output index `output_index`
+    /// (which must have been received at `receiving_address`) is detected as having been spent,
+    /// this request will be considered fulfilled.
+    ///
+    /// NOTE: The somewhat awkward API of this method is a historical artifact; if the light wallet
+    /// protocol is in the future updated to expose a mechanism to find the transaction that spends
+    /// a particular `OutPoint`, the `TransactionsInvolvingAddress` variant and this method will
+    /// likely be removed.
+    ///
+    /// [`TransactionDataRequest::TransactionsInvolvingAddress`]: super::TransactionDataRequest
+    #[cfg(feature = "transparent-inputs")]
+    fn queue_transparent_spend_detection(
+        &mut self,
+        receiving_address: TransparentAddress,
+        tx_ref: Self::TxRef,
+        output_index: u32,
+    ) -> Result<(), Self::Error>;
+
+    /// Adds [`TransactionDataRequest::Enhancement`] requests  for transactions that generated the
+    /// transparent inputs to the provided [`DecryptedTransaction`] to the transaction data request
+    /// queue.
+    ///
+    /// [`TransactionDataRequest::Enhancement`]: super::TransactionDataRequest
+    /// [`DecryptedTransaction`]: super::DecryptedTransaction
+    #[cfg(feature = "transparent-inputs")]
+    fn queue_transparent_input_retrieval(
+        &mut self,
+        tx_ref: Self::TxRef,
+        d_tx: &super::DecryptedTransaction<'_, Self::AccountId>,
+    ) -> Result<(), Self::Error>;
+
+    /// TODO
+    #[cfg(feature = "transparent-inputs")]
+    fn queue_unmined_tx_retrieval(
+        &mut self,
+        d_tx: &super::DecryptedTransaction<'_, Self::AccountId>,
+    ) -> Result<(), Self::Error>;
+
+    /// Deletes all [`TransactionDataRequest::Enhancement`] requests for the given transaction ID
+    /// from the transaction data request queue.
+    ///
+    /// [`TransactionDataRequest::Enhancement`]: super::TransactionDataRequest
+    fn delete_retrieval_queue_entries(&mut self, txid: TxId) -> Result<(), Self::Error>;
+}
+
+/// This trait provides a generalization over shielded Sapling output representations.
+pub trait ReceivedSaplingOutput {
+    type AccountId;
+
+    /// Returns the index of the Sapling output within the Sapling bundle.
+    fn index(&self) -> usize;
+    /// Returns the account ID for the account that received this output.
+    fn account_id(&self) -> Self::AccountId;
+    /// Returns the received note.
+    fn note(&self) -> &::sapling::Note;
+    /// Returns any memo associated with the output.
+    fn memo(&self) -> Option<&MemoBytes>;
+    /// Returns whether or not the received output is counted as wallet-internal change, for the
+    /// purpose of display.
+    fn is_change(&self) -> bool;
+    /// Returns the nullifier that will be revealed when the note is spent, if the output was
+    /// observed using a key that provides the capability for nullifier computation.
+    fn nullifier(&self) -> Option<&::sapling::Nullifier>;
+    /// Returns the position of the note in the note commitment tree, if the transaction that
+    /// produced the output has been mined.
+    fn note_commitment_tree_position(&self) -> Option<Position>;
+    /// Returns the HD derivation scope of the viewing key that decrypted the note, if known.
+    fn recipient_key_scope(&self) -> Option<Scope>;
+}
+
+impl<AccountId: Copy> ReceivedSaplingOutput for WalletSaplingOutput<AccountId> {
+    type AccountId = AccountId;
+
+    fn index(&self) -> usize {
+        self.index()
+    }
+    fn account_id(&self) -> Self::AccountId {
+        *WalletSaplingOutput::account_id(self)
+    }
+    fn note(&self) -> &::sapling::Note {
+        WalletSaplingOutput::note(self)
+    }
+    fn memo(&self) -> Option<&MemoBytes> {
+        None
+    }
+    fn is_change(&self) -> bool {
+        WalletSaplingOutput::is_change(self)
+    }
+    fn nullifier(&self) -> Option<&::sapling::Nullifier> {
+        self.nf()
+    }
+    fn note_commitment_tree_position(&self) -> Option<Position> {
+        Some(WalletSaplingOutput::note_commitment_tree_position(self))
+    }
+    fn recipient_key_scope(&self) -> Option<Scope> {
+        self.recipient_key_scope()
+    }
+}
+
+impl<AccountId: Copy> ReceivedSaplingOutput for DecryptedOutput<::sapling::Note, AccountId> {
+    type AccountId = AccountId;
+
+    fn index(&self) -> usize {
+        self.index()
+    }
+    fn account_id(&self) -> Self::AccountId {
+        *self.account()
+    }
+    fn note(&self) -> &::sapling::Note {
+        self.note()
+    }
+    fn memo(&self) -> Option<&MemoBytes> {
+        Some(self.memo())
+    }
+    fn is_change(&self) -> bool {
+        self.transfer_type() == TransferType::WalletInternal
+    }
+    fn nullifier(&self) -> Option<&::sapling::Nullifier> {
+        None
+    }
+    fn note_commitment_tree_position(&self) -> Option<Position> {
+        None
+    }
+    fn recipient_key_scope(&self) -> Option<Scope> {
+        if self.transfer_type() == TransferType::WalletInternal {
+            Some(Scope::Internal)
+        } else {
+            Some(Scope::External)
+        }
+    }
+}
+
+/// This trait provides a generalization over shielded Orchard output representations.
+#[cfg(feature = "orchard")]
+pub trait ReceivedOrchardOutput {
+    type AccountId;
+
+    /// Returns the index of the Orchard action that produced this output within the Orchard bundle.
+    fn index(&self) -> usize;
+    /// Returns the account ID for the account that received this output.
+    fn account_id(&self) -> Self::AccountId;
+    /// Returns the received note.
+    fn note(&self) -> &::orchard::note::Note;
+    /// Returns any memo associated with the output.
+    fn memo(&self) -> Option<&MemoBytes>;
+    /// Returns whether or not the received output is counted as wallet-internal change, for the
+    /// purpose of display.
+    fn is_change(&self) -> bool;
+    /// Returns the nullifier that will be revealed when the note is spent, if the output was
+    /// observed using a key that provides the capability for nullifier computation.
+    fn nullifier(&self) -> Option<&::orchard::note::Nullifier>;
+    /// Returns the position of the note in the note commitment tree, if the transaction that
+    /// produced the output has been mined.
+    fn note_commitment_tree_position(&self) -> Option<Position>;
+    /// Returns the HD derivation scope of the viewing key that decrypted the note, if known.
+    fn recipient_key_scope(&self) -> Option<Scope>;
+}
+
+#[cfg(feature = "orchard")]
+impl<AccountId: Copy> ReceivedOrchardOutput for WalletOrchardOutput<AccountId> {
+    type AccountId = AccountId;
+
+    fn index(&self) -> usize {
+        self.index()
+    }
+    fn account_id(&self) -> Self::AccountId {
+        *WalletOrchardOutput::account_id(self)
+    }
+    fn note(&self) -> &::orchard::note::Note {
+        WalletOrchardOutput::note(self)
+    }
+    fn memo(&self) -> Option<&MemoBytes> {
+        None
+    }
+    fn is_change(&self) -> bool {
+        WalletOrchardOutput::is_change(self)
+    }
+    fn nullifier(&self) -> Option<&::orchard::note::Nullifier> {
+        self.nf()
+    }
+    fn note_commitment_tree_position(&self) -> Option<Position> {
+        Some(WalletOrchardOutput::note_commitment_tree_position(self))
+    }
+    fn recipient_key_scope(&self) -> Option<Scope> {
+        self.recipient_key_scope()
+    }
+}
+
+#[cfg(feature = "orchard")]
+impl<AccountId: Copy> ReceivedOrchardOutput for DecryptedOutput<::orchard::note::Note, AccountId> {
+    type AccountId = AccountId;
+
+    fn index(&self) -> usize {
+        self.index()
+    }
+    fn account_id(&self) -> Self::AccountId {
+        *self.account()
+    }
+    fn note(&self) -> &orchard::note::Note {
+        self.note()
+    }
+    fn memo(&self) -> Option<&MemoBytes> {
+        Some(self.memo())
+    }
+    fn is_change(&self) -> bool {
+        self.transfer_type() == TransferType::WalletInternal
+    }
+    fn nullifier(&self) -> Option<&::orchard::note::Nullifier> {
+        None
+    }
+    fn note_commitment_tree_position(&self) -> Option<Position> {
+        None
+    }
+    fn recipient_key_scope(&self) -> Option<Scope> {
+        if self.transfer_type() == TransferType::WalletInternal {
+            Some(Scope::Internal)
+        } else {
+            Some(Scope::External)
+        }
+    }
+}
diff --git a/zcash_transparent/src/bundle.rs b/zcash_transparent/src/bundle.rs
index 43ff13c4f0..80901b7d53 100644
--- a/zcash_transparent/src/bundle.rs
+++ b/zcash_transparent/src/bundle.rs
@@ -146,6 +146,7 @@ impl<A: Authorization> Bundle<A> {
     }
 }
 
+/// A pointer to a transparent Zcash transaction output.
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub struct OutPoint {
     pub(crate) hash: TxId,

From d09e5d8055de4c65bb61b0b73b66a8f63c1d5c4e Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Fri, 7 Nov 2025 06:59:50 -0700
Subject: [PATCH 130/263] zcash_client_sqlite: Implement LowLevelWalletRead

---
 zcash_client_sqlite/CHANGELOG.md              |   4 +
 zcash_client_sqlite/src/lib.rs                | 114 +++++++++++++++---
 zcash_client_sqlite/src/wallet.rs             |  93 +++++++++++---
 .../init/migrations/receiving_key_scopes.rs   |   5 +-
 zcash_client_sqlite/src/wallet/orchard.rs     |  81 +------------
 zcash_client_sqlite/src/wallet/sapling.rs     |  81 +------------
 zcash_client_sqlite/src/wallet/transparent.rs |  24 ++--
 7 files changed, 197 insertions(+), 205 deletions(-)

diff --git a/zcash_client_sqlite/CHANGELOG.md b/zcash_client_sqlite/CHANGELOG.md
index 6926dc1093..ad04b0e6d2 100644
--- a/zcash_client_sqlite/CHANGELOG.md
+++ b/zcash_client_sqlite/CHANGELOG.md
@@ -16,6 +16,9 @@ workspace.
   - `tx_mined_height`
   - `tx_trust_status`
   - `recipient_key_scope`
+- `zcash_client_sqlite::TxRef`
+- `impl<'a> Borrow<rusqlite::Transaction<'a>> for zcash_client_sqlite::SqlTransaction<'a>`
+- `impl zcash_client_backend::data_api::ll::LowLevelWalletRead for WalletDb`
 
 ### Changed
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`.
@@ -23,6 +26,7 @@ workspace.
 ### Removed
 - `zcash_client_sqlite::GapLimits` use
   `zcash_client_backend::wallet::transparent::GapLimits` instead.
+- `zcash_client_sqlite::UtxoId` contents are now private.
 
 ## [0.18.11, 0.19.2] - 2026-01-30
 
diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs
index e5b94cc86a..f625888b0e 100644
--- a/zcash_client_sqlite/src/lib.rs
+++ b/zcash_client_sqlite/src/lib.rs
@@ -35,7 +35,6 @@
 use incrementalmerkletree::{Marking, Position, Retention};
 use nonempty::NonEmpty;
 use rand::RngCore;
-use rusqlite::{self, Connection};
 use secrecy::{ExposeSecret, SecretVec};
 use shardtree::{ShardTree, error::ShardTreeError, store::ShardStore};
 use std::{
@@ -62,6 +61,7 @@ use zcash_client_backend::{
         SeedRelevance, SentTransaction, TargetValue, TransactionDataRequest, WalletCommitmentTrees,
         WalletRead, WalletSummary, WalletWrite, Zip32Derivation,
         chain::{BlockSource, ChainState, CommitmentTreeRoot},
+        ll::{LowLevelWalletRead, LowLevelWalletWrite, ReceivedSaplingOutput},
         scanning::{ScanPriority, ScanRange},
         wallet::{ConfirmationsPolicy, TargetHeight},
     },
@@ -99,6 +99,7 @@ use wallet::{
 use {
     incrementalmerkletree::frontier::Frontier, shardtree::store::Checkpoint,
     std::collections::BTreeMap, zcash_client_backend::data_api::ORCHARD_SHARD_HEIGHT,
+    zcash_client_backend::data_api::ll::ReceivedOrchardOutput,
 };
 
 #[cfg(feature = "transparent-inputs")]
@@ -262,11 +263,11 @@ impl fmt::Display for ReceivedNoteId {
 
 /// A newtype wrapper for sqlite primary key values for the utxos table.
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub struct UtxoId(pub i64);
+pub struct UtxoId(pub(crate) i64);
 
 /// A newtype wrapper for sqlite primary key values for the transactions table.
 #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
-struct TxRef(pub i64);
+pub struct TxRef(pub(crate) i64);
 
 /// A newtype wrapper for sqlite primary key values for the addresses table.
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
@@ -293,6 +294,12 @@ impl Borrow<rusqlite::Connection> for SqlTransaction<'_> {
     }
 }
 
+impl<'a> Borrow<rusqlite::Transaction<'a>> for SqlTransaction<'a> {
+    fn borrow(&self) -> &rusqlite::Transaction<'a> {
+        self.0
+    }
+}
+
 impl<C, P, CL, R> WalletDb<C, P, CL, R> {
     /// Returns the network parameters that this walletdb instance is bound to.
     pub fn params(&self) -> &P {
@@ -300,7 +307,7 @@ impl<C, P, CL, R> WalletDb<C, P, CL, R> {
     }
 }
 
-impl<P, CL, R> WalletDb<Connection, P, CL, R> {
+impl<P, CL, R> WalletDb<rusqlite::Connection, P, CL, R> {
     /// Construct a [`WalletDb`] instance that connects to the wallet database stored at the
     /// specified path.
     ///
@@ -316,7 +323,7 @@ impl<P, CL, R> WalletDb<Connection, P, CL, R> {
         clock: CL,
         rng: R,
     ) -> Result<Self, rusqlite::Error> {
-        Connection::open(path).and_then(move |conn| {
+        rusqlite::Connection::open(path).and_then(move |conn| {
             rusqlite::vtab::array::load_module(&conn)?;
             Ok(WalletDb {
                 conn,
@@ -366,7 +373,7 @@ impl<C: Borrow<rusqlite::Connection>, P, CL, R> WalletDb<C, P, CL, R> {
     }
 }
 
-impl<C: BorrowMut<Connection>, P, CL, R> WalletDb<C, P, CL, R> {
+impl<C: BorrowMut<rusqlite::Connection>, P, CL, R> WalletDb<C, P, CL, R> {
     pub fn transactionally<F, A, E: From<rusqlite::Error>>(&mut self, f: F) -> Result<A, E>
     where
         F: FnOnce(&mut WalletDb<SqlTransaction<'_>, &P, &CL, &mut R>) -> Result<A, E>,
@@ -434,7 +441,7 @@ impl<C: BorrowMut<Connection>, P, CL, R> WalletDb<C, P, CL, R> {
 }
 
 #[cfg(feature = "transparent-inputs")]
-impl<C: BorrowMut<Connection>, P, CL: Clock, R: rand::RngCore> WalletDb<C, P, CL, R> {
+impl<C: BorrowMut<rusqlite::Connection>, P, CL: Clock, R: rand::RngCore> WalletDb<C, P, CL, R> {
     /// For each ephemeral address in the wallet, ensure that the transaction data request queue
     /// contains a request for the wallet to check for UTXOs belonging to that address at some time
     /// during the next 24-hour period.
@@ -1092,12 +1099,12 @@ impl<C: Borrow<rusqlite::Connection>, P: consensus::Parameters, CL, R> WalletTes
     fn get_transparent_output(
         &self,
         outpoint: &OutPoint,
-        spendable_as_of: Option<TargetHeight>,
+        target_height: Option<TargetHeight>,
     ) -> Result<Option<WalletTransparentOutput>, <Self as InputSource>::Error> {
         let result = wallet::transparent::get_wallet_transparent_output(
             self.conn.borrow(),
             outpoint,
-            spendable_as_of,
+            target_height,
         )?
         .map(|utxo| utxo.into_wallet_output());
 
@@ -1586,9 +1593,9 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
                     wallet::transparent::generate_gap_addresses(
                         wdb.conn.0,
                         &wdb.params,
+                        &wdb.gap_limits,
                         account_id,
                         t_key_scope,
-                        &wdb.gap_limits,
                         UnifiedAddressRequest::unsafe_custom(Allow, Allow, Require),
                         false,
                     )?;
@@ -1850,7 +1857,7 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
     ) -> Result<Self::UtxoRef, Self::Error> {
         #[cfg(feature = "transparent-inputs")]
         return self.transactionally(|wdb| {
-            let (account_id, key_scope, utxo_id) =
+            let (account_id, _, key_scope, utxo_id) =
                 wallet::transparent::put_received_transparent_utxo(
                     wdb.conn.0,
                     &wdb.params,
@@ -1863,9 +1870,9 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
                 wallet::transparent::generate_gap_addresses(
                     wdb.conn.0,
                     &wdb.params,
+                    &wdb.gap_limits,
                     account_id,
                     t_key_scope,
-                    &wdb.gap_limits,
                     UnifiedAddressRequest::unsafe_custom(Allow, Allow, Require),
                     true,
                 )?;
@@ -2012,6 +2019,81 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
     }
 }
 
+impl<'a, C: Borrow<rusqlite::Transaction<'a>>, P: consensus::Parameters, CL: Clock, R: RngCore>
+    LowLevelWalletRead for WalletDb<C, P, CL, R>
+{
+    type AccountId = AccountUuid;
+    type Error = SqliteClientError;
+    type TxRef = TxRef;
+
+    fn select_receiving_address(
+        &self,
+        account: Self::AccountId,
+        receiver: &zcash_keys::address::Receiver,
+    ) -> Result<Option<zcash_address::ZcashAddress>, Self::Error> {
+        wallet::select_receiving_address(self.conn.borrow(), &self.params, account, receiver)
+    }
+
+    #[cfg(feature = "transparent-inputs")]
+    fn find_account_for_transparent_address(
+        &self,
+        address: &TransparentAddress,
+    ) -> Result<Option<(Self::AccountId, Option<TransparentKeyScope>)>, Self::Error> {
+        wallet::transparent::find_account_uuid_for_transparent_address(
+            self.conn.borrow(),
+            &self.params,
+            address,
+        )
+        .map(|opt| opt.map(|(a, s)| (a, s.as_transparent())))
+    }
+
+    #[cfg(feature = "transparent-inputs")]
+    fn detect_accounts_transparent<'t>(
+        &self,
+        spends: impl Iterator<Item = &'t transparent::bundle::OutPoint>,
+    ) -> Result<std::collections::HashSet<Self::AccountId>, Self::Error> {
+        wallet::transparent::detect_spending_accounts(self.conn.borrow(), spends)
+            .map_err(SqliteClientError::from)
+    }
+
+    fn detect_accounts_sapling<'t>(
+        &self,
+        spends: impl Iterator<Item = &'t sapling::Nullifier>,
+    ) -> Result<std::collections::HashSet<Self::AccountId>, Self::Error> {
+        wallet::sapling::detect_spending_accounts(self.conn.borrow(), spends)
+            .map_err(SqliteClientError::from)
+    }
+
+    #[cfg(feature = "orchard")]
+    fn detect_accounts_orchard<'t>(
+        &self,
+        spends: impl Iterator<Item = &'t orchard::note::Nullifier>,
+    ) -> Result<std::collections::HashSet<Self::AccountId>, Self::Error> {
+        wallet::orchard::detect_spending_accounts(self.conn.borrow(), spends)
+            .map_err(SqliteClientError::from)
+    }
+
+    #[cfg(feature = "transparent-inputs")]
+    fn get_wallet_transparent_output(
+        &self,
+        outpoint: &OutPoint,
+        target_height: Option<TargetHeight>,
+    ) -> Result<Option<WalletUtxo>, Self::Error> {
+        wallet::transparent::get_wallet_transparent_output(
+            self.conn.borrow(),
+            outpoint,
+            target_height,
+        )
+    }
+
+    fn get_txs_spending_transparent_outputs_of(
+        &self,
+        tx_ref: Self::TxRef,
+    ) -> Result<Vec<(Self::TxRef, Transaction)>, Self::Error> {
+        wallet::get_txs_spending_transparent_outputs_of(self.conn.borrow(), &self.params, tx_ref)
+    }
+}
+
 pub(crate) type SaplingShardStore<C> = SqliteShardStore<C, sapling::Node, SAPLING_SHARD_HEIGHT>;
 pub(crate) type SaplingCommitmentTree<C> =
     ShardTree<SaplingShardStore<C>, { sapling::NOTE_COMMITMENT_TREE_DEPTH }, SAPLING_SHARD_HEIGHT>;
@@ -2218,12 +2300,12 @@ impl<P: consensus::Parameters, CL, R> WalletCommitmentTrees
 }
 
 /// A handle for the SQLite block source.
-pub struct BlockDb(Connection);
+pub struct BlockDb(rusqlite::Connection);
 
 impl BlockDb {
     /// Opens a connection to the wallet database stored at the specified path.
     pub fn for_path<P: AsRef<Path>>(path: P) -> Result<Self, rusqlite::Error> {
-        Connection::open(path).map(BlockDb)
+        rusqlite::Connection::open(path).map(BlockDb)
     }
 }
 
@@ -2283,7 +2365,7 @@ impl BlockSource for BlockDb {
 /// order; this assumption is likely to be weakened and/or removed in a future update.
 #[cfg(feature = "unstable")]
 pub struct FsBlockDb {
-    conn: Connection,
+    conn: rusqlite::Connection,
     blocks_dir: PathBuf,
 }
 
@@ -2343,7 +2425,7 @@ impl FsBlockDb {
             let blocks_dir = fsblockdb_root.as_ref().join("blocks");
             fs::create_dir_all(&blocks_dir)?;
             Ok(FsBlockDb {
-                conn: Connection::open(db_path).map_err(FsBlockDbError::Db)?,
+                conn: rusqlite::Connection::open(db_path).map_err(FsBlockDbError::Db)?,
                 blocks_dir,
             })
         } else {
diff --git a/zcash_client_sqlite/src/wallet.rs b/zcash_client_sqlite/src/wallet.rs
index e632245256..7a65a2150d 100644
--- a/zcash_client_sqlite/src/wallet.rs
+++ b/zcash_client_sqlite/src/wallet.rs
@@ -140,7 +140,6 @@ use {
         bundle::{OutPoint, TxOut},
         keys::{NonHardenedChildIndex, TransparentKeyScope},
     },
-    std::collections::BTreeMap,
     transparent::get_wallet_transparent_output,
     zcash_client_backend::wallet::WalletTransparentOutput,
 };
@@ -672,9 +671,9 @@ pub(crate) fn add_account<P: consensus::Parameters>(
         transparent::generate_gap_addresses(
             conn,
             params,
+            gap_limits,
             account_id,
             key_scope,
-            gap_limits,
             UnifiedAddressRequest::unsafe_custom(Allow, Allow, Require),
             false,
         )?;
@@ -867,9 +866,9 @@ pub(crate) fn get_next_available_address<P: consensus::Parameters, C: Clock>(
             transparent::generate_gap_addresses(
                 conn,
                 params,
+                gap_limits,
                 account.internal_id(),
                 TransparentKeyScope::EXTERNAL,
-                gap_limits,
                 UnifiedAddressRequest::unsafe_custom(Allow, Allow, Require),
                 true,
             )?;
@@ -3578,7 +3577,7 @@ fn detect_wallet_transparent_outputs<P: consensus::Parameters>(
 
                     #[cfg(feature = "transparent-inputs")]
                     let recipient_address =
-                        select_receiving_address(params, conn, account_uuid, &receiver)?
+                        select_receiving_address(conn, params, account_uuid, &receiver)?
                             .unwrap_or_else(|| receiver.to_zcash_address(params.network_type()));
 
                     #[cfg(not(feature = "transparent-inputs"))]
@@ -3706,7 +3705,7 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
     let mut tx_has_wallet_outputs = false;
 
     #[cfg(feature = "transparent-inputs")]
-    let mut receiving_accounts = BTreeMap::new();
+    let mut gap_update_set = HashSet::new();
 
     for output in d_tx.sapling_outputs() {
         #[cfg(feature = "transparent-inputs")]
@@ -3718,7 +3717,7 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
                 let recipient = {
                     let receiver = Receiver::Sapling(output.note().recipient());
                     let recipient_address =
-                        select_receiving_address(params, conn, *output.account(), &receiver)?
+                        select_receiving_address(conn, params, *output.account(), &receiver)?
                             .unwrap_or_else(|| receiver.to_zcash_address(params.network_type()));
 
                     Recipient::External {
@@ -3776,7 +3775,7 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
                 )?;
 
                 #[cfg(feature = "transparent-inputs")]
-                receiving_accounts.insert(_account_id, KeyScope::EXTERNAL);
+                gap_update_set.insert((_account_id, KeyScope::EXTERNAL));
 
                 if let Some(account_id) = funding_account {
                     let recipient = Recipient::InternalAccount {
@@ -3785,8 +3784,8 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
                             let receiver = Receiver::Sapling(output.note().recipient());
                             Some(
                                 select_receiving_address(
-                                    params,
                                     conn,
+                                    params,
                                     *output.account(),
                                     &receiver,
                                 )?
@@ -3824,7 +3823,7 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
                 let recipient = {
                     let receiver = Receiver::Orchard(output.note().recipient());
                     let recipient_address =
-                        select_receiving_address(params, conn, *output.account(), &receiver)?
+                        select_receiving_address(conn, params, *output.account(), &receiver)?
                             .unwrap_or_else(|| receiver.to_zcash_address(params.network_type()));
 
                     Recipient::External {
@@ -3882,7 +3881,7 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
                 )?;
 
                 #[cfg(feature = "transparent-inputs")]
-                receiving_accounts.insert(_account_id, KeyScope::EXTERNAL);
+                gap_update_set.insert((_account_id, KeyScope::EXTERNAL));
 
                 if let Some(account_id) = funding_account {
                     // Even if the recipient address is external, record the send as internal.
@@ -3892,8 +3891,8 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
                             let receiver = Receiver::Orchard(output.note().recipient());
                             Some(
                                 select_receiving_address(
-                                    params,
                                     conn,
+                                    params,
                                     *output.account(),
                                     &receiver,
                                 )?
@@ -3933,7 +3932,7 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
 
     #[cfg(feature = "transparent-inputs")]
     for (received_t_output, key_scope) in &wallet_transparent_outputs.received {
-        let (account_id, _, _) = transparent::put_transparent_output(
+        let (account_id, _, _, _) = transparent::put_transparent_output(
             conn,
             params,
             gap_limits,
@@ -3942,7 +3941,7 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
             false,
         )?;
 
-        receiving_accounts.insert(account_id, *key_scope);
+        gap_update_set.insert((account_id, *key_scope));
 
         // Since the wallet created the transparent output, we need to ensure
         // that any transparent inputs belonging to the wallet will be
@@ -3985,15 +3984,15 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
 
     // Regenerate the gap limit addresses.
     #[cfg(feature = "transparent-inputs")]
-    for (account_id, key_scope) in receiving_accounts {
+    for (account_id, key_scope) in gap_update_set {
         if let Some(t_key_scope) = <Option<TransparentKeyScope>>::from(key_scope) {
             use ReceiverRequirement::*;
             transparent::generate_gap_addresses(
                 conn,
                 params,
+                gap_limits,
                 account_id,
                 t_key_scope,
-                gap_limits,
                 UnifiedAddressRequest::unsafe_custom(Allow, Allow, Require),
                 false,
             )?;
@@ -4065,6 +4064,64 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
     Ok(())
 }
 
+pub(crate) fn get_txs_spending_transparent_outputs_of<P: consensus::Parameters>(
+    conn: &rusqlite::Connection,
+    params: &P,
+    tx_ref: TxRef,
+) -> Result<Vec<(TxRef, Transaction)>, SqliteClientError> {
+    // For each transaction that spends a transparent output of this transaction and does not
+    // already have a known fee value, set the fee if possible.
+    let mut spending_txs_stmt = conn.prepare(
+        "SELECT DISTINCT t.id_tx, t.raw, t.mined_height, t.expiry_height
+         FROM transactions t
+         -- find transactions that spend transparent outputs of the decrypted tx
+         LEFT OUTER JOIN transparent_received_output_spends ts
+            ON ts.transaction_id = t.id_tx
+         LEFT OUTER JOIN transparent_received_outputs tro
+            ON tro.transaction_id = :transaction_id
+            AND tro.id = ts.transparent_received_output_id
+         WHERE t.fee IS NULL
+         AND t.raw IS NOT NULL
+         AND ts.transaction_id IS NOT NULL",
+    )?;
+
+    spending_txs_stmt
+        .query_and_then(named_params![":transaction_id": tx_ref.0], |row| {
+            let spending_tx_ref = row.get(0).map(TxRef)?;
+            let tx_bytes: Vec<u8> = row.get(1)?;
+            let block: Option<u32> = row.get(2)?;
+            let expiry: Option<u32> = row.get(3)?;
+
+            let (_, spending_tx) = parse_tx(
+                params,
+                &tx_bytes,
+                block.map(BlockHeight::from),
+                expiry.map(BlockHeight::from),
+            )?;
+
+            Ok((spending_tx_ref, spending_tx))
+        })?
+        .collect()
+}
+
+pub(crate) fn update_tx_fee(
+    conn: &rusqlite::Transaction<'_>,
+    tx_ref: TxRef,
+    fee: zcash_protocol::value::Zatoshis,
+) -> Result<(), SqliteClientError> {
+    conn.execute(
+        "UPDATE transactions
+         SET fee = :fee
+         WHERE id_tx = :transaction_id",
+        named_params! {
+            ":transaction_id": tx_ref.0,
+            ":fee": u64::from(fee)
+        },
+    )?;
+
+    Ok(())
+}
+
 pub(crate) fn set_tx_trust(
     conn: &rusqlite::Transaction,
     txid: TxId,
@@ -4118,8 +4175,8 @@ pub(crate) fn put_tx_meta(
 /// Returns the most likely wallet address that corresponds to the protocol-level receiver of a
 /// note or UTXO.
 pub(crate) fn select_receiving_address<P: consensus::Parameters>(
-    _params: &P,
     conn: &rusqlite::Connection,
+    _params: &P,
     account: AccountUuid,
     receiver: &Receiver,
 ) -> Result<Option<ZcashAddress>, SqliteClientError> {
@@ -4503,8 +4560,8 @@ pub(crate) fn insert_sent_output<P: consensus::Parameters>(
 ///   the transaction.
 /// - If `recipient` is a transparent address, `output_index` is an index into the transparent
 ///   outputs of the transaction.
-/// - If `recipient` is an internal account, `output_index` is an index into the Sapling outputs of
-///   the transaction.
+/// - If `recipient` is an internal account, `output_index` is an index into the outputs of
+///   the transaction in the transaction bundle corresponding to the recipient pool.
 #[allow(clippy::too_many_arguments)]
 pub(crate) fn put_sent_output<P: consensus::Parameters>(
     conn: &rusqlite::Transaction,
diff --git a/zcash_client_sqlite/src/wallet/init/migrations/receiving_key_scopes.rs b/zcash_client_sqlite/src/wallet/init/migrations/receiving_key_scopes.rs
index 79025b2fee..7654ea6b1f 100644
--- a/zcash_client_sqlite/src/wallet/init/migrations/receiving_key_scopes.rs
+++ b/zcash_client_sqlite/src/wallet/init/migrations/receiving_key_scopes.rs
@@ -292,7 +292,9 @@ mod tests {
     };
     use zcash_client_backend::{
         TransferType,
-        data_api::{BlockMetadata, SAPLING_SHARD_HEIGHT, WalletCommitmentTrees},
+        data_api::{
+            BlockMetadata, SAPLING_SHARD_HEIGHT, WalletCommitmentTrees, ll::ReceivedSaplingOutput,
+        },
         decrypt_transaction,
         proto::compact_formats::{CompactBlock, CompactTx},
         scanning::{Nullifiers, ScanningKeys, scan_block},
@@ -326,7 +328,6 @@ mod tests {
                 migrations::{add_account_birthdays, shardtree_support, wallet_summaries},
             },
             memo_repr,
-            sapling::ReceivedSaplingOutput,
         },
     };
 
diff --git a/zcash_client_sqlite/src/wallet/orchard.rs b/zcash_client_sqlite/src/wallet/orchard.rs
index 664e9294ec..9a073b1a7f 100644
--- a/zcash_client_sqlite/src/wallet/orchard.rs
+++ b/zcash_client_sqlite/src/wallet/orchard.rs
@@ -8,19 +8,18 @@ use orchard::{
 use rusqlite::{Connection, Row, named_params, types::Value};
 
 use zcash_client_backend::{
-    DecryptedOutput, TransferType,
     data_api::{
         Account as _, NullifierQuery, TargetValue,
+        ll::ReceivedOrchardOutput,
         wallet::{ConfirmationsPolicy, TargetHeight},
     },
-    wallet::{ReceivedNote, WalletOrchardOutput},
+    wallet::ReceivedNote,
 };
 use zcash_keys::keys::{UnifiedAddressRequest, UnifiedFullViewingKey};
 use zcash_primitives::transaction::TxId;
 use zcash_protocol::{
     ShieldedProtocol,
     consensus::{self, BlockHeight},
-    memo::MemoBytes,
 };
 use zip32::Scope;
 
@@ -30,82 +29,6 @@ use super::{
     KeyScope, common::UnspentNoteMeta, get_account, get_account_ref, memo_repr, upsert_address,
 };
 
-/// This trait provides a generalization over shielded output representations.
-pub(crate) trait ReceivedOrchardOutput {
-    type AccountId;
-
-    fn index(&self) -> usize;
-    fn account_id(&self) -> Self::AccountId;
-    fn note(&self) -> &Note;
-    fn memo(&self) -> Option<&MemoBytes>;
-    fn is_change(&self) -> bool;
-    fn nullifier(&self) -> Option<&Nullifier>;
-    fn note_commitment_tree_position(&self) -> Option<Position>;
-    fn recipient_key_scope(&self) -> Option<Scope>;
-}
-
-impl<AccountId: Copy> ReceivedOrchardOutput for WalletOrchardOutput<AccountId> {
-    type AccountId = AccountId;
-
-    fn index(&self) -> usize {
-        self.index()
-    }
-    fn account_id(&self) -> Self::AccountId {
-        *WalletOrchardOutput::account_id(self)
-    }
-    fn note(&self) -> &Note {
-        WalletOrchardOutput::note(self)
-    }
-    fn memo(&self) -> Option<&MemoBytes> {
-        None
-    }
-    fn is_change(&self) -> bool {
-        WalletOrchardOutput::is_change(self)
-    }
-    fn nullifier(&self) -> Option<&Nullifier> {
-        self.nf()
-    }
-    fn note_commitment_tree_position(&self) -> Option<Position> {
-        Some(WalletOrchardOutput::note_commitment_tree_position(self))
-    }
-    fn recipient_key_scope(&self) -> Option<Scope> {
-        self.recipient_key_scope()
-    }
-}
-
-impl<AccountId: Copy> ReceivedOrchardOutput for DecryptedOutput<Note, AccountId> {
-    type AccountId = AccountId;
-
-    fn index(&self) -> usize {
-        self.index()
-    }
-    fn account_id(&self) -> Self::AccountId {
-        *self.account()
-    }
-    fn note(&self) -> &orchard::note::Note {
-        self.note()
-    }
-    fn memo(&self) -> Option<&MemoBytes> {
-        Some(self.memo())
-    }
-    fn is_change(&self) -> bool {
-        self.transfer_type() == TransferType::WalletInternal
-    }
-    fn nullifier(&self) -> Option<&Nullifier> {
-        None
-    }
-    fn note_commitment_tree_position(&self) -> Option<Position> {
-        None
-    }
-    fn recipient_key_scope(&self) -> Option<Scope> {
-        if self.transfer_type() == TransferType::WalletInternal {
-            Some(Scope::Internal)
-        } else {
-            Some(Scope::External)
-        }
-    }
-}
-
 pub(crate) fn to_received_note<P: consensus::Parameters>(
     params: &P,
     row: &Row,
diff --git a/zcash_client_sqlite/src/wallet/sapling.rs b/zcash_client_sqlite/src/wallet/sapling.rs
index 6679803431..906be6e554 100644
--- a/zcash_client_sqlite/src/wallet/sapling.rs
+++ b/zcash_client_sqlite/src/wallet/sapling.rs
@@ -8,18 +8,17 @@ use rusqlite::{Connection, Row, named_params, types::Value};
 
 use sapling::{self, Diversifier, Nullifier, Rseed};
 use zcash_client_backend::{
-    DecryptedOutput, TransferType,
     data_api::{
         Account, NullifierQuery, TargetValue,
+        ll::ReceivedSaplingOutput,
         wallet::{ConfirmationsPolicy, TargetHeight},
     },
-    wallet::{ReceivedNote, WalletSaplingOutput},
+    wallet::ReceivedNote,
 };
 use zcash_keys::keys::{UnifiedAddressRequest, UnifiedFullViewingKey};
 use zcash_protocol::{
     ShieldedProtocol, TxId,
     consensus::{self, BlockHeight},
-    memo::MemoBytes,
 };
 use zip32::Scope;
 
@@ -29,82 +28,6 @@ use super::{
     KeyScope, common::UnspentNoteMeta, get_account, get_account_ref, memo_repr, upsert_address,
 };
 
-/// This trait provides a generalization over shielded output representations.
-pub(crate) trait ReceivedSaplingOutput {
-    type AccountId;
-
-    fn index(&self) -> usize;
-    fn account_id(&self) -> Self::AccountId;
-    fn note(&self) -> &sapling::Note;
-    fn memo(&self) -> Option<&MemoBytes>;
-    fn is_change(&self) -> bool;
-    fn nullifier(&self) -> Option<&sapling::Nullifier>;
-    fn note_commitment_tree_position(&self) -> Option<Position>;
-    fn recipient_key_scope(&self) -> Option<Scope>;
-}
-
-impl<AccountId: Copy> ReceivedSaplingOutput for WalletSaplingOutput<AccountId> {
-    type AccountId = AccountId;
-
-    fn index(&self) -> usize {
-        self.index()
-    }
-    fn account_id(&self) -> Self::AccountId {
-        *WalletSaplingOutput::account_id(self)
-    }
-    fn note(&self) -> &sapling::Note {
-        WalletSaplingOutput::note(self)
-    }
-    fn memo(&self) -> Option<&MemoBytes> {
-        None
-    }
-    fn is_change(&self) -> bool {
-        WalletSaplingOutput::is_change(self)
-    }
-    fn nullifier(&self) -> Option<&sapling::Nullifier> {
-        self.nf()
-    }
-    fn note_commitment_tree_position(&self) -> Option<Position> {
-        Some(WalletSaplingOutput::note_commitment_tree_position(self))
-    }
-    fn recipient_key_scope(&self) -> Option<Scope> {
-        self.recipient_key_scope()
-    }
-}
-
-impl<AccountId: Copy> ReceivedSaplingOutput for DecryptedOutput<sapling::Note, AccountId> {
-    type AccountId = AccountId;
-
-    fn index(&self) -> usize {
-        self.index()
-    }
-    fn account_id(&self) -> Self::AccountId {
-        *self.account()
-    }
-    fn note(&self) -> &sapling::Note {
-        self.note()
-    }
-    fn memo(&self) -> Option<&MemoBytes> {
-        Some(self.memo())
-    }
-    fn is_change(&self) -> bool {
-        self.transfer_type() == TransferType::WalletInternal
-    }
-    fn nullifier(&self) -> Option<&sapling::Nullifier> {
-        None
-    }
-    fn note_commitment_tree_position(&self) -> Option<Position> {
-        None
-    }
-    fn recipient_key_scope(&self) -> Option<Scope> {
-        if self.transfer_type() == TransferType::WalletInternal {
-            Some(Scope::Internal)
-        } else {
-            Some(Scope::External)
-        }
-    }
-}
-
 pub(crate) fn to_received_note<P: consensus::Parameters>(
     params: &P,
     row: &Row,
diff --git a/zcash_client_sqlite/src/wallet/transparent.rs b/zcash_client_sqlite/src/wallet/transparent.rs
index 753a4274e0..97fad55874 100644
--- a/zcash_client_sqlite/src/wallet/transparent.rs
+++ b/zcash_client_sqlite/src/wallet/transparent.rs
@@ -747,9 +747,9 @@ pub(crate) fn generate_address_range_internal<P: consensus::Parameters>(
 pub(crate) fn generate_gap_addresses<P: consensus::Parameters>(
     conn: &rusqlite::Transaction,
     params: &P,
+    gap_limits: &GapLimits,
     account_id: AccountRef,
     key_scope: TransparentKeyScope,
-    gap_limits: &GapLimits,
     request: UnifiedAddressRequest,
     require_key: bool,
 ) -> Result<(), SqliteClientError> {
@@ -827,9 +827,9 @@ pub(crate) fn update_gap_limits<P: consensus::Parameters>(
             generate_gap_addresses(
                 conn,
                 params,
+                gap_limits,
                 account_id,
                 t_key_scope,
-                gap_limits,
                 UnifiedAddressRequest::unsafe_custom(Allow, Allow, Require),
                 false,
             )?;
@@ -1051,12 +1051,12 @@ pub(crate) fn excluding_wallet_internal_ephemeral_outputs(
 ///
 /// # Parameters
 /// - `outpoint`: The identifier for the output to be retrieved.
-/// - `spendable_as_of`: The target height of a transaction under construction that will spend the
+/// - `target_height`: The target height of a transaction under construction that will spend the
 ///   returned output. If this is `None`, no spendability checks are performed.
 pub(crate) fn get_wallet_transparent_output(
     conn: &rusqlite::Connection,
     outpoint: &OutPoint,
-    spendable_as_of: Option<TargetHeight>,
+    target_height: Option<TargetHeight>,
 ) -> Result<Option<WalletUtxo>, SqliteClientError> {
     // This could return as unspent outputs that are actually not spendable, if they are the
     // outputs of deshielding transactions where the spend anchors have been invalidated by a
@@ -1092,8 +1092,8 @@ pub(crate) fn get_wallet_transparent_output(
             named_params![
                 ":txid": outpoint.hash(),
                 ":output_index": outpoint.n(),
-                ":target_height": spendable_as_of.map(u32::from),
-                ":allow_unspendable": spendable_as_of.is_none(),
+                ":target_height": target_height.map(u32::from),
+                ":allow_unspendable": target_height.is_none(),
             ],
             |row| {
                 let output = to_unspent_transparent_output(row)?;
@@ -1521,7 +1521,7 @@ pub(crate) fn put_received_transparent_utxo<P: consensus::Parameters>(
     params: &P,
     gap_limits: &GapLimits,
     output: &WalletTransparentOutput,
-) -> Result<(AccountRef, KeyScope, UtxoId), SqliteClientError> {
+) -> Result<(AccountRef, AccountUuid, KeyScope, UtxoId), SqliteClientError> {
     let observed_height = chain_tip_height(conn)?.ok_or(SqliteClientError::ChainHeightUnknown)?;
     put_transparent_output(conn, params, gap_limits, output, observed_height, true)
 }
@@ -1963,21 +1963,23 @@ pub(crate) fn put_transparent_output<P: consensus::Parameters>(
     output: &WalletTransparentOutput,
     observation_height: BlockHeight,
     known_unspent: bool,
-) -> Result<(AccountRef, KeyScope, UtxoId), SqliteClientError> {
+) -> Result<(AccountRef, AccountUuid, KeyScope, UtxoId), SqliteClientError> {
     let addr_str = output.recipient_address().encode(params);
 
     // Unlike the shielded pools, we only can receive transparent outputs on addresses for which we
     // have an `addresses` table entry, so we can just query for that here.
-    let (address_id, account_id, key_scope_code) = conn
+    let (address_id, account_id, account_uuid, key_scope_code) = conn
         .query_row(
-            "SELECT id, account_id, key_scope
+            "SELECT addresses.id, account_id, accounts.uuid, key_scope
              FROM addresses
+             JOIN accounts ON accounts.id = addresses.account_id
              WHERE cached_transparent_receiver_address = :transparent_address",
             named_params! {":transparent_address": addr_str},
             |row| {
                 Ok((
                     row.get("id").map(AddressRef)?,
                     row.get("account_id").map(AccountRef)?,
+                    row.get("uuid").map(AccountUuid)?,
                     row.get("key_scope")?,
                 ))
             },
@@ -2130,7 +2132,7 @@ pub(crate) fn put_transparent_output<P: consensus::Parameters>(
         output_height.map_or(observation_height, BlockHeight::from),
     )?;
 
-    Ok((account_id, key_scope, utxo_id))
+    Ok((account_id, account_uuid, key_scope, utxo_id))
 }
 
 /// Adds a request to retrieve transactions involving the specified address to the transparent

From 0b49ca75bebf6ece4bff4c92400f555cc20ad213 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Fri, 7 Nov 2025 06:59:50 -0700
Subject: [PATCH 131/263] zcash_client_sqlite: Implement LowLevelWalletWrite

---
 zcash_client_sqlite/CHANGELOG.md          |   1 +
 zcash_client_sqlite/src/lib.rs            | 189 ++++++++++++++++++++++
 zcash_client_sqlite/src/wallet/orchard.rs |   1 +
 3 files changed, 191 insertions(+)

diff --git a/zcash_client_sqlite/CHANGELOG.md b/zcash_client_sqlite/CHANGELOG.md
index ad04b0e6d2..3486923bdf 100644
--- a/zcash_client_sqlite/CHANGELOG.md
+++ b/zcash_client_sqlite/CHANGELOG.md
@@ -19,6 +19,7 @@ workspace.
 - `zcash_client_sqlite::TxRef`
 - `impl<'a> Borrow<rusqlite::Transaction<'a>> for zcash_client_sqlite::SqlTransaction<'a>`
 - `impl zcash_client_backend::data_api::ll::LowLevelWalletRead for WalletDb`
+- `impl zcash_client_backend::data_api::ll::LowLevelWalletWrite for WalletDb`
 
 ### Changed
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`.
diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs
index f625888b0e..46ac296a7d 100644
--- a/zcash_client_sqlite/src/lib.rs
+++ b/zcash_client_sqlite/src/lib.rs
@@ -2094,6 +2094,195 @@ impl<'a, C: Borrow<rusqlite::Transaction<'a>>, P: consensus::Parameters, CL: Clo
     }
 }
 
+impl<'a, C: Borrow<rusqlite::Transaction<'a>>, P: consensus::Parameters, CL: Clock, R: RngCore>
+    LowLevelWalletWrite for WalletDb<C, P, CL, R>
+{
+    fn put_tx_data(
+        &mut self,
+        tx: &Transaction,
+        fee: Option<zcash_protocol::value::Zatoshis>,
+        created_at: Option<time::OffsetDateTime>,
+        target_height: Option<TargetHeight>,
+        observed_height: BlockHeight,
+    ) -> Result<Self::TxRef, Self::Error> {
+        wallet::put_tx_data(
+            self.conn.borrow(),
+            tx,
+            fee,
+            created_at,
+            target_height,
+            observed_height,
+        )
+    }
+
+    fn set_transaction_status(
+        &mut self,
+        txid: TxId,
+        status: data_api::TransactionStatus,
+    ) -> Result<(), Self::Error> {
+        wallet::set_transaction_status(
+            self.conn.borrow(),
+            &self.params,
+            #[cfg(feature = "transparent-inputs")]
+            &self.gap_limits,
+            txid,
+            status,
+        )
+    }
+
+    fn put_received_sapling_note<T: ReceivedSaplingOutput<AccountId = Self::AccountId>>(
+        &mut self,
+        output: &T,
+        tx_ref: Self::TxRef,
+        target_or_mined_height: Option<BlockHeight>,
+        spent_in: Option<Self::TxRef>,
+    ) -> Result<(), Self::Error> {
+        wallet::sapling::put_received_note(
+            self.conn.borrow(),
+            &self.params,
+            output,
+            tx_ref,
+            target_or_mined_height,
+            spent_in,
+        )?;
+
+        Ok(())
+    }
+
+    #[cfg(feature = "orchard")]
+    fn put_received_orchard_note<T: ReceivedOrchardOutput<AccountId = Self::AccountId>>(
+        &mut self,
+        output: &T,
+        tx_ref: Self::TxRef,
+        target_or_mined_height: Option<BlockHeight>,
+        spent_in: Option<Self::TxRef>,
+    ) -> Result<(), Self::Error> {
+        wallet::orchard::put_received_note(
+            self.conn.borrow(),
+            &self.params,
+            output,
+            tx_ref,
+            target_or_mined_height,
+            spent_in,
+        )?;
+
+        Ok(())
+    }
+
+    fn put_sent_output(
+        &mut self,
+        from_account_uuid: Self::AccountId,
+        tx_ref: Self::TxRef,
+        output_index: usize,
+        recipient: &zcash_client_backend::wallet::Recipient<Self::AccountId>,
+        value: zcash_protocol::value::Zatoshis,
+        memo: Option<&zcash_protocol::memo::MemoBytes>,
+    ) -> Result<(), Self::Error> {
+        wallet::put_sent_output(
+            self.conn.borrow(),
+            &self.params,
+            from_account_uuid,
+            tx_ref,
+            output_index,
+            recipient,
+            value,
+            memo,
+        )
+    }
+
+    fn update_tx_fee(
+        &mut self,
+        tx_ref: Self::TxRef,
+        fee: zcash_protocol::value::Zatoshis,
+    ) -> Result<(), Self::Error> {
+        wallet::update_tx_fee(self.conn.borrow(), tx_ref, fee)
+    }
+
+    #[cfg(feature = "transparent-inputs")]
+    fn put_transparent_output(
+        &mut self,
+        output: &zcash_client_backend::wallet::WalletTransparentOutput,
+        observation_height: BlockHeight,
+        known_unspent: bool,
+    ) -> Result<(Self::AccountId, Option<TransparentKeyScope>), Self::Error> {
+        let (_, account_uuid, key_scope, _) = wallet::transparent::put_transparent_output(
+            self.conn.borrow(),
+            &self.params,
+            &self.gap_limits,
+            output,
+            observation_height,
+            known_unspent,
+        )?;
+
+        Ok((account_uuid, key_scope.as_transparent()))
+    }
+
+    #[cfg(feature = "transparent-inputs")]
+    fn mark_transparent_utxo_spent(
+        &mut self,
+        outpoint: &OutPoint,
+        spent_in_tx: Self::TxRef,
+    ) -> Result<bool, Self::Error> {
+        wallet::transparent::mark_transparent_utxo_spent(self.conn.borrow(), spent_in_tx, outpoint)
+    }
+
+    #[cfg(feature = "transparent-inputs")]
+    fn generate_transparent_gap_addresses(
+        &mut self,
+        account_id: Self::AccountId,
+        key_scope: TransparentKeyScope,
+        request: UnifiedAddressRequest,
+    ) -> Result<(), Self::Error> {
+        let account_ref = wallet::get_account_ref(self.conn.borrow(), account_id)?;
+        wallet::transparent::generate_gap_addresses(
+            self.conn.borrow(),
+            &self.params,
+            &self.gap_limits,
+            account_ref,
+            key_scope,
+            request,
+            false,
+        )
+    }
+
+    #[cfg(feature = "transparent-inputs")]
+    fn queue_transparent_spend_detection(
+        &mut self,
+        receiving_address: TransparentAddress,
+        tx_ref: Self::TxRef,
+        output_index: u32,
+    ) -> Result<(), Self::Error> {
+        wallet::transparent::queue_transparent_spend_detection(
+            self.conn.borrow(),
+            &self.params,
+            receiving_address,
+            tx_ref,
+            output_index,
+        )
+    }
+
+    #[cfg(feature = "transparent-inputs")]
+    fn queue_transparent_input_retrieval(
+        &mut self,
+        tx_ref: Self::TxRef,
+        d_tx: &data_api::DecryptedTransaction<'_, Self::AccountId>,
+    ) -> Result<(), Self::Error> {
+        wallet::queue_transparent_input_retrieval(self.conn.borrow(), tx_ref, d_tx)
+    }
+
+    #[cfg(feature = "transparent-inputs")]
+    fn queue_unmined_tx_retrieval(
+        &mut self,
+        d_tx: &data_api::DecryptedTransaction<'_, Self::AccountId>,
+    ) -> Result<(), Self::Error> {
+        wallet::queue_unmined_tx_retrieval(self.conn.borrow(), d_tx)
+    }
+
+    fn delete_retrieval_queue_entries(&mut self, txid: TxId) -> Result<(), Self::Error> {
+        wallet::delete_retrieval_queue_entries(self.conn.borrow(), txid)
+    }
+}
+
 pub(crate) type SaplingShardStore<C> = SqliteShardStore<C, sapling::Node, SAPLING_SHARD_HEIGHT>;
 pub(crate) type SaplingCommitmentTree<C> =
     ShardTree<SaplingShardStore<C>, { sapling::NOTE_COMMITMENT_TREE_DEPTH }, SAPLING_SHARD_HEIGHT>;
diff --git a/zcash_client_sqlite/src/wallet/orchard.rs b/zcash_client_sqlite/src/wallet/orchard.rs
index 9a073b1a7f..ed84155b0a 100644
--- a/zcash_client_sqlite/src/wallet/orchard.rs
+++ b/zcash_client_sqlite/src/wallet/orchard.rs
@@ -304,6 +304,7 @@ pub(crate) fn put_received_note<
             ],
         )?;
     }
+
     Ok(account_id)
 }
 

From 22b58bcb89ae78816caf6ba523b17b696cd40dc3 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Thu, 6 Nov 2025 06:38:34 -0700
Subject: [PATCH 132/263] zcash_client_sqlite: Reimplement `store_decrypted_tx`
 using the low-level data access API.

---
 zcash_client_sqlite/src/lib.rs    |  11 +-
 zcash_client_sqlite/src/wallet.rs | 342 +++++++++---------------------
 2 files changed, 110 insertions(+), 243 deletions(-)

diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs
index 46ac296a7d..3e56189dd3 100644
--- a/zcash_client_sqlite/src/lib.rs
+++ b/zcash_client_sqlite/src/lib.rs
@@ -1892,13 +1892,10 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
         d_tx: DecryptedTransaction<Self::AccountId>,
     ) -> Result<(), Self::Error> {
         self.transactionally(|wdb| {
-            wallet::store_decrypted_tx(
-                wdb.conn.0,
-                &wdb.params,
-                d_tx,
-                #[cfg(feature = "transparent-inputs")]
-                &wdb.gap_limits,
-            )
+            let chain_tip = wallet::chain_tip_height(wdb.conn.borrow())?
+                .ok_or(SqliteClientError::ChainHeightUnknown)?;
+            let params = *wdb.params();
+            wallet::store_decrypted_tx(wdb, &params, chain_tip, d_tx)
         })
     }
 
diff --git a/zcash_client_sqlite/src/wallet.rs b/zcash_client_sqlite/src/wallet.rs
index 7a65a2150d..b665229d82 100644
--- a/zcash_client_sqlite/src/wallet.rs
+++ b/zcash_client_sqlite/src/wallet.rs
@@ -85,6 +85,8 @@ use tracing::{debug, info, warn};
 use uuid::Uuid;
 
 use zcash_address::ZcashAddress;
+#[cfg(feature = "transparent-inputs")]
+use zcash_client_backend::data_api::ll::ReceivedSaplingOutput as _;
 use zcash_client_backend::{
     DecryptedOutput,
     data_api::{
@@ -92,6 +94,7 @@ use zcash_client_backend::{
         AddressSource, BlockMetadata, DecryptedTransaction, Progress, Ratio,
         ReceivedTransactionOutput, SAPLING_SHARD_HEIGHT, SentTransaction, SentTransactionOutput,
         TransactionDataRequest, TransactionStatus, WalletSummary, Zip32Derivation,
+        ll::{LowLevelWalletRead, LowLevelWalletWrite, TxMeta},
         scanning::{ScanPriority, ScanRange},
         wallet::{ConfirmationsPolicy, TargetHeight},
     },
@@ -114,7 +117,7 @@ use zcash_protocol::{
     PoolType, ShieldedProtocol, TxId,
     consensus::{self, BlockHeight, BranchId, NetworkUpgrade, Parameters},
     memo::{Memo, MemoBytes},
-    value::{ZatBalance, Zatoshis},
+    value::{BalanceError, ZatBalance, Zatoshis},
 };
 use zip32::{DiversifierIndex, fingerprint::SeedFingerprint};
 
@@ -140,7 +143,6 @@ use {
         bundle::{OutPoint, TxOut},
         keys::{NonHardenedChildIndex, TransparentKeyScope},
     },
-    transparent::get_wallet_transparent_output,
     zcash_client_backend::wallet::WalletTransparentOutput,
 };
 
@@ -2503,40 +2505,6 @@ pub(crate) fn get_transaction<P: Parameters>(
     .transpose()
 }
 
-pub(crate) fn get_funding_accounts(
-    conn: &rusqlite::Connection,
-    tx: &Transaction,
-) -> Result<HashSet<AccountUuid>, rusqlite::Error> {
-    let mut funding_accounts = HashSet::new();
-    #[cfg(feature = "transparent-inputs")]
-    funding_accounts.extend(transparent::detect_spending_accounts(
-        conn,
-        tx.transparent_bundle()
-            .iter()
-            .flat_map(|bundle| bundle.vin.iter().map(|txin| txin.prevout())),
-    )?);
-
-    funding_accounts.extend(sapling::detect_spending_accounts(
-        conn,
-        tx.sapling_bundle().iter().flat_map(|bundle| {
-            bundle
-                .shielded_spends()
-                .iter()
-                .map(|spend| spend.nullifier())
-        }),
-    )?);
-
-    #[cfg(feature = "orchard")]
-    funding_accounts.extend(orchard::detect_spending_accounts(
-        conn,
-        tx.orchard_bundle()
-            .iter()
-            .flat_map(|bundle| bundle.actions().iter().map(|action| action.nullifier())),
-    )?);
-
-    Ok(funding_accounts)
-}
-
 /// Returns the memo for a sent note, if the sent note is known to the wallet.
 pub(crate) fn get_sent_memo(
     conn: &rusqlite::Connection,
@@ -3480,21 +3448,21 @@ pub(crate) fn put_block(
 }
 
 #[derive(Debug)]
-struct TransparentSentOutput {
-    from_account_uuid: AccountUuid,
+struct TransparentSentOutput<AccountId> {
+    from_account_uuid: AccountId,
     output_index: usize,
-    recipient: Recipient<AccountUuid>,
+    recipient: Recipient<AccountId>,
     value: Zatoshis,
 }
 
 #[derive(Debug)]
-struct WalletTransparentOutputs {
+pub struct WalletTransparentOutputs<AccountId> {
     #[cfg(feature = "transparent-inputs")]
-    received: Vec<(WalletTransparentOutput, KeyScope)>,
-    sent: Vec<TransparentSentOutput>,
+    received: Vec<(WalletTransparentOutput, Option<TransparentKeyScope>)>,
+    sent: Vec<TransparentSentOutput<AccountId>>,
 }
 
-impl WalletTransparentOutputs {
+impl<AccountId> WalletTransparentOutputs<AccountId> {
     fn empty() -> Self {
         Self {
             #[cfg(feature = "transparent-inputs")]
@@ -3515,12 +3483,16 @@ impl WalletTransparentOutputs {
     }
 }
 
-fn detect_wallet_transparent_outputs<P: consensus::Parameters>(
-    #[cfg(feature = "transparent-inputs")] conn: &rusqlite::Transaction,
+fn detect_wallet_transparent_outputs<DbT, P>(
+    #[cfg(feature = "transparent-inputs")] wallet_db: &DbT,
     params: &P,
-    d_tx: &DecryptedTransaction<AccountUuid>,
-    funding_account: Option<AccountUuid>,
-) -> Result<WalletTransparentOutputs, SqliteClientError> {
+    d_tx: &DecryptedTransaction<DbT::AccountId>,
+    funding_account: Option<DbT::AccountId>,
+) -> Result<WalletTransparentOutputs<DbT::AccountId>, DbT::Error>
+where
+    DbT: LowLevelWalletRead,
+    P: consensus::Parameters,
+{
     // This `if` is just an optimization for cases where we would do nothing in the loop.
     if funding_account.is_some() || cfg!(feature = "transparent-inputs") {
         let mut result = WalletTransparentOutputs::empty();
@@ -3542,7 +3514,7 @@ fn detect_wallet_transparent_outputs<P: consensus::Parameters>(
                 // If the output belongs to the wallet, add it to `transparent_received_outputs`.
                 #[cfg(feature = "transparent-inputs")]
                 if let Some((account_uuid, key_scope)) =
-                    transparent::find_account_uuid_for_transparent_address(conn, params, &address)?
+                    wallet_db.find_account_for_transparent_address(&address)?
                 {
                     debug!(
                         "{:?} output {} belongs to account {:?}",
@@ -3576,9 +3548,9 @@ fn detect_wallet_transparent_outputs<P: consensus::Parameters>(
                     let receiver = Receiver::Transparent(address);
 
                     #[cfg(feature = "transparent-inputs")]
-                    let recipient_address =
-                        select_receiving_address(conn, params, account_uuid, &receiver)?
-                            .unwrap_or_else(|| receiver.to_zcash_address(params.network_type()));
+                    let recipient_address = wallet_db
+                        .select_receiving_address(account_uuid, &receiver)?
+                        .unwrap_or_else(|| receiver.to_zcash_address(params.network_type()));
 
                     #[cfg(not(feature = "transparent-inputs"))]
                     let recipient_address = receiver.to_zcash_address(params.network_type());
@@ -3610,38 +3582,46 @@ fn detect_wallet_transparent_outputs<P: consensus::Parameters>(
     }
 }
 
-fn determine_fee(
-    conn: &rusqlite::Connection,
-    tx: &Transaction,
-) -> Result<Option<Zatoshis>, SqliteClientError> {
-    tx.fee_paid(|outpoint| {
+pub(crate) fn determine_fee<DbT, T: TxMeta>(
+    _wallet_db: &DbT,
+    tx: &T,
+) -> Result<Option<Zatoshis>, DbT::Error>
+where
+    DbT: LowLevelWalletRead,
+    DbT::Error: From<BalanceError>,
+{
+    tx.fee_paid(|_outpoint| {
         #[cfg(not(feature = "transparent-inputs"))]
         {
             // Transparent inputs aren't supported, so this closure should never be
             // called during transaction construction. But in case it is, handle it
             // correctly.
-            let _ = (conn, outpoint);
             Ok(None)
         }
 
         // This closure can do DB lookups to fetch the value of each transparent input.
         #[cfg(feature = "transparent-inputs")]
-        if let Some(out) = get_wallet_transparent_output(conn, outpoint, None)? {
+        if let Some(out) = _wallet_db.get_wallet_transparent_output(_outpoint, None)? {
             Ok(Some(out.txout().value()))
         } else {
             // If we can’t find it, fee computation can't complete accurately
-            Ok::<_, SqliteClientError>(None)
+            Ok(None)
         }
     })
 }
 
-pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
-    conn: &rusqlite::Transaction,
+pub fn store_decrypted_tx<DbT, P>(
+    wallet_db: &mut DbT,
     params: &P,
-    d_tx: DecryptedTransaction<AccountUuid>,
-    #[cfg(feature = "transparent-inputs")] gap_limits: &GapLimits,
-) -> Result<(), SqliteClientError> {
-    let funding_accounts = get_funding_accounts(conn, d_tx.tx())?;
+    chain_tip_height: BlockHeight,
+    d_tx: DecryptedTransaction<<DbT as LowLevelWalletRead>::AccountId>,
+) -> Result<(), <DbT as LowLevelWalletRead>::Error>
+where
+    DbT: LowLevelWalletWrite,
+    DbT::Error: From<BalanceError>,
+    P: consensus::Parameters,
+{
+    let funding_accounts = wallet_db.get_funding_accounts(d_tx.tx())?;
 
     // TODO(#1305): Correctly track accounts that fund each transaction output.
     let funding_account = funding_accounts.iter().next().copied();
@@ -3653,9 +3633,9 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
         )
     }
 
-    let wallet_transparent_outputs = detect_wallet_transparent_outputs(
+    let wallet_transparent_outputs = detect_wallet_transparent_outputs::<DbT, P>(
         #[cfg(feature = "transparent-inputs")]
-        conn,
+        wallet_db,
         params,
         &d_tx,
         funding_account,
@@ -3667,35 +3647,20 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
         && wallet_transparent_outputs.is_empty()
         && !d_tx.has_decrypted_outputs()
     {
-        delete_retrieval_queue_entries(conn, d_tx.tx().txid())?;
+        wallet_db.delete_retrieval_queue_entries(d_tx.tx().txid())?;
         return Ok(());
     }
 
     info!("Storing decrypted transaction with id {}", d_tx.tx().txid());
-
-    let observed_height = d_tx.mined_height().map_or_else(
-        || {
-            mempool_height(conn)?
-                .ok_or(SqliteClientError::ChainHeightUnknown)
-                .map(BlockHeight::from)
-        },
-        Ok,
-    )?;
+    let observed_height = d_tx.mined_height().unwrap_or(chain_tip_height + 1);
 
     // If the transaction is fully shielded, or all transparent inputs are available, set the
     // fee value.
-    let fee = determine_fee(conn, d_tx.tx())?;
+    let fee = determine_fee(wallet_db, d_tx.tx())?;
 
-    let tx_ref = put_tx_data(conn, d_tx.tx(), fee, None, None, observed_height)?;
+    let tx_ref = wallet_db.put_tx_data(d_tx.tx(), fee, None, None, observed_height)?;
     if let Some(height) = d_tx.mined_height() {
-        set_transaction_status(
-            conn,
-            params,
-            #[cfg(feature = "transparent-inputs")]
-            gap_limits,
-            d_tx.tx().txid(),
-            TransactionStatus::Mined(height),
-        )?;
+        wallet_db.set_transaction_status(d_tx.tx().txid(), TransactionStatus::Mined(height))?;
     }
 
     // A flag used to determine whether it is necessary to query for transactions that
@@ -3716,9 +3681,9 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
             TransferType::Outgoing => {
                 let recipient = {
                     let receiver = Receiver::Sapling(output.note().recipient());
-                    let recipient_address =
-                        select_receiving_address(conn, params, *output.account(), &receiver)?
-                            .unwrap_or_else(|| receiver.to_zcash_address(params.network_type()));
+                    let recipient_address = wallet_db
+                        .select_receiving_address(*output.account(), &receiver)?
+                        .unwrap_or_else(|| receiver.to_zcash_address(params.network_type()));
 
                     Recipient::External {
                         recipient_address,
@@ -3726,9 +3691,7 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
                     }
                 };
 
-                put_sent_output(
-                    conn,
-                    params,
+                wallet_db.put_sent_output(
                     *output.account(),
                     tx_ref,
                     output.index(),
@@ -3738,14 +3701,7 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
                 )?;
             }
             TransferType::WalletInternal => {
-                sapling::put_received_note(
-                    conn,
-                    params,
-                    output,
-                    tx_ref,
-                    d_tx.mined_height(),
-                    None,
-                )?;
+                wallet_db.put_received_sapling_note(output, tx_ref, d_tx.mined_height(), None)?;
 
                 let recipient = Recipient::InternalAccount {
                     receiving_account: *output.account(),
@@ -3753,9 +3709,7 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
                     note: Box::new(Note::Sapling(output.note().clone())),
                 };
 
-                put_sent_output(
-                    conn,
-                    params,
+                wallet_db.put_sent_output(
                     *output.account(),
                     tx_ref,
                     output.index(),
@@ -3765,17 +3719,10 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
                 )?;
             }
             TransferType::Incoming => {
-                let _account_id = sapling::put_received_note(
-                    conn,
-                    params,
-                    output,
-                    tx_ref,
-                    d_tx.mined_height(),
-                    None,
-                )?;
+                wallet_db.put_received_sapling_note(output, tx_ref, d_tx.mined_height(), None)?;
 
                 #[cfg(feature = "transparent-inputs")]
-                gap_update_set.insert((_account_id, KeyScope::EXTERNAL));
+                gap_update_set.insert((output.account_id(), TransparentKeyScope::EXTERNAL));
 
                 if let Some(account_id) = funding_account {
                     let recipient = Recipient::InternalAccount {
@@ -3783,23 +3730,17 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
                         external_address: {
                             let receiver = Receiver::Sapling(output.note().recipient());
                             Some(
-                                select_receiving_address(
-                                    conn,
-                                    params,
-                                    *output.account(),
-                                    &receiver,
-                                )?
-                                .unwrap_or_else(|| {
-                                    receiver.to_zcash_address(params.network_type())
-                                }),
+                                wallet_db
+                                    .select_receiving_address(*output.account(), &receiver)?
+                                    .unwrap_or_else(|| {
+                                        receiver.to_zcash_address(params.network_type())
+                                    }),
                             )
                         },
                         note: Box::new(Note::Sapling(output.note().clone())),
                     };
 
-                    put_sent_output(
-                        conn,
-                        params,
+                    wallet_db.put_sent_output(
                         account_id,
                         tx_ref,
                         output.index(),
@@ -3822,9 +3763,9 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
             TransferType::Outgoing => {
                 let recipient = {
                     let receiver = Receiver::Orchard(output.note().recipient());
-                    let recipient_address =
-                        select_receiving_address(conn, params, *output.account(), &receiver)?
-                            .unwrap_or_else(|| receiver.to_zcash_address(params.network_type()));
+                    let recipient_address = wallet_db
+                        .select_receiving_address(*output.account(), &receiver)?
+                        .unwrap_or_else(|| receiver.to_zcash_address(params.network_type()));
 
                     Recipient::External {
                         recipient_address,
@@ -3832,9 +3773,7 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
                     }
                 };
 
-                put_sent_output(
-                    conn,
-                    params,
+                wallet_db.put_sent_output(
                     *output.account(),
                     tx_ref,
                     output.index(),
@@ -3844,14 +3783,7 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
                 )?;
             }
             TransferType::WalletInternal => {
-                orchard::put_received_note(
-                    conn,
-                    params,
-                    output,
-                    tx_ref,
-                    d_tx.mined_height(),
-                    None,
-                )?;
+                wallet_db.put_received_orchard_note(output, tx_ref, d_tx.mined_height(), None)?;
 
                 let recipient = Recipient::InternalAccount {
                     receiving_account: *output.account(),
@@ -3859,9 +3791,7 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
                     note: Box::new(Note::Orchard(*output.note())),
                 };
 
-                put_sent_output(
-                    conn,
-                    params,
+                wallet_db.put_sent_output(
                     *output.account(),
                     tx_ref,
                     output.index(),
@@ -3871,17 +3801,13 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
                 )?;
             }
             TransferType::Incoming => {
-                let _account_id = orchard::put_received_note(
-                    conn,
-                    params,
-                    output,
-                    tx_ref,
-                    d_tx.mined_height(),
-                    None,
-                )?;
+                #[cfg(feature = "transparent-inputs")]
+                use zcash_client_backend::data_api::ll::ReceivedOrchardOutput as _;
+
+                wallet_db.put_received_orchard_note(output, tx_ref, d_tx.mined_height(), None)?;
 
                 #[cfg(feature = "transparent-inputs")]
-                gap_update_set.insert((_account_id, KeyScope::EXTERNAL));
+                gap_update_set.insert((output.account_id(), TransparentKeyScope::EXTERNAL));
 
                 if let Some(account_id) = funding_account {
                     // Even if the recipient address is external, record the send as internal.
@@ -3890,23 +3816,17 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
                         external_address: {
                             let receiver = Receiver::Orchard(output.note().recipient());
                             Some(
-                                select_receiving_address(
-                                    conn,
-                                    params,
-                                    *output.account(),
-                                    &receiver,
-                                )?
-                                .unwrap_or_else(|| {
-                                    receiver.to_zcash_address(params.network_type())
-                                }),
+                                wallet_db
+                                    .select_receiving_address(*output.account(), &receiver)?
+                                    .unwrap_or_else(|| {
+                                        receiver.to_zcash_address(params.network_type())
+                                    }),
                             )
                         },
                         note: Box::new(Note::Orchard(*output.note())),
                     };
 
-                    put_sent_output(
-                        conn,
-                        params,
+                    wallet_db.put_sent_output(
                         account_id,
                         tx_ref,
                         output.index(),
@@ -3927,21 +3847,17 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
         .iter()
         .flat_map(|b| b.vin.iter())
     {
-        transparent::mark_transparent_utxo_spent(conn, tx_ref, txin.prevout())?;
+        wallet_db.mark_transparent_utxo_spent(txin.prevout(), tx_ref)?;
     }
 
     #[cfg(feature = "transparent-inputs")]
     for (received_t_output, key_scope) in &wallet_transparent_outputs.received {
-        let (account_id, _, _, _) = transparent::put_transparent_output(
-            conn,
-            params,
-            gap_limits,
-            received_t_output,
-            observed_height,
-            false,
-        )?;
+        let (account_id, _) =
+            wallet_db.put_transparent_output(received_t_output, observed_height, false)?;
 
-        gap_update_set.insert((account_id, *key_scope));
+        if let Some(key_scope) = key_scope {
+            gap_update_set.insert((account_id, *key_scope));
+        }
 
         // Since the wallet created the transparent output, we need to ensure
         // that any transparent inputs belonging to the wallet will be
@@ -3953,9 +3869,7 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
         // possible that the spend of these outputs is not then later detected
         // if the transaction that spends them is purely transparent. This is
         // especially a problem in wallet recovery.
-        transparent::queue_transparent_spend_detection(
-            conn,
-            params,
+        wallet_db.queue_transparent_spend_detection(
             *received_t_output.recipient_address(),
             tx_ref,
             received_t_output.outpoint().n(),
@@ -3963,9 +3877,7 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
     }
 
     for sent_t_output in &wallet_transparent_outputs.sent {
-        put_sent_output(
-            conn,
-            params,
+        wallet_db.put_sent_output(
             sent_t_output.from_account_uuid,
             tx_ref,
             sent_t_output.output_index,
@@ -3985,63 +3897,21 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
     // Regenerate the gap limit addresses.
     #[cfg(feature = "transparent-inputs")]
     for (account_id, key_scope) in gap_update_set {
-        if let Some(t_key_scope) = <Option<TransparentKeyScope>>::from(key_scope) {
-            use ReceiverRequirement::*;
-            transparent::generate_gap_addresses(
-                conn,
-                params,
-                gap_limits,
-                account_id,
-                t_key_scope,
-                UnifiedAddressRequest::unsafe_custom(Allow, Allow, Require),
-                false,
-            )?;
-        }
+        use ReceiverRequirement::*;
+        wallet_db.generate_transparent_gap_addresses(
+            account_id,
+            key_scope,
+            UnifiedAddressRequest::unsafe_custom(Allow, Allow, Require),
+        )?;
     }
 
     // For each transaction that spends a transparent output of this transaction and does not
     // already have a known fee value, set the fee if possible.
-    let mut spending_txs_stmt = conn.prepare(
-        "SELECT DISTINCT t.id_tx, t.raw, t.mined_height, t.expiry_height
-         FROM transactions t
-         -- find transactions that spend transparent outputs of the decrypted tx
-         LEFT OUTER JOIN transparent_received_output_spends ts
-            ON ts.transaction_id = t.id_tx
-         LEFT OUTER JOIN transparent_received_outputs tro
-            ON tro.transaction_id = :transaction_id
-            AND tro.id = ts.transparent_received_output_id
-         WHERE t.fee IS NULL
-         AND t.raw IS NOT NULL
-         AND ts.transaction_id IS NOT NULL",
-    )?;
-
-    let mut spending_txs_rows = spending_txs_stmt.query(named_params! {
-        ":transaction_id": tx_ref.0
-    })?;
-
-    while let Some(row) = spending_txs_rows.next()? {
-        let spending_tx_ref = row.get(0).map(TxRef)?;
-        let tx_bytes: Vec<u8> = row.get(1)?;
-        let block: Option<u32> = row.get(2)?;
-        let expiry: Option<u32> = row.get(3)?;
-
-        let (_, spending_tx) = parse_tx(
-            params,
-            &tx_bytes,
-            block.map(BlockHeight::from),
-            expiry.map(BlockHeight::from),
-        )?;
-
-        if let Some(fee) = determine_fee(conn, &spending_tx)? {
-            conn.execute(
-                "UPDATE transactions
-                 SET fee = :fee
-                 WHERE id_tx = :transaction_id",
-                named_params! {
-                    ":transaction_id": spending_tx_ref.0,
-                    ":fee": u64::from(fee)
-                },
-            )?;
+    for (spending_tx_ref, spending_tx) in
+        wallet_db.get_txs_spending_transparent_outputs_of(tx_ref)?
+    {
+        if let Some(fee) = determine_fee(wallet_db, &spending_tx)? {
+            wallet_db.update_tx_fee(spending_tx_ref, fee)?;
         }
     }
 
@@ -4051,15 +3921,15 @@ pub(crate) fn store_decrypted_tx<P: consensus::Parameters>(
     // part) by this wallet.
     #[cfg(feature = "transparent-inputs")]
     if tx_has_wallet_outputs {
-        queue_transparent_input_retrieval(conn, tx_ref, &d_tx)?
+        wallet_db.queue_transparent_input_retrieval(tx_ref, &d_tx)?
     }
 
-    delete_retrieval_queue_entries(conn, d_tx.tx().txid())?;
+    wallet_db.delete_retrieval_queue_entries(d_tx.tx().txid())?;
 
     // If the decrypted transaction is unmined and has no shielded components, add it to
     // the queue for status retrieval.
     #[cfg(feature = "transparent-inputs")]
-    queue_unmined_tx_retrieval(conn, &d_tx)?;
+    wallet_db.queue_unmined_tx_retrieval(&d_tx)?;
 
     Ok(())
 }

From 6036af9844cf34f7c91ad541fec86936f2196908 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Fri, 7 Nov 2025 11:42:52 -0700
Subject: [PATCH 133/263] zcash_client_sqlite: Move `store_decrypted_tx` to
 `zcash_client_backend::data_api::ll::wallet`

---
 zcash_client_backend/src/data_api/ll.rs       |   2 +
 .../src/data_api/ll/wallet.rs                 | 533 ++++++++++++++++++
 zcash_client_sqlite/src/lib.rs                |   8 +-
 zcash_client_sqlite/src/wallet.rs             | 504 +----------------
 4 files changed, 547 insertions(+), 500 deletions(-)
 create mode 100644 zcash_client_backend/src/data_api/ll/wallet.rs

diff --git a/zcash_client_backend/src/data_api/ll.rs b/zcash_client_backend/src/data_api/ll.rs
index ceaf8d1da2..f01c6fa7d2 100644
--- a/zcash_client_backend/src/data_api/ll.rs
+++ b/zcash_client_backend/src/data_api/ll.rs
@@ -40,6 +40,8 @@ use {
 #[cfg(feature = "orchard")]
 use crate::wallet::WalletOrchardOutput;
 
+pub mod wallet;
+
 /// A trait for types that can provide information about outputs spent by and fees that were paid
 /// for a given transaction.
 pub trait TxMeta {
diff --git a/zcash_client_backend/src/data_api/ll/wallet.rs b/zcash_client_backend/src/data_api/ll/wallet.rs
new file mode 100644
index 0000000000..b631ae8821
--- /dev/null
+++ b/zcash_client_backend/src/data_api/ll/wallet.rs
@@ -0,0 +1,533 @@
+use tracing::{debug, info, warn};
+
+use zcash_keys::{address::Receiver, encoding::AddressCodec as _};
+use zcash_protocol::{
+    PoolType,
+    consensus::{self, BlockHeight},
+    value::{BalanceError, Zatoshis},
+};
+
+use crate::{
+    TransferType,
+    data_api::{DecryptedTransaction, TransactionStatus},
+    wallet::{Note, Recipient},
+};
+
+use super::{LowLevelWalletRead, LowLevelWalletWrite, TxMeta};
+
+#[cfg(feature = "transparent-inputs")]
+use {
+    crate::{data_api::ll::ReceivedSaplingOutput as _, wallet::WalletTransparentOutput},
+    std::collections::HashSet,
+    transparent::{bundle::OutPoint, keys::TransparentKeyScope},
+    zcash_keys::keys::{ReceiverRequirement, UnifiedAddressRequest},
+};
+
+#[cfg(feature = "orchard")]
+use crate::data_api::ll::ReceivedOrchardOutput as _;
+
+#[derive(Debug)]
+struct TransparentSentOutput<AccountId> {
+    from_account_uuid: AccountId,
+    output_index: usize,
+    recipient: Recipient<AccountId>,
+    value: Zatoshis,
+}
+
+#[derive(Debug)]
+struct WalletTransparentOutputs<AccountId> {
+    #[cfg(feature = "transparent-inputs")]
+    received: Vec<(WalletTransparentOutput, Option<TransparentKeyScope>)>,
+    sent: Vec<TransparentSentOutput<AccountId>>,
+}
+
+impl<AccountId> WalletTransparentOutputs<AccountId> {
+    fn empty() -> Self {
+        Self {
+            #[cfg(feature = "transparent-inputs")]
+            received: vec![],
+            sent: vec![],
+        }
+    }
+
+    fn is_empty(&self) -> bool {
+        #[cfg(feature = "transparent-inputs")]
+        let has_received = !self.received.is_empty();
+        #[cfg(not(feature = "transparent-inputs"))]
+        let has_received = false;
+
+        let has_sent = !self.sent.is_empty();
+
+        !(has_received || has_sent)
+    }
+}
+
+pub(crate) fn determine_fee<DbT, T: TxMeta>(
+    _wallet_db: &DbT,
+    tx: &T,
+) -> Result<Option<Zatoshis>, DbT::Error>
+where
+    DbT: LowLevelWalletRead,
+    DbT::Error: From<BalanceError>,
+{
+    tx.fee_paid(|_outpoint| {
+        #[cfg(not(feature = "transparent-inputs"))]
+        {
+            // Transparent inputs aren't supported, so this closure should never be
+            // called during transaction construction. But in case it is, handle it
+            // correctly.
+            Ok(None)
+        }
+
+        // This closure can do DB lookups to fetch the value of each transparent input.
+        #[cfg(feature = "transparent-inputs")]
+        if let Some(out) = _wallet_db.get_wallet_transparent_output(_outpoint, None)? {
+            Ok(Some(out.txout().value()))
+        } else {
+            // If we can’t find it, fee computation can't complete accurately
+            Ok(None)
+        }
+    })
+}
+
+/// Persists a decrypted transaction to the wallet database.
+///
+/// This function stores a transaction that has been decrypted by the wallet, including:
+/// - The transaction data and any computed fee (if all inputs are known)
+/// - Received shielded notes (Sapling and Orchard)
+/// - Sent outputs with recipient information
+/// - Transparent outputs received by or sent from the wallet
+/// - Nullifier tracking for spent notes
+///
+/// The function also queues requests for retrieval of any unknown transparent inputs,
+/// which may be needed to compute the transaction fee or track wallet history.
+///
+/// # Parameters
+/// - `wallet_db`: The wallet database to update.
+/// - `params`: The network parameters.
+/// - `chain_tip_height`: The current chain tip height, used as the observation height for
+///   unmined transactions.
+/// - `d_tx`: The decrypted transaction to store.
+///
+/// # Returns
+/// Returns `Ok(())` if the transaction was successfully stored, or an error if a database
+/// operation failed.
+pub fn store_decrypted_tx<DbT, P>(
+    wallet_db: &mut DbT,
+    params: &P,
+    chain_tip_height: BlockHeight,
+    d_tx: DecryptedTransaction<<DbT as LowLevelWalletRead>::AccountId>,
+) -> Result<(), <DbT as LowLevelWalletRead>::Error>
+where
+    DbT: LowLevelWalletWrite,
+    DbT::Error: From<BalanceError>,
+    P: consensus::Parameters,
+{
+    let funding_accounts = wallet_db.get_funding_accounts(d_tx.tx())?;
+
+    // TODO(#1305): Correctly track accounts that fund each transaction output.
+    let funding_account = funding_accounts.iter().next().copied();
+    if funding_accounts.len() > 1 {
+        warn!(
+            "More than one wallet account detected as funding transaction {:?}, selecting {:?}",
+            d_tx.tx().txid(),
+            funding_account.unwrap()
+        )
+    }
+
+    let wallet_transparent_outputs = detect_wallet_transparent_outputs::<DbT, P>(
+        #[cfg(feature = "transparent-inputs")]
+        wallet_db,
+        params,
+        &d_tx,
+        funding_account,
+    )?;
+
+    // If there is no wallet involvement, we don't need to store the transaction, so just return
+    // here.
+    if funding_account.is_none()
+        && wallet_transparent_outputs.is_empty()
+        && !d_tx.has_decrypted_outputs()
+    {
+        wallet_db.delete_retrieval_queue_entries(d_tx.tx().txid())?;
+        return Ok(());
+    }
+
+    info!("Storing decrypted transaction with id {}", d_tx.tx().txid());
+    let observed_height = d_tx.mined_height().unwrap_or(chain_tip_height + 1);
+
+    // If the transaction is fully shielded, or all transparent inputs are available, set the
+    // fee value.
+    let fee = determine_fee(wallet_db, d_tx.tx())?;
+
+    let tx_ref = wallet_db.put_tx_data(d_tx.tx(), fee, None, None, observed_height)?;
+    if let Some(height) = d_tx.mined_height() {
+        wallet_db.set_transaction_status(d_tx.tx().txid(), TransactionStatus::Mined(height))?;
+    }
+
+    // A flag used to determine whether it is necessary to query for transactions that
+    // provided transparent inputs to this transaction, in order to be able to correctly
+    // recover transparent transaction history.
+    #[cfg(feature = "transparent-inputs")]
+    let mut tx_has_wallet_outputs = false;
+
+    #[cfg(feature = "transparent-inputs")]
+    let mut gap_update_set = HashSet::new();
+
+    for output in d_tx.sapling_outputs() {
+        #[cfg(feature = "transparent-inputs")]
+        {
+            tx_has_wallet_outputs = true;
+        }
+        match output.transfer_type() {
+            TransferType::Outgoing => {
+                let recipient = {
+                    let receiver = Receiver::Sapling(output.note().recipient());
+                    let recipient_address = wallet_db
+                        .select_receiving_address(*output.account(), &receiver)?
+                        .unwrap_or_else(|| receiver.to_zcash_address(params.network_type()));
+
+                    Recipient::External {
+                        recipient_address,
+                        output_pool: PoolType::SAPLING,
+                    }
+                };
+
+                wallet_db.put_sent_output(
+                    *output.account(),
+                    tx_ref,
+                    output.index(),
+                    &recipient,
+                    output.note_value(),
+                    Some(output.memo()),
+                )?;
+            }
+            TransferType::WalletInternal => {
+                wallet_db.put_received_sapling_note(output, tx_ref, d_tx.mined_height(), None)?;
+
+                let recipient = Recipient::InternalAccount {
+                    receiving_account: *output.account(),
+                    external_address: None,
+                    note: Box::new(Note::Sapling(output.note().clone())),
+                };
+
+                wallet_db.put_sent_output(
+                    *output.account(),
+                    tx_ref,
+                    output.index(),
+                    &recipient,
+                    output.note_value(),
+                    Some(output.memo()),
+                )?;
+            }
+            TransferType::Incoming => {
+                wallet_db.put_received_sapling_note(output, tx_ref, d_tx.mined_height(), None)?;
+
+                #[cfg(feature = "transparent-inputs")]
+                gap_update_set.insert((output.account_id(), TransparentKeyScope::EXTERNAL));
+
+                if let Some(account_id) = funding_account {
+                    let recipient = Recipient::InternalAccount {
+                        receiving_account: *output.account(),
+                        external_address: {
+                            let receiver = Receiver::Sapling(output.note().recipient());
+                            Some(
+                                wallet_db
+                                    .select_receiving_address(*output.account(), &receiver)?
+                                    .unwrap_or_else(|| {
+                                        receiver.to_zcash_address(params.network_type())
+                                    }),
+                            )
+                        },
+                        note: Box::new(Note::Sapling(output.note().clone())),
+                    };
+
+                    wallet_db.put_sent_output(
+                        account_id,
+                        tx_ref,
+                        output.index(),
+                        &recipient,
+                        output.note_value(),
+                        Some(output.memo()),
+                    )?;
+                }
+            }
+        }
+    }
+
+    #[cfg(feature = "orchard")]
+    for output in d_tx.orchard_outputs() {
+        #[cfg(feature = "transparent-inputs")]
+        {
+            tx_has_wallet_outputs = true;
+        }
+        match output.transfer_type() {
+            TransferType::Outgoing => {
+                let recipient = {
+                    let receiver = Receiver::Orchard(output.note().recipient());
+                    let recipient_address = wallet_db
+                        .select_receiving_address(*output.account(), &receiver)?
+                        .unwrap_or_else(|| receiver.to_zcash_address(params.network_type()));
+
+                    Recipient::External {
+                        recipient_address,
+                        output_pool: PoolType::ORCHARD,
+                    }
+                };
+
+                wallet_db.put_sent_output(
+                    *output.account(),
+                    tx_ref,
+                    output.index(),
+                    &recipient,
+                    output.note_value(),
+                    Some(output.memo()),
+                )?;
+            }
+            TransferType::WalletInternal => {
+                wallet_db.put_received_orchard_note(output, tx_ref, d_tx.mined_height(), None)?;
+
+                let recipient = Recipient::InternalAccount {
+                    receiving_account: *output.account(),
+                    external_address: None,
+                    note: Box::new(Note::Orchard(*output.note())),
+                };
+
+                wallet_db.put_sent_output(
+                    *output.account(),
+                    tx_ref,
+                    output.index(),
+                    &recipient,
+                    output.note_value(),
+                    Some(output.memo()),
+                )?;
+            }
+            TransferType::Incoming => {
+                wallet_db.put_received_orchard_note(output, tx_ref, d_tx.mined_height(), None)?;
+
+                #[cfg(feature = "transparent-inputs")]
+                gap_update_set.insert((output.account_id(), TransparentKeyScope::EXTERNAL));
+
+                if let Some(account_id) = funding_account {
+                    // Even if the recipient address is external, record the send as internal.
+                    let recipient = Recipient::InternalAccount {
+                        receiving_account: *output.account(),
+                        external_address: {
+                            let receiver = Receiver::Orchard(output.note().recipient());
+                            Some(
+                                wallet_db
+                                    .select_receiving_address(*output.account(), &receiver)?
+                                    .unwrap_or_else(|| {
+                                        receiver.to_zcash_address(params.network_type())
+                                    }),
+                            )
+                        },
+                        note: Box::new(Note::Orchard(*output.note())),
+                    };
+
+                    wallet_db.put_sent_output(
+                        account_id,
+                        tx_ref,
+                        output.index(),
+                        &recipient,
+                        output.note_value(),
+                        Some(output.memo()),
+                    )?;
+                }
+            }
+        }
+    }
+
+    // If any of the utxos spent in the transaction are ours, mark them as spent.
+    #[cfg(feature = "transparent-inputs")]
+    for txin in d_tx
+        .tx()
+        .transparent_bundle()
+        .iter()
+        .flat_map(|b| b.vin.iter())
+    {
+        wallet_db.mark_transparent_utxo_spent(txin.prevout(), tx_ref)?;
+    }
+
+    #[cfg(feature = "transparent-inputs")]
+    for (received_t_output, key_scope) in &wallet_transparent_outputs.received {
+        let (account_id, _) =
+            wallet_db.put_transparent_output(received_t_output, observed_height, false)?;
+
+        if let Some(key_scope) = key_scope {
+            gap_update_set.insert((account_id, *key_scope));
+        }
+
+        // Since the wallet created the transparent output, we need to ensure
+        // that any transparent inputs belonging to the wallet will be
+        // discovered.
+        tx_has_wallet_outputs = true;
+
+        // When we receive transparent funds (particularly as ephemeral outputs
+        // in transaction pairs sending to a ZIP 320 address) it becomes
+        // possible that the spend of these outputs is not then later detected
+        // if the transaction that spends them is purely transparent. This is
+        // especially a problem in wallet recovery.
+        wallet_db.queue_transparent_spend_detection(
+            *received_t_output.recipient_address(),
+            tx_ref,
+            received_t_output.outpoint().n(),
+        )?;
+    }
+
+    for sent_t_output in &wallet_transparent_outputs.sent {
+        wallet_db.put_sent_output(
+            sent_t_output.from_account_uuid,
+            tx_ref,
+            sent_t_output.output_index,
+            &sent_t_output.recipient,
+            sent_t_output.value,
+            None,
+        )?;
+
+        // Even though we know the funding account, we don't know that we have
+        // information for all of the transparent inputs to the transaction.
+        #[cfg(feature = "transparent-inputs")]
+        {
+            tx_has_wallet_outputs = true;
+        }
+    }
+
+    // Regenerate the gap limit addresses.
+    #[cfg(feature = "transparent-inputs")]
+    for (account_id, key_scope) in gap_update_set {
+        use ReceiverRequirement::*;
+        wallet_db.generate_transparent_gap_addresses(
+            account_id,
+            key_scope,
+            UnifiedAddressRequest::unsafe_custom(Allow, Allow, Require),
+        )?;
+    }
+
+    // For each transaction that spends a transparent output of this transaction and does not
+    // already have a known fee value, set the fee if possible.
+    for (spending_tx_ref, spending_tx) in
+        wallet_db.get_txs_spending_transparent_outputs_of(tx_ref)?
+    {
+        if let Some(fee) = determine_fee(wallet_db, &spending_tx)? {
+            wallet_db.update_tx_fee(spending_tx_ref, fee)?;
+        }
+    }
+
+    // If the transaction has outputs that belong to the wallet as well as transparent
+    // inputs, we may need to download the transactions corresponding to the transparent
+    // prevout references to determine whether the transaction was created (at least in
+    // part) by this wallet.
+    #[cfg(feature = "transparent-inputs")]
+    if tx_has_wallet_outputs {
+        wallet_db.queue_transparent_input_retrieval(tx_ref, &d_tx)?
+    }
+
+    wallet_db.delete_retrieval_queue_entries(d_tx.tx().txid())?;
+
+    // If the decrypted transaction is unmined and has no shielded components, add it to
+    // the queue for status retrieval.
+    #[cfg(feature = "transparent-inputs")]
+    wallet_db.queue_unmined_tx_retrieval(&d_tx)?;
+
+    Ok(())
+}
+
+fn detect_wallet_transparent_outputs<DbT, P>(
+    #[cfg(feature = "transparent-inputs")] wallet_db: &DbT,
+    params: &P,
+    d_tx: &DecryptedTransaction<DbT::AccountId>,
+    funding_account: Option<DbT::AccountId>,
+) -> Result<WalletTransparentOutputs<DbT::AccountId>, DbT::Error>
+where
+    DbT: LowLevelWalletRead,
+    P: consensus::Parameters,
+{
+    // This `if` is just an optimization for cases where we would do nothing in the loop.
+    if funding_account.is_some() || cfg!(feature = "transparent-inputs") {
+        let mut result = WalletTransparentOutputs::empty();
+        for (output_index, txout) in d_tx
+            .tx()
+            .transparent_bundle()
+            .iter()
+            .flat_map(|b| b.vout.iter())
+            .enumerate()
+        {
+            if let Some(address) = txout.recipient_address() {
+                debug!(
+                    "{:?} output {} has recipient {}",
+                    d_tx.tx().txid(),
+                    output_index,
+                    address.encode(params)
+                );
+
+                // If the output belongs to the wallet, add it to `transparent_received_outputs`.
+                #[cfg(feature = "transparent-inputs")]
+                if let Some((account_uuid, key_scope)) =
+                    wallet_db.find_account_for_transparent_address(&address)?
+                {
+                    debug!(
+                        "{:?} output {} belongs to account {:?}",
+                        d_tx.tx().txid(),
+                        output_index,
+                        account_uuid
+                    );
+                    result.received.push((
+                        WalletTransparentOutput::from_parts(
+                            OutPoint::new(
+                                d_tx.tx().txid().into(),
+                                u32::try_from(output_index).unwrap(),
+                            ),
+                            txout.clone(),
+                            d_tx.mined_height(),
+                        )
+                        .expect("txout.recipient_address extraction previously checked"),
+                        key_scope,
+                    ));
+                } else {
+                    debug!(
+                        "Address {} is not recognized as belonging to any of our accounts.",
+                        address.encode(params)
+                    );
+                }
+
+                // If a transaction we observe contains spends from our wallet, we will
+                // store its transparent outputs in the same way they would be stored by
+                // create_spend_to_address.
+                if let Some(account_uuid) = funding_account {
+                    let receiver = Receiver::Transparent(address);
+
+                    #[cfg(feature = "transparent-inputs")]
+                    let recipient_address = wallet_db
+                        .select_receiving_address(account_uuid, &receiver)?
+                        .unwrap_or_else(|| receiver.to_zcash_address(params.network_type()));
+
+                    #[cfg(not(feature = "transparent-inputs"))]
+                    let recipient_address = receiver.to_zcash_address(params.network_type());
+
+                    let recipient = Recipient::External {
+                        recipient_address,
+                        output_pool: PoolType::TRANSPARENT,
+                    };
+
+                    result.sent.push(TransparentSentOutput {
+                        from_account_uuid: account_uuid,
+                        output_index,
+                        recipient,
+                        value: txout.value(),
+                    });
+                }
+            } else {
+                warn!(
+                    "Unable to determine recipient address for tx {} output {}",
+                    d_tx.tx().txid(),
+                    output_index
+                );
+            }
+        }
+
+        Ok(result)
+    } else {
+        Ok(WalletTransparentOutputs::empty())
+    }
+}
diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs
index 3e56189dd3..976144c5b8 100644
--- a/zcash_client_sqlite/src/lib.rs
+++ b/zcash_client_sqlite/src/lib.rs
@@ -61,7 +61,10 @@ use zcash_client_backend::{
         SeedRelevance, SentTransaction, TargetValue, TransactionDataRequest, WalletCommitmentTrees,
         WalletRead, WalletSummary, WalletWrite, Zip32Derivation,
         chain::{BlockSource, ChainState, CommitmentTreeRoot},
-        ll::{LowLevelWalletRead, LowLevelWalletWrite, ReceivedSaplingOutput},
+        ll::{
+            LowLevelWalletRead, LowLevelWalletWrite, ReceivedSaplingOutput,
+            wallet::store_decrypted_tx,
+        },
         scanning::{ScanPriority, ScanRange},
         wallet::{ConfirmationsPolicy, TargetHeight},
     },
@@ -1894,8 +1897,7 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
         self.transactionally(|wdb| {
             let chain_tip = wallet::chain_tip_height(wdb.conn.borrow())?
                 .ok_or(SqliteClientError::ChainHeightUnknown)?;
-            let params = *wdb.params();
-            wallet::store_decrypted_tx(wdb, &params, chain_tip, d_tx)
+            store_decrypted_tx(wdb, wdb.params, chain_tip, d_tx)
         })
     }
 
diff --git a/zcash_client_sqlite/src/wallet.rs b/zcash_client_sqlite/src/wallet.rs
index b665229d82..5d73654c5b 100644
--- a/zcash_client_sqlite/src/wallet.rs
+++ b/zcash_client_sqlite/src/wallet.rs
@@ -65,7 +65,7 @@
 //! - `memo` the shielded memo associated with the output, if any.
 
 use std::{
-    collections::{HashMap, HashSet},
+    collections::HashMap,
     convert::TryFrom,
     io::{self, Cursor},
     num::NonZeroU32,
@@ -81,20 +81,17 @@ use incrementalmerkletree::{Marking, Retention};
 use rusqlite::{self, Connection, OptionalExtension, named_params, params};
 use secrecy::{ExposeSecret, SecretVec};
 use shardtree::{ShardTree, error::ShardTreeError, store::ShardStore};
-use tracing::{debug, info, warn};
+use tracing::{debug, warn};
 use uuid::Uuid;
 
 use zcash_address::ZcashAddress;
-#[cfg(feature = "transparent-inputs")]
-use zcash_client_backend::data_api::ll::ReceivedSaplingOutput as _;
 use zcash_client_backend::{
     DecryptedOutput,
     data_api::{
         Account as _, AccountBalance, AccountBirthday, AccountPurpose, AccountSource, AddressInfo,
-        AddressSource, BlockMetadata, DecryptedTransaction, Progress, Ratio,
-        ReceivedTransactionOutput, SAPLING_SHARD_HEIGHT, SentTransaction, SentTransactionOutput,
-        TransactionDataRequest, TransactionStatus, WalletSummary, Zip32Derivation,
-        ll::{LowLevelWalletRead, LowLevelWalletWrite, TxMeta},
+        AddressSource, BlockMetadata, Progress, Ratio, ReceivedTransactionOutput,
+        SAPLING_SHARD_HEIGHT, SentTransaction, SentTransactionOutput, TransactionDataRequest,
+        TransactionStatus, WalletSummary, Zip32Derivation,
         scanning::{ScanPriority, ScanRange},
         wallet::{ConfirmationsPolicy, TargetHeight},
     },
@@ -117,7 +114,7 @@ use zcash_protocol::{
     PoolType, ShieldedProtocol, TxId,
     consensus::{self, BlockHeight, BranchId, NetworkUpgrade, Parameters},
     memo::{Memo, MemoBytes},
-    value::{BalanceError, ZatBalance, Zatoshis},
+    value::{ZatBalance, Zatoshis},
 };
 use zip32::{DiversifierIndex, fingerprint::SeedFingerprint};
 
@@ -143,7 +140,7 @@ use {
         bundle::{OutPoint, TxOut},
         keys::{NonHardenedChildIndex, TransparentKeyScope},
     },
-    zcash_client_backend::wallet::WalletTransparentOutput,
+    zcash_client_backend::{data_api::DecryptedTransaction, wallet::WalletTransparentOutput},
 };
 
 #[cfg(feature = "orchard")]
@@ -3447,493 +3444,6 @@ pub(crate) fn put_block(
     Ok(())
 }
 
-#[derive(Debug)]
-struct TransparentSentOutput<AccountId> {
-    from_account_uuid: AccountId,
-    output_index: usize,
-    recipient: Recipient<AccountId>,
-    value: Zatoshis,
-}
-
-#[derive(Debug)]
-pub struct WalletTransparentOutputs<AccountId> {
-    #[cfg(feature = "transparent-inputs")]
-    received: Vec<(WalletTransparentOutput, Option<TransparentKeyScope>)>,
-    sent: Vec<TransparentSentOutput<AccountId>>,
-}
-
-impl<AccountId> WalletTransparentOutputs<AccountId> {
-    fn empty() -> Self {
-        Self {
-            #[cfg(feature = "transparent-inputs")]
-            received: vec![],
-            sent: vec![],
-        }
-    }
-
-    fn is_empty(&self) -> bool {
-        #[cfg(feature = "transparent-inputs")]
-        let has_received = !self.received.is_empty();
-        #[cfg(not(feature = "transparent-inputs"))]
-        let has_received = false;
-
-        let has_sent = !self.sent.is_empty();
-
-        !(has_received || has_sent)
-    }
-}
-
-fn detect_wallet_transparent_outputs<DbT, P>(
-    #[cfg(feature = "transparent-inputs")] wallet_db: &DbT,
-    params: &P,
-    d_tx: &DecryptedTransaction<DbT::AccountId>,
-    funding_account: Option<DbT::AccountId>,
-) -> Result<WalletTransparentOutputs<DbT::AccountId>, DbT::Error>
-where
-    DbT: LowLevelWalletRead,
-    P: consensus::Parameters,
-{
-    // This `if` is just an optimization for cases where we would do nothing in the loop.
-    if funding_account.is_some() || cfg!(feature = "transparent-inputs") {
-        let mut result = WalletTransparentOutputs::empty();
-        for (output_index, txout) in d_tx
-            .tx()
-            .transparent_bundle()
-            .iter()
-            .flat_map(|b| b.vout.iter())
-            .enumerate()
-        {
-            if let Some(address) = txout.recipient_address() {
-                debug!(
-                    "{:?} output {} has recipient {}",
-                    d_tx.tx().txid(),
-                    output_index,
-                    address.encode(params)
-                );
-
-                // If the output belongs to the wallet, add it to `transparent_received_outputs`.
-                #[cfg(feature = "transparent-inputs")]
-                if let Some((account_uuid, key_scope)) =
-                    wallet_db.find_account_for_transparent_address(&address)?
-                {
-                    debug!(
-                        "{:?} output {} belongs to account {:?}",
-                        d_tx.tx().txid(),
-                        output_index,
-                        account_uuid
-                    );
-                    result.received.push((
-                        WalletTransparentOutput::from_parts(
-                            OutPoint::new(
-                                d_tx.tx().txid().into(),
-                                u32::try_from(output_index).unwrap(),
-                            ),
-                            txout.clone(),
-                            d_tx.mined_height(),
-                        )
-                        .expect("txout.recipient_address extraction previously checked"),
-                        key_scope,
-                    ));
-                } else {
-                    debug!(
-                        "Address {} is not recognized as belonging to any of our accounts.",
-                        address.encode(params)
-                    );
-                }
-
-                // If a transaction we observe contains spends from our wallet, we will
-                // store its transparent outputs in the same way they would be stored by
-                // create_spend_to_address.
-                if let Some(account_uuid) = funding_account {
-                    let receiver = Receiver::Transparent(address);
-
-                    #[cfg(feature = "transparent-inputs")]
-                    let recipient_address = wallet_db
-                        .select_receiving_address(account_uuid, &receiver)?
-                        .unwrap_or_else(|| receiver.to_zcash_address(params.network_type()));
-
-                    #[cfg(not(feature = "transparent-inputs"))]
-                    let recipient_address = receiver.to_zcash_address(params.network_type());
-
-                    let recipient = Recipient::External {
-                        recipient_address,
-                        output_pool: PoolType::TRANSPARENT,
-                    };
-
-                    result.sent.push(TransparentSentOutput {
-                        from_account_uuid: account_uuid,
-                        output_index,
-                        recipient,
-                        value: txout.value(),
-                    });
-                }
-            } else {
-                warn!(
-                    "Unable to determine recipient address for tx {} output {}",
-                    d_tx.tx().txid(),
-                    output_index
-                );
-            }
-        }
-
-        Ok(result)
-    } else {
-        Ok(WalletTransparentOutputs::empty())
-    }
-}
-
-pub(crate) fn determine_fee<DbT, T: TxMeta>(
-    _wallet_db: &DbT,
-    tx: &T,
-) -> Result<Option<Zatoshis>, DbT::Error>
-where
-    DbT: LowLevelWalletRead,
-    DbT::Error: From<BalanceError>,
-{
-    tx.fee_paid(|_outpoint| {
-        #[cfg(not(feature = "transparent-inputs"))]
-        {
-            // Transparent inputs aren't supported, so this closure should never be
-            // called during transaction construction. But in case it is, handle it
-            // correctly.
-            Ok(None)
-        }
-
-        // This closure can do DB lookups to fetch the value of each transparent input.
-        #[cfg(feature = "transparent-inputs")]
-        if let Some(out) = _wallet_db.get_wallet_transparent_output(_outpoint, None)? {
-            Ok(Some(out.txout().value()))
-        } else {
-            // If we can’t find it, fee computation can't complete accurately
-            Ok(None)
-        }
-    })
-}
-
-pub fn store_decrypted_tx<DbT, P>(
-    wallet_db: &mut DbT,
-    params: &P,
-    chain_tip_height: BlockHeight,
-    d_tx: DecryptedTransaction<<DbT as LowLevelWalletRead>::AccountId>,
-) -> Result<(), <DbT as LowLevelWalletRead>::Error>
-where
-    DbT: LowLevelWalletWrite,
-    DbT::Error: From<BalanceError>,
-    P: consensus::Parameters,
-{
-    let funding_accounts = wallet_db.get_funding_accounts(d_tx.tx())?;
-
-    // TODO(#1305): Correctly track accounts that fund each transaction output.
-    let funding_account = funding_accounts.iter().next().copied();
-    if funding_accounts.len() > 1 {
-        warn!(
-            "More than one wallet account detected as funding transaction {:?}, selecting {:?}",
-            d_tx.tx().txid(),
-            funding_account.unwrap()
-        )
-    }
-
-    let wallet_transparent_outputs = detect_wallet_transparent_outputs::<DbT, P>(
-        #[cfg(feature = "transparent-inputs")]
-        wallet_db,
-        params,
-        &d_tx,
-        funding_account,
-    )?;
-
-    // If there is no wallet involvement, we don't need to store the transaction, so just return
-    // here.
-    if funding_account.is_none()
-        && wallet_transparent_outputs.is_empty()
-        && !d_tx.has_decrypted_outputs()
-    {
-        wallet_db.delete_retrieval_queue_entries(d_tx.tx().txid())?;
-        return Ok(());
-    }
-
-    info!("Storing decrypted transaction with id {}", d_tx.tx().txid());
-    let observed_height = d_tx.mined_height().unwrap_or(chain_tip_height + 1);
-
-    // If the transaction is fully shielded, or all transparent inputs are available, set the
-    // fee value.
-    let fee = determine_fee(wallet_db, d_tx.tx())?;
-
-    let tx_ref = wallet_db.put_tx_data(d_tx.tx(), fee, None, None, observed_height)?;
-    if let Some(height) = d_tx.mined_height() {
-        wallet_db.set_transaction_status(d_tx.tx().txid(), TransactionStatus::Mined(height))?;
-    }
-
-    // A flag used to determine whether it is necessary to query for transactions that
-    // provided transparent inputs to this transaction, in order to be able to correctly
-    // recover transparent transaction history.
-    #[cfg(feature = "transparent-inputs")]
-    let mut tx_has_wallet_outputs = false;
-
-    #[cfg(feature = "transparent-inputs")]
-    let mut gap_update_set = HashSet::new();
-
-    for output in d_tx.sapling_outputs() {
-        #[cfg(feature = "transparent-inputs")]
-        {
-            tx_has_wallet_outputs = true;
-        }
-        match output.transfer_type() {
-            TransferType::Outgoing => {
-                let recipient = {
-                    let receiver = Receiver::Sapling(output.note().recipient());
-                    let recipient_address = wallet_db
-                        .select_receiving_address(*output.account(), &receiver)?
-                        .unwrap_or_else(|| receiver.to_zcash_address(params.network_type()));
-
-                    Recipient::External {
-                        recipient_address,
-                        output_pool: PoolType::SAPLING,
-                    }
-                };
-
-                wallet_db.put_sent_output(
-                    *output.account(),
-                    tx_ref,
-                    output.index(),
-                    &recipient,
-                    output.note_value(),
-                    Some(output.memo()),
-                )?;
-            }
-            TransferType::WalletInternal => {
-                wallet_db.put_received_sapling_note(output, tx_ref, d_tx.mined_height(), None)?;
-
-                let recipient = Recipient::InternalAccount {
-                    receiving_account: *output.account(),
-                    external_address: None,
-                    note: Box::new(Note::Sapling(output.note().clone())),
-                };
-
-                wallet_db.put_sent_output(
-                    *output.account(),
-                    tx_ref,
-                    output.index(),
-                    &recipient,
-                    output.note_value(),
-                    Some(output.memo()),
-                )?;
-            }
-            TransferType::Incoming => {
-                wallet_db.put_received_sapling_note(output, tx_ref, d_tx.mined_height(), None)?;
-
-                #[cfg(feature = "transparent-inputs")]
-                gap_update_set.insert((output.account_id(), TransparentKeyScope::EXTERNAL));
-
-                if let Some(account_id) = funding_account {
-                    let recipient = Recipient::InternalAccount {
-                        receiving_account: *output.account(),
-                        external_address: {
-                            let receiver = Receiver::Sapling(output.note().recipient());
-                            Some(
-                                wallet_db
-                                    .select_receiving_address(*output.account(), &receiver)?
-                                    .unwrap_or_else(|| {
-                                        receiver.to_zcash_address(params.network_type())
-                                    }),
-                            )
-                        },
-                        note: Box::new(Note::Sapling(output.note().clone())),
-                    };
-
-                    wallet_db.put_sent_output(
-                        account_id,
-                        tx_ref,
-                        output.index(),
-                        &recipient,
-                        output.note_value(),
-                        Some(output.memo()),
-                    )?;
-                }
-            }
-        }
-    }
-
-    #[cfg(feature = "orchard")]
-    for output in d_tx.orchard_outputs() {
-        #[cfg(feature = "transparent-inputs")]
-        {
-            tx_has_wallet_outputs = true;
-        }
-        match output.transfer_type() {
-            TransferType::Outgoing => {
-                let recipient = {
-                    let receiver = Receiver::Orchard(output.note().recipient());
-                    let recipient_address = wallet_db
-                        .select_receiving_address(*output.account(), &receiver)?
-                        .unwrap_or_else(|| receiver.to_zcash_address(params.network_type()));
-
-                    Recipient::External {
-                        recipient_address,
-                        output_pool: PoolType::ORCHARD,
-                    }
-                };
-
-                wallet_db.put_sent_output(
-                    *output.account(),
-                    tx_ref,
-                    output.index(),
-                    &recipient,
-                    output.note_value(),
-                    Some(output.memo()),
-                )?;
-            }
-            TransferType::WalletInternal => {
-                wallet_db.put_received_orchard_note(output, tx_ref, d_tx.mined_height(), None)?;
-
-                let recipient = Recipient::InternalAccount {
-                    receiving_account: *output.account(),
-                    external_address: None,
-                    note: Box::new(Note::Orchard(*output.note())),
-                };
-
-                wallet_db.put_sent_output(
-                    *output.account(),
-                    tx_ref,
-                    output.index(),
-                    &recipient,
-                    output.note_value(),
-                    Some(output.memo()),
-                )?;
-            }
-            TransferType::Incoming => {
-                #[cfg(feature = "transparent-inputs")]
-                use zcash_client_backend::data_api::ll::ReceivedOrchardOutput as _;
-
-                wallet_db.put_received_orchard_note(output, tx_ref, d_tx.mined_height(), None)?;
-
-                #[cfg(feature = "transparent-inputs")]
-                gap_update_set.insert((output.account_id(), TransparentKeyScope::EXTERNAL));
-
-                if let Some(account_id) = funding_account {
-                    // Even if the recipient address is external, record the send as internal.
-                    let recipient = Recipient::InternalAccount {
-                        receiving_account: *output.account(),
-                        external_address: {
-                            let receiver = Receiver::Orchard(output.note().recipient());
-                            Some(
-                                wallet_db
-                                    .select_receiving_address(*output.account(), &receiver)?
-                                    .unwrap_or_else(|| {
-                                        receiver.to_zcash_address(params.network_type())
-                                    }),
-                            )
-                        },
-                        note: Box::new(Note::Orchard(*output.note())),
-                    };
-
-                    wallet_db.put_sent_output(
-                        account_id,
-                        tx_ref,
-                        output.index(),
-                        &recipient,
-                        output.note_value(),
-                        Some(output.memo()),
-                    )?;
-                }
-            }
-        }
-    }
-
-    // If any of the utxos spent in the transaction are ours, mark them as spent.
-    #[cfg(feature = "transparent-inputs")]
-    for txin in d_tx
-        .tx()
-        .transparent_bundle()
-        .iter()
-        .flat_map(|b| b.vin.iter())
-    {
-        wallet_db.mark_transparent_utxo_spent(txin.prevout(), tx_ref)?;
-    }
-
-    #[cfg(feature = "transparent-inputs")]
-    for (received_t_output, key_scope) in &wallet_transparent_outputs.received {
-        let (account_id, _) =
-            wallet_db.put_transparent_output(received_t_output, observed_height, false)?;
-
-        if let Some(key_scope) = key_scope {
-            gap_update_set.insert((account_id, *key_scope));
-        }
-
-        // Since the wallet created the transparent output, we need to ensure
-        // that any transparent inputs belonging to the wallet will be
-        // discovered.
-        tx_has_wallet_outputs = true;
-
-        // When we receive transparent funds (particularly as ephemeral outputs
-        // in transaction pairs sending to a ZIP 320 address) it becomes
-        // possible that the spend of these outputs is not then later detected
-        // if the transaction that spends them is purely transparent. This is
-        // especially a problem in wallet recovery.
-        wallet_db.queue_transparent_spend_detection(
-            *received_t_output.recipient_address(),
-            tx_ref,
-            received_t_output.outpoint().n(),
-        )?;
-    }
-
-    for sent_t_output in &wallet_transparent_outputs.sent {
-        wallet_db.put_sent_output(
-            sent_t_output.from_account_uuid,
-            tx_ref,
-            sent_t_output.output_index,
-            &sent_t_output.recipient,
-            sent_t_output.value,
-            None,
-        )?;
-
-        // Even though we know the funding account, we don't know that we have
-        // information for all of the transparent inputs to the transaction.
-        #[cfg(feature = "transparent-inputs")]
-        {
-            tx_has_wallet_outputs = true;
-        }
-    }
-
-    // Regenerate the gap limit addresses.
-    #[cfg(feature = "transparent-inputs")]
-    for (account_id, key_scope) in gap_update_set {
-        use ReceiverRequirement::*;
-        wallet_db.generate_transparent_gap_addresses(
-            account_id,
-            key_scope,
-            UnifiedAddressRequest::unsafe_custom(Allow, Allow, Require),
-        )?;
-    }
-
-    // For each transaction that spends a transparent output of this transaction and does not
-    // already have a known fee value, set the fee if possible.
-    for (spending_tx_ref, spending_tx) in
-        wallet_db.get_txs_spending_transparent_outputs_of(tx_ref)?
-    {
-        if let Some(fee) = determine_fee(wallet_db, &spending_tx)? {
-            wallet_db.update_tx_fee(spending_tx_ref, fee)?;
-        }
-    }
-
-    // If the transaction has outputs that belong to the wallet as well as transparent
-    // inputs, we may need to download the transactions corresponding to the transparent
-    // prevout references to determine whether the transaction was created (at least in
-    // part) by this wallet.
-    #[cfg(feature = "transparent-inputs")]
-    if tx_has_wallet_outputs {
-        wallet_db.queue_transparent_input_retrieval(tx_ref, &d_tx)?
-    }
-
-    wallet_db.delete_retrieval_queue_entries(d_tx.tx().txid())?;
-
-    // If the decrypted transaction is unmined and has no shielded components, add it to
-    // the queue for status retrieval.
-    #[cfg(feature = "transparent-inputs")]
-    wallet_db.queue_unmined_tx_retrieval(&d_tx)?;
-
-    Ok(())
-}
-
 pub(crate) fn get_txs_spending_transparent_outputs_of<P: consensus::Parameters>(
     conn: &rusqlite::Connection,
     params: &P,

From cd42799684ee0630206c601ea81e3294c818bf10 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Tue, 23 Dec 2025 14:00:58 -0700
Subject: [PATCH 134/263] zcash_protocol: Add a newtype for the index of a
 transaction within a block.

---
 components/zcash_protocol/CHANGELOG.md        |  3 +
 components/zcash_protocol/src/consensus.rs    | 63 ++++++++++++++++++-
 zcash_client_backend/CHANGELOG.md             |  7 +++
 zcash_client_backend/src/data_api.rs          |  8 +--
 zcash_client_backend/src/scanning.rs          | 15 ++---
 zcash_client_backend/src/wallet.rs            |  8 +--
 .../src/types/memory_wallet/mod.rs            | 18 +++---
 zcash_client_memory/src/types/transaction.rs  |  4 +-
 zcash_client_sqlite/src/wallet.rs             | 16 ++---
 .../init/migrations/receiving_key_scopes.rs   |  2 +-
 10 files changed, 107 insertions(+), 37 deletions(-)

diff --git a/components/zcash_protocol/CHANGELOG.md b/components/zcash_protocol/CHANGELOG.md
index 156f0bf669..8499955f89 100644
--- a/components/zcash_protocol/CHANGELOG.md
+++ b/components/zcash_protocol/CHANGELOG.md
@@ -10,6 +10,9 @@ workspace.
 
 ## [Unreleased]
 
+### Added
+- `zcash_protocol::consensus::TxIndex`
+
 ## [0.7.2] - 2025-12-10
 
 ### Added
diff --git a/components/zcash_protocol/src/consensus.rs b/components/zcash_protocol/src/consensus.rs
index e5140d7def..f3b7a66b0d 100644
--- a/components/zcash_protocol/src/consensus.rs
+++ b/components/zcash_protocol/src/consensus.rs
@@ -3,6 +3,7 @@
 use core::cmp::{Ord, Ordering};
 use core::convert::TryFrom;
 use core::fmt;
+use core::num::TryFromIntError;
 use core::ops::{Add, Bound, RangeBounds, Sub};
 
 #[cfg(feature = "std")]
@@ -12,8 +13,8 @@ use crate::constants::{mainnet, regtest, testnet};
 
 /// A wrapper type representing blockchain heights.
 ///
-/// Safe conversion from various integer types, as well as addition and subtraction, are
-/// provided.
+/// Safe conversion from various integer types, as well as addition and subtraction, are provided.
+/// Subtraction of block heights, and of deltas to block heights, are always saturating.
 #[repr(transparent)]
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub struct BlockHeight(u32);
@@ -126,6 +127,64 @@ impl Sub<BlockHeight> for BlockHeight {
     }
 }
 
+/// A wrapper type the index of a transaction within a block.
+///
+/// Safe conversion from various integer types are provided.
+#[repr(transparent)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+pub struct TxIndex(u16);
+
+impl From<TxIndex> for u16 {
+    fn from(value: TxIndex) -> Self {
+        value.0
+    }
+}
+
+impl From<TxIndex> for u32 {
+    fn from(value: TxIndex) -> Self {
+        value.0.into()
+    }
+}
+
+impl From<TxIndex> for u64 {
+    fn from(value: TxIndex) -> Self {
+        value.0.into()
+    }
+}
+
+impl From<u16> for TxIndex {
+    fn from(value: u16) -> Self {
+        TxIndex(value)
+    }
+}
+
+impl TryFrom<u32> for TxIndex {
+    type Error = TryFromIntError;
+
+    fn try_from(value: u32) -> Result<Self, Self::Error> {
+        Ok(TxIndex(u16::try_from(value)?))
+    }
+}
+
+impl TryFrom<u64> for TxIndex {
+    type Error = TryFromIntError;
+
+    fn try_from(value: u64) -> Result<Self, Self::Error> {
+        Ok(TxIndex(u16::try_from(value)?))
+    }
+}
+
+impl TryFrom<usize> for TxIndex {
+    type Error = TryFromIntError;
+
+    fn try_from(value: usize) -> Result<Self, Self::Error> {
+        Ok(TxIndex(u16::try_from(value)?))
+    }
+}
+
+#[cfg(feature = "std")]
+memuse::impl_no_dynamic_usage!(TxIndex);
+
 /// The enumeration of known Zcash network types.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub enum NetworkType {
diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index e46a46615a..b7bf893513 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -60,6 +60,13 @@ workspace.
 - `zcash_client_backend::wallet::GapMetadata` has been moved behind the
   `transparent-inputs` feature flag, as it is only useful in the context
   of the wallet receiving transparent funds.
+- The return type of `zcash_client_backend::ScannedBundles::nullifier_map`
+  has been altered to use the `zcash_protocol::consensus::TxIndex` type
+  instead of `u16`. Also, the order of elements in the record has been
+  changed.
+- `zcash_client_backend::wallet::WalletTx::block_index` now has type
+  `zcash_protocol::consensus::TxIndex` and the `new` function has
+  been modified accordingly.
 
 ### Removed
 - `zcash_client_backend::data_api::testing::transparent::GapLimits` use
diff --git a/zcash_client_backend/src/data_api.rs b/zcash_client_backend/src/data_api.rs
index 0af6afc591..026bebd7cf 100644
--- a/zcash_client_backend/src/data_api.rs
+++ b/zcash_client_backend/src/data_api.rs
@@ -84,7 +84,7 @@ use zcash_keys::{
 use zcash_primitives::{block::BlockHash, transaction::Transaction};
 use zcash_protocol::{
     PoolType, ShieldedProtocol, TxId,
-    consensus::BlockHeight,
+    consensus::{BlockHeight, TxIndex},
     memo::{Memo, MemoBytes},
     value::{BalanceError, Zatoshis},
 };
@@ -2196,14 +2196,14 @@ impl BlockMetadata {
 pub struct ScannedBundles<NoteCommitment, NF> {
     final_tree_size: u32,
     commitments: Vec<(NoteCommitment, Retention<BlockHeight>)>,
-    nullifier_map: Vec<(TxId, u16, Vec<NF>)>,
+    nullifier_map: Vec<(TxIndex, TxId, Vec<NF>)>,
 }
 
 impl<NoteCommitment, NF> ScannedBundles<NoteCommitment, NF> {
     pub(crate) fn new(
         final_tree_size: u32,
         commitments: Vec<(NoteCommitment, Retention<BlockHeight>)>,
-        nullifier_map: Vec<(TxId, u16, Vec<NF>)>,
+        nullifier_map: Vec<(TxIndex, TxId, Vec<NF>)>,
     ) -> Self {
         Self {
             final_tree_size,
@@ -2223,7 +2223,7 @@ impl<NoteCommitment, NF> ScannedBundles<NoteCommitment, NF> {
     /// the block, so that either the txid or the combination of the block hash available from
     /// [`ScannedBlock::block_hash`] and returned transaction index may be used to uniquely
     /// identify the transaction, depending upon the needs of the caller.
-    pub fn nullifier_map(&self) -> &[(TxId, u16, Vec<NF>)] {
+    pub fn nullifier_map(&self) -> &[(TxIndex, TxId, Vec<NF>)] {
         &self.nullifier_map
     }
 
diff --git a/zcash_client_backend/src/scanning.rs b/zcash_client_backend/src/scanning.rs
index 9992ce6c69..e4c0295fe4 100644
--- a/zcash_client_backend/src/scanning.rs
+++ b/zcash_client_backend/src/scanning.rs
@@ -16,6 +16,7 @@ use tracing::{debug, trace};
 use zcash_keys::keys::UnifiedFullViewingKey;
 use zcash_note_encryption::{BatchDomain, COMPACT_NOTE_SIZE, Domain, ShieldedOutput, batch};
 use zcash_primitives::transaction::{TxId, components::sapling::zip212_enforcement};
+use zcash_protocol::consensus::TxIndex;
 use zcash_protocol::{
     ShieldedProtocol,
     consensus::{self, BlockHeight, NetworkUpgrade},
@@ -846,7 +847,7 @@ where
     for tx in block.vtx.into_iter() {
         let txid = tx.txid();
         let tx_index =
-            u16::try_from(tx.index).expect("Cannot fit more than 2^16 transactions in a block");
+            TxIndex::try_from(tx.index).expect("Cannot fit more than 2^16 transactions in a block");
 
         let (sapling_spends, sapling_unlinked_nullifiers) = find_spent(
             &tx.spends,
@@ -859,7 +860,7 @@ where
             WalletSpend::from_parts,
         );
 
-        sapling_nullifier_map.push((txid, tx_index, sapling_unlinked_nullifiers));
+        sapling_nullifier_map.push((tx_index, txid, sapling_unlinked_nullifiers));
 
         #[cfg(feature = "orchard")]
         let orchard_spends = {
@@ -873,7 +874,7 @@ where
                 },
                 WalletSpend::from_parts,
             );
-            orchard_nullifier_map.push((txid, tx_index, orchard_unlinked_nullifiers));
+            orchard_nullifier_map.push((tx_index, txid, orchard_unlinked_nullifiers));
             orchard_spends
         };
 
@@ -957,7 +958,7 @@ where
         if has_sapling || has_orchard {
             wtxs.push(WalletTx::new(
                 txid,
-                tx_index as usize,
+                tx_index,
                 sapling_spends,
                 sapling_outputs,
                 #[cfg(feature = "orchard")]
@@ -1402,7 +1403,7 @@ mod tests {
             assert_eq!(txs.len(), 1);
 
             let tx = &txs[0];
-            assert_eq!(tx.block_index(), 1);
+            assert_eq!(tx.block_index(), 1.into());
             assert_eq!(tx.sapling_spends().len(), 0);
             assert_eq!(tx.sapling_outputs().len(), 1);
             assert_eq!(tx.sapling_outputs()[0].index(), 0);
@@ -1482,7 +1483,7 @@ mod tests {
             assert_eq!(txs.len(), 1);
 
             let tx = &txs[0];
-            assert_eq!(tx.block_index(), 1);
+            assert_eq!(tx.block_index(), 1.into());
             assert_eq!(tx.sapling_spends().len(), 0);
             assert_eq!(tx.sapling_outputs().len(), 1);
             assert_eq!(tx.sapling_outputs()[0].index(), 0);
@@ -1542,7 +1543,7 @@ mod tests {
         assert_eq!(txs.len(), 1);
 
         let tx = &txs[0];
-        assert_eq!(tx.block_index(), 1);
+        assert_eq!(tx.block_index(), 1.into());
         assert_eq!(tx.sapling_spends().len(), 1);
         assert_eq!(tx.sapling_outputs().len(), 0);
         assert_eq!(tx.sapling_spends()[0].index(), 0);
diff --git a/zcash_client_backend/src/wallet.rs b/zcash_client_backend/src/wallet.rs
index f37d501932..980b723591 100644
--- a/zcash_client_backend/src/wallet.rs
+++ b/zcash_client_backend/src/wallet.rs
@@ -14,7 +14,7 @@ use zcash_note_encryption::EphemeralKeyBytes;
 use zcash_primitives::transaction::{TxId, fees::transparent as transparent_fees};
 use zcash_protocol::{
     PoolType, ShieldedProtocol,
-    consensus::BlockHeight,
+    consensus::{BlockHeight, TxIndex},
     value::{BalanceError, Zatoshis},
 };
 use zip32::Scope;
@@ -100,7 +100,7 @@ pub enum Recipient<AccountId> {
 #[derive(Clone)]
 pub struct WalletTx<AccountId> {
     txid: TxId,
-    block_index: usize,
+    block_index: TxIndex,
     sapling_spends: Vec<WalletSaplingSpend<AccountId>>,
     sapling_outputs: Vec<WalletSaplingOutput<AccountId>>,
     #[cfg(feature = "orchard")]
@@ -113,7 +113,7 @@ impl<AccountId> WalletTx<AccountId> {
     /// Constructs a new [`WalletTx`] from its constituent parts.
     pub fn new(
         txid: TxId,
-        block_index: usize,
+        block_index: TxIndex,
         sapling_spends: Vec<WalletSaplingSpend<AccountId>>,
         sapling_outputs: Vec<WalletSaplingOutput<AccountId>>,
         #[cfg(feature = "orchard")] orchard_spends: Vec<
@@ -141,7 +141,7 @@ impl<AccountId> WalletTx<AccountId> {
     }
 
     /// Returns the index of the transaction in the containing block.
-    pub fn block_index(&self) -> usize {
+    pub fn block_index(&self) -> TxIndex {
         self.block_index
     }
 
diff --git a/zcash_client_memory/src/types/memory_wallet/mod.rs b/zcash_client_memory/src/types/memory_wallet/mod.rs
index 6a8d07dac7..c6ed0548f0 100644
--- a/zcash_client_memory/src/types/memory_wallet/mod.rs
+++ b/zcash_client_memory/src/types/memory_wallet/mod.rs
@@ -32,7 +32,7 @@ use zcash_keys::keys::UnifiedFullViewingKey;
 use zcash_primitives::transaction::Transaction;
 use zcash_protocol::{
     ShieldedProtocol, TxId,
-    consensus::{self, BlockHeight, NetworkUpgrade},
+    consensus::{self, BlockHeight, NetworkUpgrade, TxIndex},
 };
 use zip32::{Scope, fingerprint::SeedFingerprint};
 
@@ -557,14 +557,14 @@ impl<P: consensus::Parameters> MemoryWalletDb<P> {
     pub(crate) fn insert_sapling_nullifier_map(
         &mut self,
         block_height: BlockHeight,
-        new_entries: &[(TxId, u16, Vec<sapling::Nullifier>)],
+        new_entries: &[(TxIndex, TxId, Vec<sapling::Nullifier>)],
     ) -> Result<(), Error> {
-        for (txid, tx_index, nullifiers) in new_entries {
+        for (tx_index, txid, nullifiers) in new_entries {
             for nf in nullifiers.iter() {
                 self.nullifiers
-                    .insert(block_height, *tx_index as u32, Nullifier::Sapling(*nf));
+                    .insert(block_height, u32::from(*tx_index), Nullifier::Sapling(*nf));
             }
-            match self.tx_locator.entry((block_height, *tx_index as u32)) {
+            match self.tx_locator.entry((block_height, u32::from(*tx_index))) {
                 Entry::Occupied(x) => {
                     if txid == x.get() {
                         // This is a duplicate entry
@@ -585,14 +585,14 @@ impl<P: consensus::Parameters> MemoryWalletDb<P> {
     pub(crate) fn insert_orchard_nullifier_map(
         &mut self,
         block_height: BlockHeight,
-        new_entries: &[(TxId, u16, Vec<orchard::note::Nullifier>)],
+        new_entries: &[(TxIndex, TxId, Vec<orchard::note::Nullifier>)],
     ) -> Result<(), Error> {
-        for (txid, tx_index, nullifiers) in new_entries {
+        for (tx_index, txid, nullifiers) in new_entries {
             for nf in nullifiers.iter() {
                 self.nullifiers
-                    .insert(block_height, *tx_index as u32, Nullifier::Orchard(*nf));
+                    .insert(block_height, u32::from(*tx_index), Nullifier::Orchard(*nf));
             }
-            match self.tx_locator.entry((block_height, *tx_index as u32)) {
+            match self.tx_locator.entry((block_height, u32::from(*tx_index))) {
                 Entry::Occupied(x) => {
                     if txid == x.get() {
                         // This is a duplicate entry
diff --git a/zcash_client_memory/src/types/transaction.rs b/zcash_client_memory/src/types/transaction.rs
index 886cb43422..69266702f2 100644
--- a/zcash_client_memory/src/types/transaction.rs
+++ b/zcash_client_memory/src/types/transaction.rs
@@ -47,7 +47,7 @@ impl TransactionEntry {
     pub fn new_from_tx_meta(tx_meta: WalletTx<AccountId>, height: BlockHeight) -> Self {
         Self {
             tx_status: TransactionStatus::Mined(height),
-            tx_index: Some(tx_meta.block_index() as u32),
+            tx_index: Some(u32::from(tx_meta.block_index())),
             block: Some(height),
             expiry_height: None,
             raw: None,
@@ -122,7 +122,7 @@ impl TransactionTable {
     pub(crate) fn put_tx_meta(&mut self, tx_meta: WalletTx<AccountId>, height: BlockHeight) {
         match self.0.entry(tx_meta.txid()) {
             Entry::Occupied(mut entry) => {
-                entry.get_mut().tx_index = Some(tx_meta.block_index() as u32);
+                entry.get_mut().tx_index = Some(u32::from(tx_meta.block_index()));
                 entry.get_mut().tx_status = TransactionStatus::Mined(height);
             }
             Entry::Vacant(entry) => {
diff --git a/zcash_client_sqlite/src/wallet.rs b/zcash_client_sqlite/src/wallet.rs
index 5d73654c5b..3ce3bc66a7 100644
--- a/zcash_client_sqlite/src/wallet.rs
+++ b/zcash_client_sqlite/src/wallet.rs
@@ -112,7 +112,7 @@ use zcash_primitives::{
 };
 use zcash_protocol::{
     PoolType, ShieldedProtocol, TxId,
-    consensus::{self, BlockHeight, BranchId, NetworkUpgrade, Parameters},
+    consensus::{self, BlockHeight, BranchId, NetworkUpgrade, Parameters, TxIndex},
     memo::{Memo, MemoBytes},
     value::{ZatBalance, Zatoshis},
 };
@@ -3544,7 +3544,7 @@ pub(crate) fn put_tx_meta(
     let tx_params = named_params![
         ":txid": &txid_bytes.as_ref()[..],
         ":block": u32::from(height),
-        ":tx_index": i64::try_from(tx.block_index()).expect("transaction indices are representable as i64"),
+        ":tx_index": u16::from(tx.block_index()),
     ];
 
     stmt_upsert_tx_meta
@@ -3996,7 +3996,7 @@ pub(crate) fn insert_nullifier_map<N: AsRef<[u8]>>(
     conn: &rusqlite::Transaction<'_>,
     block_height: BlockHeight,
     spend_pool: ShieldedProtocol,
-    new_entries: &[(TxId, u16, Vec<N>)],
+    new_entries: &[(TxIndex, TxId, Vec<N>)],
 ) -> Result<(), SqliteClientError> {
     let mut stmt_select_tx_locators = conn.prepare_cached(
         "SELECT block_height, tx_index, txid
@@ -4017,10 +4017,10 @@ pub(crate) fn insert_nullifier_map<N: AsRef<[u8]>>(
             tx_index = :tx_index",
     )?;
 
-    for (txid, tx_index, nullifiers) in new_entries {
+    for (tx_index, txid, nullifiers) in new_entries {
         let tx_args = named_params![
             ":block_height": u32::from(block_height),
-            ":tx_index": tx_index,
+            ":tx_index": u16::from(*tx_index),
             ":txid": txid.as_ref(),
         ];
 
@@ -4038,7 +4038,7 @@ pub(crate) fn insert_nullifier_map<N: AsRef<[u8]>>(
             .query_map(tx_args, |row| {
                 Ok((
                     BlockHeight::from_u32(row.get(0)?),
-                    row.get::<_, u16>(1)?,
+                    TxIndex::from(row.get::<_, u16>(1)?),
                     TxId::from_bytes(row.get(2)?),
                 ))
             })?
@@ -4071,7 +4071,7 @@ pub(crate) fn insert_nullifier_map<N: AsRef<[u8]>>(
                 ":spend_pool": pool_code(PoolType::Shielded(spend_pool)),
                 ":nf": nf.as_ref(),
                 ":block_height": u32::from(block_height),
-                ":tx_index": tx_index,
+                ":tx_index": u16::from(*tx_index),
             ];
             stmt_insert_nullifier_mapping.execute(nf_args)?;
         }
@@ -4104,7 +4104,7 @@ pub(crate) fn query_nullifier_map<N: AsRef<[u8]>>(
         .query_row(sql_args, |row| {
             Ok((
                 BlockHeight::from_u32(row.get(0)?),
-                row.get(1)?,
+                TxIndex::from(row.get::<_, u16>(1)?),
                 TxId::from_bytes(row.get(2)?),
             ))
         })
diff --git a/zcash_client_sqlite/src/wallet/init/migrations/receiving_key_scopes.rs b/zcash_client_sqlite/src/wallet/init/migrations/receiving_key_scopes.rs
index 7654ea6b1f..9fdca06def 100644
--- a/zcash_client_sqlite/src/wallet/init/migrations/receiving_key_scopes.rs
+++ b/zcash_client_sqlite/src/wallet/init/migrations/receiving_key_scopes.rs
@@ -911,7 +911,7 @@ mod tests {
         let tx_params = named_params![
             ":txid": &txid_bytes.as_ref()[..],
             ":block": u32::from(height),
-            ":tx_index": i64::try_from(tx.block_index()).expect("transaction indices are representable as i64"),
+            ":tx_index": u16::from(tx.block_index()),
         ];
 
         stmt_upsert_tx_meta

From dd8bc55d3cfc4748d119690fb11c57cec77571be Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Thu, 13 Nov 2025 12:27:33 -0700
Subject: [PATCH 135/263] zcash_client_backend: Implement `put_blocks` in terms
 of low level data API features.

---
 zcash_client_backend/src/data_api/ll.rs       | 166 ++++++++++++-
 .../src/data_api/ll/wallet.rs                 |  12 +-
 zcash_client_sqlite/src/lib.rs                | 227 ++++++++++++------
 zcash_client_sqlite/src/wallet.rs             |  29 +--
 4 files changed, 333 insertions(+), 101 deletions(-)

diff --git a/zcash_client_backend/src/data_api/ll.rs b/zcash_client_backend/src/data_api/ll.rs
index f01c6fa7d2..c3df51be3b 100644
--- a/zcash_client_backend/src/data_api/ll.rs
+++ b/zcash_client_backend/src/data_api/ll.rs
@@ -9,16 +9,19 @@
 //! [`WalletWrite`]: super::WalletWrite
 
 use core::{fmt::Debug, hash::Hash};
-use std::collections::HashSet;
+use std::{collections::HashSet, ops::Range};
 
 use incrementalmerkletree::Position;
 use transparent::bundle::OutPoint;
 use zcash_address::ZcashAddress;
 use zcash_keys::address::Receiver;
-use zcash_primitives::transaction::{Transaction, TransactionData};
+use zcash_primitives::{
+    block::BlockHash,
+    transaction::{Transaction, TransactionData},
+};
 use zcash_protocol::{
-    TxId,
-    consensus::BlockHeight,
+    ShieldedProtocol, TxId,
+    consensus::{BlockHeight, TxIndex},
     memo::MemoBytes,
     value::{BalanceError, Zatoshis},
 };
@@ -27,7 +30,7 @@ use zip32::Scope;
 use super::{TransactionStatus, wallet::TargetHeight};
 use crate::{
     DecryptedOutput, TransferType,
-    wallet::{Recipient, WalletSaplingOutput},
+    wallet::{Recipient, WalletSaplingOutput, WalletTx},
 };
 
 #[cfg(feature = "transparent-inputs")]
@@ -174,6 +177,15 @@ pub trait LowLevelWalletRead {
         address: &TransparentAddress,
     ) -> Result<Option<(Self::AccountId, Option<TransparentKeyScope>)>, Self::Error>;
 
+    /// Finds the set of accounts that either provide inputs to or receive outputs from any of the
+    /// provided transactions.
+    #[cfg(feature = "transparent-inputs")]
+    #[allow(clippy::type_complexity)]
+    fn find_involved_accounts(
+        &self,
+        tx_refs: impl IntoIterator<Item = Self::TxRef>,
+    ) -> Result<HashSet<(Self::AccountId, Option<TransparentKeyScope>)>, Self::Error>;
+
     /// Detects the set of accounts that received transparent outputs corresponding to the provided
     /// [`OutPoint`]s. This is used to determine which account(s) funded a given transaction.
     ///
@@ -228,6 +240,21 @@ pub trait LowLevelWalletRead {
         &self,
         tx_ref: Self::TxRef,
     ) -> Result<Vec<(Self::TxRef, Transaction)>, Self::Error>;
+
+    /// Finds the reference to the transaction that reveals the given Sapling nullifier in the
+    /// backing data store, if known.
+    fn detect_sapling_spend(
+        &self,
+        nf: &::sapling::Nullifier,
+    ) -> Result<Option<Self::TxRef>, Self::Error>;
+
+    /// Finds the reference to the transaction that reveals the given Orchard nullifier in the
+    /// backing data store, if known.
+    #[cfg(feature = "orchard")]
+    fn detect_orchard_spend(
+        &self,
+        nf: &::orchard::note::Nullifier,
+    ) -> Result<Option<Self::TxRef>, Self::Error>;
 }
 
 /// A capability trait that provides low-level wallet write operations. These operations are used
@@ -235,6 +262,26 @@ pub trait LowLevelWalletRead {
 ///
 /// [`WalletWrite`]: super::WalletWrite
 pub trait LowLevelWalletWrite: LowLevelWalletRead {
+    /// Add metadata about a block to the wallet data store.
+    #[allow(clippy::too_many_arguments)]
+    fn put_block_meta(
+        &mut self,
+        block_height: BlockHeight,
+        block_hash: BlockHash,
+        block_time: u32,
+        sapling_commitment_tree_size: u32,
+        sapling_output_count: u32,
+        #[cfg(feature = "orchard")] orchard_commitment_tree_size: u32,
+        #[cfg(feature = "orchard")] orchard_action_count: u32,
+    ) -> Result<(), Self::Error>;
+
+    /// Add metadata about a transaction to the wallet data store.
+    fn put_tx_meta(
+        &mut self,
+        tx: &WalletTx<Self::AccountId>,
+        height: BlockHeight,
+    ) -> Result<Self::TxRef, Self::Error>;
+
     /// Adds the given transaction to the wallet.
     ///
     /// # Parameters
@@ -274,6 +321,39 @@ pub trait LowLevelWalletWrite: LowLevelWalletRead {
         spent_in: Option<Self::TxRef>,
     ) -> Result<(), Self::Error>;
 
+    /// Updates the backing store to indicate that the Sapling output having the given nullifier is
+    /// spent in the transaction referenced by `spent_in_tx`. This may result in multiple distinct
+    /// transactions being recorded as having spent the note; only one of these transactions will
+    /// end up having been mined (by consensus.)
+    ///
+    /// Returns `Ok(true)` if a a new record was added to the data store.
+    fn mark_sapling_note_spent(
+        &mut self,
+        nf: &::sapling::Nullifier,
+        spent_in_tx: Self::TxRef,
+    ) -> Result<bool, Self::Error>;
+
+    /// Causes the given Sapling output nullifiers to be tracked by the wallet.
+    ///
+    /// When scanning the chain out-of-order, it is necessary to store any nullifiers observed
+    /// after a gap in the scanned blocks until the blocks in that gap have been fully scanned, in
+    /// order to be able to immediately detect that a received output has already been spent. The
+    /// data store should track a mapping from each nullifier to the block, transaction ID, and
+    /// input index where the nullifier was revealed, so that the state of a note received within
+    /// that "gap" can be properly updated when it is discovered.
+    ///
+    /// # Parameters
+    /// - `block_height`: The height of the block containing the nullifiers.
+    /// - `nfs`: A slice of tuples, where each tuple contains:
+    ///   - The transaction ID of the transaction revealing the nullifiers.
+    ///   - The index of the transaction within the block.
+    ///   - The vector of nullifiers revealed by the spends in that transaction.
+    fn track_block_sapling_nullifiers(
+        &mut self,
+        block_height: BlockHeight,
+        nfs: &[(TxIndex, TxId, Vec<::sapling::Nullifier>)],
+    ) -> Result<(), Self::Error>;
+
     /// Adds information about a received Orchard note to the wallet, or updates any existing
     /// record for that output.
     #[cfg(feature = "orchard")]
@@ -285,6 +365,53 @@ pub trait LowLevelWalletWrite: LowLevelWalletRead {
         spent_in: Option<Self::TxRef>,
     ) -> Result<(), Self::Error>;
 
+    /// Updates the backing store to indicate that the Orchard output having the given nullifier is
+    /// spent in the transaction referenced by `spent_in_tx`. This may result in multiple distinct
+    /// transactions being recorded as having spent the note; only one of these transactions will
+    /// end up having been mined (by consensus.)
+    ///
+    /// Returns `Ok(true)` if a a new record was added to the data store.
+    #[cfg(feature = "orchard")]
+    fn mark_orchard_note_spent(
+        &mut self,
+        nf: &::orchard::note::Nullifier,
+        tx_ref: Self::TxRef,
+    ) -> Result<bool, Self::Error>;
+
+    /// Causes the given Orchard output nullifiers to be tracked by the wallet.
+    ///
+    /// When scanning the chain out-of-order, it is necessary to store any nullifiers observed
+    /// after a gap in the scanned blocks until the blocks in that gap have been fully scanned, in
+    /// order to be able to immediately detect that a received output has already been spent. The
+    /// data store should track a mapping from each nullifier to the block, transaction ID, and
+    /// input index where the nullifier was revealed, so that the state of a note received within
+    /// that "gap" can be properly updated when it is discovered.
+    ///
+    /// # Parameters
+    /// - `block_height`: The height of the block containing the nullifiers.
+    /// - `nfs`: A slice of tuples, where each tuple contains:
+    ///   - The transaction ID of the transaction revealing the nullifiers.
+    ///   - The index of the transaction within the block.
+    ///   - The vector of nullifiers revealed by the actions in that transaction.
+    #[cfg(feature = "orchard")]
+    fn track_block_orchard_nullifiers(
+        &mut self,
+        block_height: BlockHeight,
+        nfs: &[(TxIndex, TxId, Vec<::orchard::note::Nullifier>)],
+    ) -> Result<(), Self::Error>;
+
+    /// Removes tracked nullifiers that are no longer needed for spend detection.
+    ///
+    /// This function prunes nullifiers that were recorded at block heights less than
+    /// `(fully_scanned_height - pruning_depth)`, where `fully_scanned_height` is the height
+    /// of the wallet's fully scanned chain state. These nullifiers are no longer needed because
+    /// any notes they could have spent would have already been discovered during scanning.
+    ///
+    /// # Parameters
+    /// - `pruning_depth`: The number of blocks below the fully scanned height at which to
+    ///   prune tracked nullifiers.
+    fn prune_tracked_nullifiers(&mut self, pruning_depth: u32) -> Result<(), Self::Error>;
+
     /// Records information about a transaction output that your wallet created, from the constituent
     /// properties of that output.
     ///
@@ -358,6 +485,19 @@ pub trait LowLevelWalletWrite: LowLevelWalletRead {
         request: UnifiedAddressRequest,
     ) -> Result<(), Self::Error>;
 
+    /// Adds a [`TransactionDataRequest::Enhancement`] request for the enhancement of the given
+    /// transaction to the transaction data request queue. The `dependent_tx_ref` parameter
+    /// specifies the transaction that caused this request to be generated, likely as part of the
+    /// process of traversing the transparent transaction graph by inspecting the inputs of a
+    /// transaction with outputs that were received by the wallet.
+    ///
+    /// [`TransactionDataRequest::Enhancement`]: super::TransactionDataRequest
+    fn queue_tx_retrieval(
+        &mut self,
+        txids: impl Iterator<Item = TxId>,
+        dependent_tx_ref: Option<Self::TxRef>,
+    ) -> Result<(), Self::Error>;
+
     /// Adds a [`TransactionDataRequest::TransactionsInvolvingAddress`] request to the transaction
     /// data request queue. When the transparetn output of `tx_ref` at output index `output_index`
     /// (which must have been received at `receiving_address`) is detected as having been spent,
@@ -390,18 +530,20 @@ pub trait LowLevelWalletWrite: LowLevelWalletRead {
         d_tx: &super::DecryptedTransaction<'_, Self::AccountId>,
     ) -> Result<(), Self::Error>;
 
-    /// TODO
-    #[cfg(feature = "transparent-inputs")]
-    fn queue_unmined_tx_retrieval(
-        &mut self,
-        d_tx: &super::DecryptedTransaction<'_, Self::AccountId>,
-    ) -> Result<(), Self::Error>;
-
     /// Deletes all [`TransactionDataRequest::Enhancement`] requests for the given transaction ID
     /// from the transaction data request queue.
     ///
     /// [`TransactionDataRequest::Enhancement`]: super::TransactionDataRequest
     fn delete_retrieval_queue_entries(&mut self, txid: TxId) -> Result<(), Self::Error>;
+
+    /// Updates the state of the wallet backend to indicate that the given range of blocks has been
+    /// fully scanned, identifying the position in the note commitment tree of any notes belonging
+    /// to the wallet that were discoveredd in the process of scanning.
+    fn notify_scan_complete(
+        &mut self,
+        range: Range<BlockHeight>,
+        wallet_note_positions: &[(ShieldedProtocol, Position)],
+    ) -> Result<(), Self::Error>;
 }
 
 /// This trait provides a generalization over shielded Sapling output representations.
diff --git a/zcash_client_backend/src/data_api/ll/wallet.rs b/zcash_client_backend/src/data_api/ll/wallet.rs
index b631ae8821..af59404fe4 100644
--- a/zcash_client_backend/src/data_api/ll/wallet.rs
+++ b/zcash_client_backend/src/data_api/ll/wallet.rs
@@ -171,6 +171,7 @@ where
     #[cfg(feature = "transparent-inputs")]
     let mut tx_has_wallet_outputs = false;
 
+    // The set of account/scope pairs for which to update the gap limit.
     #[cfg(feature = "transparent-inputs")]
     let mut gap_update_set = HashSet::new();
 
@@ -428,7 +429,16 @@ where
     // If the decrypted transaction is unmined and has no shielded components, add it to
     // the queue for status retrieval.
     #[cfg(feature = "transparent-inputs")]
-    wallet_db.queue_unmined_tx_retrieval(&d_tx)?;
+    {
+        let detectable_via_scanning = d_tx.tx().sapling_bundle().is_some();
+        #[cfg(feature = "orchard")]
+        let detectable_via_scanning =
+            detectable_via_scanning | d_tx.tx().orchard_bundle().is_some();
+
+        if d_tx.mined_height().is_none() && !detectable_via_scanning {
+            wallet_db.queue_tx_retrieval(std::iter::once(d_tx.tx().txid()), None)?
+        }
+    }
 
     Ok(())
 }
diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs
index 976144c5b8..2a44be13bf 100644
--- a/zcash_client_sqlite/src/lib.rs
+++ b/zcash_client_sqlite/src/lib.rs
@@ -40,7 +40,7 @@ use shardtree::{ShardTree, error::ShardTreeError, store::ShardStore};
 use std::{
     borrow::{Borrow, BorrowMut},
     cmp::{max, min},
-    collections::HashMap,
+    collections::{BTreeSet, HashMap, HashSet},
     convert::AsRef,
     fmt,
     num::NonZeroU32,
@@ -69,7 +69,7 @@ use zcash_client_backend::{
         wallet::{ConfirmationsPolicy, TargetHeight},
     },
     proto::compact_formats::CompactBlock,
-    wallet::{Note, NoteId, ReceivedNote, WalletTransparentOutput},
+    wallet::{Note, NoteId, ReceivedNote, WalletTransparentOutput, WalletTx},
 };
 use zcash_keys::{
     address::UnifiedAddress,
@@ -81,7 +81,7 @@ use zcash_primitives::{
 };
 use zcash_protocol::{
     ShieldedProtocol,
-    consensus::{self, BlockHeight},
+    consensus::{self, BlockHeight, TxIndex},
     memo::Memo,
 };
 use zip32::{DiversifierIndex, fingerprint::SeedFingerprint};
@@ -113,7 +113,6 @@ use {
         bundle::OutPoint,
         keys::{NonHardenedChildIndex, TransparentKeyScope},
     },
-    std::collections::BTreeSet,
     std::time::SystemTime,
     zcash_client_backend::{
         data_api::{Balance, TransactionsInvolvingAddress, WalletUtxo},
@@ -269,7 +268,7 @@ impl fmt::Display for ReceivedNoteId {
 pub struct UtxoId(pub(crate) i64);
 
 /// A newtype wrapper for sqlite primary key values for the transactions table.
-#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct TxRef(pub(crate) i64);
 
 /// A newtype wrapper for sqlite primary key values for the addresses table.
@@ -1441,8 +1440,7 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
                 }
 
                 // Insert the block into the database.
-                wallet::put_block(
-                    wdb.conn.0,
+                wdb.put_block_meta(
                     block.height(),
                     block.block_hash(),
                     block.block_time(),
@@ -1455,20 +1453,20 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
                 )?;
 
                 for tx in block.transactions() {
-                    let tx_ref = wallet::put_tx_meta(wdb.conn.0, tx, block.height())?;
+                    let tx_ref = wdb.put_tx_meta(tx, block.height())?;
 
                     #[cfg(feature = "transparent-inputs")]
                     tx_refs.insert(tx_ref);
 
-                    wallet::queue_tx_retrieval(wdb.conn.0, std::iter::once(tx.txid()), None)?;
+                    wdb.queue_tx_retrieval(std::iter::once(tx.txid()), None)?;
 
                     // Mark notes as spent and remove them from the scanning cache
                     for spend in tx.sapling_spends() {
-                        wallet::sapling::mark_sapling_note_spent(wdb.conn.0, tx_ref, spend.nf())?;
+                        wdb.mark_sapling_note_spent(spend.nf(), tx_ref)?;
                     }
                     #[cfg(feature = "orchard")]
                     for spend in tx.orchard_spends() {
-                        wallet::orchard::mark_orchard_note_spent(wdb.conn.0, tx_ref, spend.nf())?;
+                        wdb.mark_orchard_note_spent(spend.nf(), tx_ref)?;
                     }
 
                     for output in tx.sapling_outputs() {
@@ -1476,19 +1474,11 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
                         // we previously scanned.
                         let spent_in = output
                             .nf()
-                            .map(|nf| {
-                                wallet::query_nullifier_map(
-                                    wdb.conn.0,
-                                    ShieldedProtocol::Sapling,
-                                    nf,
-                                )
-                            })
+                            .map(|nf| wdb.detect_sapling_spend(nf))
                             .transpose()?
                             .flatten();
 
-                        wallet::sapling::put_received_note(
-                            wdb.conn.0,
-                            &wdb.params,
+                        wdb.put_received_sapling_note(
                             output,
                             tx_ref,
                             Some(block.height()),
@@ -1501,19 +1491,11 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
                         // we previously scanned.
                         let spent_in = output
                             .nf()
-                            .map(|nf| {
-                                wallet::query_nullifier_map(
-                                    wdb.conn.0,
-                                    ShieldedProtocol::Orchard,
-                                    &nf.to_bytes(),
-                                )
-                            })
+                            .map(|nf| wdb.detect_orchard_spend(nf))
                             .transpose()?
                             .flatten();
 
-                        wallet::orchard::put_received_note(
-                            wdb.conn.0,
-                            &wdb.params,
+                        wdb.put_received_orchard_note(
                             output,
                             tx_ref,
                             Some(block.height()),
@@ -1523,25 +1505,15 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
                 }
 
                 // Insert the new nullifiers from this block into the nullifier map.
-                wallet::insert_nullifier_map(
-                    wdb.conn.0,
+                wdb.track_block_sapling_nullifiers(
                     block.height(),
-                    ShieldedProtocol::Sapling,
                     block.sapling().nullifier_map(),
                 )?;
+
                 #[cfg(feature = "orchard")]
-                wallet::insert_nullifier_map(
-                    wdb.conn.0,
+                wdb.track_block_orchard_nullifiers(
                     block.height(),
-                    ShieldedProtocol::Orchard,
-                    &block
-                        .orchard()
-                        .nullifier_map()
-                        .iter()
-                        .map(|(txid, idx, nfs)| {
-                            (*txid, *idx, nfs.iter().map(|nf| nf.to_bytes()).collect())
-                        })
-                        .collect::<Vec<_>>(),
+                    block.orchard().nullifier_map(),
                 )?;
 
                 note_positions.extend(block.transactions().iter().flat_map(|wtx| {
@@ -1590,28 +1562,19 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
             }
 
             #[cfg(feature = "transparent-inputs")]
-            for (account_id, key_scope) in wallet::involved_accounts(wdb.conn.0, tx_refs)? {
-                if let Some(t_key_scope) = <Option<TransparentKeyScope>>::from(key_scope) {
+            for (account_id, key_scope) in wdb.find_involved_accounts(tx_refs)? {
+                if let Some(t_key_scope) = key_scope {
                     use ReceiverRequirement::*;
-                    wallet::transparent::generate_gap_addresses(
-                        wdb.conn.0,
-                        &wdb.params,
-                        &wdb.gap_limits,
+                    wdb.generate_transparent_gap_addresses(
                         account_id,
                         t_key_scope,
                         UnifiedAddressRequest::unsafe_custom(Allow, Allow, Require),
-                        false,
                     )?;
                 }
             }
 
             // Prune the nullifier map of entries we no longer need.
-            if let Some(meta) = wdb.block_fully_scanned()? {
-                wallet::prune_nullifier_map(
-                    wdb.conn.0,
-                    meta.block_height().saturating_sub(PRUNING_DEPTH),
-                )?;
-            }
+            wdb.prune_tracked_nullifiers(PRUNING_DEPTH)?;
 
             // We will have a start position and a last scanned height in all cases where
             // `blocks` is non-empty.
@@ -1738,7 +1701,7 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
                 // Update the Sapling note commitment tree with all newly read note commitments
                 {
                     let mut sapling_subtrees_iter = sapling_subtrees.into_iter();
-                    wdb.with_sapling_tree_mut::<_, _, Self::Error>(|sapling_tree| {
+                    wdb.with_sapling_tree_mut::<_, _, SqliteClientError>(|sapling_tree| {
                         debug!(
                             "Sapling initial tree size at {:?}: {:?}",
                             from_state.block_height(),
@@ -1789,7 +1752,7 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
                 #[cfg(feature = "orchard")]
                 {
                     let mut orchard_subtrees = orchard_subtrees.into_iter();
-                    wdb.with_orchard_tree_mut::<_, _, Self::Error>(|orchard_tree| {
+                    wdb.with_orchard_tree_mut::<_, _, SqliteClientError>(|orchard_tree| {
                         debug!(
                             "Orchard initial tree size at {:?}: {:?}",
                             from_state.block_height(),
@@ -1839,9 +1802,7 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
                     })?;
                 }
 
-                wallet::scanning::scan_complete(
-                    wdb.conn.0,
-                    &wdb.params,
+                wdb.notify_scan_complete(
                     Range {
                         start: start_positions.height,
                         end: last_scanned_height + 1,
@@ -2033,6 +1994,17 @@ impl<'a, C: Borrow<rusqlite::Transaction<'a>>, P: consensus::Parameters, CL: Clo
         wallet::select_receiving_address(self.conn.borrow(), &self.params, account, receiver)
     }
 
+    #[cfg(feature = "transparent-inputs")]
+    fn find_involved_accounts(
+        &self,
+        tx_refs: impl IntoIterator<Item = Self::TxRef>,
+    ) -> Result<HashSet<(Self::AccountId, Option<TransparentKeyScope>)>, Self::Error> {
+        Ok(wallet::involved_accounts(self.conn.borrow(), tx_refs)?
+            .into_iter()
+            .map(|(_, uuid, scope)| (uuid, scope))
+            .collect())
+    }
+
     #[cfg(feature = "transparent-inputs")]
     fn find_account_for_transparent_address(
         &self,
@@ -2091,11 +2063,62 @@ impl<'a, C: Borrow<rusqlite::Transaction<'a>>, P: consensus::Parameters, CL: Clo
     ) -> Result<Vec<(Self::TxRef, Transaction)>, Self::Error> {
         wallet::get_txs_spending_transparent_outputs_of(self.conn.borrow(), &self.params, tx_ref)
     }
+
+    fn detect_sapling_spend(
+        &self,
+        nf: &::sapling::Nullifier,
+    ) -> Result<Option<Self::TxRef>, Self::Error> {
+        wallet::query_nullifier_map(self.conn.borrow(), ShieldedProtocol::Sapling, nf)
+    }
+
+    #[cfg(feature = "orchard")]
+    fn detect_orchard_spend(
+        &self,
+        nf: &::orchard::note::Nullifier,
+    ) -> Result<Option<Self::TxRef>, Self::Error> {
+        wallet::query_nullifier_map(
+            self.conn.borrow(),
+            ShieldedProtocol::Orchard,
+            &nf.to_bytes(),
+        )
+    }
 }
 
 impl<'a, C: Borrow<rusqlite::Transaction<'a>>, P: consensus::Parameters, CL: Clock, R: RngCore>
     LowLevelWalletWrite for WalletDb<C, P, CL, R>
 {
+    fn put_block_meta(
+        &mut self,
+        block_height: BlockHeight,
+        block_hash: BlockHash,
+        block_time: u32,
+        sapling_commitment_tree_size: u32,
+        sapling_output_count: u32,
+        #[cfg(feature = "orchard")] orchard_commitment_tree_size: u32,
+        #[cfg(feature = "orchard")] orchard_action_count: u32,
+    ) -> Result<(), Self::Error> {
+        wallet::put_block(
+            self.conn.borrow(),
+            block_height,
+            block_hash,
+            block_time,
+            sapling_commitment_tree_size,
+            sapling_output_count,
+            #[cfg(feature = "orchard")]
+            orchard_commitment_tree_size,
+            #[cfg(feature = "orchard")]
+            orchard_action_count,
+        )
+    }
+
+    fn put_tx_meta(
+        &mut self,
+        tx: &WalletTx<Self::AccountId>,
+        height: BlockHeight,
+    ) -> Result<Self::TxRef, Self::Error> {
+        wallet::put_tx_meta(self.conn.borrow(), tx, height)
+    }
+
     fn put_tx_data(
         &mut self,
         tx: &Transaction,
@@ -2148,6 +2171,27 @@ impl<'a, C: Borrow<rusqlite::Transaction<'a>>, P: consensus::Parameters, CL: Clo
         Ok(())
     }
 
+    fn mark_sapling_note_spent(
+        &mut self,
+        nf: &::sapling::Nullifier,
+        tx_ref: Self::TxRef,
+    ) -> Result<bool, Self::Error> {
+        wallet::sapling::mark_sapling_note_spent(self.conn.borrow(), tx_ref, nf)
+    }
+
+    fn track_block_sapling_nullifiers(
+        &mut self,
+        block_height: BlockHeight,
+        nfs: &[(TxIndex, TxId, Vec<::sapling::Nullifier>)],
+    ) -> Result<(), Self::Error> {
+        wallet::insert_nullifier_map(
+            self.conn.borrow(),
+            block_height,
+            ShieldedProtocol::Sapling,
+            nfs,
+        )
+    }
+
     #[cfg(feature = "orchard")]
     fn put_received_orchard_note<T: ReceivedOrchardOutput<AccountId = Self::AccountId>>(
         &mut self,
@@ -2168,6 +2212,42 @@ impl<'a, C: Borrow<rusqlite::Transaction<'a>>, P: consensus::Parameters, CL: Clo
         Ok(())
     }
 
+    #[cfg(feature = "orchard")]
+    fn mark_orchard_note_spent(
+        &mut self,
+        nf: &::orchard::note::Nullifier,
+        tx_ref: Self::TxRef,
+    ) -> Result<bool, Self::Error> {
+        wallet::orchard::mark_orchard_note_spent(self.conn.borrow(), tx_ref, nf)
+    }
+
+    #[cfg(feature = "orchard")]
+    fn track_block_orchard_nullifiers(
+        &mut self,
+        block_height: BlockHeight,
+        nfs: &[(TxIndex, TxId, Vec<::orchard::note::Nullifier>)],
+    ) -> Result<(), Self::Error> {
+        wallet::insert_nullifier_map(
+            self.conn.borrow(),
+            block_height,
+            ShieldedProtocol::Orchard,
+            &nfs.iter()
+                .map(|(idx, txid, nfs)| (*idx, *txid, nfs.iter().map(|n| n.to_bytes()).collect()))
+                .collect::<Vec<_>>(),
+        )
+    }
+
+    fn prune_tracked_nullifiers(&mut self, pruning_depth: u32) -> Result<(), Self::Error> {
+        if let Some(meta) = wallet::block_fully_scanned(self.conn.borrow(), &self.params)? {
+            wallet::prune_nullifier_map(
+                self.conn.borrow(),
+                meta.block_height().saturating_sub(pruning_depth),
+            )?;
+        }
+
+        Ok(())
+    }
+
     fn put_sent_output(
         &mut self,
         from_account_uuid: Self::AccountId,
@@ -2269,17 +2349,30 @@ impl<'a, C: Borrow<rusqlite::Transaction<'a>>, P: consensus::Parameters, CL: Clo
         wallet::queue_transparent_input_retrieval(self.conn.borrow(), tx_ref, d_tx)
     }
 
-    #[cfg(feature = "transparent-inputs")]
-    fn queue_unmined_tx_retrieval(
+    fn queue_tx_retrieval(
         &mut self,
-        d_tx: &data_api::DecryptedTransaction<'_, Self::AccountId>,
+        txids: impl Iterator<Item = TxId>,
+        dependent_tx_ref: Option<Self::TxRef>,
     ) -> Result<(), Self::Error> {
-        wallet::queue_unmined_tx_retrieval(self.conn.borrow(), d_tx)
+        wallet::queue_tx_retrieval(self.conn.borrow(), txids, dependent_tx_ref)
     }
 
     fn delete_retrieval_queue_entries(&mut self, txid: TxId) -> Result<(), Self::Error> {
         wallet::delete_retrieval_queue_entries(self.conn.borrow(), txid)
     }
+
+    fn notify_scan_complete(
+        &mut self,
+        range: Range<BlockHeight>,
+        wallet_note_positions: &[(ShieldedProtocol, Position)],
+    ) -> Result<(), Self::Error> {
+        wallet::scanning::scan_complete(
+            self.conn.borrow(),
+            &self.params,
+            range,
+            wallet_note_positions,
+        )
+    }
 }
 
 pub(crate) type SaplingShardStore<C> = SqliteShardStore<C, sapling::Node, SAPLING_SHARD_HEIGHT>;
diff --git a/zcash_client_sqlite/src/wallet.rs b/zcash_client_sqlite/src/wallet.rs
index 3ce3bc66a7..0bf7e3973a 100644
--- a/zcash_client_sqlite/src/wallet.rs
+++ b/zcash_client_sqlite/src/wallet.rs
@@ -140,6 +140,7 @@ use {
         bundle::{OutPoint, TxOut},
         keys::{NonHardenedChildIndex, TransparentKeyScope},
     },
+    std::collections::HashSet,
     zcash_client_backend::{data_api::DecryptedTransaction, wallet::WalletTransparentOutput},
 };
 
@@ -1227,13 +1228,14 @@ pub(crate) fn upsert_address<P: consensus::Parameters>(
 pub(crate) fn involved_accounts(
     conn: &rusqlite::Connection,
     tx_refs: impl IntoIterator<Item = TxRef>,
-) -> Result<Vec<(AccountRef, KeyScope)>, SqliteClientError> {
+) -> Result<HashSet<(AccountRef, AccountUuid, Option<TransparentKeyScope>)>, SqliteClientError> {
     use rusqlite::types::Value;
     use std::rc::Rc;
 
     let mut stmt = conn.prepare_cached(
-        "SELECT account_id, key_scope
+        "SELECT account_id, accounts.uuid, key_scope
          FROM v_address_uses
+         JOIN accounts ON accounts.id = v_address_uses.account_id
          WHERE transaction_id IN rarray(:tx_refs_ptr)",
     )?;
 
@@ -1246,12 +1248,13 @@ pub(crate) fn involved_accounts(
             },
             |row| {
                 Ok::<_, SqliteClientError>((
-                    row.get(0).map(AccountRef)?,
-                    KeyScope::decode(row.get(1)?)?,
+                    row.get("account_id").map(AccountRef)?,
+                    AccountUuid(row.get("uuid")?),
+                    KeyScope::decode(row.get("key_scope")?)?.as_transparent(),
                 ))
             },
         )?
-        .collect::<Result<Vec<_>, _>>()?;
+        .collect::<Result<HashSet<_>, _>>()?;
 
     Ok(result)
 }
@@ -3687,22 +3690,6 @@ pub(crate) fn queue_transparent_input_retrieval<AccountId>(
     Ok(())
 }
 
-#[cfg(feature = "transparent-inputs")]
-pub(crate) fn queue_unmined_tx_retrieval<AccountId>(
-    conn: &rusqlite::Transaction<'_>,
-    d_tx: &DecryptedTransaction<'_, AccountId>,
-) -> Result<(), SqliteClientError> {
-    let detectable_via_scanning = d_tx.tx().sapling_bundle().is_some();
-    #[cfg(feature = "orchard")]
-    let detectable_via_scanning = detectable_via_scanning | d_tx.tx().orchard_bundle().is_some();
-
-    if d_tx.mined_height().is_none() && !detectable_via_scanning {
-        queue_tx_retrieval(conn, std::iter::once(d_tx.tx().txid()), None)?
-    }
-
-    Ok(())
-}
-
 pub(crate) fn queue_tx_retrieval(
     conn: &rusqlite::Transaction<'_>,
     txids: impl Iterator<Item = TxId>,

From 478bb3f2090d568123ee93e9dc358b00218edb49 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Thu, 13 Nov 2025 12:27:33 -0700
Subject: [PATCH 136/263] zcash_client_backend: Mark notes as spent in
 store_decrypted_tx.

Prior to this change, transactions being detected via mempool scanning
would not result in notes those transactions spend being marked as
spent; that would only happen as a consequence of calls to `put_blocks`
after the transactions in question are mined. Ordinarily this should be
indistinguishable to a mobile wallet user, but it closes a loophole that
may be relevant for Zallet.
---
 .../src/data_api/ll/wallet.rs                 | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/zcash_client_backend/src/data_api/ll/wallet.rs b/zcash_client_backend/src/data_api/ll/wallet.rs
index af59404fe4..69ed459bbc 100644
--- a/zcash_client_backend/src/data_api/ll/wallet.rs
+++ b/zcash_client_backend/src/data_api/ll/wallet.rs
@@ -256,6 +256,16 @@ where
         }
     }
 
+    // Mark Sapling notes as spent when we observe their nullifiers.
+    for spend in d_tx
+        .tx()
+        .sapling_bundle()
+        .iter()
+        .flat_map(|b| b.shielded_spends().iter())
+    {
+        wallet_db.mark_sapling_note_spent(spend.nullifier(), tx_ref)?;
+    }
+
     #[cfg(feature = "orchard")]
     for output in d_tx.orchard_outputs() {
         #[cfg(feature = "transparent-inputs")]
@@ -339,6 +349,17 @@ where
         }
     }
 
+    // Mark Orchard notes as spent when we observe their nullifiers.
+    #[cfg(feature = "orchard")]
+    for action in d_tx
+        .tx()
+        .orchard_bundle()
+        .iter()
+        .flat_map(|b| b.actions().iter())
+    {
+        wallet_db.mark_orchard_note_spent(action.nullifier(), tx_ref)?;
+    }
+
     // If any of the utxos spent in the transaction are ours, mark them as spent.
     #[cfg(feature = "transparent-inputs")]
     for txin in d_tx

From 7dafbeefacc95b6f3ba7dbb77e45995e8bb3bcda Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Fri, 14 Nov 2025 17:45:44 -0700
Subject: [PATCH 137/263] zcash_client_sqlite: Move `put_blocks` to
 `zcash_client_backend::data_api::ll::wallet`.

---
 zcash_client_backend/src/data_api/ll.rs       |   8 +-
 .../src/data_api/ll/wallet.rs                 | 492 +++++++++++++++++-
 zcash_client_sqlite/CHANGELOG.md              |   2 +
 zcash_client_sqlite/src/error.rs              |  14 +
 zcash_client_sqlite/src/lib.rs                | 472 +----------------
 .../init/migrations/receiving_key_scopes.rs   |   6 +-
 6 files changed, 530 insertions(+), 464 deletions(-)

diff --git a/zcash_client_backend/src/data_api/ll.rs b/zcash_client_backend/src/data_api/ll.rs
index c3df51be3b..5084fe6a0e 100644
--- a/zcash_client_backend/src/data_api/ll.rs
+++ b/zcash_client_backend/src/data_api/ll.rs
@@ -8,7 +8,7 @@
 //! [`WalletRead`]: super::WalletRead
 //! [`WalletWrite`]: super::WalletWrite
 
-use core::{fmt::Debug, hash::Hash};
+use core::hash::Hash;
 use std::{collections::HashSet, ops::Range};
 
 use incrementalmerkletree::Position;
@@ -115,17 +115,17 @@ impl TxMeta for Transaction {
 /// [`WalletWrite`]: super::WalletWrite
 pub trait LowLevelWalletRead {
     /// The type of errors that may be generated when querying a wallet data store.
-    type Error: Debug;
+    type Error;
 
     /// The type of the account identifier.
     ///
     /// An account identifier corresponds to at most a single unified spending key's worth of spend
     /// authority, such that both received notes and change spendable by that spending authority
     /// will be interpreted as belonging to that account.
-    type AccountId: Debug + Copy + Eq + Hash;
+    type AccountId: Copy + Eq + Hash;
 
     /// A wallet-internal transaction identifier.
-    type TxRef: Copy + Eq;
+    type TxRef: Copy + Eq + Hash;
 
     /// Returns the set of account identifiers for accounts that spent notes and/or UTXOs in the
     /// construction of the given transaction.
diff --git a/zcash_client_backend/src/data_api/ll/wallet.rs b/zcash_client_backend/src/data_api/ll/wallet.rs
index 69ed459bbc..f071c244b3 100644
--- a/zcash_client_backend/src/data_api/ll/wallet.rs
+++ b/zcash_client_backend/src/data_api/ll/wallet.rs
@@ -1,15 +1,26 @@
-use tracing::{debug, info, warn};
+use std::{hash::Hash, ops::Range};
 
+use rayon::{
+    iter::{IndexedParallelIterator as _, ParallelIterator},
+    slice::ParallelSliceMut as _,
+};
+use tracing::{debug, info, trace, warn};
+
+use incrementalmerkletree::{Marking, Position, Retention};
+use shardtree::error::ShardTreeError;
 use zcash_keys::{address::Receiver, encoding::AddressCodec as _};
 use zcash_protocol::{
-    PoolType,
+    PoolType, ShieldedProtocol,
     consensus::{self, BlockHeight},
     value::{BalanceError, Zatoshis},
 };
 
 use crate::{
     TransferType,
-    data_api::{DecryptedTransaction, TransactionStatus},
+    data_api::{
+        DecryptedTransaction, SAPLING_SHARD_HEIGHT, ScannedBlock, TransactionStatus,
+        WalletCommitmentTrees, chain::ChainState,
+    },
     wallet::{Note, Recipient},
 };
 
@@ -24,7 +35,17 @@ use {
 };
 
 #[cfg(feature = "orchard")]
-use crate::data_api::ll::ReceivedOrchardOutput as _;
+use {
+    crate::data_api::{ORCHARD_SHARD_HEIGHT, ll::ReceivedOrchardOutput as _},
+    incrementalmerkletree::frontier::Frontier,
+    shardtree::store::{Checkpoint, ShardStore as _},
+    std::collections::BTreeMap,
+};
+
+/// The maximum number of blocks the wallet is allowed to rewind. This is
+/// consistent with the bound in zcashd, and allows block data deeper than
+/// this delta from the chain tip to be pruned.
+pub(crate) const PRUNING_DEPTH: u32 = 100;
 
 #[derive(Debug)]
 struct TransparentSentOutput<AccountId> {
@@ -90,6 +111,463 @@ where
     })
 }
 
+/// Errors that can result as a consequence of attemping to insert block data for a sequence of
+/// blocks into the data store.
+pub enum PutBlocksError<SE, TE> {
+    /// Returned if a provided block sequence has gaps.
+    NonSequentialBlocks {
+        prev_height: BlockHeight,
+        block_height: BlockHeight,
+    },
+    /// Wraps an error produced by the underlying data storage system.
+    Storage(SE),
+    /// Wraps an error produced by [`shardtree`] insertion.
+    ShardTree(ShardTreeError<TE>),
+}
+
+impl<SE, TE> From<ShardTreeError<TE>> for PutBlocksError<SE, TE> {
+    fn from(value: ShardTreeError<TE>) -> Self {
+        PutBlocksError::ShardTree(value)
+    }
+}
+
+/// Adds information about a sequence of scanned blocks to the provided data store.
+///
+/// # Parameters
+/// - `wallet_db`: A handle to the underlying data store.
+/// - `from_state`: The note commitment tree state as of the end of the last block prior to the
+///   first block in the provided block vector.
+/// - `blocks`: The scanned block data to be added to the data store. This vector must contain
+///   data for blocks in sequentially increasing height order;
+///   [`PutBlocksError::NonSequentialBlocks`] will be returned if this invariant is violated.
+pub fn put_blocks<DbT, SE, TE>(
+    wallet_db: &mut DbT,
+    from_state: &ChainState,
+    blocks: Vec<ScannedBlock<DbT::AccountId>>,
+) -> Result<(), PutBlocksError<SE, TE>>
+where
+    DbT: LowLevelWalletWrite<Error = SE> + WalletCommitmentTrees<Error = TE>,
+    DbT::TxRef: Eq + Hash,
+{
+    struct BlockPositions {
+        height: BlockHeight,
+        sapling_start_position: Position,
+        #[cfg(feature = "orchard")]
+        orchard_start_position: Position,
+    }
+
+    if blocks.is_empty() {
+        return Ok(());
+    }
+
+    let initial_block = blocks.first().expect("blocks is known to be nonempty");
+    assert!(from_state.block_height() + 1 == initial_block.height());
+
+    let start_positions = BlockPositions {
+        height: initial_block.height(),
+        sapling_start_position: Position::from(
+            u64::from(initial_block.sapling().final_tree_size())
+                - u64::try_from(initial_block.sapling().commitments().len()).unwrap(),
+        ),
+        #[cfg(feature = "orchard")]
+        orchard_start_position: Position::from(
+            u64::from(initial_block.orchard().final_tree_size())
+                - u64::try_from(initial_block.orchard().commitments().len()).unwrap(),
+        ),
+    };
+
+    let mut sapling_commitments = vec![];
+    #[cfg(feature = "orchard")]
+    let mut orchard_commitments = vec![];
+    let mut last_scanned_height = None;
+    let mut note_positions = vec![];
+
+    #[cfg(feature = "transparent-inputs")]
+    let mut tx_refs = HashSet::new();
+
+    for block in blocks.into_iter() {
+        if last_scanned_height
+            .iter()
+            .any(|prev| block.height() != *prev + 1)
+        {
+            return Err(PutBlocksError::NonSequentialBlocks {
+                prev_height: last_scanned_height.expect("last scanned height is known"),
+                block_height: block.height(),
+            });
+        }
+
+        // Insert the block into the database.
+        wallet_db
+            .put_block_meta(
+                block.height(),
+                block.block_hash(),
+                block.block_time(),
+                block.sapling().final_tree_size(),
+                block.sapling().commitments().len().try_into().unwrap(),
+                #[cfg(feature = "orchard")]
+                block.orchard().final_tree_size(),
+                #[cfg(feature = "orchard")]
+                block.orchard().commitments().len().try_into().unwrap(),
+            )
+            .map_err(PutBlocksError::Storage)?;
+
+        for tx in block.transactions() {
+            let tx_ref = wallet_db
+                .put_tx_meta(tx, block.height())
+                .map_err(PutBlocksError::Storage)?;
+
+            #[cfg(feature = "transparent-inputs")]
+            tx_refs.insert(tx_ref);
+
+            wallet_db
+                .queue_tx_retrieval(std::iter::once(tx.txid()), None)
+                .map_err(PutBlocksError::Storage)?;
+
+            // Mark notes as spent and remove them from the scanning cache
+            for spend in tx.sapling_spends() {
+                wallet_db
+                    .mark_sapling_note_spent(spend.nf(), tx_ref)
+                    .map_err(PutBlocksError::Storage)?;
+            }
+            #[cfg(feature = "orchard")]
+            for spend in tx.orchard_spends() {
+                wallet_db
+                    .mark_orchard_note_spent(spend.nf(), tx_ref)
+                    .map_err(PutBlocksError::Storage)?;
+            }
+
+            for output in tx.sapling_outputs() {
+                // Check whether this note was spent in a later block range that
+                // we previously scanned.
+                let spent_in = output
+                    .nf()
+                    .map(|nf| wallet_db.detect_sapling_spend(nf))
+                    .transpose()
+                    .map_err(PutBlocksError::Storage)?
+                    .flatten();
+
+                wallet_db
+                    .put_received_sapling_note(output, tx_ref, Some(block.height()), spent_in)
+                    .map_err(PutBlocksError::Storage)?;
+            }
+            #[cfg(feature = "orchard")]
+            for output in tx.orchard_outputs() {
+                // Check whether this note was spent in a later block range that
+                // we previously scanned.
+                let spent_in = output
+                    .nf()
+                    .map(|nf| wallet_db.detect_orchard_spend(nf))
+                    .transpose()
+                    .map_err(PutBlocksError::Storage)?
+                    .flatten();
+
+                wallet_db
+                    .put_received_orchard_note(output, tx_ref, Some(block.height()), spent_in)
+                    .map_err(PutBlocksError::Storage)?;
+            }
+        }
+
+        // Insert the new nullifiers from this block into the nullifier map.
+        wallet_db
+            .track_block_sapling_nullifiers(block.height(), block.sapling().nullifier_map())
+            .map_err(PutBlocksError::Storage)?;
+
+        #[cfg(feature = "orchard")]
+        wallet_db
+            .track_block_orchard_nullifiers(block.height(), block.orchard().nullifier_map())
+            .map_err(PutBlocksError::Storage)?;
+
+        note_positions.extend(block.transactions().iter().flat_map(|wtx| {
+            let iter = wtx.sapling_outputs().iter().map(|out| {
+                (
+                    ShieldedProtocol::Sapling,
+                    out.note_commitment_tree_position(),
+                )
+            });
+            #[cfg(feature = "orchard")]
+            let iter = iter.chain(wtx.orchard_outputs().iter().map(|out| {
+                (
+                    ShieldedProtocol::Orchard,
+                    out.note_commitment_tree_position(),
+                )
+            }));
+
+            iter
+        }));
+
+        last_scanned_height = Some(block.height());
+        let block_commitments = block.into_commitments();
+        trace!(
+            "Sapling commitments for {:?}: {:?}",
+            last_scanned_height,
+            block_commitments
+                .sapling
+                .iter()
+                .map(|(_, r)| *r)
+                .collect::<Vec<_>>()
+        );
+        #[cfg(feature = "orchard")]
+        trace!(
+            "Orchard commitments for {:?}: {:?}",
+            last_scanned_height,
+            block_commitments
+                .orchard
+                .iter()
+                .map(|(_, r)| *r)
+                .collect::<Vec<_>>()
+        );
+
+        sapling_commitments.extend(block_commitments.sapling.into_iter().map(Some));
+        #[cfg(feature = "orchard")]
+        orchard_commitments.extend(block_commitments.orchard.into_iter().map(Some));
+    }
+
+    #[cfg(feature = "transparent-inputs")]
+    for (account_id, key_scope) in wallet_db
+        .find_involved_accounts(tx_refs)
+        .map_err(PutBlocksError::Storage)?
+    {
+        if let Some(t_key_scope) = key_scope {
+            use ReceiverRequirement::*;
+            wallet_db
+                .generate_transparent_gap_addresses(
+                    account_id,
+                    t_key_scope,
+                    UnifiedAddressRequest::unsafe_custom(Allow, Allow, Require),
+                )
+                .map_err(PutBlocksError::Storage)?;
+        }
+    }
+
+    // Prune the nullifier map of entries we no longer need.
+    wallet_db
+        .prune_tracked_nullifiers(PRUNING_DEPTH)
+        .map_err(PutBlocksError::Storage)?;
+
+    // We will have a start position and a last scanned height in all cases where
+    // `blocks` is non-empty.
+    if let Some(last_scanned_height) = last_scanned_height {
+        // Create subtrees from the note commitments in parallel.
+        const CHUNK_SIZE: usize = 1024;
+        let sapling_subtrees = sapling_commitments
+            .par_chunks_mut(CHUNK_SIZE)
+            .enumerate()
+            .filter_map(|(i, chunk)| {
+                let start = start_positions.sapling_start_position + (i * CHUNK_SIZE) as u64;
+                let end = start + chunk.len() as u64;
+
+                shardtree::LocatedTree::from_iter(
+                    start..end,
+                    SAPLING_SHARD_HEIGHT.into(),
+                    chunk.iter_mut().map(|n| n.take().expect("always Some")),
+                )
+            })
+            .map(|res| (res.subtree, res.checkpoints))
+            .collect::<Vec<_>>();
+
+        #[cfg(feature = "orchard")]
+        let orchard_subtrees = orchard_commitments
+            .par_chunks_mut(CHUNK_SIZE)
+            .enumerate()
+            .filter_map(|(i, chunk)| {
+                let start = start_positions.orchard_start_position + (i * CHUNK_SIZE) as u64;
+                let end = start + chunk.len() as u64;
+
+                shardtree::LocatedTree::from_iter(
+                    start..end,
+                    ORCHARD_SHARD_HEIGHT.into(),
+                    chunk.iter_mut().map(|n| n.take().expect("always Some")),
+                )
+            })
+            .map(|res| (res.subtree, res.checkpoints))
+            .collect::<Vec<_>>();
+
+        // Collect the complete set of Sapling checkpoints
+        #[cfg(feature = "orchard")]
+        let sapling_checkpoint_positions: BTreeMap<BlockHeight, Position> = sapling_subtrees
+            .iter()
+            .flat_map(|(_, checkpoints)| checkpoints.iter())
+            .map(|(k, v)| (*k, *v))
+            .collect();
+
+        #[cfg(feature = "orchard")]
+        let orchard_checkpoint_positions: BTreeMap<BlockHeight, Position> = orchard_subtrees
+            .iter()
+            .flat_map(|(_, checkpoints)| checkpoints.iter())
+            .map(|(k, v)| (*k, *v))
+            .collect();
+
+        #[cfg(feature = "orchard")]
+        fn ensure_checkpoints<'a, H, I: Iterator<Item = &'a BlockHeight>, const DEPTH: u8>(
+            // An iterator of checkpoints heights for which we wish to ensure that
+            // checkpoints exists.
+            ensure_heights: I,
+            // The map of checkpoint positions from which we will draw note commitment tree
+            // position information for the newly created checkpoints.
+            existing_checkpoint_positions: &BTreeMap<BlockHeight, Position>,
+            // The frontier whose position will be used for an inserted checkpoint when
+            // there is no preceding checkpoint in existing_checkpoint_positions.
+            state_final_tree: &Frontier<H, DEPTH>,
+        ) -> Vec<(BlockHeight, Checkpoint)> {
+            ensure_heights
+                .flat_map(|ensure_height| {
+                    existing_checkpoint_positions
+                        .range::<BlockHeight, _>(..=*ensure_height)
+                        .last()
+                        .map_or_else(
+                            || {
+                                Some((
+                                    *ensure_height,
+                                    state_final_tree
+                                        .value()
+                                        .map_or_else(Checkpoint::tree_empty, |t| {
+                                            Checkpoint::at_position(t.position())
+                                        }),
+                                ))
+                            },
+                            |(existing_checkpoint_height, position)| {
+                                if *existing_checkpoint_height < *ensure_height {
+                                    Some((*ensure_height, Checkpoint::at_position(*position)))
+                                } else {
+                                    // The checkpoint already exists, so we don't need to
+                                    // do anything.
+                                    None
+                                }
+                            },
+                        )
+                        .into_iter()
+                })
+                .collect::<Vec<_>>()
+        }
+
+        #[cfg(feature = "orchard")]
+        let (missing_sapling_checkpoints, missing_orchard_checkpoints) = (
+            ensure_checkpoints(
+                orchard_checkpoint_positions.keys(),
+                &sapling_checkpoint_positions,
+                from_state.final_sapling_tree(),
+            ),
+            ensure_checkpoints(
+                sapling_checkpoint_positions.keys(),
+                &orchard_checkpoint_positions,
+                from_state.final_orchard_tree(),
+            ),
+        );
+
+        // Update the Sapling note commitment tree with all newly read note commitments
+        {
+            let mut sapling_subtrees_iter = sapling_subtrees.into_iter();
+            wallet_db.with_sapling_tree_mut::<_, _, PutBlocksError<SE, TE>>(|sapling_tree| {
+                debug!(
+                    "Sapling initial tree size at {:?}: {:?}",
+                    from_state.block_height(),
+                    from_state.final_sapling_tree().tree_size()
+                );
+                // We insert the frontier with `Checkpoint` retention because we need to be
+                // able to truncate the tree back to this point.
+                sapling_tree.insert_frontier(
+                    from_state.final_sapling_tree().clone(),
+                    Retention::Checkpoint {
+                        id: from_state.block_height(),
+                        marking: Marking::Reference,
+                    },
+                )?;
+
+                for (tree, checkpoints) in &mut sapling_subtrees_iter {
+                    sapling_tree.insert_tree(tree, checkpoints)?;
+                }
+
+                // Ensure we have a Sapling checkpoint for each checkpointed Orchard block height.
+                // We skip all checkpoints below the minimum retained checkpoint in the
+                // Sapling tree, because branches below this height may be pruned.
+                #[cfg(feature = "orchard")]
+                {
+                    let min_checkpoint_height = sapling_tree
+                        .store()
+                        .min_checkpoint_id()
+                        .map_err(ShardTreeError::Storage)?
+                        .expect("At least one checkpoint was inserted (by insert_frontier)");
+
+                    for (height, checkpoint) in &missing_sapling_checkpoints {
+                        if *height > min_checkpoint_height {
+                            sapling_tree
+                                .store_mut()
+                                .add_checkpoint(*height, checkpoint.clone())
+                                .map_err(ShardTreeError::Storage)?;
+                        }
+                    }
+                }
+
+                Ok(())
+            })?;
+        }
+
+        // Update the Orchard note commitment tree with all newly read note commitments
+        #[cfg(feature = "orchard")]
+        {
+            let mut orchard_subtrees = orchard_subtrees.into_iter();
+            wallet_db.with_orchard_tree_mut::<_, _, PutBlocksError<SE, TE>>(|orchard_tree| {
+                debug!(
+                    "Orchard initial tree size at {:?}: {:?}",
+                    from_state.block_height(),
+                    from_state.final_orchard_tree().tree_size()
+                );
+                // We insert the frontier with `Checkpoint` retention because we need to be
+                // able to truncate the tree back to this point.
+                orchard_tree.insert_frontier(
+                    from_state.final_orchard_tree().clone(),
+                    Retention::Checkpoint {
+                        id: from_state.block_height(),
+                        marking: Marking::Reference,
+                    },
+                )?;
+
+                for (tree, checkpoints) in &mut orchard_subtrees {
+                    orchard_tree.insert_tree(tree, checkpoints)?;
+                }
+
+                // Ensure we have an Orchard checkpoint for each checkpointed Sapling block height.
+                // We skip all checkpoints below the minimum retained checkpoint in the
+                // Orchard tree, because branches below this height may be pruned.
+                {
+                    let min_checkpoint_height = orchard_tree
+                        .store()
+                        .min_checkpoint_id()
+                        .map_err(ShardTreeError::Storage)?
+                        .expect("At least one checkpoint was inserted (by insert_frontier)");
+
+                    for (height, checkpoint) in &missing_orchard_checkpoints {
+                        if *height > min_checkpoint_height {
+                            debug!(
+                                "Adding missing Orchard checkpoint for height: {:?}: {:?}",
+                                height,
+                                checkpoint.position()
+                            );
+                            orchard_tree
+                                .store_mut()
+                                .add_checkpoint(*height, checkpoint.clone())
+                                .map_err(ShardTreeError::Storage)?;
+                        }
+                    }
+                }
+                Ok(())
+            })?;
+        }
+
+        wallet_db
+            .notify_scan_complete(
+                Range {
+                    start: start_positions.height,
+                    end: last_scanned_height + 1,
+                },
+                &note_positions,
+            )
+            .map_err(PutBlocksError::Storage)?;
+    }
+
+    Ok(())
+}
+
 /// Persists a decrypted transaction to the wallet database.
 ///
 /// This function stores a transaction that has been decrypted by the wallet, including:
@@ -120,6 +598,7 @@ pub fn store_decrypted_tx<DbT, P>(
 ) -> Result<(), <DbT as LowLevelWalletRead>::Error>
 where
     DbT: LowLevelWalletWrite,
+    DbT::AccountId: core::fmt::Debug,
     DbT::Error: From<BalanceError>,
     P: consensus::Parameters,
 {
@@ -376,8 +855,8 @@ where
         let (account_id, _) =
             wallet_db.put_transparent_output(received_t_output, observed_height, false)?;
 
-        if let Some(key_scope) = key_scope {
-            gap_update_set.insert((account_id, *key_scope));
+        if let Some(t_key_scope) = key_scope {
+            gap_update_set.insert((account_id, *t_key_scope));
         }
 
         // Since the wallet created the transparent output, we need to ensure
@@ -472,6 +951,7 @@ fn detect_wallet_transparent_outputs<DbT, P>(
 ) -> Result<WalletTransparentOutputs<DbT::AccountId>, DbT::Error>
 where
     DbT: LowLevelWalletRead,
+    DbT::AccountId: core::fmt::Debug,
     P: consensus::Parameters,
 {
     // This `if` is just an optimization for cases where we would do nothing in the loop.
diff --git a/zcash_client_sqlite/CHANGELOG.md b/zcash_client_sqlite/CHANGELOG.md
index 3486923bdf..a4405de4fd 100644
--- a/zcash_client_sqlite/CHANGELOG.md
+++ b/zcash_client_sqlite/CHANGELOG.md
@@ -20,6 +20,8 @@ workspace.
 - `impl<'a> Borrow<rusqlite::Transaction<'a>> for zcash_client_sqlite::SqlTransaction<'a>`
 - `impl zcash_client_backend::data_api::ll::LowLevelWalletRead for WalletDb`
 - `impl zcash_client_backend::data_api::ll::LowLevelWalletWrite for WalletDb`
+- `impl Hash for zcash_client_sqlite::{ReceivedNoteId, UtxoId, TxRef}`
+- `impl {PartialOrd, Ord} for zcash_client_sqlite::{UtxoId, PartialOrd, Ord}`
 
 ### Changed
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`.
diff --git a/zcash_client_sqlite/src/error.rs b/zcash_client_sqlite/src/error.rs
index 72a4cbf0b4..1254f513d6 100644
--- a/zcash_client_sqlite/src/error.rs
+++ b/zcash_client_sqlite/src/error.rs
@@ -10,6 +10,8 @@ use shardtree::error::ShardTreeError;
 use uuid::Uuid;
 use zcash_address::ParseError;
 use zcash_client_backend::data_api::NoteFilter;
+use zcash_client_backend::data_api::ll;
+use zcash_client_backend::data_api::ll::wallet::PutBlocksError;
 use zcash_keys::address::UnifiedAddress;
 use zcash_keys::keys::AddressGenerationError;
 use zcash_protocol::{PoolType, TxId, consensus::BlockHeight, value::BalanceError};
@@ -387,6 +389,18 @@ impl From<SchedulingError> for SqliteClientError {
     }
 }
 
+impl From<PutBlocksError<SqliteClientError, commitment_tree::Error>> for SqliteClientError {
+    fn from(value: PutBlocksError<SqliteClientError, commitment_tree::Error>) -> Self {
+        match value {
+            ll::wallet::PutBlocksError::NonSequentialBlocks { .. } => {
+                SqliteClientError::NonSequentialBlocks
+            }
+            ll::wallet::PutBlocksError::Storage(e) => e,
+            ll::wallet::PutBlocksError::ShardTree(e) => SqliteClientError::from(e),
+        }
+    }
+}
+
 impl ErrUnsupportedPool for SqliteClientError {
     fn unsupported_pool_type(pool_type: PoolType) -> Self {
         SqliteClientError::UnsupportedPoolType(pool_type)
diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs
index 2a44be13bf..544a1f7ae8 100644
--- a/zcash_client_sqlite/src/lib.rs
+++ b/zcash_client_sqlite/src/lib.rs
@@ -32,7 +32,7 @@
 // Catch documentation errors caused by code changes.
 #![deny(rustdoc::broken_intra_doc_links)]
 
-use incrementalmerkletree::{Marking, Position, Retention};
+use incrementalmerkletree::Position;
 use nonempty::NonEmpty;
 use rand::RngCore;
 use secrecy::{ExposeSecret, SecretVec};
@@ -40,7 +40,7 @@ use shardtree::{ShardTree, error::ShardTreeError, store::ShardStore};
 use std::{
     borrow::{Borrow, BorrowMut},
     cmp::{max, min},
-    collections::{BTreeSet, HashMap, HashSet},
+    collections::{HashMap, HashSet},
     convert::AsRef,
     fmt,
     num::NonZeroU32,
@@ -48,7 +48,7 @@ use std::{
     path::Path,
 };
 use subtle::ConditionallySelectable;
-use tracing::{debug, trace, warn};
+use tracing::warn;
 use util::Clock;
 use uuid::Uuid;
 
@@ -62,7 +62,7 @@ use zcash_client_backend::{
         WalletRead, WalletSummary, WalletWrite, Zip32Derivation,
         chain::{BlockSource, ChainState, CommitmentTreeRoot},
         ll::{
-            LowLevelWalletRead, LowLevelWalletWrite, ReceivedSaplingOutput,
+            self, LowLevelWalletRead, LowLevelWalletWrite, ReceivedSaplingOutput,
             wallet::store_decrypted_tx,
         },
         scanning::{ScanPriority, ScanRange},
@@ -100,8 +100,7 @@ use wallet::{
 
 #[cfg(feature = "orchard")]
 use {
-    incrementalmerkletree::frontier::Frontier, shardtree::store::Checkpoint,
-    std::collections::BTreeMap, zcash_client_backend::data_api::ORCHARD_SHARD_HEIGHT,
+    zcash_client_backend::data_api::ORCHARD_SHARD_HEIGHT,
     zcash_client_backend::data_api::ll::ReceivedOrchardOutput,
 };
 
@@ -121,12 +120,6 @@ use {
     zcash_keys::encoding::AddressCodec,
 };
 
-#[cfg(feature = "multicore")]
-use maybe_rayon::{
-    prelude::{IndexedParallelIterator, ParallelIterator},
-    slice::ParallelSliceMut,
-};
-
 #[cfg(any(test, feature = "test-dependencies"))]
 use {
     rusqlite::named_params,
@@ -140,18 +133,6 @@ use crate::wallet::encoding::KeyScope;
 #[cfg(any(test, feature = "test-dependencies", not(feature = "orchard")))]
 use zcash_protocol::PoolType;
 
-/// `maybe-rayon` doesn't provide this as a fallback, so we have to.
-#[cfg(not(feature = "multicore"))]
-trait ParallelSliceMut<T> {
-    fn par_chunks_mut(&mut self, chunk_size: usize) -> std::slice::ChunksMut<'_, T>;
-}
-#[cfg(not(feature = "multicore"))]
-impl<T> ParallelSliceMut<T> for [T] {
-    fn par_chunks_mut(&mut self, chunk_size: usize) -> std::slice::ChunksMut<'_, T> {
-        self.chunks_mut(chunk_size)
-    }
-}
-
 #[cfg(feature = "unstable")]
 use {
     crate::chain::{BlockMeta, fsblockdb_with_blocks},
@@ -207,7 +188,7 @@ pub(crate) const UA_TRANSPARENT: ReceiverRequirement = ReceiverRequirement::Requ
 /// events". Examples of these include:
 /// - Restoring a wallet from a backed-up seed.
 /// - Importing the same viewing key into two different wallet instances.
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Default, PartialOrd, Ord)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Default, PartialOrd, Ord, Hash)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct AccountUuid(#[cfg_attr(feature = "serde", serde(with = "uuid::serde::compact"))] Uuid);
 
@@ -238,7 +219,7 @@ impl AccountUuid {
 ///
 /// This is an ephemeral value for efficiently and generically working with accounts in a
 /// [`WalletDb`]. To reference accounts in external contexts, use [`AccountUuid`].
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Default, PartialOrd, Ord)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Default, PartialOrd, Ord, Hash)]
 pub(crate) struct AccountRef(i64);
 
 /// This implementation is retained under `#[cfg(test)]` for pre-AccountUuid testing.
@@ -252,7 +233,7 @@ impl ConditionallySelectable for AccountRef {
 }
 
 /// An opaque type for received note identifiers.
-#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct ReceivedNoteId(pub(crate) ShieldedProtocol, pub(crate) i64);
 
 impl fmt::Display for ReceivedNoteId {
@@ -264,7 +245,7 @@ impl fmt::Display for ReceivedNoteId {
 }
 
 /// A newtype wrapper for sqlite primary key values for the utxos table.
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct UtxoId(pub(crate) i64);
 
 /// A newtype wrapper for sqlite primary key values for the transactions table.
@@ -272,7 +253,7 @@ pub struct UtxoId(pub(crate) i64);
 pub struct TxRef(pub(crate) i64);
 
 /// A newtype wrapper for sqlite primary key values for the addresses table.
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 struct AddressRef(pub(crate) i64);
 
 /// A wrapper for the SQLite connection to the wallet database, along with a capability to read the
@@ -1381,10 +1362,10 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
     }
 
     fn update_chain_tip(&mut self, tip_height: BlockHeight) -> Result<(), Self::Error> {
-        let tx = self.conn.borrow_mut().transaction()?;
-        wallet::scanning::update_chain_tip(&tx, &self.params, tip_height)?;
-        tx.commit()?;
-        Ok(())
+        self.transactionally(|wdb| {
+            wallet::scanning::update_chain_tip(wdb.conn.0, &wdb.params, tip_height)?;
+            Ok(())
+        })
     }
 
     #[tracing::instrument(skip_all, fields(height = blocks.first().map(|b| u32::from(b.height())), count = blocks.len()))]
@@ -1394,424 +1375,17 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
         from_state: &ChainState,
         blocks: Vec<ScannedBlock<Self::AccountId>>,
     ) -> Result<(), Self::Error> {
-        struct BlockPositions {
-            height: BlockHeight,
-            sapling_start_position: Position,
-            #[cfg(feature = "orchard")]
-            orchard_start_position: Position,
-        }
-
-        if blocks.is_empty() {
-            return Ok(());
-        }
-
         self.transactionally(|wdb| {
-            let initial_block = blocks.first().expect("blocks is known to be nonempty");
-            assert!(from_state.block_height() + 1 == initial_block.height());
-
-            let start_positions = BlockPositions {
-                height: initial_block.height(),
-                sapling_start_position: Position::from(
-                    u64::from(initial_block.sapling().final_tree_size())
-                        - u64::try_from(initial_block.sapling().commitments().len()).unwrap(),
-                ),
-                #[cfg(feature = "orchard")]
-                orchard_start_position: Position::from(
-                    u64::from(initial_block.orchard().final_tree_size())
-                        - u64::try_from(initial_block.orchard().commitments().len()).unwrap(),
-                ),
-            };
-
-            let mut sapling_commitments = vec![];
-            #[cfg(feature = "orchard")]
-            let mut orchard_commitments = vec![];
-            let mut last_scanned_height = None;
-            let mut note_positions = vec![];
-
-            #[cfg(feature = "transparent-inputs")]
-            let mut tx_refs = BTreeSet::new();
-
-            for block in blocks.into_iter() {
-                if last_scanned_height
-                    .iter()
-                    .any(|prev| block.height() != *prev + 1)
-                {
-                    return Err(SqliteClientError::NonSequentialBlocks);
-                }
-
-                // Insert the block into the database.
-                wdb.put_block_meta(
-                    block.height(),
-                    block.block_hash(),
-                    block.block_time(),
-                    block.sapling().final_tree_size(),
-                    block.sapling().commitments().len().try_into().unwrap(),
-                    #[cfg(feature = "orchard")]
-                    block.orchard().final_tree_size(),
-                    #[cfg(feature = "orchard")]
-                    block.orchard().commitments().len().try_into().unwrap(),
-                )?;
-
-                for tx in block.transactions() {
-                    let tx_ref = wdb.put_tx_meta(tx, block.height())?;
-
-                    #[cfg(feature = "transparent-inputs")]
-                    tx_refs.insert(tx_ref);
-
-                    wdb.queue_tx_retrieval(std::iter::once(tx.txid()), None)?;
-
-                    // Mark notes as spent and remove them from the scanning cache
-                    for spend in tx.sapling_spends() {
-                        wdb.mark_sapling_note_spent(spend.nf(), tx_ref)?;
-                    }
-                    #[cfg(feature = "orchard")]
-                    for spend in tx.orchard_spends() {
-                        wdb.mark_orchard_note_spent(spend.nf(), tx_ref)?;
-                    }
-
-                    for output in tx.sapling_outputs() {
-                        // Check whether this note was spent in a later block range that
-                        // we previously scanned.
-                        let spent_in = output
-                            .nf()
-                            .map(|nf| wdb.detect_sapling_spend(nf))
-                            .transpose()?
-                            .flatten();
-
-                        wdb.put_received_sapling_note(
-                            output,
-                            tx_ref,
-                            Some(block.height()),
-                            spent_in,
-                        )?;
-                    }
-                    #[cfg(feature = "orchard")]
-                    for output in tx.orchard_outputs() {
-                        // Check whether this note was spent in a later block range that
-                        // we previously scanned.
-                        let spent_in = output
-                            .nf()
-                            .map(|nf| wdb.detect_orchard_spend(nf))
-                            .transpose()?
-                            .flatten();
-
-                        wdb.put_received_orchard_note(
-                            output,
-                            tx_ref,
-                            Some(block.height()),
-                            spent_in,
-                        )?;
-                    }
-                }
-
-                // Insert the new nullifiers from this block into the nullifier map.
-                wdb.track_block_sapling_nullifiers(
-                    block.height(),
-                    block.sapling().nullifier_map(),
-                )?;
-
-                #[cfg(feature = "orchard")]
-                wdb.track_block_orchard_nullifiers(
-                    block.height(),
-                    block.orchard().nullifier_map(),
-                )?;
-
-                note_positions.extend(block.transactions().iter().flat_map(|wtx| {
-                    let iter = wtx.sapling_outputs().iter().map(|out| {
-                        (
-                            ShieldedProtocol::Sapling,
-                            out.note_commitment_tree_position(),
-                        )
-                    });
-                    #[cfg(feature = "orchard")]
-                    let iter = iter.chain(wtx.orchard_outputs().iter().map(|out| {
-                        (
-                            ShieldedProtocol::Orchard,
-                            out.note_commitment_tree_position(),
-                        )
-                    }));
-
-                    iter
-                }));
-
-                last_scanned_height = Some(block.height());
-                let block_commitments = block.into_commitments();
-                trace!(
-                    "Sapling commitments for {:?}: {:?}",
-                    last_scanned_height,
-                    block_commitments
-                        .sapling
-                        .iter()
-                        .map(|(_, r)| *r)
-                        .collect::<Vec<_>>()
-                );
-                #[cfg(feature = "orchard")]
-                trace!(
-                    "Orchard commitments for {:?}: {:?}",
-                    last_scanned_height,
-                    block_commitments
-                        .orchard
-                        .iter()
-                        .map(|(_, r)| *r)
-                        .collect::<Vec<_>>()
-                );
-
-                sapling_commitments.extend(block_commitments.sapling.into_iter().map(Some));
-                #[cfg(feature = "orchard")]
-                orchard_commitments.extend(block_commitments.orchard.into_iter().map(Some));
-            }
-
-            #[cfg(feature = "transparent-inputs")]
-            for (account_id, key_scope) in wdb.find_involved_accounts(tx_refs)? {
-                if let Some(t_key_scope) = key_scope {
-                    use ReceiverRequirement::*;
-                    wdb.generate_transparent_gap_addresses(
-                        account_id,
-                        t_key_scope,
-                        UnifiedAddressRequest::unsafe_custom(Allow, Allow, Require),
-                    )?;
-                }
-            }
-
-            // Prune the nullifier map of entries we no longer need.
-            wdb.prune_tracked_nullifiers(PRUNING_DEPTH)?;
-
-            // We will have a start position and a last scanned height in all cases where
-            // `blocks` is non-empty.
-            if let Some(last_scanned_height) = last_scanned_height {
-                // Create subtrees from the note commitments in parallel.
-                const CHUNK_SIZE: usize = 1024;
-                let sapling_subtrees = sapling_commitments
-                    .par_chunks_mut(CHUNK_SIZE)
-                    .enumerate()
-                    .filter_map(|(i, chunk)| {
-                        let start =
-                            start_positions.sapling_start_position + (i * CHUNK_SIZE) as u64;
-                        let end = start + chunk.len() as u64;
-
-                        shardtree::LocatedTree::from_iter(
-                            start..end,
-                            SAPLING_SHARD_HEIGHT.into(),
-                            chunk.iter_mut().map(|n| n.take().expect("always Some")),
-                        )
-                    })
-                    .map(|res| (res.subtree, res.checkpoints))
-                    .collect::<Vec<_>>();
-
-                #[cfg(feature = "orchard")]
-                let orchard_subtrees = orchard_commitments
-                    .par_chunks_mut(CHUNK_SIZE)
-                    .enumerate()
-                    .filter_map(|(i, chunk)| {
-                        let start =
-                            start_positions.orchard_start_position + (i * CHUNK_SIZE) as u64;
-                        let end = start + chunk.len() as u64;
-
-                        shardtree::LocatedTree::from_iter(
-                            start..end,
-                            ORCHARD_SHARD_HEIGHT.into(),
-                            chunk.iter_mut().map(|n| n.take().expect("always Some")),
-                        )
-                    })
-                    .map(|res| (res.subtree, res.checkpoints))
-                    .collect::<Vec<_>>();
-
-                // Collect the complete set of Sapling checkpoints
-                #[cfg(feature = "orchard")]
-                let sapling_checkpoint_positions: BTreeMap<BlockHeight, Position> =
-                    sapling_subtrees
-                        .iter()
-                        .flat_map(|(_, checkpoints)| checkpoints.iter())
-                        .map(|(k, v)| (*k, *v))
-                        .collect();
-
-                #[cfg(feature = "orchard")]
-                let orchard_checkpoint_positions: BTreeMap<BlockHeight, Position> =
-                    orchard_subtrees
-                        .iter()
-                        .flat_map(|(_, checkpoints)| checkpoints.iter())
-                        .map(|(k, v)| (*k, *v))
-                        .collect();
-
-                #[cfg(feature = "orchard")]
-                fn ensure_checkpoints<
-                    'a,
-                    H,
-                    I: Iterator<Item = &'a BlockHeight>,
-                    const DEPTH: u8,
-                >(
-                    // An iterator of checkpoints heights for which we wish to ensure that
-                    // checkpoints exists.
-                    ensure_heights: I,
-                    // The map of checkpoint positions from which we will draw note commitment tree
-                    // position information for the newly created checkpoints.
-                    existing_checkpoint_positions: &BTreeMap<BlockHeight, Position>,
-                    // The frontier whose position will be used for an inserted checkpoint when
-                    // there is no preceding checkpoint in existing_checkpoint_positions.
-                    state_final_tree: &Frontier<H, DEPTH>,
-                ) -> Vec<(BlockHeight, Checkpoint)> {
-                    ensure_heights
-                        .flat_map(|ensure_height| {
-                            existing_checkpoint_positions
-                                .range::<BlockHeight, _>(..=*ensure_height)
-                                .last()
-                                .map_or_else(
-                                    || {
-                                        Some((
-                                            *ensure_height,
-                                            state_final_tree
-                                                .value()
-                                                .map_or_else(Checkpoint::tree_empty, |t| {
-                                                    Checkpoint::at_position(t.position())
-                                                }),
-                                        ))
-                                    },
-                                    |(existing_checkpoint_height, position)| {
-                                        if *existing_checkpoint_height < *ensure_height {
-                                            Some((
-                                                *ensure_height,
-                                                Checkpoint::at_position(*position),
-                                            ))
-                                        } else {
-                                            // The checkpoint already exists, so we don't need to
-                                            // do anything.
-                                            None
-                                        }
-                                    },
-                                )
-                                .into_iter()
-                        })
-                        .collect::<Vec<_>>()
-                }
-
-                #[cfg(feature = "orchard")]
-                let (missing_sapling_checkpoints, missing_orchard_checkpoints) = (
-                    ensure_checkpoints(
-                        orchard_checkpoint_positions.keys(),
-                        &sapling_checkpoint_positions,
-                        from_state.final_sapling_tree(),
-                    ),
-                    ensure_checkpoints(
-                        sapling_checkpoint_positions.keys(),
-                        &orchard_checkpoint_positions,
-                        from_state.final_orchard_tree(),
-                    ),
-                );
-
-                // Update the Sapling note commitment tree with all newly read note commitments
-                {
-                    let mut sapling_subtrees_iter = sapling_subtrees.into_iter();
-                    wdb.with_sapling_tree_mut::<_, _, SqliteClientError>(|sapling_tree| {
-                        debug!(
-                            "Sapling initial tree size at {:?}: {:?}",
-                            from_state.block_height(),
-                            from_state.final_sapling_tree().tree_size()
-                        );
-                        // We insert the frontier with `Checkpoint` retention because we need to be
-                        // able to truncate the tree back to this point.
-                        sapling_tree.insert_frontier(
-                            from_state.final_sapling_tree().clone(),
-                            Retention::Checkpoint {
-                                id: from_state.block_height(),
-                                marking: Marking::Reference,
-                            },
-                        )?;
-
-                        for (tree, checkpoints) in &mut sapling_subtrees_iter {
-                            sapling_tree.insert_tree(tree, checkpoints)?;
-                        }
-
-                        // Ensure we have a Sapling checkpoint for each checkpointed Orchard block height.
-                        // We skip all checkpoints below the minimum retained checkpoint in the
-                        // Sapling tree, because branches below this height may be pruned.
-                        #[cfg(feature = "orchard")]
-                        {
-                            let min_checkpoint_height = sapling_tree
-                                .store()
-                                .min_checkpoint_id()
-                                .map_err(ShardTreeError::Storage)?
-                                .expect(
-                                    "At least one checkpoint was inserted (by insert_frontier)",
-                                );
-
-                            for (height, checkpoint) in &missing_sapling_checkpoints {
-                                if *height > min_checkpoint_height {
-                                    sapling_tree
-                                        .store_mut()
-                                        .add_checkpoint(*height, checkpoint.clone())
-                                        .map_err(ShardTreeError::Storage)?;
-                                }
-                            }
-                        }
-
-                        Ok(())
-                    })?;
-                }
-
-                // Update the Orchard note commitment tree with all newly read note commitments
-                #[cfg(feature = "orchard")]
-                {
-                    let mut orchard_subtrees = orchard_subtrees.into_iter();
-                    wdb.with_orchard_tree_mut::<_, _, SqliteClientError>(|orchard_tree| {
-                        debug!(
-                            "Orchard initial tree size at {:?}: {:?}",
-                            from_state.block_height(),
-                            from_state.final_orchard_tree().tree_size()
-                        );
-                        // We insert the frontier with `Checkpoint` retention because we need to be
-                        // able to truncate the tree back to this point.
-                        orchard_tree.insert_frontier(
-                            from_state.final_orchard_tree().clone(),
-                            Retention::Checkpoint {
-                                id: from_state.block_height(),
-                                marking: Marking::Reference,
-                            },
-                        )?;
-
-                        for (tree, checkpoints) in &mut orchard_subtrees {
-                            orchard_tree.insert_tree(tree, checkpoints)?;
-                        }
-
-                        // Ensure we have an Orchard checkpoint for each checkpointed Sapling block height.
-                        // We skip all checkpoints below the minimum retained checkpoint in the
-                        // Orchard tree, because branches below this height may be pruned.
-                        {
-                            let min_checkpoint_height = orchard_tree
-                                .store()
-                                .min_checkpoint_id()
-                                .map_err(ShardTreeError::Storage)?
-                                .expect(
-                                    "At least one checkpoint was inserted (by insert_frontier)",
-                                );
-
-                            for (height, checkpoint) in &missing_orchard_checkpoints {
-                                if *height > min_checkpoint_height {
-                                    debug!(
-                                        "Adding missing Orchard checkpoint for height: {:?}: {:?}",
-                                        height,
-                                        checkpoint.position()
-                                    );
-                                    orchard_tree
-                                        .store_mut()
-                                        .add_checkpoint(*height, checkpoint.clone())
-                                        .map_err(ShardTreeError::Storage)?;
-                                }
-                            }
-                        }
-                        Ok(())
-                    })?;
+            ll::wallet::put_blocks::<_, SqliteClientError, commitment_tree::Error>(
+                wdb, from_state, blocks,
+            )
+            .map_err(|e| match e {
+                ll::wallet::PutBlocksError::NonSequentialBlocks { .. } => {
+                    SqliteClientError::NonSequentialBlocks
                 }
-
-                wdb.notify_scan_complete(
-                    Range {
-                        start: start_positions.height,
-                        end: last_scanned_height + 1,
-                    },
-                    &note_positions,
-                )?;
-            }
-
-            Ok(())
+                ll::wallet::PutBlocksError::Storage(e) => e,
+                ll::wallet::PutBlocksError::ShardTree(e) => SqliteClientError::from(e),
+            })
         })
     }
 
diff --git a/zcash_client_sqlite/src/wallet/init/migrations/receiving_key_scopes.rs b/zcash_client_sqlite/src/wallet/init/migrations/receiving_key_scopes.rs
index 9fdca06def..1a70c05eec 100644
--- a/zcash_client_sqlite/src/wallet/init/migrations/receiving_key_scopes.rs
+++ b/zcash_client_sqlite/src/wallet/init/migrations/receiving_key_scopes.rs
@@ -276,10 +276,6 @@ impl<P: consensus::Parameters> RusqliteMigration for Migration<P> {
 mod tests {
     use std::convert::Infallible;
 
-    use crate::ParallelSliceMut;
-    #[cfg(feature = "multicore")]
-    use maybe_rayon::iter::{IndexedParallelIterator, ParallelIterator};
-
     use incrementalmerkletree::Position;
     use rand_core::OsRng;
     use rusqlite::{Connection, OptionalExtension, named_params, params};
@@ -741,7 +737,7 @@ mod tests {
                     // Create subtrees from the note commitments in parallel.
                     const CHUNK_SIZE: usize = 1024;
                     let subtrees = sapling_commitments
-                        .par_chunks_mut(CHUNK_SIZE)
+                        .chunks_mut(CHUNK_SIZE)
                         .enumerate()
                         .filter_map(|(i, chunk)| {
                             let start = start_position + (i * CHUNK_SIZE) as u64;

From 34bf74552ec1de66d920a6a6494d60ce960cc377 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Fri, 14 Nov 2025 19:42:40 -0700
Subject: [PATCH 138/263] zcash_client_backend: Generalize
 `DecryptedTransaction`.

---
 zcash_client_backend/CHANGELOG.md               |  3 +++
 zcash_client_backend/src/data_api.rs            | 12 ++++++------
 zcash_client_backend/src/data_api/ll.rs         |  2 +-
 zcash_client_backend/src/data_api/ll/wallet.rs  |  5 +++--
 zcash_client_backend/src/data_api/testing.rs    |  2 +-
 .../src/data_api/testing/orchard.rs             |  4 ++--
 .../src/data_api/testing/pool.rs                |  7 +++++--
 .../src/data_api/testing/sapling.rs             |  4 ++--
 zcash_client_backend/src/decrypt.rs             |  2 +-
 zcash_client_memory/src/wallet_write.rs         |  3 ++-
 zcash_client_sqlite/src/lib.rs                  |  4 ++--
 zcash_client_sqlite/src/wallet.rs               |  2 +-
 .../init/migrations/tx_retrieval_queue.rs       | 17 +++++++++--------
 13 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index b7bf893513..f1d80bf6b4 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -67,6 +67,9 @@ workspace.
 - `zcash_client_backend::wallet::WalletTx::block_index` now has type
   `zcash_protocol::consensus::TxIndex` and the `new` function has
   been modified accordingly.
+- Type parameters to `zcash_client_backend::data_api::DecryptedTransaction`
+  have been modified. It now abstracts over the transaction type, to permit
+  use with partial or compact transaction data instead of full transactions.
 
 ### Removed
 - `zcash_client_backend::data_api::testing::transparent::GapLimits` use
diff --git a/zcash_client_backend/src/data_api.rs b/zcash_client_backend/src/data_api.rs
index 026bebd7cf..63c6677f1f 100644
--- a/zcash_client_backend/src/data_api.rs
+++ b/zcash_client_backend/src/data_api.rs
@@ -2343,19 +2343,19 @@ impl<A> ScannedBlock<A> {
 ///
 /// The purpose of this struct is to permit atomic updates of the
 /// wallet database when transactions are successfully decrypted.
-pub struct DecryptedTransaction<'a, AccountId> {
+pub struct DecryptedTransaction<'a, Tx, AccountId> {
     mined_height: Option<BlockHeight>,
-    tx: &'a Transaction,
+    tx: &'a Tx,
     sapling_outputs: Vec<DecryptedOutput<sapling::Note, AccountId>>,
     #[cfg(feature = "orchard")]
     orchard_outputs: Vec<DecryptedOutput<orchard::note::Note, AccountId>>,
 }
 
-impl<'a, AccountId> DecryptedTransaction<'a, AccountId> {
+impl<'a, Tx, AccountId> DecryptedTransaction<'a, Tx, AccountId> {
     /// Constructs a new [`DecryptedTransaction`] from its constituent parts.
     pub fn new(
         mined_height: Option<BlockHeight>,
-        tx: &'a Transaction,
+        tx: &'a Tx,
         sapling_outputs: Vec<DecryptedOutput<sapling::Note, AccountId>>,
         #[cfg(feature = "orchard")] orchard_outputs: Vec<
             DecryptedOutput<orchard::note::Note, AccountId>,
@@ -2375,7 +2375,7 @@ impl<'a, AccountId> DecryptedTransaction<'a, AccountId> {
         self.mined_height
     }
     /// Returns the raw transaction data.
-    pub fn tx(&self) -> &Transaction {
+    pub fn tx(&self) -> &Tx {
         self.tx
     }
     /// Returns the Sapling outputs that were decrypted from the transaction.
@@ -3053,7 +3053,7 @@ pub trait WalletWrite: WalletRead {
     /// Caches a decrypted transaction in the persistent wallet store.
     fn store_decrypted_tx(
         &mut self,
-        received_tx: DecryptedTransaction<Self::AccountId>,
+        received_tx: DecryptedTransaction<Transaction, Self::AccountId>,
     ) -> Result<(), Self::Error>;
 
     /// Sets the trust status of the given transaction to either trusted or untrusted.
diff --git a/zcash_client_backend/src/data_api/ll.rs b/zcash_client_backend/src/data_api/ll.rs
index 5084fe6a0e..addb5f41e5 100644
--- a/zcash_client_backend/src/data_api/ll.rs
+++ b/zcash_client_backend/src/data_api/ll.rs
@@ -527,7 +527,7 @@ pub trait LowLevelWalletWrite: LowLevelWalletRead {
     fn queue_transparent_input_retrieval(
         &mut self,
         tx_ref: Self::TxRef,
-        d_tx: &super::DecryptedTransaction<'_, Self::AccountId>,
+        d_tx: &super::DecryptedTransaction<Transaction, Self::AccountId>,
     ) -> Result<(), Self::Error>;
 
     /// Deletes all [`TransactionDataRequest::Enhancement`] requests for the given transaction ID
diff --git a/zcash_client_backend/src/data_api/ll/wallet.rs b/zcash_client_backend/src/data_api/ll/wallet.rs
index f071c244b3..f88c146cb1 100644
--- a/zcash_client_backend/src/data_api/ll/wallet.rs
+++ b/zcash_client_backend/src/data_api/ll/wallet.rs
@@ -9,6 +9,7 @@ use tracing::{debug, info, trace, warn};
 use incrementalmerkletree::{Marking, Position, Retention};
 use shardtree::error::ShardTreeError;
 use zcash_keys::{address::Receiver, encoding::AddressCodec as _};
+use zcash_primitives::transaction::Transaction;
 use zcash_protocol::{
     PoolType, ShieldedProtocol,
     consensus::{self, BlockHeight},
@@ -594,7 +595,7 @@ pub fn store_decrypted_tx<DbT, P>(
     wallet_db: &mut DbT,
     params: &P,
     chain_tip_height: BlockHeight,
-    d_tx: DecryptedTransaction<<DbT as LowLevelWalletRead>::AccountId>,
+    d_tx: DecryptedTransaction<Transaction, <DbT as LowLevelWalletRead>::AccountId>,
 ) -> Result<(), <DbT as LowLevelWalletRead>::Error>
 where
     DbT: LowLevelWalletWrite,
@@ -946,7 +947,7 @@ where
 fn detect_wallet_transparent_outputs<DbT, P>(
     #[cfg(feature = "transparent-inputs")] wallet_db: &DbT,
     params: &P,
-    d_tx: &DecryptedTransaction<DbT::AccountId>,
+    d_tx: &DecryptedTransaction<Transaction, DbT::AccountId>,
     funding_account: Option<DbT::AccountId>,
 ) -> Result<WalletTransparentOutputs<DbT::AccountId>, DbT::Error>
 where
diff --git a/zcash_client_backend/src/data_api/testing.rs b/zcash_client_backend/src/data_api/testing.rs
index b3d3fb9486..741b11330d 100644
--- a/zcash_client_backend/src/data_api/testing.rs
+++ b/zcash_client_backend/src/data_api/testing.rs
@@ -2877,7 +2877,7 @@ impl WalletWrite for MockWalletDb {
 
     fn store_decrypted_tx(
         &mut self,
-        _received_tx: DecryptedTransaction<Self::AccountId>,
+        _received_tx: DecryptedTransaction<Transaction, Self::AccountId>,
     ) -> Result<(), Self::Error> {
         Ok(())
     }
diff --git a/zcash_client_backend/src/data_api/testing/orchard.rs b/zcash_client_backend/src/data_api/testing/orchard.rs
index e069e7dd9e..b8a4ee3ed9 100644
--- a/zcash_client_backend/src/data_api/testing/orchard.rs
+++ b/zcash_client_backend/src/data_api/testing/orchard.rs
@@ -146,12 +146,12 @@ impl ShieldedPoolTester for OrchardPoolTester {
             .map(|n| n.take_orchard())
     }
 
-    fn decrypted_pool_outputs_count<A>(d_tx: &DecryptedTransaction<'_, A>) -> usize {
+    fn decrypted_pool_outputs_count<A>(d_tx: &DecryptedTransaction<Transaction, A>) -> usize {
         d_tx.orchard_outputs().len()
     }
 
     fn with_decrypted_pool_memos<A>(
-        d_tx: &DecryptedTransaction<'_, A>,
+        d_tx: &DecryptedTransaction<Transaction, A>,
         mut f: impl FnMut(&MemoBytes),
     ) {
         for output in d_tx.orchard_outputs() {
diff --git a/zcash_client_backend/src/data_api/testing/pool.rs b/zcash_client_backend/src/data_api/testing/pool.rs
index ab65b63f1c..5bf6f7cb1a 100644
--- a/zcash_client_backend/src/data_api/testing/pool.rs
+++ b/zcash_client_backend/src/data_api/testing/pool.rs
@@ -164,9 +164,12 @@ pub trait ShieldedPoolTester {
         exclude: &[DbT::NoteRef],
     ) -> Result<Vec<ReceivedNote<DbT::NoteRef, Self::Note>>, <DbT as InputSource>::Error>;
 
-    fn decrypted_pool_outputs_count<A>(d_tx: &DecryptedTransaction<'_, A>) -> usize;
+    fn decrypted_pool_outputs_count<A>(d_tx: &DecryptedTransaction<Transaction, A>) -> usize;
 
-    fn with_decrypted_pool_memos<A>(d_tx: &DecryptedTransaction<'_, A>, f: impl FnMut(&MemoBytes));
+    fn with_decrypted_pool_memos<A>(
+        d_tx: &DecryptedTransaction<Transaction, A>,
+        f: impl FnMut(&MemoBytes),
+    );
 
     fn try_output_recovery<P: consensus::Parameters>(
         params: &P,
diff --git a/zcash_client_backend/src/data_api/testing/sapling.rs b/zcash_client_backend/src/data_api/testing/sapling.rs
index bf7c276927..548122af7f 100644
--- a/zcash_client_backend/src/data_api/testing/sapling.rs
+++ b/zcash_client_backend/src/data_api/testing/sapling.rs
@@ -130,12 +130,12 @@ impl ShieldedPoolTester for SaplingPoolTester {
             .map(|n| n.take_sapling())
     }
 
-    fn decrypted_pool_outputs_count<A>(d_tx: &DecryptedTransaction<'_, A>) -> usize {
+    fn decrypted_pool_outputs_count<A>(d_tx: &DecryptedTransaction<Transaction, A>) -> usize {
         d_tx.sapling_outputs().len()
     }
 
     fn with_decrypted_pool_memos<A>(
-        d_tx: &DecryptedTransaction<'_, A>,
+        d_tx: &DecryptedTransaction<Transaction, A>,
         mut f: impl FnMut(&MemoBytes),
     ) {
         for output in d_tx.sapling_outputs() {
diff --git a/zcash_client_backend/src/decrypt.rs b/zcash_client_backend/src/decrypt.rs
index 21ca5bb370..ff6c6b510e 100644
--- a/zcash_client_backend/src/decrypt.rs
+++ b/zcash_client_backend/src/decrypt.rs
@@ -120,7 +120,7 @@ pub fn decrypt_transaction<'a, P: consensus::Parameters, AccountId: Copy>(
     chain_tip_height: Option<BlockHeight>,
     tx: &'a Transaction,
     ufvks: &HashMap<AccountId, UnifiedFullViewingKey>,
-) -> DecryptedTransaction<'a, AccountId> {
+) -> DecryptedTransaction<'a, Transaction, AccountId> {
     let zip212_enforcement = zip212_enforcement(
         params,
         // Height is block height for mined transactions, and the "mempool height" (chain height + 1)
diff --git a/zcash_client_memory/src/wallet_write.rs b/zcash_client_memory/src/wallet_write.rs
index 3c74532759..8423f46e90 100644
--- a/zcash_client_memory/src/wallet_write.rs
+++ b/zcash_client_memory/src/wallet_write.rs
@@ -25,6 +25,7 @@ use zcash_client_backend::{
     keys::{UnifiedAddressRequest, UnifiedFullViewingKey, UnifiedSpendingKey},
     wallet::{NoteId, Recipient, WalletTransparentOutput},
 };
+use zcash_primitives::transaction::Transaction;
 use zcash_protocol::{
     PoolType,
     ShieldedProtocol::{self, Sapling},
@@ -617,7 +618,7 @@ impl<P: consensus::Parameters> WalletWrite for MemoryWalletDb<P> {
 
     fn store_decrypted_tx(
         &mut self,
-        d_tx: DecryptedTransaction<Self::AccountId>,
+        d_tx: DecryptedTransaction<Transaction, Self::AccountId>,
     ) -> Result<(), Self::Error> {
         tracing::debug!("store_decrypted_tx");
         self.tx_table.put_tx_data(d_tx.tx(), None, None);
diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs
index 544a1f7ae8..62bde68dcb 100644
--- a/zcash_client_sqlite/src/lib.rs
+++ b/zcash_client_sqlite/src/lib.rs
@@ -1427,7 +1427,7 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
 
     fn store_decrypted_tx(
         &mut self,
-        d_tx: DecryptedTransaction<Self::AccountId>,
+        d_tx: DecryptedTransaction<Transaction, Self::AccountId>,
     ) -> Result<(), Self::Error> {
         self.transactionally(|wdb| {
             let chain_tip = wallet::chain_tip_height(wdb.conn.borrow())?
@@ -1918,7 +1918,7 @@ impl<'a, C: Borrow<rusqlite::Transaction<'a>>, P: consensus::Parameters, CL: Clo
     fn queue_transparent_input_retrieval(
         &mut self,
         tx_ref: Self::TxRef,
-        d_tx: &data_api::DecryptedTransaction<'_, Self::AccountId>,
+        d_tx: &data_api::DecryptedTransaction<Transaction, Self::AccountId>,
     ) -> Result<(), Self::Error> {
         wallet::queue_transparent_input_retrieval(self.conn.borrow(), tx_ref, d_tx)
     }
diff --git a/zcash_client_sqlite/src/wallet.rs b/zcash_client_sqlite/src/wallet.rs
index 0bf7e3973a..a1622fcf14 100644
--- a/zcash_client_sqlite/src/wallet.rs
+++ b/zcash_client_sqlite/src/wallet.rs
@@ -3674,7 +3674,7 @@ impl TxQueryType {
 pub(crate) fn queue_transparent_input_retrieval<AccountId>(
     conn: &rusqlite::Transaction<'_>,
     tx_ref: TxRef,
-    d_tx: &DecryptedTransaction<'_, AccountId>,
+    d_tx: &DecryptedTransaction<Transaction, AccountId>,
 ) -> Result<(), SqliteClientError> {
     if let Some(b) = d_tx.tx().transparent_bundle() {
         if !b.is_coinbase() {
diff --git a/zcash_client_sqlite/src/wallet/init/migrations/tx_retrieval_queue.rs b/zcash_client_sqlite/src/wallet/init/migrations/tx_retrieval_queue.rs
index 17bc1b01c0..7ecfb8ccc7 100644
--- a/zcash_client_sqlite/src/wallet/init/migrations/tx_retrieval_queue.rs
+++ b/zcash_client_sqlite/src/wallet/init/migrations/tx_retrieval_queue.rs
@@ -1,10 +1,11 @@
 //! Adds tables for tracking transactions to be downloaded for transparent output and/or memo retrieval.
 
-use rusqlite::{Transaction, named_params};
+use rusqlite::named_params;
 use schemerz_rusqlite::RusqliteMigration;
 use std::collections::HashSet;
 use uuid::Uuid;
-use zcash_primitives::transaction::builder::DEFAULT_TX_EXPIRY_DELTA;
+
+use zcash_primitives::transaction::{Transaction, builder::DEFAULT_TX_EXPIRY_DELTA};
 use zcash_protocol::consensus;
 
 use crate::wallet::init::WalletMigrationError;
@@ -63,7 +64,7 @@ impl<P> schemerz::Migration<Uuid> for Migration<P> {
 impl<P: consensus::Parameters> RusqliteMigration for Migration<P> {
     type Error = WalletMigrationError;
 
-    fn up(&self, conn: &Transaction) -> Result<(), WalletMigrationError> {
+    fn up(&self, conn: &rusqlite::Transaction) -> Result<(), WalletMigrationError> {
         conn.execute_batch(
             "CREATE TABLE tx_retrieval_queue (
                 txid BLOB NOT NULL UNIQUE,
@@ -120,7 +121,7 @@ impl<P: consensus::Parameters> RusqliteMigration for Migration<P> {
                 let mined_height = row.get::<_, Option<u32>>(2)?.map(BlockHeight::from);
 
                 if let Some(tx_data) = tx_data {
-                    let tx = zcash_primitives::transaction::Transaction::read(
+                    let tx = Transaction::read(
                         &tx_data[..],
                         // We assume unmined transactions are created with the current consensus branch ID.
                         mined_height.map_or(BranchId::Sapling, |h| {
@@ -189,7 +190,7 @@ impl<P: consensus::Parameters> RusqliteMigration for Migration<P> {
                         }
                     }
 
-                    let d_tx = DecryptedTransaction::<'_, Infallible>::new(
+                    let d_tx = DecryptedTransaction::<Transaction, Infallible>::new(
                         mined_height,
                         &tx,
                         vec![],
@@ -206,7 +207,7 @@ impl<P: consensus::Parameters> RusqliteMigration for Migration<P> {
         Ok(())
     }
 
-    fn down(&self, conn: &Transaction) -> Result<(), WalletMigrationError> {
+    fn down(&self, conn: &rusqlite::Transaction) -> Result<(), WalletMigrationError> {
         conn.execute_batch(
             "DROP TABLE transparent_spend_map;
              DROP TABLE transparent_spend_search_queue;
@@ -248,7 +249,7 @@ fn queue_transparent_spend_detection<P: consensus::Parameters>(
 fn queue_transparent_input_retrieval<AccountId>(
     conn: &rusqlite::Transaction<'_>,
     tx_ref: TxRef,
-    d_tx: &DecryptedTransaction<'_, AccountId>,
+    d_tx: &DecryptedTransaction<Transaction, AccountId>,
 ) -> Result<(), SqliteClientError> {
     if let Some(b) = d_tx.tx().transparent_bundle() {
         if !b.is_coinbase() {
@@ -267,7 +268,7 @@ fn queue_transparent_input_retrieval<AccountId>(
 #[cfg(feature = "transparent-inputs")]
 fn queue_unmined_tx_retrieval<AccountId>(
     conn: &rusqlite::Transaction<'_>,
-    d_tx: &DecryptedTransaction<'_, AccountId>,
+    d_tx: &DecryptedTransaction<Transaction, AccountId>,
 ) -> Result<(), SqliteClientError> {
     let detectable_via_scanning = d_tx.tx().sapling_bundle().is_some();
     #[cfg(feature = "orchard")]

From 3bad9b96bde81015fdee9991fdbf45ba24973ac3 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Tue, 23 Dec 2025 10:03:34 -0700
Subject: [PATCH 139/263] Apply suggestions from code review

Co-authored-by: Jack Grigg <jack@electriccoin.co>
---
 zcash_client_backend/src/data_api/ll.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/zcash_client_backend/src/data_api/ll.rs b/zcash_client_backend/src/data_api/ll.rs
index addb5f41e5..c5162fcd60 100644
--- a/zcash_client_backend/src/data_api/ll.rs
+++ b/zcash_client_backend/src/data_api/ll.rs
@@ -150,7 +150,7 @@ pub trait LowLevelWalletRead {
     /// note or UTXO.
     ///
     /// If the wallet database has stored a wallet address that contains the given receiver, then
-    /// that address is returned; otherwise, a the most likely address containing that receiver
+    /// that address is returned; otherwise, the most likely address containing that receiver
     /// will be returned. The "most likely" address should be produced by generating the "standard"
     /// address (a transparent address if the receiver is transparent, or the default Unified
     /// address for the account) derived at the receiver's diviersifier index if the receiver is
@@ -443,7 +443,7 @@ pub trait LowLevelWalletWrite: LowLevelWalletRead {
     /// # Parameters
     /// - `output`: The output data.
     /// - `observation_height`: The chain tip height at the time that the update is made. Note that
-    ///   this is likely to differ from the height at which the output was mined (if any.)
+    ///   this is likely to differ from the height at which the output was mined (if any).
     /// - `known_unspent`: Set to `true` if the output is known to be a member of the UTXO set as
     ///   of the given observation height.
     #[cfg(feature = "transparent-inputs")]
@@ -499,7 +499,7 @@ pub trait LowLevelWalletWrite: LowLevelWalletRead {
     ) -> Result<(), Self::Error>;
 
     /// Adds a [`TransactionDataRequest::TransactionsInvolvingAddress`] request to the transaction
-    /// data request queue. When the transparetn output of `tx_ref` at output index `output_index`
+    /// data request queue. When the transparent output of `tx_ref` at output index `output_index`
     /// (which must have been received at `receiving_address`) is detected as having been spent,
     /// this request will be considered fulfilled.
     ///
@@ -517,7 +517,7 @@ pub trait LowLevelWalletWrite: LowLevelWalletRead {
         output_index: u32,
     ) -> Result<(), Self::Error>;
 
-    /// Adds [`TransactionDataRequest::Enhancement`] requests  for transactions that generated the
+    /// Adds [`TransactionDataRequest::Enhancement`] requests for transactions that generated the
     /// transparent inputs to the provided [`DecryptedTransaction`] to the transaction data request
     /// queue.
     ///
@@ -538,7 +538,7 @@ pub trait LowLevelWalletWrite: LowLevelWalletRead {
 
     /// Updates the state of the wallet backend to indicate that the given range of blocks has been
     /// fully scanned, identifying the position in the note commitment tree of any notes belonging
-    /// to the wallet that were discoveredd in the process of scanning.
+    /// to the wallet that were discovered in the process of scanning.
     fn notify_scan_complete(
         &mut self,
         range: Range<BlockHeight>,

From ecce19791fe8df8739fcdbdf17df0ce31dd8c513 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Sat, 10 Jan 2026 10:01:28 -0700
Subject: [PATCH 140/263] zcash_client_backend: Clarify documentation of
 `LowLevelWalletWrite::put_transparent_output`

---
 zcash_client_backend/src/data_api/ll.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/zcash_client_backend/src/data_api/ll.rs b/zcash_client_backend/src/data_api/ll.rs
index c5162fcd60..75eeb8a7a8 100644
--- a/zcash_client_backend/src/data_api/ll.rs
+++ b/zcash_client_backend/src/data_api/ll.rs
@@ -442,8 +442,10 @@ pub trait LowLevelWalletWrite: LowLevelWalletRead {
     ///
     /// # Parameters
     /// - `output`: The output data.
-    /// - `observation_height`: The chain tip height at the time that the update is made. Note that
-    ///   this is likely to differ from the height at which the output was mined (if any).
+    /// - `observation_height`: This should be set to the mined height, if known. If the TXO is
+    ///   known to be mined but the height at which it was mined is unknown, this should be set to
+    ///   the chain tip height at the time of the observation; if the utxo is known to be unmined,
+    ///   this should be set to the mempool height.
     /// - `known_unspent`: Set to `true` if the output is known to be a member of the UTXO set as
     ///   of the given observation height.
     #[cfg(feature = "transparent-inputs")]

From a4892da85b3a9960fbc44926aa23e4c2ddadfa05 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Sat, 10 Jan 2026 10:09:24 -0700
Subject: [PATCH 141/263] zcash_client_backend: Clarify documentation of
 `LowLevelWalletRead::get_txs_spending_transparent_outputs_of`

---
 zcash_client_backend/src/data_api/ll.rs | 5 +++--
 zcash_client_sqlite/src/wallet.rs       | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/zcash_client_backend/src/data_api/ll.rs b/zcash_client_backend/src/data_api/ll.rs
index 75eeb8a7a8..d4d398466a 100644
--- a/zcash_client_backend/src/data_api/ll.rs
+++ b/zcash_client_backend/src/data_api/ll.rs
@@ -231,8 +231,9 @@ pub trait LowLevelWalletRead {
     ) -> Result<Option<WalletUtxo>, Self::Error>;
 
     /// Returns the vector of transactions in the wallet that spend the transparent outputs of the
-    /// referenced transaction. This should include conflicted transactions and transactions that
-    /// have expired without having been mined.
+    /// referenced transaction, but for which the amount of fee paid is unknown. This should
+    /// include conflicted transactions and transactions that have expired without having been
+    /// mined.
     ///
     /// This is used as part of [`wallet::store_decrypted_tx`] to allow downstream transactions'
     /// fee amounts to be updated once the value of all their inputs are known.
diff --git a/zcash_client_sqlite/src/wallet.rs b/zcash_client_sqlite/src/wallet.rs
index a1622fcf14..2970e357a6 100644
--- a/zcash_client_sqlite/src/wallet.rs
+++ b/zcash_client_sqlite/src/wallet.rs
@@ -3453,7 +3453,7 @@ pub(crate) fn get_txs_spending_transparent_outputs_of<P: consensus::Parameters>(
     tx_ref: TxRef,
 ) -> Result<Vec<(TxRef, Transaction)>, SqliteClientError> {
     // For each transaction that spends a transparent output of this transaction and does not
-    // already have a known fee value, set the fee if possible.
+    // already have a known fee value.
     let mut spending_txs_stmt = conn.prepare(
         "SELECT DISTINCT t.id_tx, t.raw, t.mined_height, t.expiry_height
          FROM transactions t

From 6bafea3a92bcffead3cd73e4521c500f38fe1cb2 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Sat, 10 Jan 2026 10:24:34 -0700
Subject: [PATCH 142/263] zcash_client_backend: Clarify documentation of
 `LowLevelWalletWrite::put_sent_output`

---
 zcash_client_backend/src/data_api/ll.rs | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/zcash_client_backend/src/data_api/ll.rs b/zcash_client_backend/src/data_api/ll.rs
index d4d398466a..d0c18dccad 100644
--- a/zcash_client_backend/src/data_api/ll.rs
+++ b/zcash_client_backend/src/data_api/ll.rs
@@ -416,14 +416,13 @@ pub trait LowLevelWalletWrite: LowLevelWalletRead {
     /// Records information about a transaction output that your wallet created, from the constituent
     /// properties of that output.
     ///
-    /// - If `recipient` is a Unified address, `output_index` is an index into the outputs of the
-    ///   transaction within the bundle associated with the recipient's output pool.
-    /// - If `recipient` is a Sapling address, `output_index` is an index into the Sapling outputs of
-    ///   the transaction.
-    /// - If `recipient` is a transparent address, `output_index` is an index into the transparent
-    ///   outputs of the transaction.
-    /// - If `recipient` is an internal account, `output_index` is an index into the outputs of
-    ///   the transaction in the transaction bundle corresponding to the recipient pool.
+    /// # Parameters
+    /// - `tx_ref`: The identifier for the transaction that produced the output.
+    /// - `output_index`: The index of the output in the bundle corresponding to the pool where the
+    ///   output was created.
+    /// - `recipient`: Information about the address or account that the output is being sent to.
+    /// - `value`: The value of the output.
+    /// - `memo`: The memo attached to the output, if any.
     fn put_sent_output(
         &mut self,
         from_account_uuid: Self::AccountId,

From 11299621c3d61f974159e680c6084c4ff7dd73b7 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Thu, 29 Jan 2026 17:02:57 -0700
Subject: [PATCH 143/263] Fix feature-flagging errors.

---
 zcash_client_backend/Cargo.toml                | 2 +-
 zcash_client_backend/src/data_api/ll/wallet.rs | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/zcash_client_backend/Cargo.toml b/zcash_client_backend/Cargo.toml
index b87097c157..d52cf937fa 100644
--- a/zcash_client_backend/Cargo.toml
+++ b/zcash_client_backend/Cargo.toml
@@ -40,7 +40,7 @@ pczt = { workspace = true, optional = true }
 # Dependencies exposed in a public API:
 # (Breaking upgrades to these require a breaking upgrade to this crate.)
 # - Data Access API
-time.workspace = true
+time = { workspace = true, features = ["std"] }
 nonempty.workspace = true
 
 # - CSPRNG
diff --git a/zcash_client_backend/src/data_api/ll/wallet.rs b/zcash_client_backend/src/data_api/ll/wallet.rs
index f88c146cb1..2e670cc40f 100644
--- a/zcash_client_backend/src/data_api/ll/wallet.rs
+++ b/zcash_client_backend/src/data_api/ll/wallet.rs
@@ -37,12 +37,15 @@ use {
 
 #[cfg(feature = "orchard")]
 use {
-    crate::data_api::{ORCHARD_SHARD_HEIGHT, ll::ReceivedOrchardOutput as _},
+    crate::data_api::ORCHARD_SHARD_HEIGHT,
     incrementalmerkletree::frontier::Frontier,
     shardtree::store::{Checkpoint, ShardStore as _},
     std::collections::BTreeMap,
 };
 
+#[cfg(all(feature = "orchard", feature = "transparent-inputs"))]
+use crate::data_api::ll::ReceivedOrchardOutput as _;
+
 /// The maximum number of blocks the wallet is allowed to rewind. This is
 /// consistent with the bound in zcashd, and allows block data deeper than
 /// this delta from the chain tip to be pruned.

From 44a615522ab0c3a12e223d8efd9ff7cd4c2d5a3e Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Thu, 29 Jan 2026 17:06:34 -0700
Subject: [PATCH 144/263] Remove rendundant error conversion.

---
 zcash_client_sqlite/src/lib.rs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs
index 62bde68dcb..06d06f9df2 100644
--- a/zcash_client_sqlite/src/lib.rs
+++ b/zcash_client_sqlite/src/lib.rs
@@ -1379,13 +1379,7 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
             ll::wallet::put_blocks::<_, SqliteClientError, commitment_tree::Error>(
                 wdb, from_state, blocks,
             )
-            .map_err(|e| match e {
-                ll::wallet::PutBlocksError::NonSequentialBlocks { .. } => {
-                    SqliteClientError::NonSequentialBlocks
-                }
-                ll::wallet::PutBlocksError::Storage(e) => e,
-                ll::wallet::PutBlocksError::ShardTree(e) => SqliteClientError::from(e),
-            })
+            .map_err(SqliteClientError::from)
         })
     }
 

From a6643cb9340c9816ed4e281a5524f28c963e4911 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Thu, 29 Jan 2026 17:57:42 -0700
Subject: [PATCH 145/263] zcash_client_sqlite: Prevent spent-in-tx conflicts.

---
 zcash_client_backend/src/data_api/ll.rs   |  8 +++--
 zcash_client_sqlite/src/wallet/orchard.rs | 37 ++++++++++++++++++---
 zcash_client_sqlite/src/wallet/sapling.rs | 39 ++++++++++++++++++++---
 3 files changed, 73 insertions(+), 11 deletions(-)

diff --git a/zcash_client_backend/src/data_api/ll.rs b/zcash_client_backend/src/data_api/ll.rs
index d0c18dccad..0587a0444f 100644
--- a/zcash_client_backend/src/data_api/ll.rs
+++ b/zcash_client_backend/src/data_api/ll.rs
@@ -325,7 +325,9 @@ pub trait LowLevelWalletWrite: LowLevelWalletRead {
     /// Updates the backing store to indicate that the Sapling output having the given nullifier is
     /// spent in the transaction referenced by `spent_in_tx`. This may result in multiple distinct
     /// transactions being recorded as having spent the note; only one of these transactions will
-    /// end up having been mined (by consensus.)
+    /// end up having been mined (by consensus). If an attempt is made to associate a nullifier
+    /// with a mined transaction, and another mined transaction reveals the same nullifier,
+    /// implementations of this method must return an error.
     ///
     /// Returns `Ok(true)` if a a new record was added to the data store.
     fn mark_sapling_note_spent(
@@ -369,7 +371,9 @@ pub trait LowLevelWalletWrite: LowLevelWalletRead {
     /// Updates the backing store to indicate that the Orchard output having the given nullifier is
     /// spent in the transaction referenced by `spent_in_tx`. This may result in multiple distinct
     /// transactions being recorded as having spent the note; only one of these transactions will
-    /// end up having been mined (by consensus.)
+    /// end up having been mined (by consensus). If an attempt is made to associate a nullifier
+    /// with a mined transaction, and another mined transaction reveals the same nullifier,
+    /// implementations of this method must return an error.
     ///
     /// Returns `Ok(true)` if a a new record was added to the data store.
     #[cfg(feature = "orchard")]
diff --git a/zcash_client_sqlite/src/wallet/orchard.rs b/zcash_client_sqlite/src/wallet/orchard.rs
index ed84155b0a..bf83c55172 100644
--- a/zcash_client_sqlite/src/wallet/orchard.rs
+++ b/zcash_client_sqlite/src/wallet/orchard.rs
@@ -363,16 +363,45 @@ pub(crate) fn mark_orchard_note_spent(
     tx_ref: TxRef,
     nf: &Nullifier,
 ) -> Result<bool, SqliteClientError> {
+    let sql_params = named_params![
+       ":nf": nf.to_bytes(),
+       ":transaction_id": tx_ref.0
+    ];
+    let has_collision = conn.query_row(
+        "WITH possible_conflicts AS (
+            SELECT s.transaction_id
+            FROM orchard_received_notes n
+            JOIN orchard_received_note_spends s ON s.orchard_received_note_id = n.id
+            JOIN transactions t ON t.id_tx = s.transaction_id
+            WHERE n.nf = :nf
+            AND t.id_tx != :transaction_id
+            AND t.mined_height IS NOT NULL
+        ),
+        mined_tx AS (
+            SELECT t.id_tx AS transaction_id
+            FROM transactions t
+            WHERE t.id_tx = :transaction_id
+            AND t.mined_height IS NOT NULL
+        )
+        SELECT EXISTS(SELECT 1 FROM possible_conflicts) AND EXISTS(SELECT 1 FROM mined_tx)",
+        sql_params,
+        |row| row.get::<_, bool>(0),
+    )?;
+
+    if has_collision {
+        return Err(SqliteClientError::CorruptedData(format!(
+            "A different mined transaction revealing Orchard nullifier {} already exists",
+            hex::encode(nf.to_bytes())
+        )));
+    }
+
     let mut stmt_mark_orchard_note_spent = conn.prepare_cached(
         "INSERT INTO orchard_received_note_spends (orchard_received_note_id, transaction_id)
          SELECT id, :transaction_id FROM orchard_received_notes WHERE nf = :nf
          ON CONFLICT (orchard_received_note_id, transaction_id) DO NOTHING",
     )?;
 
-    match stmt_mark_orchard_note_spent.execute(named_params![
-       ":nf": nf.to_bytes(),
-       ":transaction_id": tx_ref.0
-    ])? {
+    match stmt_mark_orchard_note_spent.execute(sql_params)? {
         0 => Ok(false),
         1 => Ok(true),
         _ => unreachable!("nf column is marked as UNIQUE"),
diff --git a/zcash_client_sqlite/src/wallet/sapling.rs b/zcash_client_sqlite/src/wallet/sapling.rs
index 906be6e554..cfbaf644f0 100644
--- a/zcash_client_sqlite/src/wallet/sapling.rs
+++ b/zcash_client_sqlite/src/wallet/sapling.rs
@@ -239,16 +239,45 @@ pub(crate) fn mark_sapling_note_spent(
     tx_ref: TxRef,
     nf: &sapling::Nullifier,
 ) -> Result<bool, SqliteClientError> {
-    let mut stmt_mark_sapling_note_spent = conn.prepare_cached(
+    let sql_params = named_params![
+       ":nf": &nf.0[..],
+       ":transaction_id": tx_ref.0
+    ];
+    let has_collision = conn.query_row(
+        "WITH possible_conflicts AS (
+            SELECT s.transaction_id
+            FROM sapling_received_notes n
+            JOIN sapling_received_note_spends s ON s.sapling_received_note_id = n.id
+            JOIN transactions t ON t.id_tx = s.transaction_id
+            WHERE n.nf = :nf
+            AND t.id_tx != :transaction_id
+            AND t.mined_height IS NOT NULL
+        ),
+        mined_tx AS (
+            SELECT t.id_tx AS transaction_id
+            FROM transactions t
+            WHERE t.id_tx = :transaction_id
+            AND t.mined_height IS NOT NULL
+        )
+        SELECT EXISTS(SELECT 1 FROM possible_conflicts) AND EXISTS(SELECT 1 FROM mined_tx)",
+        sql_params,
+        |row| row.get::<_, bool>(0),
+    )?;
+
+    if has_collision {
+        return Err(SqliteClientError::CorruptedData(format!(
+            "A different mined transaction revealing Sapling nullifier {} already exists",
+            hex::encode(&nf.0[..])
+        )));
+    }
+
+    let mut stmt_mark_sapling_note_spent = conn.prepare(
         "INSERT INTO sapling_received_note_spends (sapling_received_note_id, transaction_id)
          SELECT id, :transaction_id FROM sapling_received_notes WHERE nf = :nf
          ON CONFLICT (sapling_received_note_id, transaction_id) DO NOTHING",
     )?;
 
-    match stmt_mark_sapling_note_spent.execute(named_params![
-       ":nf": &nf.0[..],
-       ":transaction_id": tx_ref.0
-    ])? {
+    match stmt_mark_sapling_note_spent.execute(sql_params)? {
         0 => Ok(false),
         1 => Ok(true),
         _ => unreachable!("nf column is marked as UNIQUE"),

From dc089c4dd909efaab1a28302b03d736806ccdf88 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Thu, 29 Jan 2026 18:06:12 -0700
Subject: [PATCH 146/263] Fix documentation of `track_block_*_nullifiers`.

---
 zcash_client_backend/src/data_api/ll.rs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/zcash_client_backend/src/data_api/ll.rs b/zcash_client_backend/src/data_api/ll.rs
index 0587a0444f..7af5e15c94 100644
--- a/zcash_client_backend/src/data_api/ll.rs
+++ b/zcash_client_backend/src/data_api/ll.rs
@@ -341,9 +341,11 @@ pub trait LowLevelWalletWrite: LowLevelWalletRead {
     /// When scanning the chain out-of-order, it is necessary to store any nullifiers observed
     /// after a gap in the scanned blocks until the blocks in that gap have been fully scanned, in
     /// order to be able to immediately detect that a received output has already been spent. The
-    /// data store should track a mapping from each nullifier to the block, transaction ID, and
-    /// input index where the nullifier was revealed, so that the state of a note received within
-    /// that "gap" can be properly updated when it is discovered.
+    /// data store should track a mapping from each nullifier to the block, the index of the
+    /// transaction in the block, and the transaction ID, so when a note is received within that
+    /// "gap" its spentness can be determined by checking in the store. For space efficiency, the
+    /// backing store may use the combination of block height and index within the block instead of
+    /// the txid for transaction identification.
     ///
     /// # Parameters
     /// - `block_height`: The height of the block containing the nullifiers.
@@ -388,9 +390,11 @@ pub trait LowLevelWalletWrite: LowLevelWalletRead {
     /// When scanning the chain out-of-order, it is necessary to store any nullifiers observed
     /// after a gap in the scanned blocks until the blocks in that gap have been fully scanned, in
     /// order to be able to immediately detect that a received output has already been spent. The
-    /// data store should track a mapping from each nullifier to the block, transaction ID, and
-    /// input index where the nullifier was revealed, so that the state of a note received within
-    /// that "gap" can be properly updated when it is discovered.
+    /// data store should track a mapping from each nullifier to the block, the index of the
+    /// transaction in the block, and the transaction ID, so when a note is received within that
+    /// "gap" its spentness can be determined by checking in the store. For space efficiency, the
+    /// backing store may use the combination of block height and index within the block instead of
+    /// the txid for transaction identification.
     ///
     /// # Parameters
     /// - `block_height`: The height of the block containing the nullifiers.

From ef34c717468dc4810e09b6eed0f159d0dab764b7 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Thu, 29 Jan 2026 18:09:22 -0700
Subject: [PATCH 147/263] Fix zcash_client_sqlite changelog error.

---
 zcash_client_sqlite/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zcash_client_sqlite/CHANGELOG.md b/zcash_client_sqlite/CHANGELOG.md
index a4405de4fd..f790db575b 100644
--- a/zcash_client_sqlite/CHANGELOG.md
+++ b/zcash_client_sqlite/CHANGELOG.md
@@ -21,7 +21,7 @@ workspace.
 - `impl zcash_client_backend::data_api::ll::LowLevelWalletRead for WalletDb`
 - `impl zcash_client_backend::data_api::ll::LowLevelWalletWrite for WalletDb`
 - `impl Hash for zcash_client_sqlite::{ReceivedNoteId, UtxoId, TxRef}`
-- `impl {PartialOrd, Ord} for zcash_client_sqlite::{UtxoId, PartialOrd, Ord}`
+- `impl {PartialOrd, Ord} for zcash_client_sqlite::UtxoId`
 
 ### Changed
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`.

From 7ada37d329286bdec62793485f62560ac9789c5b Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Mon, 8 Dec 2025 17:21:15 +1300
Subject: [PATCH 148/263] fix: immature coinbase inputs are filtered from note
 selection and mature coinbase outputs can be shielded

Completes the coinbase maturity test by ensuring that once a coinbase
transaction has reached 100 confirmations, it can be proposed for
shielding.

- Set tx_index=0 for coinbase transactions in put_tx_data so they can
  be identified when querying spendable outputs
- Added excluding_immature_coinbase_outputs SQL to correctly exclude only
  immature coinbase outputs (tx_index=0 AND <100 confirmations)
- Have add_empty_blocks scan blocks so wallet chain_height stays in sync
- Allow outputs with null tx_index
---
 components/zcash_protocol/CHANGELOG.md        |   1 +
 components/zcash_protocol/src/consensus.rs    |   9 ++
 zcash_client_backend/src/data_api.rs          |   2 +-
 zcash_client_backend/src/data_api/testing.rs  |   1 +
 .../src/data_api/testing/pool.rs              | 115 +++++++++++++++++-
 .../src/data_api/testing/pool/dsl.rs          |   3 +-
 zcash_client_memory/src/input_source.rs       |   2 +
 zcash_client_sqlite/src/testing/pool.rs       |   8 ++
 zcash_client_sqlite/src/wallet.rs             |  10 +-
 zcash_client_sqlite/src/wallet/orchard.rs     |   8 ++
 zcash_client_sqlite/src/wallet/sapling.rs     |   8 ++
 zcash_client_sqlite/src/wallet/transparent.rs |  41 ++++++-
 12 files changed, 198 insertions(+), 10 deletions(-)

diff --git a/components/zcash_protocol/CHANGELOG.md b/components/zcash_protocol/CHANGELOG.md
index 8499955f89..7868f6c18a 100644
--- a/components/zcash_protocol/CHANGELOG.md
+++ b/components/zcash_protocol/CHANGELOG.md
@@ -12,6 +12,7 @@ workspace.
 
 ### Added
 - `zcash_protocol::consensus::TxIndex`
+- `zcash_protocol::consensus::COINBASE_MATURITY_BLOCKS`
 
 ## [0.7.2] - 2025-12-10
 
diff --git a/components/zcash_protocol/src/consensus.rs b/components/zcash_protocol/src/consensus.rs
index f3b7a66b0d..33ae6005d1 100644
--- a/components/zcash_protocol/src/consensus.rs
+++ b/components/zcash_protocol/src/consensus.rs
@@ -676,6 +676,15 @@ const UPGRADES_IN_ORDER: &[NetworkUpgrade] = &[
 /// [ZIP 212]: https://zips.z.cash/zip-0212#changes-to-the-process-of-receiving-sapling-or-orchard-notes
 pub const ZIP212_GRACE_PERIOD: u32 = 32256;
 
+/// The number of blocks after which a coinbase output is considered mature and spendable.
+///
+/// From [§ 7.1.2 of the Zcash Protocol Specification][txnconsensus]:
+/// > A transaction MUST NOT spend a transparent output of a coinbase transaction from a
+/// > block less than 100 blocks prior to the spend.
+///
+/// [txnconsensus]: https://zips.z.cash/protocol/protocol.pdf#txnconsensus
+pub const COINBASE_MATURITY_BLOCKS: u32 = 100;
+
 /// A globally-unique identifier for a set of consensus rules within the Zcash chain.
 ///
 /// Each branch ID in this enum corresponds to one of the epochs between a pair of Zcash
diff --git a/zcash_client_backend/src/data_api.rs b/zcash_client_backend/src/data_api.rs
index 63c6677f1f..feea344744 100644
--- a/zcash_client_backend/src/data_api.rs
+++ b/zcash_client_backend/src/data_api.rs
@@ -1540,7 +1540,7 @@ pub trait InputSource {
     /// * the transaction that produced the output had or will have at least the required number of
     ///   confirmations according to the provided [`ConfirmationsPolicy`]; and
     /// * the output can potentially be spent in a transaction mined in a block at the given
-    ///   `target_height`.
+    ///   `target_height` (also taking into consideration the coinbase maturity rule).
     ///
     /// Any output that is potentially spent by an unmined transaction in the mempool should be
     /// excluded unless the spending transaction will be expired at `target_height`.
diff --git a/zcash_client_backend/src/data_api/testing.rs b/zcash_client_backend/src/data_api/testing.rs
index 741b11330d..af787d4738 100644
--- a/zcash_client_backend/src/data_api/testing.rs
+++ b/zcash_client_backend/src/data_api/testing.rs
@@ -97,6 +97,7 @@ pub mod orchard;
 pub mod transparent;
 
 /// Information about a transaction that the wallet is interested in.
+#[derive(Debug)]
 pub struct TransactionSummary<AccountId> {
     account_id: AccountId,
     txid: TxId,
diff --git a/zcash_client_backend/src/data_api/testing/pool.rs b/zcash_client_backend/src/data_api/testing/pool.rs
index 5bf6f7cb1a..cef43d972b 100644
--- a/zcash_client_backend/src/data_api/testing/pool.rs
+++ b/zcash_client_backend/src/data_api/testing/pool.rs
@@ -8,15 +8,17 @@ use std::{
 use assert_matches::assert_matches;
 use incrementalmerkletree::{Level, Position, frontier::Frontier};
 use rand::{Rng, RngCore};
+use rand_core::OsRng;
 use secrecy::Secret;
 use shardtree::error::ShardTreeError;
 
-use transparent::address::TransparentAddress;
+use transparent::{address::TransparentAddress, builder::TransparentSigningSet};
 use zcash_keys::{address::Address, keys::UnifiedSpendingKey};
 use zcash_primitives::{
     block::BlockHash,
     transaction::{
         Transaction,
+        builder::{BuildConfig, Builder},
         fees::zip317::{FeeRule as Zip317FeeRule, MARGINAL_FEE, MINIMUM_FEE},
     },
 };
@@ -27,6 +29,7 @@ use zcash_protocol::{
     memo::{Memo, MemoBytes},
     value::Zatoshis,
 };
+use zcash_script::opcode::PushValue;
 use zip32::Scope;
 use zip321::{Payment, TransactionRequest};
 
@@ -4963,3 +4966,113 @@ pub fn receive_two_notes_with_same_value<T: ShieldedPoolTester>(
         assert_eq!(T::note_value(note.note()), value);
     }
 }
+
+#[cfg(feature = "pczt")]
+fn build_coinbase_tx(
+    network: &LocalNetwork,
+    target_height: BlockHeight,
+    value: Zatoshis,
+    recipient: TransparentAddress,
+    miner_data: Option<PushValue>,
+) -> zcash_primitives::transaction::builder::BuildResult {
+    let build_config = BuildConfig::Coinbase { miner_data };
+    let mut builder = Builder::new(*network, target_height, build_config);
+
+    // Add transparent output to recipient
+    builder.add_transparent_output(&recipient, value).unwrap();
+
+    // Build the transaction (coinbase transactions don't need provers)
+    builder
+        .build(
+            // unused internally
+            &TransparentSigningSet::new(),
+            // unused internally
+            &[],
+            // unused internally
+            &[],
+            OsRng,
+            &LocalTxProver::bundled(),
+            &LocalTxProver::bundled(),
+            // unused internally
+            &StandardFeeRule::Zip317,
+        )
+        .unwrap()
+}
+
+#[cfg(all(feature = "pczt", feature = "transparent-inputs"))]
+/// Tests that immature coinbase outputs are excluded from note selection.
+pub fn immature_coinbase_outputs_are_excluded_from_note_selection<T: ShieldedPoolTester>(
+    dsf: impl DataStoreFactory,
+    cache: impl TestCache,
+) {
+    let mut st = TestDsl::with_sapling_birthday_account(dsf, cache).build::<T>();
+
+    // Get the default transparent address
+    let (t_addr, _) = st.get_account().usk().default_transparent_address();
+
+    let coinbase_value = Zatoshis::const_from_u64(50000);
+
+    // Get the height where the coinbase tx will be mined
+    let coinbase_height = st.sapling_activation_height();
+
+    // Construct the coinbase transaction and mine the block
+    let coinbase_build_result =
+        build_coinbase_tx(st.network(), coinbase_height, coinbase_value, t_addr, None);
+    let coinbase_tx = coinbase_build_result.transaction();
+    let (h, _) = st.generate_next_block_from_tx(0, coinbase_tx);
+    st.scan_cached_blocks(h, 1);
+
+    let params = *st.network();
+    decrypt_and_store_transaction(&params, st.wallet_mut(), coinbase_tx, Some(h)).unwrap();
+
+    for i in 1..=99 {
+        let latest_block_height = st.add_empty_blocks(1);
+
+        // Verify the coinbase UTXO is **not** spendable
+        let spendable_utxos = st
+            .wallet()
+            .get_spendable_transparent_outputs(
+                &t_addr,
+                TargetHeight::from(h + i),
+                ConfirmationsPolicy::default(),
+            )
+            .unwrap();
+        let confirmations = latest_block_height - h;
+        assert!(
+            spendable_utxos.is_empty(),
+            "{i}: Immature coinbase output is spendable at blockheight {latest_block_height} \
+            with {confirmations} confirmations \
+            (should only be spendable at 100):\n \
+            {spendable_utxos:#?}"
+        );
+    }
+
+    // Add the last block and ensure that the coinbase transaction is spendable
+    let latest_height = st.add_empty_blocks(1);
+    let confirmations = latest_height - h;
+    let target_height = TargetHeight::from(latest_height + 1);
+    let spendable_utxos = st
+        .wallet()
+        .get_spendable_transparent_outputs(&t_addr, target_height, ConfirmationsPolicy::default())
+        .unwrap();
+    assert!(
+        !spendable_utxos.is_empty(),
+        "Coinbase output should be spendable at blockheight {latest_height} \
+        with {confirmations} confirmations since the coinbase tx was mined (at {h})\n \
+        target_height {target_height:?} - coinbase_tx.mined_height {h} = {}",
+        u32::from(target_height) - u32::from(h)
+    );
+
+    // Verify we can propose shielding the coinbase utxo
+    let account = st.get_account().id();
+    let _proposal = st
+        .propose_shielding(
+            &GreedyInputSelector::new(),
+            &single_output_change_strategy(StandardFeeRule::Zip317, None, T::SHIELDED_PROTOCOL),
+            Zatoshis::from_u64(10000).unwrap(),
+            &[t_addr],
+            account,
+            ConfirmationsPolicy::default(),
+        )
+        .unwrap();
+}
diff --git a/zcash_client_backend/src/data_api/testing/pool/dsl.rs b/zcash_client_backend/src/data_api/testing/pool/dsl.rs
index 5586139c8c..78b6094dd1 100644
--- a/zcash_client_backend/src/data_api/testing/pool/dsl.rs
+++ b/zcash_client_backend/src/data_api/testing/pool/dsl.rs
@@ -255,7 +255,7 @@ where
             .unwrap_or_else(|| BlockHeight::from_u32(0))
     }
 
-    /// Generates `N` empty blocks.
+    /// Generates `N` empty blocks and scans them.
     ///
     /// Returns the current block height.
     pub fn add_empty_blocks(&mut self, n: usize) -> BlockHeight {
@@ -263,6 +263,7 @@ where
         for _ in 0..n {
             let (h, _) = self.generate_empty_block();
             out_height = h;
+            self.scan_cached_blocks(h, 1);
         }
         out_height
     }
diff --git a/zcash_client_memory/src/input_source.rs b/zcash_client_memory/src/input_source.rs
index 4a5752640a..370525f89b 100644
--- a/zcash_client_memory/src/input_source.rs
+++ b/zcash_client_memory/src/input_source.rs
@@ -155,6 +155,8 @@ impl<P: consensus::Parameters> InputSource for MemoryWalletDb<P> {
         target_height: TargetHeight,
         confirmations_policy: ConfirmationsPolicy,
     ) -> Result<Vec<WalletUtxo>, Self::Error> {
+        // TODO: take into consideration coinbase maturity
+        // See <https://github.com/zcash/librustzcash/issues/821>
         let txos = self
             .transparent_received_outputs
             .iter()
diff --git a/zcash_client_sqlite/src/testing/pool.rs b/zcash_client_sqlite/src/testing/pool.rs
index 9f96dd70ab..bb90db6fe7 100644
--- a/zcash_client_sqlite/src/testing/pool.rs
+++ b/zcash_client_sqlite/src/testing/pool.rs
@@ -397,3 +397,11 @@ pub(crate) fn receive_two_notes_with_same_value<T: ShieldedPoolTester>() {
         BlockCache::new(),
     )
 }
+
+#[cfg(feature = "pczt-tests")]
+pub(crate) fn immature_coinbase_outputs_are_excluded_from_note_selection<T: ShieldedPoolTester>() {
+    zcash_client_backend::data_api::testing::pool::immature_coinbase_outputs_are_excluded_from_note_selection::<T>(
+        TestDbFactory::default(),
+        BlockCache::new(),
+    );
+}
diff --git a/zcash_client_sqlite/src/wallet.rs b/zcash_client_sqlite/src/wallet.rs
index 2970e357a6..4fcc143e95 100644
--- a/zcash_client_sqlite/src/wallet.rs
+++ b/zcash_client_sqlite/src/wallet.rs
@@ -3615,12 +3615,13 @@ pub(crate) fn put_tx_data(
     observed_height: BlockHeight,
 ) -> Result<TxRef, SqliteClientError> {
     let mut stmt_upsert_tx_data = conn.prepare_cached(
-        "INSERT INTO transactions (txid, created, expiry_height, raw, fee, target_height, min_observed_height)
-        VALUES (:txid, :created_at, :expiry_height, :raw, :fee, :target_height, :observed_height)
+        "INSERT INTO transactions (txid, tx_index, created, expiry_height, raw, fee, target_height, min_observed_height)
+        VALUES (:txid, :tx_index, :created_at, :expiry_height, :raw, :fee, :target_height, :observed_height)
         ON CONFLICT (txid) DO UPDATE
         SET expiry_height = :expiry_height,
             raw = :raw,
             fee = IFNULL(:fee, fee),
+            tx_index = IFNULL(tx_index, :tx_index),
             min_observed_height = MIN(
                 min_observed_height,
                 :observed_height
@@ -3632,8 +3633,13 @@ pub(crate) fn put_tx_data(
     let mut raw_tx = vec![];
     tx.write(&mut raw_tx)?;
 
+    let tx_index = tx
+        .transparent_bundle()
+        .and_then(|bundle| bundle.is_coinbase().then_some(0i64));
+
     let tx_params = named_params![
         ":txid": &txid.as_ref()[..],
+        ":tx_index": tx_index,
         ":created_at": created_at,
         ":expiry_height": u32::from(tx.expiry_height()),
         ":raw": raw_tx,
diff --git a/zcash_client_sqlite/src/wallet/orchard.rs b/zcash_client_sqlite/src/wallet/orchard.rs
index bf83c55172..512e9e4f16 100644
--- a/zcash_client_sqlite/src/wallet/orchard.rs
+++ b/zcash_client_sqlite/src/wallet/orchard.rs
@@ -625,4 +625,12 @@ pub(crate) mod tests {
     fn receive_two_notes_with_same_value() {
         testing::pool::receive_two_notes_with_same_value::<OrchardPoolTester>();
     }
+
+    #[cfg(all(feature = "pczt-tests", feature = "transparent-inputs"))]
+    #[test]
+    fn immature_coinbase_outputs_are_excluded_from_note_selection() {
+        testing::pool::immature_coinbase_outputs_are_excluded_from_note_selection::<
+            OrchardPoolTester,
+        >();
+    }
 }
diff --git a/zcash_client_sqlite/src/wallet/sapling.rs b/zcash_client_sqlite/src/wallet/sapling.rs
index cfbaf644f0..f7a17c1c8d 100644
--- a/zcash_client_sqlite/src/wallet/sapling.rs
+++ b/zcash_client_sqlite/src/wallet/sapling.rs
@@ -640,4 +640,12 @@ pub(crate) mod tests {
     fn receive_two_notes_with_same_value() {
         testing::pool::receive_two_notes_with_same_value::<SaplingPoolTester>();
     }
+
+    #[cfg(all(feature = "pczt-tests", feature = "transparent-inputs"))]
+    #[test]
+    fn immature_coinbase_outputs_are_excluded_from_note_selection() {
+        testing::pool::immature_coinbase_outputs_are_excluded_from_note_selection::<
+            SaplingPoolTester,
+        >();
+    }
 }
diff --git a/zcash_client_sqlite/src/wallet/transparent.rs b/zcash_client_sqlite/src/wallet/transparent.rs
index 97fad55874..7b6b006162 100644
--- a/zcash_client_sqlite/src/wallet/transparent.rs
+++ b/zcash_client_sqlite/src/wallet/transparent.rs
@@ -43,7 +43,7 @@ use zcash_keys::{
 use zcash_primitives::transaction::{builder::DEFAULT_TX_EXPIRY_DELTA, fees::zip317};
 use zcash_protocol::{
     TxId,
-    consensus::{self, BlockHeight},
+    consensus::{self, BlockHeight, COINBASE_MATURITY_BLOCKS},
     value::{ZatBalance, Zatoshis},
 };
 use zcash_script::script;
@@ -1017,7 +1017,7 @@ pub(crate) fn tx_unexpired_condition_minconf_0(tx: &str) -> String {
 ///   `accounts.id = transparent_received_outputs.account_id`
 /// - The parent is responsible for enclosing this condition in parentheses as appropriate.
 /// - The parent is responsible for ensuring that this condition will only be checked for
-///   outputs that have already otherwise been verified to be spendible, i.e. it must be
+///   outputs that have already otherwise been verified to be spendable, i.e. it must be
 ///   used as a strictly constricting clause on the set of outputs.
 pub(crate) fn excluding_wallet_internal_ephemeral_outputs(
     transparent_received_outputs: &str,
@@ -1047,6 +1047,34 @@ pub(crate) fn excluding_wallet_internal_ephemeral_outputs(
     )
 }
 
+/// Generates a SQL condition that checks the coinbase maturity rule.
+///
+/// # Usage requirements
+/// - `tx` must be set to the SQL variable name for the transaction in the parent.
+/// - The parent is responsible for enclosing this condition in parentheses as appropriate.
+/// - The parent is responsible for ensuring that this condition will only be checked for
+///   outputs that have already otherwise been verified to be spendable, i.e. it must be
+///   used as a strictly constricting clause on the set of outputs.
+pub(crate) fn excluding_immature_coinbase_outputs(tx: &str) -> String {
+    // FIXME: If a coinbase transaction is discovered via the get_compact_utxos RPC call
+    // we won't have sufficient info to identify it as coinbase, so it may not be excluded
+    // unless decrypt_and_store_transaction has been called on the transaction that produced it.
+    //
+    // To fix this we'll need to add the `tx_index` field to the GetAddressUtxosReply proto type.
+    format!(
+        r#"
+        NOT (
+            -- the output is a coinbase output
+            -- -- TODO(schell): After https://github.com/zcash/librustzcash/pull/2036 merges we may be able
+            -- -- to simplify this query to:
+            -- -- {tx}.tx_index == 0
+            IFNULL({tx}.tx_index, 1) == 0
+            -- the coinbase output is immature (< 100 confirmations)
+            AND :target_height - {tx}.mined_height < {COINBASE_MATURITY_BLOCKS}
+        )
+        "#
+    )
+}
 /// Get information about a transparent output controlled by the wallet.
 ///
 /// # Parameters
@@ -1112,7 +1140,8 @@ pub(crate) fn get_wallet_transparent_output(
 /// such that, at height `target_height`:
 /// * the transaction that produced the output had or will have at least the number of
 ///   confirmations required by the specified confirmations policy; and
-/// * the output is unspent as of the current chain tip.
+/// * the output is unspent as of the current chain tip; and
+/// * the output adheres to the coinbase maturity requirement, if it is a coinbase output.
 ///
 /// An output that is potentially spent by an unmined transaction in the mempool is excluded
 /// iff the spending transaction will not be expired at `target_height`.
@@ -1140,10 +1169,12 @@ pub(crate) fn get_spendable_transparent_outputs<P: consensus::Parameters>(
          AND u.value_zat >= :min_value
          AND ({}) -- the transaction is mined or unexpired with minconf 0
          AND u.id NOT IN ({}) -- and the output is unspent
-         AND ({}) -- exclude likely-spent wallet-internal ephemeral outputs",
+         AND ({}) -- exclude likely-spent wallet-internal ephemeral outputs
+         AND ({}) -- exclude immature coinbase outputs",
         tx_unexpired_condition_minconf_0("t"),
         spent_utxos_clause(),
-        excluding_wallet_internal_ephemeral_outputs("u", "addresses", "t", "accounts")
+        excluding_wallet_internal_ephemeral_outputs("u", "addresses", "t", "accounts"),
+        excluding_immature_coinbase_outputs("t"),
     ))?;
 
     let addr_str = address.encode(params);

From b08476a31962f4e67e8f3114de9bedbe9e687329 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Mon, 26 Jan 2026 10:48:03 +1300
Subject: [PATCH 149/263] include link to tracking ticket for tx_index fixme

---
 zcash_client_sqlite/src/wallet/transparent.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/zcash_client_sqlite/src/wallet/transparent.rs b/zcash_client_sqlite/src/wallet/transparent.rs
index 7b6b006162..8f693f5b65 100644
--- a/zcash_client_sqlite/src/wallet/transparent.rs
+++ b/zcash_client_sqlite/src/wallet/transparent.rs
@@ -1061,6 +1061,8 @@ pub(crate) fn excluding_immature_coinbase_outputs(tx: &str) -> String {
     // unless decrypt_and_store_transaction has been called on the transaction that produced it.
     //
     // To fix this we'll need to add the `tx_index` field to the GetAddressUtxosReply proto type.
+    //
+    // See the tracking ticket https://github.com/zcash/lightwallet-protocol/issues/17.
     format!(
         r#"
         NOT (

From aff88c39c2a32820cba07cc416346d15e48a9be3 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Mon, 2 Feb 2026 19:11:09 +0000
Subject: [PATCH 150/263] CI: Add `cargo-mutants` workflow

---
 .github/workflows/mutants.yml | 109 ++++++++++++++++++++++++++++++++++
 1 file changed, 109 insertions(+)
 create mode 100644 .github/workflows/mutants.yml

diff --git a/.github/workflows/mutants.yml b/.github/workflows/mutants.yml
new file mode 100644
index 0000000000..c792b6e0be
--- /dev/null
+++ b/.github/workflows/mutants.yml
@@ -0,0 +1,109 @@
+name: Mutation testing
+
+env:
+  CARGO_TERM_COLOR: always
+
+on:
+  # Run weekly on Sundays at 2 AM UTC
+  schedule:
+    - cron: "0 2 * * 0"
+  # Allow manual triggering
+  workflow_dispatch:
+    inputs:
+      package:
+        description: "Package to test (select 'all' for all packages)"
+        required: false
+        default: "all"
+        type: choice
+        options:
+          - all
+          - eip681
+          - equihash
+          - f4jumble
+          - pczt
+          - zcash_address
+          - zcash_client_backend
+          - zcash_client_sqlite
+          - zcash_encoding
+          - zcash_extensions
+          - zcash_history
+          - zcash_keys
+          - zcash_primitives
+          - zcash_proofs
+          - zcash_protocol
+          - zcash_transparent
+          - zip321
+
+permissions:
+  contents: read
+
+# Only run one mutation test at a time
+concurrency:
+  group: mutation-testing
+  cancel-in-progress: false
+
+jobs:
+  mutants:
+    name: Mutation testing of ${{ matrix.package }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        package:
+          - eip681
+          - equihash
+          - f4jumble
+          - pczt
+          - zcash_address
+          - zcash_client_backend
+          - zcash_client_sqlite
+          - zcash_encoding
+          - zcash_extensions
+          - zcash_history
+          - zcash_keys
+          - zcash_primitives
+          - zcash_proofs
+          - zcash_protocol
+          - zcash_transparent
+          - zip321
+        # Only filter if a specific package was requested via workflow_dispatch
+        # For push/pull_request events, inputs.package is undefined, so default to 'all'
+        exclude:
+          - package: ${{ case((github.event.inputs.package || 'all') != 'all' && (github.event.inputs.package || 'all') != 'eip681',               'eip681',               'NONE') }}
+          - package: ${{ case((github.event.inputs.package || 'all') != 'all' && (github.event.inputs.package || 'all') != 'equihash',             'equihash',             'NONE') }}
+          - package: ${{ case((github.event.inputs.package || 'all') != 'all' && (github.event.inputs.package || 'all') != 'f4jumble',             'f4jumble',             'NONE') }}
+          - package: ${{ case((github.event.inputs.package || 'all') != 'all' && (github.event.inputs.package || 'all') != 'pczt',                 'pczt',                 'NONE') }}
+          - package: ${{ case((github.event.inputs.package || 'all') != 'all' && (github.event.inputs.package || 'all') != 'zcash_address',        'zcash_address',        'NONE') }}
+          - package: ${{ case((github.event.inputs.package || 'all') != 'all' && (github.event.inputs.package || 'all') != 'zcash_client_backend', 'zcash_client_backend', 'NONE') }}
+          - package: ${{ case((github.event.inputs.package || 'all') != 'all' && (github.event.inputs.package || 'all') != 'zcash_client_sqlite',  'zcash_client_sqlite',  'NONE') }}
+          - package: ${{ case((github.event.inputs.package || 'all') != 'all' && (github.event.inputs.package || 'all') != 'zcash_encoding',       'zcash_encoding',       'NONE') }}
+          - package: ${{ case((github.event.inputs.package || 'all') != 'all' && (github.event.inputs.package || 'all') != 'zcash_extensions',     'zcash_extensions',     'NONE') }}
+          - package: ${{ case((github.event.inputs.package || 'all') != 'all' && (github.event.inputs.package || 'all') != 'zcash_history',        'zcash_history',        'NONE') }}
+          - package: ${{ case((github.event.inputs.package || 'all') != 'all' && (github.event.inputs.package || 'all') != 'zcash_keys',           'zcash_keys',           'NONE') }}
+          - package: ${{ case((github.event.inputs.package || 'all') != 'all' && (github.event.inputs.package || 'all') != 'zcash_primitives',     'zcash_primitives',     'NONE') }}
+          - package: ${{ case((github.event.inputs.package || 'all') != 'all' && (github.event.inputs.package || 'all') != 'zcash_proofs',         'zcash_proofs',         'NONE') }}
+          - package: ${{ case((github.event.inputs.package || 'all') != 'all' && (github.event.inputs.package || 'all') != 'zcash_protocol',       'zcash_protocol',       'NONE') }}
+          - package: ${{ case((github.event.inputs.package || 'all') != 'all' && (github.event.inputs.package || 'all') != 'zcash_transparent',    'zcash_transparent',    'NONE') }}
+          - package: ${{ case((github.event.inputs.package || 'all') != 'all' && (github.event.inputs.package || 'all') != 'zip321',               'zip321',               'NONE') }}
+
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+      - uses: dtolnay/rust-toolchain@stable
+        id: toolchain
+      - run: rustup override set "${TOOLCHAIN}"
+        shell: sh
+        env:
+          TOOLCHAIN: ${{steps.toolchain.outputs.name}}
+      - uses: taiki-e/install-action@650c5ca14212efbbf3e580844b04bdccf68dac31 # v2.67.18
+        with:
+          tool: cargo-mutants
+      - run: cargo mutants --package "${{ matrix.package }}" --all-features -vV --in-place
+      - uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        if: always()
+        with:
+          name: mutants-${{ matrix.package }}
+          path: |
+            mutants.out/
+          retention-days: 30

From a2f9d38d4399b63256d4db5dfe2372833400872e Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Tue, 3 Feb 2026 11:15:43 +1300
Subject: [PATCH 151/263] coinbase maturity: remove TODO, better naming, more
 appropriate test parameters

---
 zcash_client_backend/src/data_api/testing/pool.rs | 15 ++++++++++-----
 zcash_client_sqlite/src/wallet/transparent.rs     |  3 ---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/zcash_client_backend/src/data_api/testing/pool.rs b/zcash_client_backend/src/data_api/testing/pool.rs
index cef43d972b..7892028205 100644
--- a/zcash_client_backend/src/data_api/testing/pool.rs
+++ b/zcash_client_backend/src/data_api/testing/pool.rs
@@ -4968,15 +4968,15 @@ pub fn receive_two_notes_with_same_value<T: ShieldedPoolTester>(
 }
 
 #[cfg(feature = "pczt")]
-fn build_coinbase_tx(
+fn build_transparent_coinbase_tx(
     network: &LocalNetwork,
-    target_height: BlockHeight,
+    target_height: TargetHeight,
     value: Zatoshis,
     recipient: TransparentAddress,
     miner_data: Option<PushValue>,
 ) -> zcash_primitives::transaction::builder::BuildResult {
     let build_config = BuildConfig::Coinbase { miner_data };
-    let mut builder = Builder::new(*network, target_height, build_config);
+    let mut builder = Builder::new(*network, BlockHeight::from(target_height), build_config);
 
     // Add transparent output to recipient
     builder.add_transparent_output(&recipient, value).unwrap();
@@ -5016,8 +5016,13 @@ pub fn immature_coinbase_outputs_are_excluded_from_note_selection<T: ShieldedPoo
     let coinbase_height = st.sapling_activation_height();
 
     // Construct the coinbase transaction and mine the block
-    let coinbase_build_result =
-        build_coinbase_tx(st.network(), coinbase_height, coinbase_value, t_addr, None);
+    let coinbase_build_result = build_transparent_coinbase_tx(
+        st.network(),
+        TargetHeight::from(coinbase_height),
+        coinbase_value,
+        t_addr,
+        None,
+    );
     let coinbase_tx = coinbase_build_result.transaction();
     let (h, _) = st.generate_next_block_from_tx(0, coinbase_tx);
     st.scan_cached_blocks(h, 1);
diff --git a/zcash_client_sqlite/src/wallet/transparent.rs b/zcash_client_sqlite/src/wallet/transparent.rs
index 8f693f5b65..cd97c1fb9a 100644
--- a/zcash_client_sqlite/src/wallet/transparent.rs
+++ b/zcash_client_sqlite/src/wallet/transparent.rs
@@ -1067,9 +1067,6 @@ pub(crate) fn excluding_immature_coinbase_outputs(tx: &str) -> String {
         r#"
         NOT (
             -- the output is a coinbase output
-            -- -- TODO(schell): After https://github.com/zcash/librustzcash/pull/2036 merges we may be able
-            -- -- to simplify this query to:
-            -- -- {tx}.tx_index == 0
             IFNULL({tx}.tx_index, 1) == 0
             -- the coinbase output is immature (< 100 confirmations)
             AND :target_height - {tx}.mined_height < {COINBASE_MATURITY_BLOCKS}

From ea2c39da9382f18354b5bbf03e541ce6f19f31a5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 5 Feb 2026 05:28:58 +0000
Subject: [PATCH 152/263] build(deps): bump zizmorcore/zizmor-action from 0.4.1
 to 0.5.0

Bumps [zizmorcore/zizmor-action](https://github.com/zizmorcore/zizmor-action) from 0.4.1 to 0.5.0.
- [Release notes](https://github.com/zizmorcore/zizmor-action/releases)
- [Commits](https://github.com/zizmorcore/zizmor-action/compare/135698455da5c3b3e55f73f4419e481ab68cdd95...0dce2577a4760a2749d8cfb7a84b7d5585ebcb7d)

---
updated-dependencies:
- dependency-name: zizmorcore/zizmor-action
  dependency-version: 0.5.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/zizmor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml
index 24352f0ef1..c782955fe2 100644
--- a/.github/workflows/zizmor.yml
+++ b/.github/workflows/zizmor.yml
@@ -21,4 +21,4 @@ jobs:
           persist-credentials: false
 
       - name: Run zizmor 🌈
-        uses: zizmorcore/zizmor-action@135698455da5c3b3e55f73f4419e481ab68cdd95 # v0.4.1
+        uses: zizmorcore/zizmor-action@0dce2577a4760a2749d8cfb7a84b7d5585ebcb7d # v0.5.0

From cba48cd0cf50b85f3954a2046588235faf84fb4f Mon Sep 17 00:00:00 2001
From: John Boyd <john@coldnoise.net>
Date: Wed, 4 Feb 2026 12:30:33 -0600
Subject: [PATCH 153/263] Fix warnings when building without transparent-inputs

---
 zcash_client_sqlite/src/lib.rs                                | 4 +++-
 .../src/wallet/init/migrations/tx_retrieval_queue.rs          | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs
index 06d06f9df2..785180f1b8 100644
--- a/zcash_client_sqlite/src/lib.rs
+++ b/zcash_client_sqlite/src/lib.rs
@@ -37,10 +37,12 @@ use nonempty::NonEmpty;
 use rand::RngCore;
 use secrecy::{ExposeSecret, SecretVec};
 use shardtree::{ShardTree, error::ShardTreeError, store::ShardStore};
+#[cfg(feature = "transparent-inputs")]
+use std::collections::HashSet;
 use std::{
     borrow::{Borrow, BorrowMut},
     cmp::{max, min},
-    collections::{HashMap, HashSet},
+    collections::HashMap,
     convert::AsRef,
     fmt,
     num::NonZeroU32,
diff --git a/zcash_client_sqlite/src/wallet/init/migrations/tx_retrieval_queue.rs b/zcash_client_sqlite/src/wallet/init/migrations/tx_retrieval_queue.rs
index 7ecfb8ccc7..5f0cfc8f44 100644
--- a/zcash_client_sqlite/src/wallet/init/migrations/tx_retrieval_queue.rs
+++ b/zcash_client_sqlite/src/wallet/init/migrations/tx_retrieval_queue.rs
@@ -5,7 +5,9 @@ use schemerz_rusqlite::RusqliteMigration;
 use std::collections::HashSet;
 use uuid::Uuid;
 
-use zcash_primitives::transaction::{Transaction, builder::DEFAULT_TX_EXPIRY_DELTA};
+#[cfg(feature = "transparent-inputs")]
+use zcash_primitives::transaction::Transaction;
+use zcash_primitives::transaction::builder::DEFAULT_TX_EXPIRY_DELTA;
 use zcash_protocol::consensus;
 
 use crate::wallet::init::WalletMigrationError;

From 3e31106b10be1b945d322abfed1619c7a0bcfd2a Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Fri, 6 Feb 2026 15:15:03 +0000
Subject: [PATCH 154/263] zcash_client_backend: Collate `tx_has_wallet_outputs`
 updates in `store_decrypted_tx`

---
 .../src/data_api/ll/wallet.rs                 | 38 +++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/zcash_client_backend/src/data_api/ll/wallet.rs b/zcash_client_backend/src/data_api/ll/wallet.rs
index 2e670cc40f..1f435445c9 100644
--- a/zcash_client_backend/src/data_api/ll/wallet.rs
+++ b/zcash_client_backend/src/data_api/ll/wallet.rs
@@ -653,16 +653,30 @@ where
     // recover transparent transaction history.
     #[cfg(feature = "transparent-inputs")]
     let mut tx_has_wallet_outputs = false;
+    #[cfg(feature = "transparent-inputs")]
+    {
+        tx_has_wallet_outputs |= !d_tx.sapling_outputs().is_empty();
+
+        #[cfg(feature = "orchard")]
+        {
+            tx_has_wallet_outputs |= !d_tx.orchard_outputs().is_empty();
+        }
+
+        // Since the wallet created the transparent output, we need to ensure
+        // that any transparent inputs belonging to the wallet will be
+        // discovered.
+        tx_has_wallet_outputs |= !wallet_transparent_outputs.received.is_empty();
+
+        // Even though we know the funding account, we don't know that we have
+        // information for all of the transparent inputs to the transaction.
+        tx_has_wallet_outputs |= !wallet_transparent_outputs.sent.is_empty();
+    }
 
     // The set of account/scope pairs for which to update the gap limit.
     #[cfg(feature = "transparent-inputs")]
     let mut gap_update_set = HashSet::new();
 
     for output in d_tx.sapling_outputs() {
-        #[cfg(feature = "transparent-inputs")]
-        {
-            tx_has_wallet_outputs = true;
-        }
         match output.transfer_type() {
             TransferType::Outgoing => {
                 let recipient = {
@@ -751,10 +765,6 @@ where
 
     #[cfg(feature = "orchard")]
     for output in d_tx.orchard_outputs() {
-        #[cfg(feature = "transparent-inputs")]
-        {
-            tx_has_wallet_outputs = true;
-        }
         match output.transfer_type() {
             TransferType::Outgoing => {
                 let recipient = {
@@ -863,11 +873,6 @@ where
             gap_update_set.insert((account_id, *t_key_scope));
         }
 
-        // Since the wallet created the transparent output, we need to ensure
-        // that any transparent inputs belonging to the wallet will be
-        // discovered.
-        tx_has_wallet_outputs = true;
-
         // When we receive transparent funds (particularly as ephemeral outputs
         // in transaction pairs sending to a ZIP 320 address) it becomes
         // possible that the spend of these outputs is not then later detected
@@ -889,13 +894,6 @@ where
             sent_t_output.value,
             None,
         )?;
-
-        // Even though we know the funding account, we don't know that we have
-        // information for all of the transparent inputs to the transaction.
-        #[cfg(feature = "transparent-inputs")]
-        {
-            tx_has_wallet_outputs = true;
-        }
     }
 
     // Regenerate the gap limit addresses.

From 5c704a75c7e615f2cad21f0a4fec36e5351819b8 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Fri, 6 Feb 2026 15:17:01 +0000
Subject: [PATCH 155/263] zcash_client_backend: Extract common "put shielded
 outputs" logic from `store_decrypted_tx`

---
 .../src/data_api/ll/wallet.rs                 | 298 ++++++++----------
 1 file changed, 140 insertions(+), 158 deletions(-)

diff --git a/zcash_client_backend/src/data_api/ll/wallet.rs b/zcash_client_backend/src/data_api/ll/wallet.rs
index 1f435445c9..0fb8699a85 100644
--- a/zcash_client_backend/src/data_api/ll/wallet.rs
+++ b/zcash_client_backend/src/data_api/ll/wallet.rs
@@ -17,7 +17,7 @@ use zcash_protocol::{
 };
 
 use crate::{
-    TransferType,
+    DecryptedOutput, TransferType,
     data_api::{
         DecryptedTransaction, SAPLING_SHARD_HEIGHT, ScannedBlock, TransactionStatus,
         WalletCommitmentTrees, chain::ChainState,
@@ -29,7 +29,7 @@ use super::{LowLevelWalletRead, LowLevelWalletWrite, TxMeta};
 
 #[cfg(feature = "transparent-inputs")]
 use {
-    crate::{data_api::ll::ReceivedSaplingOutput as _, wallet::WalletTransparentOutput},
+    crate::wallet::WalletTransparentOutput,
     std::collections::HashSet,
     transparent::{bundle::OutPoint, keys::TransparentKeyScope},
     zcash_keys::keys::{ReceiverRequirement, UnifiedAddressRequest},
@@ -43,9 +43,6 @@ use {
     std::collections::BTreeMap,
 };
 
-#[cfg(all(feature = "orchard", feature = "transparent-inputs"))]
-use crate::data_api::ll::ReceivedOrchardOutput as _;
-
 /// The maximum number of blocks the wallet is allowed to rewind. This is
 /// consistent with the bound in zcashd, and allows block data deeper than
 /// this delta from the chain tip to be pruned.
@@ -676,82 +673,24 @@ where
     #[cfg(feature = "transparent-inputs")]
     let mut gap_update_set = HashSet::new();
 
-    for output in d_tx.sapling_outputs() {
-        match output.transfer_type() {
-            TransferType::Outgoing => {
-                let recipient = {
-                    let receiver = Receiver::Sapling(output.note().recipient());
-                    let recipient_address = wallet_db
-                        .select_receiving_address(*output.account(), &receiver)?
-                        .unwrap_or_else(|| receiver.to_zcash_address(params.network_type()));
-
-                    Recipient::External {
-                        recipient_address,
-                        output_pool: PoolType::SAPLING,
-                    }
-                };
-
-                wallet_db.put_sent_output(
-                    *output.account(),
-                    tx_ref,
-                    output.index(),
-                    &recipient,
-                    output.note_value(),
-                    Some(output.memo()),
-                )?;
-            }
-            TransferType::WalletInternal => {
-                wallet_db.put_received_sapling_note(output, tx_ref, d_tx.mined_height(), None)?;
-
-                let recipient = Recipient::InternalAccount {
-                    receiving_account: *output.account(),
-                    external_address: None,
-                    note: Box::new(Note::Sapling(output.note().clone())),
-                };
-
-                wallet_db.put_sent_output(
-                    *output.account(),
-                    tx_ref,
-                    output.index(),
-                    &recipient,
-                    output.note_value(),
-                    Some(output.memo()),
-                )?;
-            }
-            TransferType::Incoming => {
-                wallet_db.put_received_sapling_note(output, tx_ref, d_tx.mined_height(), None)?;
-
-                #[cfg(feature = "transparent-inputs")]
-                gap_update_set.insert((output.account_id(), TransparentKeyScope::EXTERNAL));
-
-                if let Some(account_id) = funding_account {
-                    let recipient = Recipient::InternalAccount {
-                        receiving_account: *output.account(),
-                        external_address: {
-                            let receiver = Receiver::Sapling(output.note().recipient());
-                            Some(
-                                wallet_db
-                                    .select_receiving_address(*output.account(), &receiver)?
-                                    .unwrap_or_else(|| {
-                                        receiver.to_zcash_address(params.network_type())
-                                    }),
-                            )
-                        },
-                        note: Box::new(Note::Sapling(output.note().clone())),
-                    };
-
-                    wallet_db.put_sent_output(
-                        account_id,
-                        tx_ref,
-                        output.index(),
-                        &recipient,
-                        output.note_value(),
-                        Some(output.memo()),
-                    )?;
-                }
-            }
-        }
-    }
+    put_shielded_outputs(
+        wallet_db,
+        params,
+        tx_ref,
+        funding_account,
+        d_tx.sapling_outputs(),
+        PoolType::SAPLING,
+        Note::Sapling,
+        |note| Receiver::Sapling(note.recipient()),
+        |output| output.note_value(),
+        |wallet_db, output, tx_ref| {
+            wallet_db.put_received_sapling_note(output, tx_ref, d_tx.mined_height(), None)
+        },
+        |_account_id| {
+            #[cfg(feature = "transparent-inputs")]
+            gap_update_set.insert((_account_id, TransparentKeyScope::EXTERNAL));
+        },
+    )?;
 
     // Mark Sapling notes as spent when we observe their nullifiers.
     for spend in d_tx
@@ -764,83 +703,24 @@ where
     }
 
     #[cfg(feature = "orchard")]
-    for output in d_tx.orchard_outputs() {
-        match output.transfer_type() {
-            TransferType::Outgoing => {
-                let recipient = {
-                    let receiver = Receiver::Orchard(output.note().recipient());
-                    let recipient_address = wallet_db
-                        .select_receiving_address(*output.account(), &receiver)?
-                        .unwrap_or_else(|| receiver.to_zcash_address(params.network_type()));
-
-                    Recipient::External {
-                        recipient_address,
-                        output_pool: PoolType::ORCHARD,
-                    }
-                };
-
-                wallet_db.put_sent_output(
-                    *output.account(),
-                    tx_ref,
-                    output.index(),
-                    &recipient,
-                    output.note_value(),
-                    Some(output.memo()),
-                )?;
-            }
-            TransferType::WalletInternal => {
-                wallet_db.put_received_orchard_note(output, tx_ref, d_tx.mined_height(), None)?;
-
-                let recipient = Recipient::InternalAccount {
-                    receiving_account: *output.account(),
-                    external_address: None,
-                    note: Box::new(Note::Orchard(*output.note())),
-                };
-
-                wallet_db.put_sent_output(
-                    *output.account(),
-                    tx_ref,
-                    output.index(),
-                    &recipient,
-                    output.note_value(),
-                    Some(output.memo()),
-                )?;
-            }
-            TransferType::Incoming => {
-                wallet_db.put_received_orchard_note(output, tx_ref, d_tx.mined_height(), None)?;
-
-                #[cfg(feature = "transparent-inputs")]
-                gap_update_set.insert((output.account_id(), TransparentKeyScope::EXTERNAL));
-
-                if let Some(account_id) = funding_account {
-                    // Even if the recipient address is external, record the send as internal.
-                    let recipient = Recipient::InternalAccount {
-                        receiving_account: *output.account(),
-                        external_address: {
-                            let receiver = Receiver::Orchard(output.note().recipient());
-                            Some(
-                                wallet_db
-                                    .select_receiving_address(*output.account(), &receiver)?
-                                    .unwrap_or_else(|| {
-                                        receiver.to_zcash_address(params.network_type())
-                                    }),
-                            )
-                        },
-                        note: Box::new(Note::Orchard(*output.note())),
-                    };
-
-                    wallet_db.put_sent_output(
-                        account_id,
-                        tx_ref,
-                        output.index(),
-                        &recipient,
-                        output.note_value(),
-                        Some(output.memo()),
-                    )?;
-                }
-            }
-        }
-    }
+    put_shielded_outputs(
+        wallet_db,
+        params,
+        tx_ref,
+        funding_account,
+        d_tx.orchard_outputs(),
+        PoolType::ORCHARD,
+        Note::Orchard,
+        |note| Receiver::Orchard(note.recipient()),
+        |output| output.note_value(),
+        |wallet_db, output, tx_ref| {
+            wallet_db.put_received_orchard_note(output, tx_ref, d_tx.mined_height(), None)
+        },
+        |_account_id| {
+            #[cfg(feature = "transparent-inputs")]
+            gap_update_set.insert((_account_id, TransparentKeyScope::EXTERNAL));
+        },
+    )?;
 
     // Mark Orchard notes as spent when we observe their nullifiers.
     #[cfg(feature = "orchard")]
@@ -1044,3 +924,105 @@ where
         Ok(WalletTransparentOutputs::empty())
     }
 }
+
+#[allow(clippy::too_many_arguments)]
+fn put_shielded_outputs<DbT, P, N>(
+    wallet_db: &mut DbT,
+    params: &P,
+    tx_ref: <DbT as LowLevelWalletRead>::TxRef,
+    funding_account: Option<DbT::AccountId>,
+    outputs: &[DecryptedOutput<N, <DbT as LowLevelWalletRead>::AccountId>],
+    output_pool: PoolType,
+    note: impl Fn(N) -> Note,
+    receiver: impl Fn(&N) -> Receiver,
+    value: impl Fn(&DecryptedOutput<N, <DbT as LowLevelWalletRead>::AccountId>) -> Zatoshis,
+    put_received_note: impl Fn(
+        &mut DbT,
+        &DecryptedOutput<N, <DbT as LowLevelWalletRead>::AccountId>,
+        <DbT as LowLevelWalletRead>::TxRef,
+    ) -> Result<(), <DbT as LowLevelWalletRead>::Error>,
+    mut on_external_account: impl FnMut(<DbT as LowLevelWalletRead>::AccountId),
+) -> Result<(), <DbT as LowLevelWalletRead>::Error>
+where
+    DbT: LowLevelWalletWrite,
+    P: consensus::Parameters,
+    N: Clone,
+{
+    for output in outputs {
+        match output.transfer_type() {
+            TransferType::Outgoing => {
+                let recipient = {
+                    let receiver = receiver(output.note());
+                    let recipient_address = wallet_db
+                        .select_receiving_address(*output.account(), &receiver)?
+                        .unwrap_or_else(|| receiver.to_zcash_address(params.network_type()));
+
+                    Recipient::External {
+                        recipient_address,
+                        output_pool,
+                    }
+                };
+
+                wallet_db.put_sent_output(
+                    *output.account(),
+                    tx_ref,
+                    output.index(),
+                    &recipient,
+                    value(output),
+                    Some(output.memo()),
+                )?;
+            }
+            TransferType::WalletInternal => {
+                put_received_note(wallet_db, output, tx_ref)?;
+
+                let recipient = Recipient::InternalAccount {
+                    receiving_account: *output.account(),
+                    external_address: None,
+                    note: Box::new(note(output.note().clone())),
+                };
+
+                wallet_db.put_sent_output(
+                    *output.account(),
+                    tx_ref,
+                    output.index(),
+                    &recipient,
+                    value(output),
+                    Some(output.memo()),
+                )?;
+            }
+            TransferType::Incoming => {
+                put_received_note(wallet_db, output, tx_ref)?;
+                on_external_account(*output.account());
+
+                if let Some(account_id) = funding_account {
+                    // Even if the recipient address is external, record the send as internal.
+                    let recipient = Recipient::InternalAccount {
+                        receiving_account: *output.account(),
+                        external_address: {
+                            let receiver = receiver(output.note());
+                            Some(
+                                wallet_db
+                                    .select_receiving_address(*output.account(), &receiver)?
+                                    .unwrap_or_else(|| {
+                                        receiver.to_zcash_address(params.network_type())
+                                    }),
+                            )
+                        },
+                        note: Box::new(note(output.note().clone())),
+                    };
+
+                    wallet_db.put_sent_output(
+                        account_id,
+                        tx_ref,
+                        output.index(),
+                        &recipient,
+                        value(output),
+                        Some(output.memo()),
+                    )?;
+                }
+            }
+        }
+    }
+
+    Ok(())
+}

From 5a21510fbf2b5d7efba78d5a4aa5267d0ccaeb56 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Fri, 6 Feb 2026 15:21:06 +0000
Subject: [PATCH 156/263] zcash_client_backend: Mark spends before putting
 outputs in `store_decrypted_tx`

---
 .../src/data_api/ll/wallet.rs                 | 64 +++++++++----------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/zcash_client_backend/src/data_api/ll/wallet.rs b/zcash_client_backend/src/data_api/ll/wallet.rs
index 0fb8699a85..05c8f42986 100644
--- a/zcash_client_backend/src/data_api/ll/wallet.rs
+++ b/zcash_client_backend/src/data_api/ll/wallet.rs
@@ -645,6 +645,38 @@ where
         wallet_db.set_transaction_status(d_tx.tx().txid(), TransactionStatus::Mined(height))?;
     }
 
+    // Mark Sapling notes as spent when we observe their nullifiers.
+    for spend in d_tx
+        .tx()
+        .sapling_bundle()
+        .iter()
+        .flat_map(|b| b.shielded_spends().iter())
+    {
+        wallet_db.mark_sapling_note_spent(spend.nullifier(), tx_ref)?;
+    }
+
+    // Mark Orchard notes as spent when we observe their nullifiers.
+    #[cfg(feature = "orchard")]
+    for action in d_tx
+        .tx()
+        .orchard_bundle()
+        .iter()
+        .flat_map(|b| b.actions().iter())
+    {
+        wallet_db.mark_orchard_note_spent(action.nullifier(), tx_ref)?;
+    }
+
+    // If any of the utxos spent in the transaction are ours, mark them as spent.
+    #[cfg(feature = "transparent-inputs")]
+    for txin in d_tx
+        .tx()
+        .transparent_bundle()
+        .iter()
+        .flat_map(|b| b.vin.iter())
+    {
+        wallet_db.mark_transparent_utxo_spent(txin.prevout(), tx_ref)?;
+    }
+
     // A flag used to determine whether it is necessary to query for transactions that
     // provided transparent inputs to this transaction, in order to be able to correctly
     // recover transparent transaction history.
@@ -692,16 +724,6 @@ where
         },
     )?;
 
-    // Mark Sapling notes as spent when we observe their nullifiers.
-    for spend in d_tx
-        .tx()
-        .sapling_bundle()
-        .iter()
-        .flat_map(|b| b.shielded_spends().iter())
-    {
-        wallet_db.mark_sapling_note_spent(spend.nullifier(), tx_ref)?;
-    }
-
     #[cfg(feature = "orchard")]
     put_shielded_outputs(
         wallet_db,
@@ -722,28 +744,6 @@ where
         },
     )?;
 
-    // Mark Orchard notes as spent when we observe their nullifiers.
-    #[cfg(feature = "orchard")]
-    for action in d_tx
-        .tx()
-        .orchard_bundle()
-        .iter()
-        .flat_map(|b| b.actions().iter())
-    {
-        wallet_db.mark_orchard_note_spent(action.nullifier(), tx_ref)?;
-    }
-
-    // If any of the utxos spent in the transaction are ours, mark them as spent.
-    #[cfg(feature = "transparent-inputs")]
-    for txin in d_tx
-        .tx()
-        .transparent_bundle()
-        .iter()
-        .flat_map(|b| b.vin.iter())
-    {
-        wallet_db.mark_transparent_utxo_spent(txin.prevout(), tx_ref)?;
-    }
-
     #[cfg(feature = "transparent-inputs")]
     for (received_t_output, key_scope) in &wallet_transparent_outputs.received {
         let (account_id, _) =

From 3da7b9d44b0caf8a64e8ab38e4a985b09c767e92 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Fri, 6 Feb 2026 15:30:33 +0000
Subject: [PATCH 157/263] zcash_client_backend: Extract "put transparent
 outputs" logic from `store_decrypted_tx`

This has symmetry with `put_shielded_outputs`, further regularising the
internals of `store_decrypted_tx`.
---
 .../src/data_api/ll/wallet.rs                 | 98 +++++++++++++------
 1 file changed, 67 insertions(+), 31 deletions(-)

diff --git a/zcash_client_backend/src/data_api/ll/wallet.rs b/zcash_client_backend/src/data_api/ll/wallet.rs
index 05c8f42986..7855257ca5 100644
--- a/zcash_client_backend/src/data_api/ll/wallet.rs
+++ b/zcash_client_backend/src/data_api/ll/wallet.rs
@@ -744,37 +744,17 @@ where
         },
     )?;
 
-    #[cfg(feature = "transparent-inputs")]
-    for (received_t_output, key_scope) in &wallet_transparent_outputs.received {
-        let (account_id, _) =
-            wallet_db.put_transparent_output(received_t_output, observed_height, false)?;
-
-        if let Some(t_key_scope) = key_scope {
-            gap_update_set.insert((account_id, *t_key_scope));
-        }
-
-        // When we receive transparent funds (particularly as ephemeral outputs
-        // in transaction pairs sending to a ZIP 320 address) it becomes
-        // possible that the spend of these outputs is not then later detected
-        // if the transaction that spends them is purely transparent. This is
-        // especially a problem in wallet recovery.
-        wallet_db.queue_transparent_spend_detection(
-            *received_t_output.recipient_address(),
-            tx_ref,
-            received_t_output.outpoint().n(),
-        )?;
-    }
-
-    for sent_t_output in &wallet_transparent_outputs.sent {
-        wallet_db.put_sent_output(
-            sent_t_output.from_account_uuid,
-            tx_ref,
-            sent_t_output.output_index,
-            &sent_t_output.recipient,
-            sent_t_output.value,
-            None,
-        )?;
-    }
+    put_transparent_outputs(
+        wallet_db,
+        tx_ref,
+        &wallet_transparent_outputs,
+        #[cfg(feature = "transparent-inputs")]
+        |wallet_db, output| wallet_db.put_transparent_output(output, observed_height, false),
+        #[cfg(feature = "transparent-inputs")]
+        |account_id, t_key_scope| {
+            gap_update_set.insert((account_id, t_key_scope));
+        },
+    )?;
 
     // Regenerate the gap limit addresses.
     #[cfg(feature = "transparent-inputs")]
@@ -1026,3 +1006,59 @@ where
 
     Ok(())
 }
+
+fn put_transparent_outputs<DbT>(
+    wallet_db: &mut DbT,
+    tx_ref: <DbT as LowLevelWalletRead>::TxRef,
+    outputs: &WalletTransparentOutputs<<DbT as LowLevelWalletRead>::AccountId>,
+    #[cfg(feature = "transparent-inputs")] put_received_output: impl Fn(
+        &mut DbT,
+        &WalletTransparentOutput,
+    ) -> Result<
+        (
+            <DbT as LowLevelWalletRead>::AccountId,
+            std::option::Option<TransparentKeyScope>,
+        ),
+        <DbT as LowLevelWalletRead>::Error,
+    >,
+    #[cfg(feature = "transparent-inputs")] mut on_received: impl FnMut(
+        <DbT as LowLevelWalletRead>::AccountId,
+        TransparentKeyScope,
+    ),
+) -> Result<(), <DbT as LowLevelWalletRead>::Error>
+where
+    DbT: LowLevelWalletWrite,
+{
+    #[cfg(feature = "transparent-inputs")]
+    for (received_t_output, key_scope) in &outputs.received {
+        let (account_id, _) = put_received_output(wallet_db, received_t_output)?;
+
+        if let Some(t_key_scope) = key_scope {
+            on_received(account_id, *t_key_scope);
+        }
+
+        // When we receive transparent funds (particularly as ephemeral outputs
+        // in transaction pairs sending to a ZIP 320 address) it becomes
+        // possible that the spend of these outputs is not then later detected
+        // if the transaction that spends them is purely transparent. This is
+        // especially a problem in wallet recovery.
+        wallet_db.queue_transparent_spend_detection(
+            *received_t_output.recipient_address(),
+            tx_ref,
+            received_t_output.outpoint().n(),
+        )?;
+    }
+
+    for sent_t_output in &outputs.sent {
+        wallet_db.put_sent_output(
+            sent_t_output.from_account_uuid,
+            tx_ref,
+            sent_t_output.output_index,
+            &sent_t_output.recipient,
+            sent_t_output.value,
+            None,
+        )?;
+    }
+
+    Ok(())
+}

From 853dccc6f766e43d20629627d83169b0da798b50 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Thu, 5 Feb 2026 17:18:02 +1300
Subject: [PATCH 158/263] feat: support for uint256 in eip681 WIP

---
 Cargo.lock                     |   1 +
 components/eip681/Cargo.toml   |   3 +
 components/eip681/src/error.rs |   3 +
 components/eip681/src/lib.rs   |   1 +
 components/eip681/src/parse.rs | 171 +++++++++++++++++++++++++++++++++
 5 files changed, 179 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index 0fa161c8f2..4db143258f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1480,6 +1480,7 @@ dependencies = [
  "nom",
  "percent-encoding",
  "pretty_assertions",
+ "primitive-types",
  "proptest",
  "sha3",
  "snafu",
diff --git a/components/eip681/Cargo.toml b/components/eip681/Cargo.toml
index 7a770f75d8..a6a1aa8b76 100644
--- a/components/eip681/Cargo.toml
+++ b/components/eip681/Cargo.toml
@@ -17,6 +17,9 @@ categories.workspace = true
 # - Error handling
 snafu = "0.8.6"
 
+# - Large integers
+primitive-types = { version = "0.12", default-features = false }
+
 # - Parsing and Encoding
 base64.workspace = true
 ens-normalize-rs = "0.1.1"
diff --git a/components/eip681/src/error.rs b/components/eip681/src/error.rs
index 4013ff652a..4b1d648855 100644
--- a/components/eip681/src/error.rs
+++ b/components/eip681/src/error.rs
@@ -125,6 +125,9 @@ pub enum ValidationError {
     ))]
     Overflow,
 
+    #[snafu(display("Cannot convert negative number to unsigned type"))]
+    NegativeValueForUnsignedType,
+
     #[snafu(display("Could not decode url-encoded string: {source}"))]
     UrlEncoding { source: std::str::Utf8Error },
 
diff --git a/components/eip681/src/lib.rs b/components/eip681/src/lib.rs
index 6d34587d98..da5c10d428 100644
--- a/components/eip681/src/lib.rs
+++ b/components/eip681/src/lib.rs
@@ -29,6 +29,7 @@
 //! See
 //! [ABNF core rules](https://en.wikipedia.org/wiki/Augmented_Backus%E2%80%93Naur_form#Core_rules)
 //! for general information about the `ABNF` format.
+pub use primitive_types::U256;
 
 pub mod error;
 mod parse;
diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index fbeb456790..0bb3b51876 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -3,6 +3,7 @@
 use std::{borrow::Cow, collections::BTreeMap};
 
 use nom::{AsChar, Parser};
+use primitive_types::U256;
 use sha3::{Digest, Keccak256};
 use snafu::{OptionExt, ResultExt};
 
@@ -62,6 +63,22 @@ impl Digits {
         Ok(total)
     }
 
+    /// Returns the [`U256`] representation.
+    ///
+    /// ## Errors
+    /// Errors if internal arithmetic operations overflow.
+    pub fn as_uint256(&self) -> Result<U256, ValidationError> {
+        let mut total = U256::zero();
+        for digit in &self.places {
+            total = total
+                .checked_mul(U256::from(10u64))
+                .context(OverflowSnafu)?
+                .checked_add(U256::from(*digit))
+                .context(OverflowSnafu)?;
+        }
+        Ok(total)
+    }
+
     #[cfg(test)]
     /// Returns the ratio corresponding to the decimal number `0.<digits>`,
     /// i.e. the denominator will be `10^len(digits)`.
@@ -492,6 +509,76 @@ impl Number {
             .context(OverflowSnafu)?;
         signum.checked_mul(value).context(OverflowSnafu)
     }
+
+    /// Convert this [`Number`] into a [`U256`], if possible.
+    ///
+    /// ## Errors
+    /// - Returns [`NegativeValueForUnsignedType`](ValidationError::NegativeValueForUnsignedType)
+    ///   if the number has a negative sign
+    /// - Returns [`Overflow`](ValidationError::Overflow) if internal arithmetic operations overflow
+    /// - Returns [`SmallExponent`](ValidationError::SmallExponent) if the exponent doesn't cover
+    ///   all non-zero decimal places (i.e., would require truncating non-zero decimal digits)
+    pub fn as_uint256(&self) -> Result<U256, ValidationError> {
+        // Reject negative numbers - U256 is unsigned
+        snafu::ensure!(
+            self.signum.is_none_or(|b| b),
+            NegativeValueForUnsignedTypeSnafu
+        );
+
+        let integer = self.integer.as_uint256()?;
+        let decimal_numerator = self
+            .decimal
+            .as_ref()
+            .map(|d| d.as_uint256())
+            .transpose()?
+            .unwrap_or(U256::zero());
+        let decimal_places: u32 = self
+            .decimal
+            .as_ref()
+            .map(|d| d.places.len())
+            .unwrap_or(0)
+            .try_into()
+            .context(IntegerSnafu)?;
+        let exp: u32 = self
+            .exponent
+            .as_ref()
+            .and_then(|(_, maybe_exp)| maybe_exp.as_ref().map(|digits| digits.as_u64()))
+            .transpose()?
+            .unwrap_or(0)
+            .try_into()
+            .context(IntegerSnafu)?;
+
+        let multiplier = U256::from(10u64)
+            .checked_pow(U256::from(exp))
+            .context(OverflowSnafu)?;
+
+        // The exponent must be >= the number of decimal places to yield an integer result.
+        let decimal_exp = exp
+            .checked_sub(decimal_places)
+            .with_context(|| SmallExponentSnafu {
+                expected: decimal_places as usize,
+                seen: exp,
+            });
+
+        // Formula: (integer * 10^exp) + (decimal_numerator * 10^(exp - decimal_places))
+        let multiplied_integer = integer.checked_mul(multiplier).context(OverflowSnafu)?;
+
+        let decimal_multiplier = match decimal_exp {
+            Ok(d) => U256::from(10u64)
+                .checked_pow(U256::from(d))
+                .context(OverflowSnafu)?,
+            Err(_) if decimal_numerator.is_zero() => U256::zero(),
+            Err(e) => return Err(e),
+        };
+
+        let multiplied_decimal = decimal_numerator
+            .checked_mul(decimal_multiplier)
+            .context(OverflowSnafu)?;
+
+        multiplied_integer
+            .checked_add(multiplied_decimal)
+            .context(OverflowSnafu)
+    }
 }
 
 /// Ethereum Name Service name.
@@ -1160,6 +1247,29 @@ mod test {
         assert_eq!((666, 1000), digits.as_decimal_ratio().unwrap());
     }
 
+    #[test]
+    fn digits_as_uint256_sanity() {
+        let digits = Digits {
+            places: vec![1, 2, 3],
+        };
+        assert_eq!(U256::from(123u64), digits.as_uint256().unwrap());
+    }
+
+    #[test]
+    fn digits_as_uint256_large_value() {
+        // 30 digits - larger than u64::MAX but fits in U256
+        // 123456789012345678901234567890
+        let digits = Digits {
+            places: vec![
+                1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8,
+                9, 0,
+            ],
+        };
+        let result = digits.as_uint256().unwrap();
+        // Verify it's larger than u64::MAX
+        assert!(result > U256::from(u64::MAX));
+    }
+
     fn arb_digits_in(size_range: RangeInclusive<usize>) -> impl Strategy<Value = Digits> {
         prop::collection::vec(0..10u8, size_range).prop_map(|places| Digits { places })
     }
@@ -1229,6 +1339,54 @@ mod test {
         assert_eq!(0, n.as_i128().unwrap());
     }
 
+    #[test]
+    fn number_as_uint256_sanity() {
+        let (_, n) = Number::parse("666.0").unwrap();
+        assert_eq!(U256::from(666u64), n.as_uint256().unwrap());
+    }
+
+    #[test]
+    fn number_as_uint256_large_value() {
+        // 2.014e18 - typical ERC-20 amount with 18 decimals
+        let (_, n) = Number::parse("2.014e18").unwrap();
+        assert_eq!(
+            U256::from(2_014_000_000_000_000_000u64),
+            n.as_uint256().unwrap()
+        );
+    }
+
+    #[test]
+    fn number_as_uint256_exceeds_i128() {
+        // Value larger than i128::MAX (~1.7e38), should work with U256
+        let (_, n) = Number::parse("1e39").unwrap();
+        let result = n.as_uint256().unwrap();
+        assert!(result > U256::from(i128::MAX as u128));
+    }
+
+    #[test]
+    fn number_as_uint256_negative_fails() {
+        let (_, n) = Number::parse("-100").unwrap();
+        assert_eq!(
+            Err(ValidationError::NegativeValueForUnsignedType),
+            n.as_uint256()
+        );
+    }
+
+    #[test]
+    fn number_as_uint256_positive_sign_works() {
+        let (_, n) = Number::parse("+100").unwrap();
+        assert_eq!(U256::from(100u64), n.as_uint256().unwrap());
+    }
+
+    #[test]
+    fn number_as_uint256_very_large_integer() {
+        // A number with 30 digits in the integer part (exceeds u64::MAX)
+        let (_, n) = Number::parse("123456789012345678901234567890").unwrap();
+        let result = n.as_uint256().unwrap();
+        // Verify it's larger than u64::MAX
+        assert!(result > U256::from(u64::MAX));
+    }
+
     fn arb_valid_number() -> impl Strategy<Value = Number> {
         (
             prop::option::of(any::<bool>()),
@@ -1279,6 +1437,19 @@ mod test {
         }
     }
 
+    proptest! {
+        #[test]
+        fn arb_valid_non_negative_number_as_uint256(number in arb_valid_number()) {
+            // Skip negative numbers
+            if number.signum != Some(false) {
+                let n_uint256 = number.as_uint256().unwrap();
+                // This is safe because `arb_valid_number` only creates digits with 4 places
+                let n_u128 = number.as_i128().unwrap() as u128;
+                assert_eq!(U256::from(n_u128), n_uint256);
+            }
+        }
+    }
+
     proptest! {
         #[test]
         fn parse_arb_valid_number(ns in arb_valid_number()) {

From 19c4dee07ef9f607eb4a3d1d07a41a1d25e2a864 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Thu, 5 Feb 2026 16:57:11 +1300
Subject: [PATCH 159/263] feat: eip681 - add high-level TransactionRequest API
 for native and ERC-20 transfers

---
 components/eip681/src/error.rs   | 130 ++++++++-
 components/eip681/src/lib.rs     |  39 ++-
 components/eip681/src/parse.rs   | 166 ++++++-----
 components/eip681/src/request.rs | 455 +++++++++++++++++++++++++++++++
 4 files changed, 720 insertions(+), 70 deletions(-)
 create mode 100644 components/eip681/src/request.rs

diff --git a/components/eip681/src/error.rs b/components/eip681/src/error.rs
index 4b1d648855..0637d8356d 100644
--- a/components/eip681/src/error.rs
+++ b/components/eip681/src/error.rs
@@ -2,7 +2,7 @@
 
 use snafu::prelude::*;
 
-use crate::Value;
+use crate::parse::Value;
 
 /// Errors discovered during parsing.
 #[derive(Debug, Snafu)]
@@ -60,8 +60,8 @@ pub enum ParseError<'a> {
     #[snafu(display("Invalid parameter key '{key}'."))]
     InvalidParameterKey { key: String },
 
-    /// Unexpected leftover parsing input.
-    #[snafu(display("Unexpected leftover parsing input '{input}'"))]
+    /// Unexpected leftover input after parsing.
+    #[snafu(display("Unexpected leftover input: {input}"))]
     UnexpectedLeftoverInput { input: &'a str },
 }
 
@@ -152,3 +152,127 @@ pub enum ValidationError {
         reason: Erc55ValidationFailureReason,
     },
 }
+
+/// Errors encountered while converting [`RawTransactionRequest`] into
+/// [`Erc20Request`].
+///
+/// [`RawTransactionRequest`]: crate::parse::RawTransactionRequest
+/// [`Erc20Request`]: crate::Erc20Request
+#[derive(Debug, Snafu)]
+#[non_exhaustive]
+#[snafu(visibility(pub(crate)))]
+pub enum Erc20Error {
+    #[snafu(display("Transaction is missing the function name"))]
+    MissingFn,
+
+    #[snafu(display("Expected function name to be 'transfer', saw '{seen}'"))]
+    FnName { seen: String },
+
+    #[snafu(display("Incorrect number of ABI parameters, expected 2, saw '{seen}'"))]
+    AbiParameterLen { seen: usize },
+
+    #[snafu(display(
+        r#"Incorrect ABI parameter names, \
+        expected "address" and "uint256" - saw "{param1}" and "{param2}""#
+    ))]
+    AbiParameterName { param1: String, param2: String },
+
+    #[snafu(display("The 'address' parameter value is not an address"))]
+    AbiParameterAddressIsNotAnAddress,
+
+    #[snafu(display("The 'uint256' parameter is not a number"))]
+    AbiParameterUint256,
+
+    #[snafu(display("The 'uint256' parameter could not be converted: {source}"))]
+    AbiParameterUint256Conversion { source: std::num::TryFromIntError },
+}
+
+/// Errors encountered while converting [`RawTransactionRequest`] into [`NativeRequest`].
+///
+/// [`RawTransactionRequest`]: crate::parse::RawTransactionRequest
+/// [`NativeRequest`]: crate::NativeRequest
+#[derive(Debug, Snafu)]
+#[non_exhaustive]
+#[snafu(visibility(pub(crate)))]
+pub enum NativeTransferError {
+    #[snafu(display("Has a function name"))]
+    HasFunctionName,
+
+    #[snafu(display("Request has ABI parameters"))]
+    HasAbiParameters,
+
+    #[snafu(display("Parameter '{key}' is not a number"))]
+    ParameterNotNumber { key: String },
+
+    #[snafu(display("Parameter '{key}' value is invalid: {source}"))]
+    ParameterInvalid {
+        key: String,
+        source: ValidationError,
+    },
+
+    #[snafu(display("Invalid chain ID: {source}"))]
+    ChainIdInvalid { source: ValidationError },
+
+    #[snafu(display("Invalid recipient address: {source}"))]
+    RecipientAddressInvalid { source: ValidationError },
+}
+
+/// Top-level errors for the transaction request API.
+#[derive(Debug, Snafu)]
+#[snafu(visibility(pub(crate)))]
+#[non_exhaustive]
+pub enum Error {
+    /// An error occurred during parsing.
+    #[snafu(display("Parsing error: {message}"))]
+    Parse { message: String },
+
+    /// An error occurred during validation.
+    #[snafu(display("Validation error: {source}"))]
+    Validation { source: ValidationError },
+
+    /// The provided address string is not a valid Ethereum address.
+    #[snafu(display("Invalid Ethereum address: {address}"))]
+    InvalidAddress { address: String },
+
+    /// The request is not a valid ERC-20 transfer.
+    #[snafu(display("Not an ERC-20 transfer request: {source}"))]
+    NotErc20Transfer { source: Erc20Error },
+
+    /// The request is not a valid native transfer.
+    #[snafu(display("Not a native transfer request: {source}"))]
+    NotNativeTransfer { source: NativeTransferError },
+}
+
+impl From<ValidationError> for Error {
+    fn from(source: ValidationError) -> Self {
+        Error::Validation { source }
+    }
+}
+
+impl From<Erc20Error> for Error {
+    fn from(source: Erc20Error) -> Self {
+        Error::NotErc20Transfer { source }
+    }
+}
+
+impl From<NativeTransferError> for Error {
+    fn from(source: NativeTransferError) -> Self {
+        Error::NotNativeTransfer { source }
+    }
+}
+
+impl From<ParseError<'_>> for Error {
+    fn from(value: ParseError<'_>) -> Self {
+        Error::Parse {
+            message: value.to_string(),
+        }
+    }
+}
+
+impl<'a> From<nom::Err<ParseError<'a>>> for Error {
+    fn from(value: nom::Err<ParseError<'a>>) -> Self {
+        Error::Parse {
+            message: value.to_string(),
+        }
+    }
+}
diff --git a/components/eip681/src/lib.rs b/components/eip681/src/lib.rs
index da5c10d428..43b3378159 100644
--- a/components/eip681/src/lib.rs
+++ b/components/eip681/src/lib.rs
@@ -1,9 +1,37 @@
 //! Parser for [EIP-681](https://eips.ethereum.org/EIPS/eip-681) transaction requests.
 //!
-//! The top level of the parsing tree is the type [`EthereumTransactionRequest`].
+//! This crate provides two levels of API:
+//!
+//! 1. **High-level API** (this module): [`TransactionRequest`], [`NativeRequest`], and
+//!    [`Erc20Request`] for common use cases.
+//! 2. **Low-level parsing API** ([`parse`] module): Direct access to the full EIP-681 grammar
+//!    via [`parse::RawTransactionRequest`].
+//!
+//! ## Quick Start
+//!
+//! ```rust
+//! use eip681::TransactionRequest;
+//!
+//! let uri = "ethereum:0xfB6916095ca1df60bB79Ce92cE3Ea74c37c5d359?value=2.014e18";
+//! let request = TransactionRequest::parse(uri).unwrap();
+//!
+//! match request {
+//!     TransactionRequest::NativeRequest(native) => {
+//!         println!("Native transfer to {}", native.recipient_address());
+//!     }
+//!     TransactionRequest::Erc20Request(erc20) => {
+//!         println!("ERC-20 transfer to {}", erc20.recipient_address());
+//!     }
+//!     TransactionRequest::Unrecognised(raw) => {
+//!         println!("Other request: {}", raw);
+//!     }
+//! }
+//! ```
 //!
 //! ## ABNF Syntax
 //!
+//! The underlying parser implements the following grammar:
+//!
 //! ```abnf
 //! request          = schema_prefix target_address [ "@" chain_id ] [ "/" function_name ] [ "?" parameters ]
 //! schema_prefix    = "ethereum" ":" [ "pay-" ]
@@ -32,8 +60,7 @@
 pub use primitive_types::U256;
 
 pub mod error;
-mod parse;
-pub use parse::{
-    Digits, EnsName, EthereumAbiTypeName, EthereumAddressOrEnsName, EthereumTransactionRequest,
-    HexDigits, Number, Parameter, Parameters, SchemaPrefix, UrlEncodedUnicodeString, Value,
-};
+pub mod parse;
+
+mod request;
+pub use request::{Erc20Request, NativeRequest, TransactionRequest};
diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index 0bb3b51876..fe44fa70aa 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -334,9 +334,9 @@ impl HexDigits {
 /// multiplier of a power of 10. Only integer numbers are allowed, so the
 /// exponent MUST be greater or equal to the number of decimals after the point.
 ///
-/// ## Note
-/// This ABNF notation doesn't seem correct, as it allows for quite a few
-/// cases that don't make sense - for example:
+/// ## Warning
+/// The ABNF notation is ambiguous, it allows for quite a few cases that don't
+/// make sense - for example:
 ///
 /// 1. `*DIGIT` is missing and `[ "." 1*DIGIT ]` is present while `[ ( "e" / "E" ) [ 1*DIGIT] ]`
 ///    is not
@@ -389,7 +389,7 @@ impl core::fmt::Display for Number {
 impl Number {
     /// Parse a `Number`.
     ///
-    /// /// ```abnf
+    /// ```abnf
     /// number = [ "-" / "+" ] *DIGIT [ "." 1*DIGIT ] [ ( "e" / "E" ) [ 1*DIGIT ] ]
     /// ```
     pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
@@ -590,7 +590,7 @@ impl Number {
 /// * linea.eth
 ///
 /// Uses:
-/// * https://crates.io/crates/ens-normalize-rs
+/// * <https://crates.io/crates/ens-normalize-rs>
 ///
 /// ENS names must conform to the following syntax:
 ///
@@ -656,7 +656,7 @@ impl EnsName {
     }
 }
 
-/// An Ethereum address, or an ENS name.
+/// A 40 character hexadecimal address, or an ENS name.
 ///
 /// ```abnf
 /// ethereum_address = ( "0x" 40*HEXDIG ) / ENS_NAME
@@ -664,36 +664,56 @@ impl EnsName {
 ///
 /// Where `ENS_NAME` is [`EnsName`].
 #[derive(Clone, Debug, PartialEq)]
-pub enum EthereumAddressOrEnsName {
+pub enum AddressOrEnsName {
     Address(HexDigits),
     Name(EnsName),
 }
 
-impl core::fmt::Display for EthereumAddressOrEnsName {
+impl core::fmt::Display for AddressOrEnsName {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            EthereumAddressOrEnsName::Address(digits) => f.write_fmt(format_args!("0x{digits}")),
-            EthereumAddressOrEnsName::Name(name) => name.fmt(f),
+            AddressOrEnsName::Address(digits) => f.write_fmt(format_args!("0x{digits}")),
+            AddressOrEnsName::Name(name) => name.fmt(f),
         }
     }
 }
 
-impl EthereumAddressOrEnsName {
+impl AddressOrEnsName {
     /// Parse an `EthereumAddress`.
     pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
         // Parse "0x" and then 40+ hex digits
-        fn parse_40plus_hex(
-            i: &str,
-        ) -> nom::IResult<&str, EthereumAddressOrEnsName, ParseError<'_>> {
+        fn parse_40plus_hex(i: &str) -> nom::IResult<&str, AddressOrEnsName, ParseError<'_>> {
             let (i, _) = nom::bytes::complete::tag("0x")(i)?;
             let (i, digits) = HexDigits::parse_min(i, 40)?;
-            Ok((i, EthereumAddressOrEnsName::Address(digits)))
+            Ok((i, AddressOrEnsName::Address(digits)))
         }
-        let parse_ens = EnsName::parse.map(EthereumAddressOrEnsName::Name);
+        let parse_ens = EnsName::parse.map(AddressOrEnsName::Name);
         let mut parse_address = parse_40plus_hex.or(parse_ens);
         let (i, address) = parse_address.parse(i)?;
         Ok((i, address))
     }
+
+    /// Returns the ERC-55 validated string representation of the address, or the ENS name, if possible.
+    pub fn to_erc55_validated_string(&self) -> Result<String, ValidationError> {
+        match self {
+            AddressOrEnsName::Address(hex_digits) => {
+                if let Err(ValidationError::Erc55Validation { reason }) =
+                    hex_digits.validate_erc55()
+                {
+                    match reason {
+                        Erc55ValidationFailureReason::AllLowercase
+                        | Erc55ValidationFailureReason::AllUppercase => {
+                            Ok(format!("0x{hex_digits}"))
+                        }
+                        e => Erc55ValidationSnafu { reason: e }.fail(),
+                    }
+                } else {
+                    Ok(format!("0x{hex_digits}"))
+                }
+            }
+            AddressOrEnsName::Name(ens_name) => Ok(ens_name.to_string()),
+        }
+    }
 }
 
 /// A URL-encoded unicode string of arbitrary length, where delimiters and the
@@ -739,7 +759,7 @@ impl UrlEncodedUnicodeString {
 #[derive(Clone, Debug, PartialEq)]
 pub enum Value {
     Number(Number),
-    Address(EthereumAddressOrEnsName),
+    Address(AddressOrEnsName),
     String(UrlEncodedUnicodeString),
 }
 
@@ -761,7 +781,7 @@ impl Value {
     /// ```
     pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
         let mut number = Number::parse.map(Value::Number);
-        let mut ethereum_address = EthereumAddressOrEnsName::parse.map(Value::Address);
+        let mut ethereum_address = AddressOrEnsName::parse.map(Value::Address);
         let mut string = UrlEncodedUnicodeString::parse.map(Value::String);
 
         // Here there are some interesting corner cases:
@@ -797,6 +817,14 @@ impl Value {
             _ => None,
         }
     }
+
+    /// Return the value as an [`AddressOrEnsName`].
+    pub fn as_address_or_ens_name(&self) -> Option<&AddressOrEnsName> {
+        match self {
+            Value::Address(a) => Some(a),
+            _ => None,
+        }
+    }
 }
 
 /// An Ethereum ABI type name.
@@ -836,21 +864,6 @@ impl EthereumAbiTypeName {
     }
 }
 
-// pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
-//     let parse_value = nom::bytes::complete::tag("value").map(|_| Key::Value);
-//     let parse_gas = nom::bytes::complete::tag("gas").map(|_| Key::Gas);
-//     let parse_gas_limit = nom::bytes::complete::tag("gasLimit").map(|_| Key::GasLimit);
-//     let parse_gas_price = nom::bytes::complete::tag("gasPrice").map(|_| Key::GasPrice);
-
-//     nom::branch::alt((
-//         parse_value,
-//         parse_gas_limit,
-//         parse_gas_price,
-//         parse_gas,
-//         EthereumAbiTypeName::parse.map(Key::Type),
-//     ))(i)
-// }
-
 /// A key-value pair, where the the type of the value depends upon the key.
 ///
 /// ```abnf
@@ -864,7 +877,7 @@ impl EthereumAbiTypeName {
 /// > ... gasLimit and gasPrice are suggested user-editable values for gas
 /// > limit and gas price, respectively, for the requested transaction. It is
 /// > acceptable to abbreviate gasLimit as gas, the two are treated synonymously.
-#[derive(Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq)]
 pub enum Parameter {
     /// The amount to be paid, in the atomic unit of the native token of the blockchain.
     ///
@@ -890,7 +903,8 @@ impl core::fmt::Display for Parameter {
 }
 
 impl Parameter {
-    fn key(&self) -> String {
+    /// Returns the parameter name or type.
+    pub fn key(&self) -> String {
         match self {
             Parameter::Value(_) => "value".to_string(),
             Parameter::Gas(_) => "gas".to_string(),
@@ -955,7 +969,7 @@ impl Parameter {
 }
 
 /// A collection of [`Parameter`].
-#[derive(Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq)]
 pub struct Parameters(Vec<Parameter>);
 
 impl core::fmt::Display for Parameters {
@@ -1105,8 +1119,15 @@ impl Parameters {
 /// ```abnf
 /// schema_prefix = "ethereum" ":" [ "pay-" ]
 /// ```
-#[derive(Debug, PartialEq)]
+///
+/// ## Note
+/// The EIP-681 rules are used by multiple chains, so the prefix may be
+/// something other than `"ethereum"`. Unfortunately, this also means that
+/// the prefix _could_ contain garbage. Take care to ensure that the schema
+/// prefix is what you expect.
+#[derive(Clone, Debug, PartialEq)]
 pub struct SchemaPrefix {
+    prefix: String,
     has_pay: bool,
 }
 
@@ -1122,28 +1143,49 @@ impl core::fmt::Display for SchemaPrefix {
 
 impl SchemaPrefix {
     pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
-        let (i, _) = nom::bytes::complete::tag("ethereum:")(i)?;
+        let (i, prefix) = nom::bytes::complete::take_till1(|c| c == ':')(i)?;
+        let (i, _) = nom::character::complete::char(':')(i)?;
         let (i, maybe_pay) = nom::combinator::opt(nom::bytes::complete::tag("pay-"))(i)?;
         let has_pay = maybe_pay.is_some();
-        Ok((i, SchemaPrefix { has_pay }))
+        Ok((
+            i,
+            SchemaPrefix {
+                prefix: prefix.to_string(),
+                has_pay,
+            },
+        ))
+    }
+
+    /// Returns the schema prefix.
+    pub fn prefix(&self) -> &str {
+        &self.prefix
+    }
+
+    /// Returns whether the request contains "pay-" in the prefix.
+    pub fn has_pay(&self) -> bool {
+        self.has_pay
     }
 }
 
-/// Ethereum transaction request.
+/// A raw, parsed EIP-681 transaction request.
 ///
 /// ```abnf
 /// request = schema_prefix target_address [ "@" chain_id ] [ "/" function_name ] [ "?" parameters ]
 /// ```
-#[derive(Debug, PartialEq)]
-pub struct EthereumTransactionRequest {
+///
+/// ## Note
+/// [`RawTransactionRequest::parse`] succeeds if any portion of the input can be parsed as a transaction.
+/// You must take care to handle any leftover input properly, or otherwise fail downstream parsers.
+#[derive(Clone, Debug, PartialEq)]
+pub struct RawTransactionRequest {
     pub schema_prefix: SchemaPrefix,
-    pub target_address: EthereumAddressOrEnsName,
+    pub target_address: AddressOrEnsName,
     pub chain_id: Option<Digits>,
     pub function_name: Option<UrlEncodedUnicodeString>,
     pub parameters: Parameters,
 }
 
-impl core::fmt::Display for EthereumTransactionRequest {
+impl core::fmt::Display for RawTransactionRequest {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let Self {
             schema_prefix,
@@ -1171,13 +1213,12 @@ impl core::fmt::Display for EthereumTransactionRequest {
     }
 }
 
-impl EthereumTransactionRequest {
+impl RawTransactionRequest {
     /// Parse a transaction request.
     pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
         let (i, schema_prefix) = SchemaPrefix::parse(i)?;
         let (i, address_blob) = nom::bytes::complete::is_not("@/?")(i)?;
-        let (remaining_address_input, target_address) =
-            EthereumAddressOrEnsName::parse(address_blob)?;
+        let (remaining_address_input, target_address) = AddressOrEnsName::parse(address_blob)?;
         snafu::ensure!(
             remaining_address_input.is_empty(),
             UnexpectedLeftoverInputSnafu {
@@ -1587,10 +1628,10 @@ mod test {
     #[test]
     fn hex_address_zero_sanity() {
         let input = "0x0000000000000000000000000000000000000000";
-        let (output, addy) = EthereumAddressOrEnsName::parse(input).unwrap();
+        let (output, addy) = AddressOrEnsName::parse(input).unwrap();
         assert_eq!("", output, "output was not fully consumed");
         assert_eq!(
-            EthereumAddressOrEnsName::Address(HexDigits {
+            AddressOrEnsName::Address(HexDigits {
                 places: [CaseSensitiveHexDigit::from_char('0').expect("always valid"); 40].to_vec()
             }),
             addy
@@ -1598,12 +1639,12 @@ mod test {
         assert_eq!(input, &format!("{addy}"));
     }
 
-    fn arb_eth_addy() -> impl Strategy<Value = EthereumAddressOrEnsName> {
-        let hexes: BoxedStrategy<EthereumAddressOrEnsName> = arb_hex_digits(40, 40)
-            .prop_map(EthereumAddressOrEnsName::Address)
+    fn arb_eth_addy() -> impl Strategy<Value = AddressOrEnsName> {
+        let hexes: BoxedStrategy<AddressOrEnsName> = arb_hex_digits(40, 40)
+            .prop_map(AddressOrEnsName::Address)
             .boxed();
-        let names: BoxedStrategy<EthereumAddressOrEnsName> = arb_happy_ens_name()
-            .prop_map(EthereumAddressOrEnsName::Name)
+        let names: BoxedStrategy<AddressOrEnsName> = arb_happy_ens_name()
+            .prop_map(AddressOrEnsName::Name)
             .boxed();
         hexes.prop_union(names)
     }
@@ -1612,7 +1653,7 @@ mod test {
         #[test]
         fn parse_arb_eth_address(expected in arb_eth_addy()) {
             let input = expected.to_string();
-            let (rest, seen) = EthereumAddressOrEnsName::parse(&input).unwrap();
+            let (rest, seen) = AddressOrEnsName::parse(&input).unwrap();
             assert_eq!("", rest);
             assert_eq!(expected, seen);
         }
@@ -1795,7 +1836,7 @@ mod test {
     /// Parsing a value as an ENS name consumes more input than as a string, so ENS name should
     /// win.
     fn parse_value_ens_name_over_string() {
-        let expected = Value::Address(EthereumAddressOrEnsName::Name(EnsName("aa.a0".to_string())));
+        let expected = Value::Address(AddressOrEnsName::Name(EnsName("aa.a0".to_string())));
         let input = expected.to_string();
         let (_output, seen) = Value::parse(&input).unwrap();
         pretty_assertions::assert_eq!(expected, seen);
@@ -1883,7 +1924,10 @@ mod test {
     }
 
     fn arb_schema_prefix() -> impl Strategy<Value = SchemaPrefix> {
-        any::<bool>().prop_map(|has_pay| SchemaPrefix { has_pay })
+        any::<bool>().prop_map(|has_pay| SchemaPrefix {
+            prefix: "ethereum".to_string(),
+            has_pay,
+        })
     }
 
     proptest! {
@@ -1896,7 +1940,7 @@ mod test {
         }
     }
 
-    fn arb_request() -> impl Strategy<Value = EthereumTransactionRequest> {
+    fn arb_request() -> impl Strategy<Value = RawTransactionRequest> {
         (
             arb_schema_prefix(),
             arb_eth_addy(),
@@ -1906,7 +1950,7 @@ mod test {
         )
             .prop_map(
                 |(schema_prefix, target_address, chain_id, function_name, paramaters)| {
-                    EthereumTransactionRequest {
+                    RawTransactionRequest {
                         schema_prefix,
                         target_address,
                         chain_id,
@@ -1921,7 +1965,7 @@ mod test {
         #[test]
         fn parse_arb_request(expected in arb_request()) {
             let input = expected.to_string();
-            let (i, seen) = EthereumTransactionRequest::parse(&input).unwrap_or_else(|e| panic!("could not parse '{input}': {e}"));
+            let (i, seen) = RawTransactionRequest::parse(&input).unwrap_or_else(|e| panic!("could not parse '{input}': {e}"));
             pretty_assertions::assert_str_eq!(input, seen.to_string().as_str(), "input: {input}\ni: {i}");
             pretty_assertions::assert_eq!(expected, seen);
         }
@@ -1930,7 +1974,7 @@ mod test {
     #[test]
     fn test_vectors_eip_681() {
         let input = "ethereum:0xfb6916095ca1df60bb79Ce92ce3ea74c37c5d359?value=2.014e18";
-        let (_, seen) = EthereumTransactionRequest::parse(input).unwrap();
+        let (_, seen) = RawTransactionRequest::parse(input).unwrap();
         // Ensure the address is case-sensitive
         pretty_assertions::assert_eq!(
             "0xfb6916095ca1df60bb79Ce92ce3ea74c37c5d359",
diff --git a/components/eip681/src/request.rs b/components/eip681/src/request.rs
new file mode 100644
index 0000000000..155d77ded8
--- /dev/null
+++ b/components/eip681/src/request.rs
@@ -0,0 +1,455 @@
+//! High-level API for EIP-681 transaction requests.
+//!
+//! This module provides ergonomic types for working with common EIP-681 transaction
+//! request patterns:
+//!
+//! - [`NativeRequest`]: Native ETH/chain token transfers
+//! - [`Erc20Request`]: ERC-20 token transfers via `transfer(address,uint256)`
+//! - [`TransactionRequest`]: Enum that auto-detects the request type
+
+use primitive_types::U256;
+use snafu::prelude::*;
+
+use crate::error::{
+    AbiParameterAddressIsNotAnAddressSnafu, AbiParameterLenSnafu, AbiParameterNameSnafu,
+    AbiParameterUint256Snafu, ChainIdInvalidSnafu, Error, FnNameSnafu, HasAbiParametersSnafu,
+    HasFunctionNameSnafu, MissingFnSnafu, NativeTransferError, ParameterInvalidSnafu,
+    ParameterNotNumberSnafu, RecipientAddressInvalidSnafu, UnexpectedLeftoverInputSnafu,
+};
+use crate::parse::RawTransactionRequest;
+
+/// A parsed EIP-681 transaction request.
+///
+/// This enum automatically categorizes parsed requests into common patterns:
+///
+/// - [`NativeRequest`]: Native transfers (no function call)
+/// - [`Erc20Request`]: ERC-20 `transfer(address,uint256)` calls
+/// - [`Unrecognised`](TransactionRequest::Unrecognised): Any other format
+///
+/// # Example
+///
+/// ```rust
+/// use eip681::TransactionRequest;
+///
+/// // Parse a native transfer
+/// let native = "ethereum:0xfB6916095ca1df60bB79Ce92cE3Ea74c37c5d359?value=1e18";
+/// let request = TransactionRequest::parse(native).unwrap();
+/// assert!(matches!(request, TransactionRequest::NativeRequest(_)));
+///
+/// // Parse an ERC-20 transfer
+/// let erc20 = "ethereum:0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/transfer?address=0xfB6916095ca1df60bB79Ce92cE3Ea74c37c5d359&uint256=1000000";
+/// let request = TransactionRequest::parse(erc20).unwrap();
+/// assert!(matches!(request, TransactionRequest::Erc20Request(_)));
+/// ```
+#[derive(Debug)]
+pub enum TransactionRequest {
+    /// A native ETH/token transfer (no function call).
+    NativeRequest(NativeRequest),
+    /// An ERC-20 token transfer via `transfer(address,uint256)`.
+    Erc20Request(Erc20Request),
+    /// Any other transaction request format.
+    Unrecognised(RawTransactionRequest),
+}
+
+impl TransactionRequest {
+    /// Parse an EIP-681 URI into a categorized transaction request.
+    ///
+    /// The request is automatically categorized based on its structure:
+    ///
+    /// - **Native**: No `function_name` and no ABI-typed parameters
+    /// - **ERC-20**: `function_name` is "transfer" with exactly `address` and `uint256` parameters
+    /// - **Unrecognised**: The transaction is valid via EIP-681, but unrecognised.
+    pub fn parse(input: &str) -> Result<Self, Error> {
+        let (i, raw) = RawTransactionRequest::parse(input)?;
+
+        ensure!(i.is_empty(), UnexpectedLeftoverInputSnafu { input: i });
+
+        // Determine the type based on the parsed request
+        if let Ok(native_req) = NativeRequest::try_from(&raw) {
+            return Ok(TransactionRequest::NativeRequest(native_req));
+        }
+
+        // Otherwise try ERC-20.
+        if let Ok(erc20_req) = Erc20Request::try_from(&raw) {
+            return Ok(TransactionRequest::Erc20Request(erc20_req));
+        }
+
+        // Otherwise return the raw, Unrecognised request
+        Ok(TransactionRequest::Unrecognised(raw))
+    }
+
+    /// Consume this request and return the underlying raw parsed request.
+    pub fn into_raw(self) -> RawTransactionRequest {
+        match self {
+            TransactionRequest::NativeRequest(r) => r.inner,
+            TransactionRequest::Erc20Request(r) => r.inner,
+            TransactionRequest::Unrecognised(r) => r,
+        }
+    }
+
+    /// Returns the underlying [`NativeRequest`], if possible.
+    pub fn as_native(&self) -> Option<&NativeRequest> {
+        match self {
+            TransactionRequest::NativeRequest(req) => Some(req),
+            _ => None,
+        }
+    }
+
+    /// Returns the underlying [`Erc20Request`], if possible.
+    pub fn as_erc20(&self) -> Option<&Erc20Request> {
+        match self {
+            TransactionRequest::Erc20Request(req) => Some(req),
+            _ => None,
+        }
+    }
+
+    /// Returns the underlying [`RawTransactionRequest`].
+    pub fn as_raw(&self) -> &RawTransactionRequest {
+        match self {
+            TransactionRequest::Erc20Request(erc20_request) => &erc20_request.inner,
+            TransactionRequest::NativeRequest(native_request) => &native_request.inner,
+            TransactionRequest::Unrecognised(raw_transaction_request) => raw_transaction_request,
+        }
+    }
+}
+
+impl core::fmt::Display for TransactionRequest {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        match self {
+            TransactionRequest::NativeRequest(r) => r.fmt(f),
+            TransactionRequest::Erc20Request(r) => r.fmt(f),
+            TransactionRequest::Unrecognised(r) => r.fmt(f),
+        }
+    }
+}
+
+/// A native transfer request (ETH or native chain token).
+///
+/// Native transfers are EIP-681 URIs with:
+/// - No `function_name`
+/// - No ABI-typed parameters (only `value`, `gas`, `gasLimit`, `gasPrice`)
+///   * `value`, `gas`, `gasLimit` and `gasPrice` parameters are valid
+///     `U256` values.
+///
+/// # Example
+///
+/// ```rust
+/// use eip681::{TransactionRequest, U256};
+///
+/// // Create a new native transfer request
+/// let request = "ethereum:0xfB6916095ca1df60bB79Ce92cE3Ea74c37c5d359?value=1e18";
+/// let tx_req = TransactionRequest::parse(request).unwrap();
+/// let native_req = tx_req.as_native().unwrap();
+///
+/// assert_eq!(native_req.recipient_address(), "0xfB6916095ca1df60bB79Ce92cE3Ea74c37c5d359");
+/// assert_eq!(native_req.value_atomic().unwrap().to_string(), "1000000000000000000");
+/// ```
+#[derive(Debug)]
+pub struct NativeRequest {
+    chain_id: Option<u64>,
+    recipient_address: String,
+    inner: RawTransactionRequest,
+}
+
+impl TryFrom<&RawTransactionRequest> for NativeRequest {
+    type Error = NativeTransferError;
+
+    fn try_from(raw: &RawTransactionRequest) -> Result<Self, Self::Error> {
+        // A notive request cannot have a function name
+        ensure!(raw.function_name.is_none(), HasFunctionNameSnafu);
+        // A native request cannot have ABI parameters
+        ensure!(
+            raw.parameters.abi_parameters().next().is_none(),
+            HasAbiParametersSnafu
+        );
+
+        for p in raw.parameters.iter() {
+            let v = p.value();
+            let n = v
+                .as_number()
+                .context(ParameterNotNumberSnafu { key: p.key() })?;
+            let _uint256 = n
+                .as_uint256()
+                .context(ParameterInvalidSnafu { key: p.key() })?;
+        }
+
+        Ok(NativeRequest {
+            chain_id: if let Some(chain_id_digits) = raw.chain_id.as_ref() {
+                Some(chain_id_digits.as_u64().context(ChainIdInvalidSnafu)?)
+            } else {
+                None
+            },
+            recipient_address: raw
+                .target_address
+                .to_erc55_validated_string()
+                .context(RecipientAddressInvalidSnafu)?,
+            inner: raw.clone(),
+        })
+    }
+}
+
+impl NativeRequest {
+    /// Returns the schema prefix of the request.
+    pub fn schema_prefix(&self) -> &str {
+        self.inner.schema_prefix.prefix()
+    }
+
+    /// Returns the chain ID, if specified.
+    pub fn chain_id(&self) -> Option<u64> {
+        self.chain_id
+    }
+
+    /// Returns the recipient address as a string.
+    ///
+    /// If this address is a 40 character hexadecimal address, it is known at this
+    /// point to be valid according to ERC-55.
+    pub fn recipient_address(&self) -> &str {
+        &self.recipient_address
+    }
+
+    /// Returns the transfer value in atomic units (e.g., wei), if specified.
+    pub fn value_atomic(&self) -> Option<U256> {
+        // Swallowing errors with `??` is ok here as we already validated these parameters
+        // to construct the request.
+        let value = self.inner.parameters.value().ok()??;
+        value.as_uint256().ok()
+    }
+
+    /// Returns the gas limit, if specified.
+    pub fn gas_limit(&self) -> Option<U256> {
+        // Swallowing errors with `??` is ok here as we already validated these parameters
+        // to construct the request.
+        let limit = self.inner.parameters.gas_limit().ok()??;
+        limit.as_uint256().ok()
+    }
+
+    /// Returns the gas price, if specified.
+    pub fn gas_price(&self) -> Option<U256> {
+        // Swallowing errors with `??` is ok here as we already validated these parameters
+        // to construct the request.
+        let price = self.inner.parameters.gas_price().ok()??;
+        price.as_uint256().ok()
+    }
+}
+
+impl core::fmt::Display for NativeRequest {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        self.inner.fmt(f)
+    }
+}
+
+/// An ERC-20 token transfer request.
+///
+/// ERC-20 transfers are EIP-681 URIs with:
+/// - `function_name` == "transfer"
+/// - Exactly two ABI parameters: `address` (recipient) and `uint256` (amount)
+///
+/// # Example
+///
+/// ```rust
+/// use eip681::TransactionRequest;
+///
+/// let examples = [
+///     (
+///         "ethereum:0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/transfer?address=0xfB6916095ca1df60bB79Ce92cE3Ea74c37c5d359&uint256=1000000",
+///         "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+///         "0xfB6916095ca1df60bB79Ce92cE3Ea74c37c5d359",
+///         "1000000"
+///     ),
+///     (
+///         "ethereum:efnx.eth/transfer?address=schellsan.eth&uint256=1000000",
+///         "efnx.eth",
+///         "schellsan.eth",
+///         "1000000"
+///     )
+/// ];
+///
+/// for (request, token_contract_address, recipient, value) in examples {
+///     let req = TransactionRequest::parse(request).unwrap();
+///     let erc20_req = req.as_erc20().unwrap();
+///
+///     assert_eq!(erc20_req.token_contract_address(), token_contract_address);
+///     assert_eq!(erc20_req.recipient_address(), recipient);
+///     assert_eq!(erc20_req.value_atomic().to_string(), value);
+/// }
+/// ```
+#[derive(Debug)]
+pub struct Erc20Request {
+    /// Validated token contract
+    token_contract_address: String,
+    /// Validated recipient
+    recipient: String,
+    /// Validated atomic value
+    value_atomic: U256,
+
+    /// The original parsed request that the validated values
+    /// originated from.
+    inner: RawTransactionRequest,
+}
+
+/// A [`RawTransactionRequest`] may be an [`Erc20Request`].
+///
+/// Conversion requires:
+/// - `function_name` == "transfer"
+/// - Exactly 2 ABI parameters: `address` and `uint256` (and in that order)
+impl TryFrom<&RawTransactionRequest> for Erc20Request {
+    type Error = Error;
+
+    fn try_from(raw: &RawTransactionRequest) -> Result<Self, Self::Error> {
+        // Get the function name and ensure it's "transfer"
+        let fn_name = raw.function_name.as_ref().context(MissingFnSnafu)?;
+        let decoded = fn_name.decode()?;
+        ensure!(
+            decoded == "transfer",
+            FnNameSnafu {
+                seen: decoded.to_string()
+            }
+        );
+
+        // Check ABI parameters - must have exactly address and uint256
+        let abi_params: Vec<_> = raw.parameters.abi_parameters().collect();
+        ensure!(
+            abi_params.len() == 2,
+            AbiParameterLenSnafu {
+                seen: abi_params.len()
+            }
+        );
+
+        // Indexing is safe here because we ensured the length == 2 above
+        let (param1_ty, param1_value) = abi_params[0];
+        let (param2_ty, param2_value) = abi_params[1];
+        let param1 = param1_ty.to_string();
+        let param2 = param2_ty.to_string();
+
+        // We expect a specific parameter count and order
+        ensure!(
+            param1 == "address" && param2 == "uint256",
+            AbiParameterNameSnafu { param1, param2 }
+        );
+
+        Ok(Erc20Request {
+            token_contract_address: raw.target_address.to_erc55_validated_string()?,
+            recipient: param1_value
+                .as_address_or_ens_name()
+                .context(AbiParameterAddressIsNotAnAddressSnafu)?
+                .to_erc55_validated_string()?,
+            value_atomic: param2_value
+                .as_number()
+                .context(AbiParameterUint256Snafu)?
+                .as_uint256()?,
+            inner: raw.clone(),
+        })
+    }
+}
+
+impl Erc20Request {
+    /// Returns the chain ID, if specified.
+    pub fn chain_id(&self) -> Option<u64> {
+        let digits = self.inner.chain_id.as_ref()?;
+        digits.as_u64().ok()
+    }
+
+    /// Returns the ERC-20 token contract address.
+    ///
+    /// If this address is a 40 character hexadecimal address, it is known at this
+    /// point to be valid according to ERC-55.
+    pub fn token_contract_address(&self) -> &str {
+        &self.token_contract_address
+    }
+
+    /// Returns the transfer recipient address.
+    ///
+    /// This is extracted from the `address` parameter in the ERC-20 transfer call.
+    ///
+    /// If this address is a 40 character hexadecimal address, it is known at this
+    /// point to be valid according to ERC-55.
+    pub fn recipient_address(&self) -> &str {
+        &self.recipient
+    }
+
+    /// Returns the transfer value in atomic units.
+    ///
+    /// This is extracted from the `uint256` parameter in the ERC-20 transfer parameters.
+    pub fn value_atomic(&self) -> U256 {
+        self.value_atomic
+    }
+}
+
+impl core::fmt::Display for Erc20Request {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        self.inner.fmt(f)
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn parse_native_transfer() {
+        let input = "ethereum:0xfB6916095ca1df60bB79Ce92cE3Ea74c37c5d359?value=2.014e18";
+        let request = TransactionRequest::parse(input).unwrap();
+
+        match request {
+            TransactionRequest::NativeRequest(native) => {
+                assert_eq!(
+                    native.recipient_address(),
+                    "0xfB6916095ca1df60bB79Ce92cE3Ea74c37c5d359"
+                );
+                assert_eq!(
+                    native.value_atomic(),
+                    Some(U256::from(2014000000000000000u64))
+                );
+            }
+            _ => panic!("Expected NativeRequest"),
+        }
+    }
+
+    #[test]
+    fn parse_erc20_transfer() {
+        let input = "ethereum:0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/transfer?address=0xfB6916095ca1df60bB79Ce92cE3Ea74c37c5d359&uint256=1000000";
+        let request = TransactionRequest::parse(input).unwrap();
+
+        match request {
+            TransactionRequest::Erc20Request(erc20) => {
+                assert_eq!(
+                    erc20.token_contract_address(),
+                    "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"
+                );
+                assert_eq!(
+                    erc20.recipient_address(),
+                    "0xfB6916095ca1df60bB79Ce92cE3Ea74c37c5d359"
+                );
+                assert_eq!(erc20.value_atomic(), U256::from(1000000));
+            }
+            _ => panic!("Expected Erc20Request"),
+        }
+    }
+
+    #[test]
+    fn parse_unrecognised() {
+        // A request with a different function name
+        let input = "ethereum:0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/approve?address=0xfB6916095ca1df60bB79Ce92cE3Ea74c37c5d359&uint256=1000000";
+        let request = TransactionRequest::parse(input).unwrap();
+
+        assert!(matches!(request, TransactionRequest::Unrecognised(_)));
+    }
+
+    #[test]
+    fn display_roundtrip() {
+        let input = "ethereum:0xfB6916095ca1df60bB79Ce92cE3Ea74c37c5d359?value=1e18";
+        let request = TransactionRequest::parse(input).unwrap();
+        let output = request.to_string();
+
+        // Parse the output and verify it produces the same data
+        let reparsed = TransactionRequest::parse(&output).unwrap();
+
+        match (request, reparsed) {
+            (TransactionRequest::NativeRequest(a), TransactionRequest::NativeRequest(b)) => {
+                assert_eq!(a.recipient_address(), b.recipient_address());
+                assert_eq!(a.value_atomic(), b.value_atomic());
+            }
+            _ => panic!("Roundtrip changed request type"),
+        }
+    }
+}

From 2a51c0549fc37bb60e8dffa77170fd3354f8e38b Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Thu, 12 Feb 2026 09:28:19 +1300
Subject: [PATCH 160/263] only compare arbitrary request structure if
 serializations differ

manual Debug impl for HexDigits
---
 components/eip681/src/parse.rs | 38 +++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index fe44fa70aa..a244613fe9 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -213,11 +213,27 @@ impl CaseSensitiveHexDigit {
 /// ```abnf
 /// *HEXDIG
 /// ```
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, PartialEq)]
 pub struct HexDigits {
     places: Vec<CaseSensitiveHexDigit>,
 }
 
+impl std::fmt::Debug for HexDigits {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("HexDigits")
+            .field(
+                "places",
+                &self
+                    .places
+                    .iter()
+                    .map(|digit| digit.to_string())
+                    .collect::<Vec<_>>()
+                    .concat(),
+            )
+            .finish()
+    }
+}
+
 impl core::fmt::Display for HexDigits {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         for n in self.places.iter() {
@@ -1966,8 +1982,17 @@ mod test {
         fn parse_arb_request(expected in arb_request()) {
             let input = expected.to_string();
             let (i, seen) = RawTransactionRequest::parse(&input).unwrap_or_else(|e| panic!("could not parse '{input}': {e}"));
-            pretty_assertions::assert_str_eq!(input, seen.to_string().as_str(), "input: {input}\ni: {i}");
-            pretty_assertions::assert_eq!(expected, seen);
+            if input != seen.to_string().as_str() {
+                pretty_assertions::assert_eq!(
+                    expected,
+                    seen,
+                    "\n\
+                     expected {input}\n\
+                     saw:     {seen}\n\
+                     input: {input}\ni: {i}"
+                );
+                unreachable!("requests with differing serialization should not pass assert_eq");
+             }
         }
     }
 
@@ -2046,4 +2071,11 @@ mod test {
         assert_eq!((1234, 10_000_000), ratio);
         assert_eq!(0.0001234, ratio.0 as f32 / ratio.1 as f32);
     }
+
+    #[test]
+    fn zero_e_zero_number_sanity() {
+        let input = "0e0";
+        let (_, n) = Number::parse(input).unwrap();
+        assert_eq!(n.as_i128().unwrap(), 0);
+    }
 }

From 941ae222c2843e4105353436a1b8a959d1577784 Mon Sep 17 00:00:00 2001
From: Bradley Cushing <bradleycushing@gmail.com>
Date: Fri, 5 Dec 2025 17:59:41 -0500
Subject: [PATCH 161/263] refactor(gap): move gap limits logic into zcash keys

---
 zcash_client_backend/CHANGELOG.md             |   2 +-
 zcash_client_backend/src/data_api/ll.rs       |  22 ++-
 .../src/data_api/ll/wallet.rs                 | 174 ++++++++++++++++--
 zcash_client_backend/src/data_api/testing.rs  |   6 +-
 .../src/data_api/testing/pool.rs              |  21 +--
 .../src/data_api/testing/transparent.rs       |   7 +-
 zcash_client_backend/src/wallet.rs            |   3 -
 zcash_client_memory/src/testing/mod.rs        |   9 +-
 zcash_client_sqlite/CHANGELOG.md              |   4 +-
 zcash_client_sqlite/src/error.rs              |  24 +++
 zcash_client_sqlite/src/lib.rs                | 108 ++++++++---
 zcash_client_sqlite/src/testing/db.rs         |   2 +-
 zcash_client_sqlite/src/wallet/init.rs        |   4 +
 .../init/migrations/tx_retrieval_queue.rs     |   3 +-
 zcash_client_sqlite/src/wallet/transparent.rs |   4 +-
 zcash_keys/src/keys/transparent.rs            |   3 +
 .../src/keys/transparent/gap_limits.rs        |   0
 zcash_keys/src/keys/transparent/wallet.rs     |  36 ++++
 18 files changed, 365 insertions(+), 67 deletions(-)
 rename zcash_client_backend/src/wallet/transparent.rs => zcash_keys/src/keys/transparent/gap_limits.rs (100%)
 create mode 100644 zcash_keys/src/keys/transparent/wallet.rs

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index f1d80bf6b4..8ed19a8913 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -73,7 +73,7 @@ workspace.
 
 ### Removed
 - `zcash_client_backend::data_api::testing::transparent::GapLimits` use
-  `zcash_client_backend::wallet::transparent::GapLimits` instead.
+  `zcash_keys::keys::transparent::GapLimits` instead.
 
 ## [0.21.0] - 2025-11-05
 
diff --git a/zcash_client_backend/src/data_api/ll.rs b/zcash_client_backend/src/data_api/ll.rs
index 7af5e15c94..5da06fb93e 100644
--- a/zcash_client_backend/src/data_api/ll.rs
+++ b/zcash_client_backend/src/data_api/ll.rs
@@ -27,7 +27,7 @@ use zcash_protocol::{
 };
 use zip32::Scope;
 
-use super::{TransactionStatus, wallet::TargetHeight};
+use super::{Account, TransactionStatus, wallet::TargetHeight};
 use crate::{
     DecryptedOutput, TransferType,
     wallet::{Recipient, WalletSaplingOutput, WalletTx},
@@ -124,6 +124,12 @@ pub trait LowLevelWalletRead {
     /// will be interpreted as belonging to that account.
     type AccountId: Copy + Eq + Hash;
 
+    /// A wallet-internal account identifier
+    type AccountRef: Copy + Eq + Hash;
+
+    /// Type of the account with associated capabilities
+    type Account: Account;
+
     /// A wallet-internal transaction identifier.
     type TxRef: Copy + Eq + Hash;
 
@@ -256,6 +262,20 @@ pub trait LowLevelWalletRead {
         &self,
         nf: &::orchard::note::Nullifier,
     ) -> Result<Option<Self::TxRef>, Self::Error>;
+
+    /// Get the ephemeral value for working with accounts in the wallet data store
+    #[cfg(feature = "transparent-inputs")]
+    fn get_account_ref(
+        &self,
+        account_uuid: Self::AccountId,
+    ) -> Result<Self::AccountRef, Self::Error>;
+
+    /// Get the account for an internal account reference
+    #[cfg(feature = "transparent-inputs")]
+    fn get_account_internal(
+        &self,
+        account_id: Self::AccountRef,
+    ) -> Result<Option<Self::Account>, Self::Error>;
 }
 
 /// A capability trait that provides low-level wallet write operations. These operations are used
diff --git a/zcash_client_backend/src/data_api/ll/wallet.rs b/zcash_client_backend/src/data_api/ll/wallet.rs
index 7855257ca5..ea95e82220 100644
--- a/zcash_client_backend/src/data_api/ll/wallet.rs
+++ b/zcash_client_backend/src/data_api/ll/wallet.rs
@@ -29,10 +29,13 @@ use super::{LowLevelWalletRead, LowLevelWalletWrite, TxMeta};
 
 #[cfg(feature = "transparent-inputs")]
 use {
-    crate::wallet::WalletTransparentOutput,
+    crate::{data_api::Account, wallet::WalletTransparentOutput},
     std::collections::HashSet,
     transparent::{bundle::OutPoint, keys::TransparentKeyScope},
-    zcash_keys::keys::{ReceiverRequirement, UnifiedAddressRequest},
+    zcash_keys::keys::{
+        AddressGenerationError, ReceiverRequirement, UnifiedAddressRequest,
+        transparent::{gap_limits::GapLimits, wallet::GapLimitsWalletAccess},
+    },
 };
 
 #[cfg(feature = "orchard")]
@@ -114,6 +117,64 @@ where
 
 /// Errors that can result as a consequence of attemping to insert block data for a sequence of
 /// blocks into the data store.
+#[cfg(feature = "transparent-inputs")]
+pub enum GapAddressesError<SE> {
+    Storage(SE),
+    AddressGeneration(AddressGenerationError),
+    AccountUnknown,
+}
+
+#[cfg(feature = "transparent-inputs")]
+pub fn generate_transparent_gap_addresses<DbT, SE>(
+    wallet_db: &mut DbT,
+    gap_limits: GapLimits,
+    account_id: <DbT as LowLevelWalletRead>::AccountId,
+    key_scope: TransparentKeyScope,
+    request: UnifiedAddressRequest,
+) -> Result<(), GapAddressesError<SE>>
+where
+    DbT: LowLevelWalletWrite<Error = SE>
+        + GapLimitsWalletAccess<Error = SE, AccountRef = <DbT as LowLevelWalletRead>::AccountRef>,
+    DbT::TxRef: Eq + Hash,
+{
+    let account_ref = wallet_db
+        .get_account_ref(account_id)
+        .map_err(GapAddressesError::Storage)?;
+
+    let gap_limit = match key_scope {
+        TransparentKeyScope::EXTERNAL => Ok(gap_limits.external()),
+        TransparentKeyScope::INTERNAL => Ok(gap_limits.internal()),
+        TransparentKeyScope::EPHEMERAL => Ok(gap_limits.ephemeral()),
+        _ => Err(AddressGenerationError::UnsupportedTransparentKeyScope(
+            key_scope,
+        )),
+    }
+    .map_err(GapAddressesError::AddressGeneration)?;
+
+    if let Some(gap_start) = wallet_db
+        .find_gap_start(account_ref, key_scope, gap_limit)
+        .map_err(GapAddressesError::Storage)?
+    {
+        let account = wallet_db
+            .get_account_internal(account_ref)
+            .map_err(GapAddressesError::Storage)?
+            .ok_or(GapAddressesError::AccountUnknown)?;
+        wallet_db
+            .generate_address_range_internal(
+                account_ref,
+                &account.uivk(),
+                account.ufvk(),
+                key_scope,
+                request,
+                gap_start..gap_start.saturating_add(gap_limit),
+                false,
+            )
+            .map_err(GapAddressesError::Storage)?
+    }
+
+    Ok(())
+}
+
 pub enum PutBlocksError<SE, TE> {
     /// Returned if a provided block sequence has gaps.
     NonSequentialBlocks {
@@ -124,6 +185,8 @@ pub enum PutBlocksError<SE, TE> {
     Storage(SE),
     /// Wraps an error produced by [`shardtree`] insertion.
     ShardTree(ShardTreeError<TE>),
+    #[cfg(feature = "transparent-inputs")]
+    GapAddresses(GapAddressesError<SE>),
 }
 
 impl<SE, TE> From<ShardTreeError<TE>> for PutBlocksError<SE, TE> {
@@ -132,6 +195,45 @@ impl<SE, TE> From<ShardTreeError<TE>> for PutBlocksError<SE, TE> {
     }
 }
 
+#[cfg(feature = "transparent-inputs")]
+impl<SE, TE> From<GapAddressesError<SE>> for PutBlocksError<SE, TE> {
+    fn from(value: GapAddressesError<SE>) -> Self {
+        PutBlocksError::GapAddresses(value)
+    }
+}
+
+#[cfg(not(feature = "transparent-inputs"))]
+pub trait PutBlocksDbT<SE, TE, AR>:
+    LowLevelWalletWrite<Error = SE> + WalletCommitmentTrees<Error = TE>
+{
+}
+
+#[cfg(not(feature = "transparent-inputs"))]
+impl<T: LowLevelWalletWrite<Error = SE> + WalletCommitmentTrees<Error = TE>, SE, TE, AR>
+    PutBlocksDbT<SE, TE, AR> for T
+{
+}
+
+#[cfg(feature = "transparent-inputs")]
+pub trait PutBlocksDbT<SE, TE, AR>:
+    LowLevelWalletWrite<Error = SE>
+    + WalletCommitmentTrees<Error = TE>
+    + GapLimitsWalletAccess<Error = SE, AccountRef = AR>
+{
+}
+
+#[cfg(feature = "transparent-inputs")]
+impl<
+    T: LowLevelWalletWrite<Error = SE>
+        + WalletCommitmentTrees<Error = TE>
+        + GapLimitsWalletAccess<Error = SE, AccountRef = AR>,
+    SE,
+    TE,
+    AR,
+> PutBlocksDbT<SE, TE, AR> for T
+{
+}
+
 /// Adds information about a sequence of scanned blocks to the provided data store.
 ///
 /// # Parameters
@@ -143,11 +245,12 @@ impl<SE, TE> From<ShardTreeError<TE>> for PutBlocksError<SE, TE> {
 ///   [`PutBlocksError::NonSequentialBlocks`] will be returned if this invariant is violated.
 pub fn put_blocks<DbT, SE, TE>(
     wallet_db: &mut DbT,
+    #[cfg(feature = "transparent-inputs")] gap_limits: GapLimits,
     from_state: &ChainState,
-    blocks: Vec<ScannedBlock<DbT::AccountId>>,
+    blocks: Vec<ScannedBlock<<DbT as LowLevelWalletRead>::AccountId>>,
 ) -> Result<(), PutBlocksError<SE, TE>>
 where
-    DbT: LowLevelWalletWrite<Error = SE> + WalletCommitmentTrees<Error = TE>,
+    DbT: PutBlocksDbT<SE, TE, <DbT as LowLevelWalletRead>::AccountRef>,
     DbT::TxRef: Eq + Hash,
 {
     struct BlockPositions {
@@ -330,13 +433,14 @@ where
     {
         if let Some(t_key_scope) = key_scope {
             use ReceiverRequirement::*;
-            wallet_db
-                .generate_transparent_gap_addresses(
-                    account_id,
-                    t_key_scope,
-                    UnifiedAddressRequest::unsafe_custom(Allow, Allow, Require),
-                )
-                .map_err(PutBlocksError::Storage)?;
+            generate_transparent_gap_addresses(
+                wallet_db,
+                gap_limits,
+                account_id,
+                t_key_scope,
+                UnifiedAddressRequest::unsafe_custom(Allow, Allow, Require),
+            )
+            .map_err(PutBlocksError::GapAddresses)?;
         }
     }
 
@@ -569,6 +673,43 @@ where
     Ok(())
 }
 
+#[cfg(not(feature = "transparent-inputs"))]
+type GapError<DbT> = <DbT as LowLevelWalletRead>::Error;
+
+#[cfg(not(feature = "transparent-inputs"))]
+pub trait StoreDecryptedTxDbT: LowLevelWalletWrite {}
+
+#[cfg(not(feature = "transparent-inputs"))]
+impl<T: LowLevelWalletWrite> StoreDecryptedTxDbT for T {}
+
+#[cfg(feature = "transparent-inputs")]
+type GapError<DbT> = GapAddressesError<<DbT as LowLevelWalletRead>::Error>;
+
+#[cfg(feature = "transparent-inputs")]
+pub trait StoreDecryptedTxDbT:
+    LowLevelWalletWrite
+    + GapLimitsWalletAccess<
+        Error = <Self as LowLevelWalletRead>::Error,
+        AccountRef = <Self as LowLevelWalletRead>::AccountRef,
+    >
+where
+    <Self as LowLevelWalletRead>::Error: From<GapError<Self>>,
+{
+}
+
+#[cfg(feature = "transparent-inputs")]
+impl<
+    T: LowLevelWalletWrite
+        + GapLimitsWalletAccess<
+            Error = <T as LowLevelWalletRead>::Error,
+            AccountRef = <T as LowLevelWalletRead>::AccountRef,
+        >,
+> StoreDecryptedTxDbT for T
+where
+    <T as LowLevelWalletRead>::Error: From<GapError<T>>,
+{
+}
+
 /// Persists a decrypted transaction to the wallet database.
 ///
 /// This function stores a transaction that has been decrypted by the wallet, including:
@@ -594,13 +735,14 @@ where
 pub fn store_decrypted_tx<DbT, P>(
     wallet_db: &mut DbT,
     params: &P,
+    #[cfg(feature = "transparent-inputs")] gap_limits: GapLimits,
     chain_tip_height: BlockHeight,
     d_tx: DecryptedTransaction<Transaction, <DbT as LowLevelWalletRead>::AccountId>,
 ) -> Result<(), <DbT as LowLevelWalletRead>::Error>
 where
-    DbT: LowLevelWalletWrite,
-    DbT::AccountId: core::fmt::Debug,
-    DbT::Error: From<BalanceError>,
+    DbT: StoreDecryptedTxDbT,
+    <DbT as LowLevelWalletRead>::AccountId: core::fmt::Debug,
+    <DbT as LowLevelWalletRead>::Error: From<BalanceError> + From<GapError<DbT>>,
     P: consensus::Parameters,
 {
     let funding_accounts = wallet_db.get_funding_accounts(d_tx.tx())?;
@@ -760,7 +902,9 @@ where
     #[cfg(feature = "transparent-inputs")]
     for (account_id, key_scope) in gap_update_set {
         use ReceiverRequirement::*;
-        wallet_db.generate_transparent_gap_addresses(
+        generate_transparent_gap_addresses(
+            wallet_db,
+            gap_limits,
             account_id,
             key_scope,
             UnifiedAddressRequest::unsafe_custom(Allow, Allow, Require),
diff --git a/zcash_client_backend/src/data_api/testing.rs b/zcash_client_backend/src/data_api/testing.rs
index af787d4738..83b6f58736 100644
--- a/zcash_client_backend/src/data_api/testing.rs
+++ b/zcash_client_backend/src/data_api/testing.rs
@@ -75,11 +75,9 @@ use crate::{
 #[cfg(feature = "transparent-inputs")]
 use {
     super::{TransactionsInvolvingAddress, wallet::input_selection::ShieldingSelector},
-    crate::{
-        data_api::Balance,
-        wallet::{TransparentAddressMetadata, transparent::GapLimits},
-    },
+    crate::{data_api::Balance, wallet::TransparentAddressMetadata},
     ::transparent::{address::TransparentAddress, keys::TransparentKeyScope},
+    zcash_keys::keys::transparent::gap_limits::GapLimits,
 };
 
 #[cfg(feature = "orchard")]
diff --git a/zcash_client_backend/src/data_api/testing/pool.rs b/zcash_client_backend/src/data_api/testing/pool.rs
index 7892028205..0f7ead518c 100644
--- a/zcash_client_backend/src/data_api/testing/pool.rs
+++ b/zcash_client_backend/src/data_api/testing/pool.rs
@@ -1019,10 +1019,8 @@ pub fn spend_everything_multi_step_single_note_proposed_transfer<T: ShieldedPool
     Dsf: DataStoreFactory,
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    use crate::{
-        data_api::{MaxSpendMode, OutputOfSentTx},
-        wallet::transparent::GapLimits,
-    };
+    use crate::data_api::{MaxSpendMode, OutputOfSentTx};
+    use zcash_keys::keys::transparent::gap_limits::GapLimits;
 
     let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache)
         .map(|builder| builder.with_gap_limits(GapLimits::new(10, 5, 3)))
@@ -1179,7 +1177,8 @@ pub fn spend_everything_multi_step_many_notes_proposed_transfer<T: ShieldedPoolT
     Dsf: DataStoreFactory,
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    use crate::{data_api::OutputOfSentTx, wallet::transparent::GapLimits};
+    use crate::data_api::OutputOfSentTx;
+    use zcash_keys::keys::transparent::gap_limits::GapLimits;
 
     let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache)
         .map(|builder| builder.with_gap_limits(GapLimits::new(10, 5, 3)))
@@ -1333,10 +1332,8 @@ pub fn spend_everything_multi_step_with_marginal_notes_proposed_transfer<
     Dsf: DataStoreFactory,
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    use crate::{
-        data_api::{MaxSpendMode, OutputOfSentTx},
-        wallet::transparent::GapLimits,
-    };
+    use crate::data_api::{MaxSpendMode, OutputOfSentTx};
+    use zcash_keys::keys::transparent::gap_limits::GapLimits;
 
     let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache)
         .map(|builder| builder.with_gap_limits(GapLimits::new(10, 5, 3)))
@@ -1653,8 +1650,9 @@ pub fn send_multi_step_proposed_transfer<T: ShieldedPoolTester, Dsf>(
 {
     use crate::{
         data_api::{OutputOfSentTx, TransactionStatus},
-        wallet::{Exposure, TransparentAddressSource, transparent::GapLimits},
+        wallet::{Exposure, TransparentAddressSource},
     };
+    use zcash_keys::keys::transparent::gap_limits::GapLimits;
 
     let gap_limits = GapLimits::new(10, 5, 3);
     let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache)
@@ -2157,7 +2155,8 @@ pub fn spend_all_funds_multi_step_proposed_transfer<T: ShieldedPoolTester, Dsf>(
     Dsf: DataStoreFactory,
     <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
 {
-    use crate::{data_api::OutputOfSentTx, wallet::transparent::GapLimits};
+    use crate::data_api::OutputOfSentTx;
+    use zcash_keys::keys::transparent::gap_limits::GapLimits;
 
     let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache)
         .map(|builder| builder.with_gap_limits(GapLimits::new(10, 5, 3)))
diff --git a/zcash_client_backend/src/data_api/testing/transparent.rs b/zcash_client_backend/src/data_api/testing/transparent.rs
index 35776aad15..71d817148b 100644
--- a/zcash_client_backend/src/data_api/testing/transparent.rs
+++ b/zcash_client_backend/src/data_api/testing/transparent.rs
@@ -7,7 +7,10 @@ use ::transparent::{
     bundle::{OutPoint, TxOut},
 };
 use sapling::zip32::ExtendedSpendingKey;
-use zcash_keys::{address::Address, keys::UnifiedAddressRequest};
+use zcash_keys::{
+    address::Address,
+    keys::{UnifiedAddressRequest, transparent::gap_limits::GapLimits},
+};
 use zcash_primitives::block::BlockHash;
 use zcash_protocol::{local_consensus::LocalNetwork, value::Zatoshis};
 
@@ -24,7 +27,7 @@ use crate::{
         },
     },
     fees::{DustOutputPolicy, StandardFeeRule, standard},
-    wallet::{WalletTransparentOutput, transparent::GapLimits},
+    wallet::WalletTransparentOutput,
 };
 
 /// Checks whether the transparent balance of the given test `account` is as `expected`
diff --git a/zcash_client_backend/src/wallet.rs b/zcash_client_backend/src/wallet.rs
index 980b723591..42fe6ab3a5 100644
--- a/zcash_client_backend/src/wallet.rs
+++ b/zcash_client_backend/src/wallet.rs
@@ -30,9 +30,6 @@ use {
     std::time::SystemTime,
 };
 
-#[cfg(feature = "transparent-inputs")]
-pub mod transparent;
-
 /// A unique identifier for a shielded transaction output
 #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct NoteId {
diff --git a/zcash_client_memory/src/testing/mod.rs b/zcash_client_memory/src/testing/mod.rs
index 0b5d094e09..8d70db711e 100644
--- a/zcash_client_memory/src/testing/mod.rs
+++ b/zcash_client_memory/src/testing/mod.rs
@@ -23,9 +23,12 @@ use shardtree::store::ShardStore;
 use crate::{Account, AccountId, Error, MemBlockCache, MemoryWalletDb, SentNoteId};
 
 #[cfg(feature = "transparent-inputs")]
-use zcash_client_backend::{
-    data_api::{InputSource, WalletRead, wallet::TargetHeight},
-    wallet::{WalletTransparentOutput, transparent::GapLimits},
+use {
+    zcash_client_backend::{
+        data_api::{InputSource, WalletRead, wallet::TargetHeight},
+        wallet::WalletTransparentOutput,
+    },
+    zcash_keys::keys::transparent::gap_limits::GapLimits,
 };
 
 pub mod pool;
diff --git a/zcash_client_sqlite/CHANGELOG.md b/zcash_client_sqlite/CHANGELOG.md
index f790db575b..8576f40ee9 100644
--- a/zcash_client_sqlite/CHANGELOG.md
+++ b/zcash_client_sqlite/CHANGELOG.md
@@ -25,10 +25,10 @@ workspace.
 
 ### Changed
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`.
+- `zcash_client_sqlite::error::SqliteClientError` has added variant `GapAddresses`.
 
 ### Removed
-- `zcash_client_sqlite::GapLimits` use
-  `zcash_client_backend::wallet::transparent::GapLimits` instead.
+- `zcash_client_sqlite::GapLimits` use `zcash_keys::keys::transparent::GapLimits` instead.
 - `zcash_client_sqlite::UtxoId` contents are now private.
 
 ## [0.18.11, 0.19.2] - 2026-01-30
diff --git a/zcash_client_sqlite/src/error.rs b/zcash_client_sqlite/src/error.rs
index 1254f513d6..93d7d06a03 100644
--- a/zcash_client_sqlite/src/error.rs
+++ b/zcash_client_sqlite/src/error.rs
@@ -26,6 +26,7 @@ use crate::{
 use {
     crate::wallet::transparent::SchedulingError,
     ::transparent::{address::TransparentAddress, keys::TransparentKeyScope},
+    zcash_client_backend::data_api::ll::wallet::GapAddressesError,
     zcash_keys::encoding::TransparentCodecError,
 };
 
@@ -166,6 +167,9 @@ pub enum SqliteClientError {
         actual: BlockHeight,
     },
 
+    #[cfg(feature = "transparent-inputs")]
+    GapAddresses,
+
     /// An attempt to import a transparent pubkey failed because that pubkey had already been
     /// imported to a different account.
     #[cfg(feature = "transparent-key-import")]
@@ -185,6 +189,17 @@ impl error::Error for SqliteClientError {
     }
 }
 
+#[cfg(feature = "transparent-inputs")]
+impl From<GapAddressesError<SqliteClientError>> for SqliteClientError {
+    fn from(err: GapAddressesError<SqliteClientError>) -> Self {
+        match err {
+            GapAddressesError::Storage(e) => e,
+            GapAddressesError::AddressGeneration(e) => SqliteClientError::AddressGeneration(e),
+            GapAddressesError::AccountUnknown => SqliteClientError::AccountUnknown,
+        }
+    }
+}
+
 impl fmt::Display for SqliteClientError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match &self {
@@ -287,6 +302,13 @@ impl fmt::Display for SqliteClientError {
                     u128::from(*i)
                 )
             }
+            #[cfg(feature = "transparent-inputs")]
+            SqliteClientError::GapAddresses => {
+                write!(
+                    f,
+                    "An error occured while generating a transparent gap addresses"
+                )
+            }
             SqliteClientError::AddressReuse(address_str, txids) => {
                 write!(
                     f,
@@ -397,6 +419,8 @@ impl From<PutBlocksError<SqliteClientError, commitment_tree::Error>> for SqliteC
             }
             ll::wallet::PutBlocksError::Storage(e) => e,
             ll::wallet::PutBlocksError::ShardTree(e) => SqliteClientError::from(e),
+            #[cfg(feature = "transparent-inputs")]
+            ll::wallet::PutBlocksError::GapAddresses(e) => SqliteClientError::from(e),
         }
     }
 }
diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs
index 785180f1b8..4965bb22c1 100644
--- a/zcash_client_sqlite/src/lib.rs
+++ b/zcash_client_sqlite/src/lib.rs
@@ -1,5 +1,3 @@
-//! *An SQLite-based Zcash light client.*
-//!
 //! `zcash_client_sqlite` contains complete SQLite-based implementations of the [`WalletRead`],
 //! [`WalletWrite`], and [`BlockSource`] traits from the [`zcash_client_backend`] crate. In
 //! combination with [`zcash_client_backend`], it provides a full implementation of a SQLite-backed
@@ -37,8 +35,6 @@ use nonempty::NonEmpty;
 use rand::RngCore;
 use secrecy::{ExposeSecret, SecretVec};
 use shardtree::{ShardTree, error::ShardTreeError, store::ShardStore};
-#[cfg(feature = "transparent-inputs")]
-use std::collections::HashSet;
 use std::{
     borrow::{Borrow, BorrowMut},
     cmp::{max, min},
@@ -114,12 +110,21 @@ use {
         bundle::OutPoint,
         keys::{NonHardenedChildIndex, TransparentKeyScope},
     },
-    std::time::SystemTime,
+    std::{collections::HashSet, time::SystemTime},
     zcash_client_backend::{
-        data_api::{Balance, TransactionsInvolvingAddress, WalletUtxo},
-        wallet::{TransparentAddressMetadata, transparent::GapLimits},
+        data_api::{
+            Balance, TransactionsInvolvingAddress, WalletUtxo,
+            ll::wallet::generate_transparent_gap_addresses,
+        },
+        wallet::TransparentAddressMetadata,
+    },
+    zcash_keys::{
+        encoding::AddressCodec,
+        keys::{
+            UnifiedIncomingViewingKey,
+            transparent::{gap_limits::GapLimits, wallet::GapLimitsWalletAccess},
+        },
     },
-    zcash_keys::encoding::AddressCodec,
 };
 
 #[cfg(any(test, feature = "test-dependencies"))]
@@ -222,7 +227,7 @@ impl AccountUuid {
 /// This is an ephemeral value for efficiently and generically working with accounts in a
 /// [`WalletDb`]. To reference accounts in external contexts, use [`AccountUuid`].
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Default, PartialOrd, Ord, Hash)]
-pub(crate) struct AccountRef(i64);
+pub struct AccountRef(i64);
 
 /// This implementation is retained under `#[cfg(test)]` for pre-AccountUuid testing.
 #[cfg(test)]
@@ -1379,7 +1384,11 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
     ) -> Result<(), Self::Error> {
         self.transactionally(|wdb| {
             ll::wallet::put_blocks::<_, SqliteClientError, commitment_tree::Error>(
-                wdb, from_state, blocks,
+                wdb,
+                #[cfg(feature = "transparent-inputs")]
+                wdb.gap_limits,
+                from_state,
+                blocks,
             )
             .map_err(SqliteClientError::from)
         })
@@ -1428,7 +1437,14 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
         self.transactionally(|wdb| {
             let chain_tip = wallet::chain_tip_height(wdb.conn.borrow())?
                 .ok_or(SqliteClientError::ChainHeightUnknown)?;
-            store_decrypted_tx(wdb, wdb.params, chain_tip, d_tx)
+            store_decrypted_tx(
+                wdb,
+                wdb.params,
+                #[cfg(feature = "transparent-inputs")]
+                wdb.gap_limits,
+                chain_tip,
+                d_tx,
+            )
         })
     }
 
@@ -1553,6 +1569,8 @@ impl<'a, C: Borrow<rusqlite::Transaction<'a>>, P: consensus::Parameters, CL: Clo
     LowLevelWalletRead for WalletDb<C, P, CL, R>
 {
     type AccountId = AccountUuid;
+    type AccountRef = AccountRef;
+    type Account = wallet::Account;
     type Error = SqliteClientError;
     type TxRef = TxRef;
 
@@ -1652,6 +1670,22 @@ impl<'a, C: Borrow<rusqlite::Transaction<'a>>, P: consensus::Parameters, CL: Clo
             &nf.to_bytes(),
         )
     }
+
+    #[cfg(feature = "transparent-inputs")]
+    fn get_account_ref(
+        &self,
+        account_uuid: Self::AccountId,
+    ) -> Result<Self::AccountRef, Self::Error> {
+        wallet::get_account_ref(self.conn.borrow(), account_uuid)
+    }
+
+    #[cfg(feature = "transparent-inputs")]
+    fn get_account_internal(
+        &self,
+        account_id: Self::AccountRef,
+    ) -> Result<Option<wallet::Account>, SqliteClientError> {
+        wallet::get_account_internal(self.conn.borrow(), &self.params, account_id)
+    }
 }
 
 impl<'a, C: Borrow<rusqlite::Transaction<'a>>, P: consensus::Parameters, CL: Clock, R: RngCore>
@@ -1882,16 +1916,8 @@ impl<'a, C: Borrow<rusqlite::Transaction<'a>>, P: consensus::Parameters, CL: Clo
         key_scope: TransparentKeyScope,
         request: UnifiedAddressRequest,
     ) -> Result<(), Self::Error> {
-        let account_ref = wallet::get_account_ref(self.conn.borrow(), account_id)?;
-        wallet::transparent::generate_gap_addresses(
-            self.conn.borrow(),
-            &self.params,
-            &self.gap_limits,
-            account_ref,
-            key_scope,
-            request,
-            false,
-        )
+        generate_transparent_gap_addresses(self, self.gap_limits, account_id, key_scope, request)?;
+        Ok(())
     }
 
     #[cfg(feature = "transparent-inputs")]
@@ -2150,6 +2176,46 @@ impl<P: consensus::Parameters, CL, R> WalletCommitmentTrees
     }
 }
 
+#[cfg(feature = "transparent-inputs")]
+impl<'a, C: Borrow<rusqlite::Transaction<'a>>, P: consensus::Parameters, CL: Clock, R: RngCore>
+    GapLimitsWalletAccess for WalletDb<C, P, CL, R>
+{
+    type Error = SqliteClientError;
+    type AccountRef = AccountRef;
+
+    fn find_gap_start(
+        &self,
+        account_ref: Self::AccountRef,
+        key_scope: TransparentKeyScope,
+        gap_limit: u32,
+    ) -> Result<Option<NonHardenedChildIndex>, Self::Error> {
+        wallet::transparent::find_gap_start(self.conn.borrow(), account_ref, key_scope, gap_limit)
+    }
+
+    fn generate_address_range_internal(
+        &self,
+        account_id: Self::AccountRef,
+        account_uivk: &UnifiedIncomingViewingKey,
+        account_ufvk: Option<&UnifiedFullViewingKey>,
+        key_scope: TransparentKeyScope,
+        request: UnifiedAddressRequest,
+        range_to_store: Range<NonHardenedChildIndex>,
+        require_key: bool,
+    ) -> Result<(), Self::Error> {
+        wallet::transparent::generate_address_range_internal(
+            self.conn.borrow(),
+            &self.params,
+            account_id,
+            account_uivk,
+            account_ufvk,
+            key_scope,
+            request,
+            range_to_store,
+            require_key,
+        )
+    }
+}
+
 /// A handle for the SQLite block source.
 pub struct BlockDb(rusqlite::Connection);
 
diff --git a/zcash_client_sqlite/src/testing/db.rs b/zcash_client_sqlite/src/testing/db.rs
index 49950cc9f2..bd1cbf0c06 100644
--- a/zcash_client_sqlite/src/testing/db.rs
+++ b/zcash_client_sqlite/src/testing/db.rs
@@ -51,7 +51,7 @@ use {
         keys::{NonHardenedChildIndex, TransparentKeyScope},
     },
     core::ops::Range,
-    zcash_client_backend::wallet::transparent::GapLimits,
+    zcash_keys::keys::transparent::gap_limits::GapLimits,
 };
 
 /// Tuesday, 25 February 2025 00:00:00Z (the day the clock code was added).
diff --git a/zcash_client_sqlite/src/wallet/init.rs b/zcash_client_sqlite/src/wallet/init.rs
index 2737bc0147..eaff14d8f0 100644
--- a/zcash_client_sqlite/src/wallet/init.rs
+++ b/zcash_client_sqlite/src/wallet/init.rs
@@ -212,6 +212,10 @@ fn sqlite_client_error_to_wallet_migration_error(e: SqliteClientError) -> Wallet
         SqliteClientError::AccountUnknown => {
             unreachable!("all accounts are known in migration context")
         }
+        #[cfg(feature = "transparent-inputs")]
+        SqliteClientError::GapAddresses => {
+            unreachable!("we don't deal with gap addresses in migrations")
+        }
         SqliteClientError::UnknownZip32Derivation => {
             unreachable!("we don't call methods that require operating on imported accounts")
         }
diff --git a/zcash_client_sqlite/src/wallet/init/migrations/tx_retrieval_queue.rs b/zcash_client_sqlite/src/wallet/init/migrations/tx_retrieval_queue.rs
index 5f0cfc8f44..e0c42f1323 100644
--- a/zcash_client_sqlite/src/wallet/init/migrations/tx_retrieval_queue.rs
+++ b/zcash_client_sqlite/src/wallet/init/migrations/tx_retrieval_queue.rs
@@ -5,8 +5,6 @@ use schemerz_rusqlite::RusqliteMigration;
 use std::collections::HashSet;
 use uuid::Uuid;
 
-#[cfg(feature = "transparent-inputs")]
-use zcash_primitives::transaction::Transaction;
 use zcash_primitives::transaction::builder::DEFAULT_TX_EXPIRY_DELTA;
 use zcash_protocol::consensus;
 
@@ -31,6 +29,7 @@ use {
     transparent::address::TransparentAddress,
     zcash_client_backend::data_api::DecryptedTransaction,
     zcash_keys::encoding::AddressCodec,
+    zcash_primitives::transaction::Transaction,
     zcash_protocol::{
         TxId,
         consensus::{BlockHeight, BranchId},
diff --git a/zcash_client_sqlite/src/wallet/transparent.rs b/zcash_client_sqlite/src/wallet/transparent.rs
index cd97c1fb9a..5a1970739a 100644
--- a/zcash_client_sqlite/src/wallet/transparent.rs
+++ b/zcash_client_sqlite/src/wallet/transparent.rs
@@ -22,7 +22,6 @@ use transparent::{
 };
 use zcash_address::unified::{Ivk, Typecode, Uivk};
 use zcash_client_backend::data_api::WalletUtxo;
-use zcash_client_backend::wallet::transparent::GapLimits;
 use zcash_client_backend::wallet::{Exposure, GapMetadata, TransparentAddressSource};
 use zcash_client_backend::{
     data_api::{
@@ -32,6 +31,7 @@ use zcash_client_backend::{
     },
     wallet::{TransparentAddressMetadata, WalletTransparentOutput},
 };
+use zcash_keys::keys::transparent::gap_limits::GapLimits;
 use zcash_keys::{
     address::Address,
     encoding::AddressCodec,
@@ -624,6 +624,8 @@ pub(crate) fn generate_external_address(
 ///
 /// [`WalletWrite::get_next_available_address`]: zcash_client_backend::data_api::WalletWrite::get_next_available_address
 /// [`WalletWrite::get_address_for_index`]: zcash_client_backend::data_api::WalletWrite::get_address_for_index
+// We could remove this and many children if we're able to
+// call what's shared from zcash_client_backend in this codebase
 pub(crate) fn generate_address_range<P: consensus::Parameters>(
     conn: &rusqlite::Transaction,
     params: &P,
diff --git a/zcash_keys/src/keys/transparent.rs b/zcash_keys/src/keys/transparent.rs
index 938f348e91..d2905f29a0 100644
--- a/zcash_keys/src/keys/transparent.rs
+++ b/zcash_keys/src/keys/transparent.rs
@@ -10,6 +10,9 @@ use secp256k1::{PublicKey, Secp256k1, SecretKey, Signing};
 use secrecy::{ExposeSecret, SecretString, SecretVec, Zeroize, zeroize::ZeroizeOnDrop};
 use zcash_protocol::consensus::NetworkConstants;
 
+pub mod gap_limits;
+pub mod wallet;
+
 /// Errors that can occur in the parsing of Bitcoin-style base58-encoded secret key material
 #[derive(Debug)]
 pub enum ParseError {
diff --git a/zcash_client_backend/src/wallet/transparent.rs b/zcash_keys/src/keys/transparent/gap_limits.rs
similarity index 100%
rename from zcash_client_backend/src/wallet/transparent.rs
rename to zcash_keys/src/keys/transparent/gap_limits.rs
diff --git a/zcash_keys/src/keys/transparent/wallet.rs b/zcash_keys/src/keys/transparent/wallet.rs
new file mode 100644
index 0000000000..852b908567
--- /dev/null
+++ b/zcash_keys/src/keys/transparent/wallet.rs
@@ -0,0 +1,36 @@
+use crate::keys::{UnifiedAddressRequest, UnifiedFullViewingKey, UnifiedIncomingViewingKey};
+use core::{hash::Hash, ops::Range};
+use transparent::keys::{NonHardenedChildIndex, TransparentKeyScope};
+
+#[cfg(feature = "transparent-inputs")]
+pub trait GapLimitsWalletAccess {
+    /// The type of query error
+    type Error;
+
+    /// A wallet-internal account identifier
+    type AccountRef: Copy + Eq + Hash;
+
+    /// Returns the transparent address index at the start of the first gap of at least `gap_limit`
+    /// indices in the given account, considering only addresses derived for the specified key scope.
+    ///
+    /// Returns `Ok(None)` if the gap would start at an index greater than the maximum valid
+    /// non-hardened transparent child index.
+    fn find_gap_start(
+        &self,
+        account_ref: Self::AccountRef,
+        key_scope: TransparentKeyScope,
+        gap_limit: u32,
+    ) -> Result<Option<NonHardenedChildIndex>, Self::Error>;
+
+    #[allow(clippy::too_many_arguments)]
+    fn generate_address_range_internal(
+        &self,
+        account_id: Self::AccountRef,
+        account_uivk: &UnifiedIncomingViewingKey,
+        account_ufvk: Option<&UnifiedFullViewingKey>,
+        key_scope: TransparentKeyScope,
+        request: UnifiedAddressRequest,
+        range_to_store: Range<NonHardenedChildIndex>,
+        require_key: bool,
+    ) -> Result<(), Self::Error>;
+}

From e98e75bcb45cf815363f81a44c56dc550533e979 Mon Sep 17 00:00:00 2001
From: Bradley Cushing <bradleycushing@gmail.com>
Date: Sun, 7 Dec 2025 14:38:01 -0500
Subject: [PATCH 162/263] refactor(gap): call shared gap limits logic in zcash
 keys

---
 .../src/data_api/ll/wallet.rs                 | 57 +++++++------------
 zcash_client_sqlite/src/error.rs              |  5 +-
 zcash_client_sqlite/src/lib.rs                |  4 +-
 zcash_client_sqlite/src/wallet/transparent.rs | 13 +----
 zcash_keys/src/keys/transparent/gap_limits.rs |  3 +
 .../src/keys/transparent/gap_limits/wallet.rs | 52 +++++++++++++++++
 zcash_keys/src/keys/transparent/wallet.rs     |  2 +-
 7 files changed, 84 insertions(+), 52 deletions(-)
 create mode 100644 zcash_keys/src/keys/transparent/gap_limits/wallet.rs

diff --git a/zcash_client_backend/src/data_api/ll/wallet.rs b/zcash_client_backend/src/data_api/ll/wallet.rs
index ea95e82220..b35cc2e2e3 100644
--- a/zcash_client_backend/src/data_api/ll/wallet.rs
+++ b/zcash_client_backend/src/data_api/ll/wallet.rs
@@ -33,8 +33,11 @@ use {
     std::collections::HashSet,
     transparent::{bundle::OutPoint, keys::TransparentKeyScope},
     zcash_keys::keys::{
-        AddressGenerationError, ReceiverRequirement, UnifiedAddressRequest,
-        transparent::{gap_limits::GapLimits, wallet::GapLimitsWalletAccess},
+        ReceiverRequirement, UnifiedAddressRequest,
+        transparent::{
+            gap_limits::{self, GapLimits, wallet::GapAddressesError},
+            wallet::GapLimitsWalletAccess,
+        },
     },
 };
 
@@ -117,13 +120,6 @@ where
 
 /// Errors that can result as a consequence of attemping to insert block data for a sequence of
 /// blocks into the data store.
-#[cfg(feature = "transparent-inputs")]
-pub enum GapAddressesError<SE> {
-    Storage(SE),
-    AddressGeneration(AddressGenerationError),
-    AccountUnknown,
-}
-
 #[cfg(feature = "transparent-inputs")]
 pub fn generate_transparent_gap_addresses<DbT, SE>(
     wallet_db: &mut DbT,
@@ -141,36 +137,21 @@ where
         .get_account_ref(account_id)
         .map_err(GapAddressesError::Storage)?;
 
-    let gap_limit = match key_scope {
-        TransparentKeyScope::EXTERNAL => Ok(gap_limits.external()),
-        TransparentKeyScope::INTERNAL => Ok(gap_limits.internal()),
-        TransparentKeyScope::EPHEMERAL => Ok(gap_limits.ephemeral()),
-        _ => Err(AddressGenerationError::UnsupportedTransparentKeyScope(
-            key_scope,
-        )),
-    }
-    .map_err(GapAddressesError::AddressGeneration)?;
-
-    if let Some(gap_start) = wallet_db
-        .find_gap_start(account_ref, key_scope, gap_limit)
+    let account = wallet_db
+        .get_account_internal(account_ref)
         .map_err(GapAddressesError::Storage)?
-    {
-        let account = wallet_db
-            .get_account_internal(account_ref)
-            .map_err(GapAddressesError::Storage)?
-            .ok_or(GapAddressesError::AccountUnknown)?;
-        wallet_db
-            .generate_address_range_internal(
-                account_ref,
-                &account.uivk(),
-                account.ufvk(),
-                key_scope,
-                request,
-                gap_start..gap_start.saturating_add(gap_limit),
-                false,
-            )
-            .map_err(GapAddressesError::Storage)?
-    }
+        .ok_or(GapAddressesError::AccountUnknown)?;
+
+    gap_limits::wallet::generate_gap_addresses(
+        wallet_db,
+        &gap_limits,
+        account_ref,
+        &account.uivk(),
+        account.ufvk(),
+        key_scope,
+        request,
+        false,
+    )?;
 
     Ok(())
 }
diff --git a/zcash_client_sqlite/src/error.rs b/zcash_client_sqlite/src/error.rs
index 93d7d06a03..ffdcdf77a3 100644
--- a/zcash_client_sqlite/src/error.rs
+++ b/zcash_client_sqlite/src/error.rs
@@ -26,8 +26,9 @@ use crate::{
 use {
     crate::wallet::transparent::SchedulingError,
     ::transparent::{address::TransparentAddress, keys::TransparentKeyScope},
-    zcash_client_backend::data_api::ll::wallet::GapAddressesError,
-    zcash_keys::encoding::TransparentCodecError,
+    zcash_keys::{
+        encoding::TransparentCodecError, keys::transparent::gap_limits::wallet::GapAddressesError,
+    },
 };
 
 /// The primary error type for the SQLite wallet backend.
diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs
index 4965bb22c1..70dca02ee8 100644
--- a/zcash_client_sqlite/src/lib.rs
+++ b/zcash_client_sqlite/src/lib.rs
@@ -1,3 +1,5 @@
+//! *An SQLite-based Zcash light client.*
+//!
 //! `zcash_client_sqlite` contains complete SQLite-based implementations of the [`WalletRead`],
 //! [`WalletWrite`], and [`BlockSource`] traits from the [`zcash_client_backend`] crate. In
 //! combination with [`zcash_client_backend`], it provides a full implementation of a SQLite-backed
@@ -2192,7 +2194,7 @@ impl<'a, C: Borrow<rusqlite::Transaction<'a>>, P: consensus::Parameters, CL: Clo
         wallet::transparent::find_gap_start(self.conn.borrow(), account_ref, key_scope, gap_limit)
     }
 
-    fn generate_address_range_internal(
+    fn generate_address_range(
         &self,
         account_id: Self::AccountRef,
         account_uivk: &UnifiedIncomingViewingKey,
diff --git a/zcash_client_sqlite/src/wallet/transparent.rs b/zcash_client_sqlite/src/wallet/transparent.rs
index 5a1970739a..7977a20864 100644
--- a/zcash_client_sqlite/src/wallet/transparent.rs
+++ b/zcash_client_sqlite/src/wallet/transparent.rs
@@ -624,8 +624,6 @@ pub(crate) fn generate_external_address(
 ///
 /// [`WalletWrite::get_next_available_address`]: zcash_client_backend::data_api::WalletWrite::get_next_available_address
 /// [`WalletWrite::get_address_for_index`]: zcash_client_backend::data_api::WalletWrite::get_address_for_index
-// We could remove this and many children if we're able to
-// call what's shared from zcash_client_backend in this codebase
 pub(crate) fn generate_address_range<P: consensus::Parameters>(
     conn: &rusqlite::Transaction,
     params: &P,
@@ -755,14 +753,9 @@ pub(crate) fn generate_gap_addresses<P: consensus::Parameters>(
     request: UnifiedAddressRequest,
     require_key: bool,
 ) -> Result<(), SqliteClientError> {
-    let gap_limit = match key_scope {
-        TransparentKeyScope::EXTERNAL => Ok(gap_limits.external()),
-        TransparentKeyScope::INTERNAL => Ok(gap_limits.internal()),
-        TransparentKeyScope::EPHEMERAL => Ok(gap_limits.ephemeral()),
-        _ => Err(AddressGenerationError::UnsupportedTransparentKeyScope(
-            key_scope,
-        )),
-    }?;
+    let gap_limit = gap_limits.limit_for(key_scope).ok_or(
+        AddressGenerationError::UnsupportedTransparentKeyScope(key_scope),
+    )?;
 
     if let Some(gap_start) = find_gap_start(conn, account_id, key_scope, gap_limit)? {
         generate_address_range(
diff --git a/zcash_keys/src/keys/transparent/gap_limits.rs b/zcash_keys/src/keys/transparent/gap_limits.rs
index 4de6ee9ef2..ed3835e56a 100644
--- a/zcash_keys/src/keys/transparent/gap_limits.rs
+++ b/zcash_keys/src/keys/transparent/gap_limits.rs
@@ -2,6 +2,9 @@
 //! received by the wallet.
 use transparent::keys::TransparentKeyScope;
 
+#[cfg(feature = "transparent-inputs")]
+pub mod wallet;
+
 /// Configuration for gap limits used in transparent address management.
 ///
 /// A "gap limit" is the number of consecutive unused addresses that the wallet will generate
diff --git a/zcash_keys/src/keys/transparent/gap_limits/wallet.rs b/zcash_keys/src/keys/transparent/gap_limits/wallet.rs
new file mode 100644
index 0000000000..86a4c03b80
--- /dev/null
+++ b/zcash_keys/src/keys/transparent/gap_limits/wallet.rs
@@ -0,0 +1,52 @@
+use super::GapLimits;
+use crate::keys::{
+    AddressGenerationError, UnifiedAddressRequest, transparent::wallet::GapLimitsWalletAccess,
+};
+use crate::keys::{UnifiedFullViewingKey, UnifiedIncomingViewingKey};
+use transparent::keys::TransparentKeyScope;
+
+pub enum GapAddressesError<SE> {
+    Storage(SE),
+    AddressGeneration(AddressGenerationError),
+    AccountUnknown,
+}
+
+#[allow(clippy::too_many_arguments)]
+pub fn generate_gap_addresses<DbT, SE>(
+    wallet_db: &mut DbT,
+    gap_limits: &GapLimits,
+    account_id: DbT::AccountRef,
+    account_uivk: &UnifiedIncomingViewingKey,
+    account_ufvk: Option<&UnifiedFullViewingKey>,
+    key_scope: TransparentKeyScope,
+    request: UnifiedAddressRequest,
+    require_key: bool,
+) -> Result<(), GapAddressesError<SE>>
+where
+    DbT: GapLimitsWalletAccess<Error = SE>,
+{
+    let gap_limit = gap_limits
+        .limit_for(key_scope)
+        .ok_or(GapAddressesError::AddressGeneration(
+            AddressGenerationError::UnsupportedTransparentKeyScope(key_scope),
+        ))?;
+
+    if let Some(gap_start) = wallet_db
+        .find_gap_start(account_id, key_scope, gap_limit)
+        .map_err(GapAddressesError::Storage)?
+    {
+        wallet_db
+            .generate_address_range(
+                account_id,
+                account_uivk,
+                account_ufvk,
+                key_scope,
+                request,
+                gap_start..gap_start.saturating_add(gap_limit),
+                require_key,
+            )
+            .map_err(GapAddressesError::Storage)?;
+    }
+
+    Ok(())
+}
diff --git a/zcash_keys/src/keys/transparent/wallet.rs b/zcash_keys/src/keys/transparent/wallet.rs
index 852b908567..d4c0f6dd8b 100644
--- a/zcash_keys/src/keys/transparent/wallet.rs
+++ b/zcash_keys/src/keys/transparent/wallet.rs
@@ -23,7 +23,7 @@ pub trait GapLimitsWalletAccess {
     ) -> Result<Option<NonHardenedChildIndex>, Self::Error>;
 
     #[allow(clippy::too_many_arguments)]
-    fn generate_address_range_internal(
+    fn generate_address_range(
         &self,
         account_id: Self::AccountRef,
         account_uivk: &UnifiedIncomingViewingKey,

From c2c64178379314e7c5e087d9040658a397f0c5be Mon Sep 17 00:00:00 2001
From: Bradley Cushing <bradleycushing@gmail.com>
Date: Sun, 7 Dec 2025 16:36:35 -0500
Subject: [PATCH 163/263] chore(changelog): reflect zcash keys gap limits
 changes

---
 zcash_client_backend/CHANGELOG.md | 3 +++
 zcash_client_sqlite/CHANGELOG.md  | 1 +
 zcash_keys/CHANGELOG.md           | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index 8ed19a8913..c074cb22d9 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -25,6 +25,9 @@ workspace.
 - `zcash_client_backend::fees::MetaSource`
 - `zcash_client_backend::wallet::transparent` module, behind the `transparent-inputs` feature flag.
 - `zcash_client_backend::data_api::ll`
+- `LowLevelWalletRead::get_account_ref`
+- `LowLevelWalletRead::get_account_internal`
+- `GapLimitsWalletAccess::generate_transparent_gap_addresses`
 
 ### Changed
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`, `zip321 0.7`
diff --git a/zcash_client_sqlite/CHANGELOG.md b/zcash_client_sqlite/CHANGELOG.md
index 8576f40ee9..86eeda9b10 100644
--- a/zcash_client_sqlite/CHANGELOG.md
+++ b/zcash_client_sqlite/CHANGELOG.md
@@ -22,6 +22,7 @@ workspace.
 - `impl zcash_client_backend::data_api::ll::LowLevelWalletWrite for WalletDb`
 - `impl Hash for zcash_client_sqlite::{ReceivedNoteId, UtxoId, TxRef}`
 - `impl {PartialOrd, Ord} for zcash_client_sqlite::UtxoId`
+- `impl zcash_keys::keys::transparent::GapLimitsWalletAccess for WalletDb`
 
 ### Changed
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`.
diff --git a/zcash_keys/CHANGELOG.md b/zcash_keys/CHANGELOG.md
index dfcd895450..743b2f17eb 100644
--- a/zcash_keys/CHANGELOG.md
+++ b/zcash_keys/CHANGELOG.md
@@ -12,6 +12,9 @@ workspace.
 ### Added
 - `zcash_keys::keys::OutgoingViewingKey`
 - `zcash_keys::keys::UnifiedFullViewingKey::select_ovk`
+- `zcash_keys::keys::transparent::gap_limits::generate_gap_addresses`
+- `zcash_keys::keys::transparent::GapLimitWalletAccess`
+- `zcash_keys::keys::transparent::GapLimits`
 
 ### Changed
 - MSRV is now 1.85.1.

From 0e53e1b4c93c7f414bc54ba19a00cbe927d8b83e Mon Sep 17 00:00:00 2001
From: Bradley Cushing <bradleycushing@gmail.com>
Date: Wed, 17 Dec 2025 17:31:15 -0500
Subject: [PATCH 164/263] refactor(gap): move internal address generation logic

`generate_address_range_internal` business logic has been extracted in
`zcash_keys`, where `zcash_client_sqlite` now imports this logic where
it needs to use it directly for internal calls. We now generate address
lists and store them in the db separately, exposing the storage
abstraction through the `GapLimitsWalletAccess` trait.
---
 zcash_client_backend/src/data_api/ll.rs       |  10 +-
 zcash_client_sqlite/src/lib.rs                |  39 ++++---
 .../transparent_gap_limit_handling.rs         |   4 +-
 zcash_client_sqlite/src/wallet/transparent.rs |  97 +++++----------
 zcash_keys/CHANGELOG.md                       |   1 +
 .../src/keys/transparent/gap_limits/wallet.rs | 110 ++++++++++++++++--
 zcash_keys/src/keys/transparent/wallet.rs     |  21 ++--
 7 files changed, 170 insertions(+), 112 deletions(-)

diff --git a/zcash_client_backend/src/data_api/ll.rs b/zcash_client_backend/src/data_api/ll.rs
index 5da06fb93e..054bd15afd 100644
--- a/zcash_client_backend/src/data_api/ll.rs
+++ b/zcash_client_backend/src/data_api/ll.rs
@@ -37,7 +37,7 @@ use crate::{
 use {
     super::WalletUtxo,
     transparent::{address::TransparentAddress, keys::TransparentKeyScope},
-    zcash_keys::keys::UnifiedAddressRequest,
+    zcash_keys::keys::{UnifiedAddressRequest, transparent::gap_limits::GapLimits},
 };
 
 #[cfg(feature = "orchard")]
@@ -574,6 +574,14 @@ pub trait LowLevelWalletWrite: LowLevelWalletRead {
         range: Range<BlockHeight>,
         wallet_note_positions: &[(ShieldedProtocol, Position)],
     ) -> Result<(), Self::Error>;
+
+    #[cfg(feature = "transparent-inputs")]
+    fn update_gap_limits(
+        &mut self,
+        gap_limits: &GapLimits,
+        txid: TxId,
+        observation_height: BlockHeight,
+    ) -> Result<(), Self::Error>;
 }
 
 /// This trait provides a generalization over shielded Sapling output representations.
diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs
index 70dca02ee8..32167ed2a0 100644
--- a/zcash_client_sqlite/src/lib.rs
+++ b/zcash_client_sqlite/src/lib.rs
@@ -122,10 +122,7 @@ use {
     },
     zcash_keys::{
         encoding::AddressCodec,
-        keys::{
-            UnifiedIncomingViewingKey,
-            transparent::{gap_limits::GapLimits, wallet::GapLimitsWalletAccess},
-        },
+        keys::transparent::{gap_limits::GapLimits, wallet::GapLimitsWalletAccess},
     },
 };
 
@@ -1971,6 +1968,22 @@ impl<'a, C: Borrow<rusqlite::Transaction<'a>>, P: consensus::Parameters, CL: Clo
             wallet_note_positions,
         )
     }
+
+    #[cfg(feature = "transparent-inputs")]
+    fn update_gap_limits(
+        &mut self,
+        gap_limits: &GapLimits,
+        txid: TxId,
+        observation_height: BlockHeight,
+    ) -> Result<(), Self::Error> {
+        wallet::transparent::update_gap_limits(
+            self.conn.borrow(),
+            &self.params,
+            gap_limits,
+            txid,
+            observation_height,
+        )
+    }
 }
 
 pub(crate) type SaplingShardStore<C> = SqliteShardStore<C, sapling::Node, SAPLING_SHARD_HEIGHT>;
@@ -2194,26 +2207,18 @@ impl<'a, C: Borrow<rusqlite::Transaction<'a>>, P: consensus::Parameters, CL: Clo
         wallet::transparent::find_gap_start(self.conn.borrow(), account_ref, key_scope, gap_limit)
     }
 
-    fn generate_address_range(
-        &self,
+    fn store_address_range(
+        &mut self,
         account_id: Self::AccountRef,
-        account_uivk: &UnifiedIncomingViewingKey,
-        account_ufvk: Option<&UnifiedFullViewingKey>,
         key_scope: TransparentKeyScope,
-        request: UnifiedAddressRequest,
-        range_to_store: Range<NonHardenedChildIndex>,
-        require_key: bool,
+        list: Vec<(Address, TransparentAddress, NonHardenedChildIndex)>,
     ) -> Result<(), Self::Error> {
-        wallet::transparent::generate_address_range_internal(
+        wallet::transparent::store_address_range(
             self.conn.borrow(),
             &self.params,
             account_id,
-            account_uivk,
-            account_ufvk,
             key_scope,
-            request,
-            range_to_store,
-            require_key,
+            list,
         )
     }
 }
diff --git a/zcash_client_sqlite/src/wallet/init/migrations/transparent_gap_limit_handling.rs b/zcash_client_sqlite/src/wallet/init/migrations/transparent_gap_limit_handling.rs
index f8bd606790..a97b0b408d 100644
--- a/zcash_client_sqlite/src/wallet/init/migrations/transparent_gap_limit_handling.rs
+++ b/zcash_client_sqlite/src/wallet/init/migrations/transparent_gap_limit_handling.rs
@@ -145,7 +145,7 @@ pub(super) fn insert_initial_transparent_addrs<P: consensus::Parameters>(
         );
 
         generate_address_range_internal(
-            conn,
+            &conn,
             params,
             account_id,
             &uivk,
@@ -757,7 +757,7 @@ impl<P: consensus::Parameters, C: Clock, R: RngCore> RusqliteMigration for Migra
 
                 if let Some(gap_start) = find_gap_start(conn, account_id, key_scope, gap_limit)? {
                     generate_address_range_internal(
-                        conn,
+                        &conn,
                         &self.params,
                         account_id,
                         &uivk,
diff --git a/zcash_client_sqlite/src/wallet/transparent.rs b/zcash_client_sqlite/src/wallet/transparent.rs
index 7977a20864..bcd62f734e 100644
--- a/zcash_client_sqlite/src/wallet/transparent.rs
+++ b/zcash_client_sqlite/src/wallet/transparent.rs
@@ -14,13 +14,13 @@ use rusqlite::types::Value;
 use rusqlite::{Connection, Row, named_params};
 use tracing::debug;
 
-use transparent::keys::{NonHardenedChildRange, TransparentKeyScope};
+use transparent::keys::TransparentKeyScope;
 use transparent::{
     address::{Script, TransparentAddress},
     bundle::{OutPoint, TxOut},
     keys::{IncomingViewingKey, NonHardenedChildIndex},
 };
-use zcash_address::unified::{Ivk, Typecode, Uivk};
+use zcash_address::unified::{Ivk, Uivk};
 use zcash_client_backend::data_api::WalletUtxo;
 use zcash_client_backend::wallet::{Exposure, GapMetadata, TransparentAddressSource};
 use zcash_client_backend::{
@@ -31,7 +31,7 @@ use zcash_client_backend::{
     },
     wallet::{TransparentAddressMetadata, WalletTransparentOutput},
 };
-use zcash_keys::keys::transparent::gap_limits::GapLimits;
+use zcash_keys::keys::transparent::gap_limits::{self, GapLimits};
 use zcash_keys::{
     address::Address,
     encoding::AddressCodec,
@@ -47,7 +47,7 @@ use zcash_protocol::{
     value::{ZatBalance, Zatoshis},
 };
 use zcash_script::script;
-use zip32::{DiversifierIndex, Scope};
+use zip32::Scope;
 
 #[cfg(feature = "transparent-key-import")]
 use bip32::{PublicKey, PublicKeyBytes};
@@ -581,37 +581,6 @@ pub(crate) fn reserve_next_n_addresses<P: consensus::Parameters>(
         .collect())
 }
 
-pub(crate) fn generate_external_address(
-    uivk: &UnifiedIncomingViewingKey,
-    ua_request: UnifiedAddressRequest,
-    index: NonHardenedChildIndex,
-) -> Result<(Address, TransparentAddress), AddressGenerationError> {
-    let ua = uivk.address(index.into(), ua_request);
-    let transparent_address = uivk
-        .transparent()
-        .as_ref()
-        .ok_or(AddressGenerationError::KeyNotAvailable(Typecode::P2pkh))?
-        .derive_address(index)
-        .map_err(|_| {
-            AddressGenerationError::InvalidTransparentChildIndex(DiversifierIndex::from(index))
-        })?;
-    Ok((
-        ua.map_or_else(
-            |e| {
-                if matches!(e, AddressGenerationError::ShieldedReceiverRequired) {
-                    // fall back to the transparent-only address
-                    Ok(Address::from(transparent_address))
-                } else {
-                    // other address generation errors are allowed to propagate
-                    Err(e)
-                }
-            },
-            |addr| Ok(Address::from(addr)),
-        )?,
-        transparent_address,
-    ))
-}
-
 /// Generates addresses to fill the specified non-hardened child index range.
 ///
 /// The provided [`UnifiedAddressRequest`] is used to pre-generate unified addresses that correspond
@@ -635,7 +604,6 @@ pub(crate) fn generate_address_range<P: consensus::Parameters>(
 ) -> Result<(), SqliteClientError> {
     let account = get_account_internal(conn, params, account_id)?
         .ok_or_else(|| SqliteClientError::AccountUnknown)?;
-
     generate_address_range_internal(
         conn,
         params,
@@ -646,7 +614,8 @@ pub(crate) fn generate_address_range<P: consensus::Parameters>(
         request,
         range_to_store,
         require_key,
-    )
+    )?;
+    Ok(())
 }
 
 #[allow(clippy::too_many_arguments)]
@@ -661,39 +630,26 @@ pub(crate) fn generate_address_range_internal<P: consensus::Parameters>(
     range_to_store: Range<NonHardenedChildIndex>,
     require_key: bool,
 ) -> Result<(), SqliteClientError> {
-    if !account_uivk.has_transparent() {
-        if require_key {
-            return Err(SqliteClientError::AddressGeneration(
-                AddressGenerationError::KeyNotAvailable(Typecode::P2pkh),
-            ));
-        } else {
-            return Ok(());
-        }
-    }
-
-    let gen_addrs = |key_scope: TransparentKeyScope, index: NonHardenedChildIndex| match key_scope {
-        TransparentKeyScope::EXTERNAL => generate_external_address(account_uivk, request, index),
-        TransparentKeyScope::INTERNAL => {
-            let internal_address = account_ufvk
-                .and_then(|k| k.transparent())
-                .expect("presence of transparent key was checked above.")
-                .derive_internal_ivk()?
-                .derive_address(index)?;
-            Ok((Address::from(internal_address), internal_address))
-        }
-        TransparentKeyScope::EPHEMERAL => {
-            let ephemeral_address = account_ufvk
-                .and_then(|k| k.transparent())
-                .expect("presence of transparent key was checked above.")
-                .derive_ephemeral_ivk()?
-                .derive_ephemeral_address(index)?;
-            Ok((Address::from(ephemeral_address), ephemeral_address))
-        }
-        _ => Err(AddressGenerationError::UnsupportedTransparentKeyScope(
-            key_scope,
-        )),
-    };
+    let address_list = gap_limits::wallet::generate_address_list(
+        account_uivk,
+        account_ufvk,
+        key_scope,
+        request,
+        range_to_store,
+        require_key,
+    )?;
+    store_address_range(conn, params, account_id, key_scope, address_list)?;
+    Ok(())
+}
 
+#[allow(clippy::too_many_arguments)]
+pub(crate) fn store_address_range<P: consensus::Parameters>(
+    conn: &rusqlite::Transaction,
+    params: &P,
+    account_id: AccountRef,
+    key_scope: TransparentKeyScope,
+    address_list: Vec<(Address, TransparentAddress, NonHardenedChildIndex)>,
+) -> Result<(), SqliteClientError> {
     // exposed_at_height is initially NULL
     let mut stmt_insert_address = conn.prepare_cached(
         "INSERT INTO addresses (
@@ -709,8 +665,7 @@ pub(crate) fn generate_address_range_internal<P: consensus::Parameters>(
          ON CONFLICT (account_id, diversifier_index_be, key_scope) DO NOTHING",
     )?;
 
-    for transparent_child_index in NonHardenedChildRange::from(range_to_store) {
-        let (address, transparent_address) = gen_addrs(key_scope, transparent_child_index)?;
+    for (address, transparent_address, transparent_child_index) in address_list {
         let zcash_address = address.to_zcash_address(params);
         let receiver_flags: ReceiverFlags = zcash_address
             .clone()
diff --git a/zcash_keys/CHANGELOG.md b/zcash_keys/CHANGELOG.md
index 743b2f17eb..edaf67f838 100644
--- a/zcash_keys/CHANGELOG.md
+++ b/zcash_keys/CHANGELOG.md
@@ -13,6 +13,7 @@ workspace.
 - `zcash_keys::keys::OutgoingViewingKey`
 - `zcash_keys::keys::UnifiedFullViewingKey::select_ovk`
 - `zcash_keys::keys::transparent::gap_limits::generate_gap_addresses`
+- `zcash_keys::keys::transparent::gap_limits::generate_address_list`
 - `zcash_keys::keys::transparent::GapLimitWalletAccess`
 - `zcash_keys::keys::transparent::GapLimits`
 
diff --git a/zcash_keys/src/keys/transparent/gap_limits/wallet.rs b/zcash_keys/src/keys/transparent/gap_limits/wallet.rs
index 86a4c03b80..ec32830ef1 100644
--- a/zcash_keys/src/keys/transparent/gap_limits/wallet.rs
+++ b/zcash_keys/src/keys/transparent/gap_limits/wallet.rs
@@ -1,9 +1,98 @@
 use super::GapLimits;
+use crate::address::Address;
 use crate::keys::{
     AddressGenerationError, UnifiedAddressRequest, transparent::wallet::GapLimitsWalletAccess,
 };
 use crate::keys::{UnifiedFullViewingKey, UnifiedIncomingViewingKey};
-use transparent::keys::TransparentKeyScope;
+use core::ops::Range;
+use std::vec::Vec;
+use transparent::address::TransparentAddress;
+use transparent::keys::{
+    IncomingViewingKey, NonHardenedChildIndex, NonHardenedChildRange, TransparentKeyScope,
+};
+use zcash_address::unified::Typecode;
+use zip32::DiversifierIndex;
+
+fn generate_external_address(
+    uivk: &UnifiedIncomingViewingKey,
+    ua_request: UnifiedAddressRequest,
+    index: NonHardenedChildIndex,
+) -> Result<(Address, TransparentAddress), AddressGenerationError> {
+    let ua = uivk.address(index.into(), ua_request);
+    let transparent_address = uivk
+        .transparent()
+        .as_ref()
+        .ok_or(AddressGenerationError::KeyNotAvailable(Typecode::P2pkh))?
+        .derive_address(index)
+        .map_err(|_| {
+            AddressGenerationError::InvalidTransparentChildIndex(DiversifierIndex::from(index))
+        })?;
+    Ok((
+        ua.map_or_else(
+            |e| {
+                if matches!(e, AddressGenerationError::ShieldedReceiverRequired) {
+                    // fall back to the transparent-only address
+                    Ok(Address::from(transparent_address))
+                } else {
+                    // other address generation errors are allowed to propagate
+                    Err(e)
+                }
+            },
+            |addr| Ok(Address::from(addr)),
+        )?,
+        transparent_address,
+    ))
+}
+
+pub fn generate_address_list(
+    account_uivk: &UnifiedIncomingViewingKey,
+    account_ufvk: Option<&UnifiedFullViewingKey>,
+    key_scope: TransparentKeyScope,
+    request: UnifiedAddressRequest,
+    range_to_store: Range<NonHardenedChildIndex>,
+    require_key: bool,
+) -> Result<Vec<(Address, TransparentAddress, NonHardenedChildIndex)>, AddressGenerationError> {
+    let mut address_list = Vec::<(Address, TransparentAddress, NonHardenedChildIndex)>::new();
+
+    if !account_uivk.has_transparent() {
+        if require_key {
+            return Err(AddressGenerationError::KeyNotAvailable(Typecode::P2pkh));
+        } else {
+            // No addresses to generate
+            return Ok(address_list);
+        }
+    }
+
+    let gen_addrs = |key_scope: TransparentKeyScope, index: NonHardenedChildIndex| match key_scope {
+        TransparentKeyScope::EXTERNAL => generate_external_address(account_uivk, request, index),
+        TransparentKeyScope::INTERNAL => {
+            let internal_address = account_ufvk
+                .and_then(|k| k.transparent())
+                .expect("presence of transparent key was checked above.")
+                .derive_internal_ivk()?
+                .derive_address(index)?;
+            Ok((Address::from(internal_address), internal_address))
+        }
+        TransparentKeyScope::EPHEMERAL => {
+            let ephemeral_address = account_ufvk
+                .and_then(|k| k.transparent())
+                .expect("presence of transparent key was checked above.")
+                .derive_ephemeral_ivk()?
+                .derive_ephemeral_address(index)?;
+            Ok((Address::from(ephemeral_address), ephemeral_address))
+        }
+        _ => Err(AddressGenerationError::UnsupportedTransparentKeyScope(
+            key_scope,
+        )),
+    };
+
+    for transparent_child_index in NonHardenedChildRange::from(range_to_store) {
+        let (address, transparent_address) = gen_addrs(key_scope, transparent_child_index)?;
+        address_list.push((address, transparent_address, transparent_child_index));
+    }
+
+    Ok(address_list)
+}
 
 pub enum GapAddressesError<SE> {
     Storage(SE),
@@ -35,16 +124,17 @@ where
         .find_gap_start(account_id, key_scope, gap_limit)
         .map_err(GapAddressesError::Storage)?
     {
+        let address_list = generate_address_list(
+            account_uivk,
+            account_ufvk,
+            key_scope,
+            request,
+            gap_start..gap_start.saturating_add(gap_limit),
+            require_key,
+        )
+        .map_err(GapAddressesError::AddressGeneration)?;
         wallet_db
-            .generate_address_range(
-                account_id,
-                account_uivk,
-                account_ufvk,
-                key_scope,
-                request,
-                gap_start..gap_start.saturating_add(gap_limit),
-                require_key,
-            )
+            .store_address_range(account_id, key_scope, address_list)
             .map_err(GapAddressesError::Storage)?;
     }
 
diff --git a/zcash_keys/src/keys/transparent/wallet.rs b/zcash_keys/src/keys/transparent/wallet.rs
index d4c0f6dd8b..b1ebb505fb 100644
--- a/zcash_keys/src/keys/transparent/wallet.rs
+++ b/zcash_keys/src/keys/transparent/wallet.rs
@@ -1,6 +1,10 @@
-use crate::keys::{UnifiedAddressRequest, UnifiedFullViewingKey, UnifiedIncomingViewingKey};
-use core::{hash::Hash, ops::Range};
-use transparent::keys::{NonHardenedChildIndex, TransparentKeyScope};
+use crate::address::Address;
+use core::hash::Hash;
+use std::vec::Vec;
+use transparent::{
+    address::TransparentAddress,
+    keys::{NonHardenedChildIndex, TransparentKeyScope},
+};
 
 #[cfg(feature = "transparent-inputs")]
 pub trait GapLimitsWalletAccess {
@@ -22,15 +26,10 @@ pub trait GapLimitsWalletAccess {
         gap_limit: u32,
     ) -> Result<Option<NonHardenedChildIndex>, Self::Error>;
 
-    #[allow(clippy::too_many_arguments)]
-    fn generate_address_range(
-        &self,
+    fn store_address_range(
+        &mut self,
         account_id: Self::AccountRef,
-        account_uivk: &UnifiedIncomingViewingKey,
-        account_ufvk: Option<&UnifiedFullViewingKey>,
         key_scope: TransparentKeyScope,
-        request: UnifiedAddressRequest,
-        range_to_store: Range<NonHardenedChildIndex>,
-        require_key: bool,
+        list: Vec<(Address, TransparentAddress, NonHardenedChildIndex)>,
     ) -> Result<(), Self::Error>;
 }

From a98972a17a637ed9d74b2be92e06b816f7d6819f Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Tue, 3 Feb 2026 12:04:05 -0700
Subject: [PATCH 165/263] Minor refactor to avoid re-extracting the transparent
 account pubkey.

---
 .../transparent_gap_limit_handling.rs         |  4 +-
 .../src/keys/transparent/gap_limits/wallet.rs | 43 +++++++++----------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/zcash_client_sqlite/src/wallet/init/migrations/transparent_gap_limit_handling.rs b/zcash_client_sqlite/src/wallet/init/migrations/transparent_gap_limit_handling.rs
index a97b0b408d..f8bd606790 100644
--- a/zcash_client_sqlite/src/wallet/init/migrations/transparent_gap_limit_handling.rs
+++ b/zcash_client_sqlite/src/wallet/init/migrations/transparent_gap_limit_handling.rs
@@ -145,7 +145,7 @@ pub(super) fn insert_initial_transparent_addrs<P: consensus::Parameters>(
         );
 
         generate_address_range_internal(
-            &conn,
+            conn,
             params,
             account_id,
             &uivk,
@@ -757,7 +757,7 @@ impl<P: consensus::Parameters, C: Clock, R: RngCore> RusqliteMigration for Migra
 
                 if let Some(gap_start) = find_gap_start(conn, account_id, key_scope, gap_limit)? {
                     generate_address_range_internal(
-                        &conn,
+                        conn,
                         &self.params,
                         account_id,
                         &uivk,
diff --git a/zcash_keys/src/keys/transparent/gap_limits/wallet.rs b/zcash_keys/src/keys/transparent/gap_limits/wallet.rs
index ec32830ef1..16978b9f85 100644
--- a/zcash_keys/src/keys/transparent/gap_limits/wallet.rs
+++ b/zcash_keys/src/keys/transparent/gap_limits/wallet.rs
@@ -52,31 +52,29 @@ pub fn generate_address_list(
     range_to_store: Range<NonHardenedChildIndex>,
     require_key: bool,
 ) -> Result<Vec<(Address, TransparentAddress, NonHardenedChildIndex)>, AddressGenerationError> {
-    let mut address_list = Vec::<(Address, TransparentAddress, NonHardenedChildIndex)>::new();
-
-    if !account_uivk.has_transparent() {
-        if require_key {
-            return Err(AddressGenerationError::KeyNotAvailable(Typecode::P2pkh));
-        } else {
-            // No addresses to generate
-            return Ok(address_list);
-        }
-    }
+    let account_pubkey = if let Some(k) = account_ufvk.and_then(|ufvk| ufvk.transparent()) {
+        k
+    } else if matches!(
+        key_scope,
+        TransparentKeyScope::INTERNAL | TransparentKeyScope::EPHEMERAL
+    ) && require_key
+    {
+        return Err(AddressGenerationError::KeyNotAvailable(Typecode::P2pkh));
+    } else {
+        // No addresses to generate
+        return Ok(vec![]);
+    };
 
     let gen_addrs = |key_scope: TransparentKeyScope, index: NonHardenedChildIndex| match key_scope {
         TransparentKeyScope::EXTERNAL => generate_external_address(account_uivk, request, index),
         TransparentKeyScope::INTERNAL => {
-            let internal_address = account_ufvk
-                .and_then(|k| k.transparent())
-                .expect("presence of transparent key was checked above.")
+            let internal_address = account_pubkey
                 .derive_internal_ivk()?
                 .derive_address(index)?;
             Ok((Address::from(internal_address), internal_address))
         }
         TransparentKeyScope::EPHEMERAL => {
-            let ephemeral_address = account_ufvk
-                .and_then(|k| k.transparent())
-                .expect("presence of transparent key was checked above.")
+            let ephemeral_address = account_pubkey
                 .derive_ephemeral_ivk()?
                 .derive_ephemeral_address(index)?;
             Ok((Address::from(ephemeral_address), ephemeral_address))
@@ -86,12 +84,13 @@ pub fn generate_address_list(
         )),
     };
 
-    for transparent_child_index in NonHardenedChildRange::from(range_to_store) {
-        let (address, transparent_address) = gen_addrs(key_scope, transparent_child_index)?;
-        address_list.push((address, transparent_address, transparent_child_index));
-    }
-
-    Ok(address_list)
+    NonHardenedChildRange::from(range_to_store)
+        .into_iter()
+        .map(|transparent_child_index| {
+            let (address, transparent_address) = gen_addrs(key_scope, transparent_child_index)?;
+            Ok((address, transparent_address, transparent_child_index))
+        })
+        .collect::<Result<Vec<_>, _>>()
 }
 
 pub enum GapAddressesError<SE> {

From 04434d39b14181f39440517fd6a869e35974823b Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Tue, 10 Feb 2026 13:40:39 -0700
Subject: [PATCH 166/263] docs: document new public APIs and fix CHANGELOG
 entries

Add doc comments to all new public types and functions introduced
on this branch, and correct paths and missing items in the
CHANGELOGs for zcash_keys, zcash_client_backend, and
zcash_client_sqlite.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 zcash_client_backend/CHANGELOG.md             |  4 ---
 zcash_client_backend/src/data_api/ll.rs       | 16 ++++++++---
 .../src/data_api/ll/wallet.rs                 | 27 +++++++++++++++++--
 zcash_client_sqlite/CHANGELOG.md              |  4 ++-
 zcash_keys/CHANGELOG.md                       | 14 +++++++---
 .../src/keys/transparent/gap_limits/wallet.rs | 24 +++++++++++++++++
 zcash_keys/src/keys/transparent/wallet.rs     | 20 ++++++++++++--
 7 files changed, 92 insertions(+), 17 deletions(-)

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index c074cb22d9..10826fd605 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -23,11 +23,7 @@ workspace.
   - `GetMempoolTxRequest` (previously named `Exclude`) has added field `pool_types`
 - `impl From<zcash_client_backend::proposal::ProposalError> for zcash_client_backend::data_api::wallet::input_selection::InputSelectorError<...>`
 - `zcash_client_backend::fees::MetaSource`
-- `zcash_client_backend::wallet::transparent` module, behind the `transparent-inputs` feature flag.
 - `zcash_client_backend::data_api::ll`
-- `LowLevelWalletRead::get_account_ref`
-- `LowLevelWalletRead::get_account_internal`
-- `GapLimitsWalletAccess::generate_transparent_gap_addresses`
 
 ### Changed
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`, `zip321 0.7`
diff --git a/zcash_client_backend/src/data_api/ll.rs b/zcash_client_backend/src/data_api/ll.rs
index 054bd15afd..b22fbd64a4 100644
--- a/zcash_client_backend/src/data_api/ll.rs
+++ b/zcash_client_backend/src/data_api/ll.rs
@@ -124,10 +124,15 @@ pub trait LowLevelWalletRead {
     /// will be interpreted as belonging to that account.
     type AccountId: Copy + Eq + Hash;
 
-    /// A wallet-internal account identifier
+    /// A wallet-internal account identifier, used for efficient lookups within the data store.
+    ///
+    /// Unlike [`AccountId`](Self::AccountId), this type is not intended for use in external
+    /// contexts; it is an ephemeral handle that may change across database migrations or
+    /// backend implementations.
     type AccountRef: Copy + Eq + Hash;
 
-    /// Type of the account with associated capabilities
+    /// The type of account records returned by the wallet backend, providing access to
+    /// the account's viewing keys and capabilities.
     type Account: Account;
 
     /// A wallet-internal transaction identifier.
@@ -263,14 +268,17 @@ pub trait LowLevelWalletRead {
         nf: &::orchard::note::Nullifier,
     ) -> Result<Option<Self::TxRef>, Self::Error>;
 
-    /// Get the ephemeral value for working with accounts in the wallet data store
+    /// Returns the wallet-internal account reference for the given external account identifier.
+    ///
+    /// This is used to translate between the stable external [`AccountId`](Self::AccountId)
+    /// and the ephemeral internal [`AccountRef`](Self::AccountRef) used for efficient lookups.
     #[cfg(feature = "transparent-inputs")]
     fn get_account_ref(
         &self,
         account_uuid: Self::AccountId,
     ) -> Result<Self::AccountRef, Self::Error>;
 
-    /// Get the account for an internal account reference
+    /// Returns the full account record for the given wallet-internal account reference.
     #[cfg(feature = "transparent-inputs")]
     fn get_account_internal(
         &self,
diff --git a/zcash_client_backend/src/data_api/ll/wallet.rs b/zcash_client_backend/src/data_api/ll/wallet.rs
index b35cc2e2e3..c5fca75be4 100644
--- a/zcash_client_backend/src/data_api/ll/wallet.rs
+++ b/zcash_client_backend/src/data_api/ll/wallet.rs
@@ -118,8 +118,11 @@ where
     })
 }
 
-/// Errors that can result as a consequence of attemping to insert block data for a sequence of
-/// blocks into the data store.
+/// Generates transparent gap addresses for a given account and key scope.
+///
+/// This is a convenience function that resolves the account's viewing keys from the wallet
+/// database and delegates to
+/// [`gap_limits::wallet::generate_gap_addresses`](zcash_keys::keys::transparent::gap_limits::wallet::generate_gap_addresses).
 #[cfg(feature = "transparent-inputs")]
 pub fn generate_transparent_gap_addresses<DbT, SE>(
     wallet_db: &mut DbT,
@@ -183,6 +186,11 @@ impl<SE, TE> From<GapAddressesError<SE>> for PutBlocksError<SE, TE> {
     }
 }
 
+/// A trait alias capturing the database capabilities required by [`put_blocks`].
+///
+/// When the `transparent-inputs` feature is enabled, this additionally requires
+/// [`GapLimitsWalletAccess`] so that transparent gap addresses can be maintained as new
+/// blocks are scanned.
 #[cfg(not(feature = "transparent-inputs"))]
 pub trait PutBlocksDbT<SE, TE, AR>:
     LowLevelWalletWrite<Error = SE> + WalletCommitmentTrees<Error = TE>
@@ -195,6 +203,11 @@ impl<T: LowLevelWalletWrite<Error = SE> + WalletCommitmentTrees<Error = TE>, SE,
 {
 }
 
+/// A trait alias capturing the database capabilities required by [`put_blocks`].
+///
+/// When the `transparent-inputs` feature is enabled, this additionally requires
+/// [`GapLimitsWalletAccess`] so that transparent gap addresses can be maintained as new
+/// blocks are scanned.
 #[cfg(feature = "transparent-inputs")]
 pub trait PutBlocksDbT<SE, TE, AR>:
     LowLevelWalletWrite<Error = SE>
@@ -657,6 +670,11 @@ where
 #[cfg(not(feature = "transparent-inputs"))]
 type GapError<DbT> = <DbT as LowLevelWalletRead>::Error;
 
+/// A trait alias capturing the database capabilities required by [`store_decrypted_tx`].
+///
+/// When the `transparent-inputs` feature is enabled, this additionally requires
+/// [`GapLimitsWalletAccess`] so that transparent gap addresses can be regenerated after
+/// storing a decrypted transaction.
 #[cfg(not(feature = "transparent-inputs"))]
 pub trait StoreDecryptedTxDbT: LowLevelWalletWrite {}
 
@@ -666,6 +684,11 @@ impl<T: LowLevelWalletWrite> StoreDecryptedTxDbT for T {}
 #[cfg(feature = "transparent-inputs")]
 type GapError<DbT> = GapAddressesError<<DbT as LowLevelWalletRead>::Error>;
 
+/// A trait alias capturing the database capabilities required by [`store_decrypted_tx`].
+///
+/// When the `transparent-inputs` feature is enabled, this additionally requires
+/// [`GapLimitsWalletAccess`] so that transparent gap addresses can be regenerated after
+/// storing a decrypted transaction.
 #[cfg(feature = "transparent-inputs")]
 pub trait StoreDecryptedTxDbT:
     LowLevelWalletWrite
diff --git a/zcash_client_sqlite/CHANGELOG.md b/zcash_client_sqlite/CHANGELOG.md
index 86eeda9b10..89b4bea7f0 100644
--- a/zcash_client_sqlite/CHANGELOG.md
+++ b/zcash_client_sqlite/CHANGELOG.md
@@ -22,7 +22,9 @@ workspace.
 - `impl zcash_client_backend::data_api::ll::LowLevelWalletWrite for WalletDb`
 - `impl Hash for zcash_client_sqlite::{ReceivedNoteId, UtxoId, TxRef}`
 - `impl {PartialOrd, Ord} for zcash_client_sqlite::UtxoId`
-- `impl zcash_keys::keys::transparent::GapLimitsWalletAccess for WalletDb`
+- `impl zcash_keys::keys::transparent::wallet::GapLimitsWalletAccess for WalletDb`
+  (behind the `transparent-inputs` feature flag)
+- `zcash_client_sqlite::AccountRef` is now public.
 
 ### Changed
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`.
diff --git a/zcash_keys/CHANGELOG.md b/zcash_keys/CHANGELOG.md
index edaf67f838..4795a33f12 100644
--- a/zcash_keys/CHANGELOG.md
+++ b/zcash_keys/CHANGELOG.md
@@ -12,10 +12,16 @@ workspace.
 ### Added
 - `zcash_keys::keys::OutgoingViewingKey`
 - `zcash_keys::keys::UnifiedFullViewingKey::select_ovk`
-- `zcash_keys::keys::transparent::gap_limits::generate_gap_addresses`
-- `zcash_keys::keys::transparent::gap_limits::generate_address_list`
-- `zcash_keys::keys::transparent::GapLimitWalletAccess`
-- `zcash_keys::keys::transparent::GapLimits`
+- `zcash_keys::keys::transparent::gap_limits` module, containing the `GapLimits`
+  type (moved from `zcash_client_backend::wallet::transparent`).
+- `zcash_keys::keys::transparent::gap_limits::GapLimits::limit_for`
+- `zcash_keys::keys::transparent::gap_limits::wallet` module (behind the
+  `transparent-inputs` feature flag), containing:
+  - `generate_gap_addresses`
+  - `generate_address_list`
+  - `GapAddressesError`
+- `zcash_keys::keys::transparent::wallet` module, containing:
+  - `GapLimitsWalletAccess` (behind the `transparent-inputs` feature flag)
 
 ### Changed
 - MSRV is now 1.85.1.
diff --git a/zcash_keys/src/keys/transparent/gap_limits/wallet.rs b/zcash_keys/src/keys/transparent/gap_limits/wallet.rs
index 16978b9f85..7d48f30858 100644
--- a/zcash_keys/src/keys/transparent/gap_limits/wallet.rs
+++ b/zcash_keys/src/keys/transparent/gap_limits/wallet.rs
@@ -1,3 +1,9 @@
+//! Wallet-specific operations for transparent address gap limit management.
+//!
+//! This module provides functions for generating transparent addresses according to BIP-44
+//! gap limit rules, abstracting over the wallet storage backend via the
+//! [`GapLimitsWalletAccess`] trait.
+
 use super::GapLimits;
 use crate::address::Address;
 use crate::keys::{
@@ -44,6 +50,14 @@ fn generate_external_address(
     ))
 }
 
+/// Generates a list of addresses for the given range of transparent child indices.
+///
+/// For external-scoped addresses, a unified address is generated using the provided
+/// [`UnifiedAddressRequest`]; for internal and ephemeral scopes, the raw transparent address is
+/// returned.
+///
+/// Returns an empty list if the account lacks a transparent key and `require_key` is `false`.
+/// Returns an error if the key is required but unavailable, or if the key scope is unsupported.
 pub fn generate_address_list(
     account_uivk: &UnifiedIncomingViewingKey,
     account_ufvk: Option<&UnifiedFullViewingKey>,
@@ -93,12 +107,22 @@ pub fn generate_address_list(
         .collect::<Result<Vec<_>, _>>()
 }
 
+/// Errors that can occur when generating transparent gap addresses.
 pub enum GapAddressesError<SE> {
+    /// An error occurred in the underlying wallet storage backend.
     Storage(SE),
+    /// An error occurred while deriving a transparent address.
     AddressGeneration(AddressGenerationError),
+    /// The specified account was not found in the wallet database.
     AccountUnknown,
 }
 
+/// Generates transparent addresses to fill the gap for a given account and key scope.
+///
+/// This function queries the wallet backend (via [`GapLimitsWalletAccess`]) to find the start
+/// of the first gap of unused addresses, then generates enough addresses to maintain the
+/// configured gap limit. If no gap exists (i.e., the address space is exhausted), this is a
+/// no-op.
 #[allow(clippy::too_many_arguments)]
 pub fn generate_gap_addresses<DbT, SE>(
     wallet_db: &mut DbT,
diff --git a/zcash_keys/src/keys/transparent/wallet.rs b/zcash_keys/src/keys/transparent/wallet.rs
index b1ebb505fb..7489626ba8 100644
--- a/zcash_keys/src/keys/transparent/wallet.rs
+++ b/zcash_keys/src/keys/transparent/wallet.rs
@@ -1,3 +1,9 @@
+//! Wallet storage abstractions for transparent address gap limit management.
+//!
+//! This module defines the [`GapLimitsWalletAccess`] trait, which provides the storage
+//! operations needed by the gap limit address generation logic in
+//! [`super::gap_limits::wallet`].
+
 use crate::address::Address;
 use core::hash::Hash;
 use std::vec::Vec;
@@ -6,12 +12,18 @@ use transparent::{
     keys::{NonHardenedChildIndex, TransparentKeyScope},
 };
 
+/// A trait providing wallet storage operations required for transparent address gap limit
+/// management.
+///
+/// Implementations of this trait allow the gap limit logic in
+/// [`gap_limits::wallet`](super::gap_limits::wallet) to query and update the wallet's
+/// transparent address state without being coupled to a specific storage backend.
 #[cfg(feature = "transparent-inputs")]
 pub trait GapLimitsWalletAccess {
-    /// The type of query error
+    /// The type of errors produced by the wallet storage backend.
     type Error;
 
-    /// A wallet-internal account identifier
+    /// A wallet-internal account identifier.
     type AccountRef: Copy + Eq + Hash;
 
     /// Returns the transparent address index at the start of the first gap of at least `gap_limit`
@@ -26,6 +38,10 @@ pub trait GapLimitsWalletAccess {
         gap_limit: u32,
     ) -> Result<Option<NonHardenedChildIndex>, Self::Error>;
 
+    /// Persists a range of derived transparent addresses to the wallet storage.
+    ///
+    /// Each entry in the list contains the wallet-level address, the raw transparent address,
+    /// and the child index from which the address was derived.
     fn store_address_range(
         &mut self,
         account_id: Self::AccountRef,

From 6bf391e8ec97d64cd59f893a189b76903eb57098 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Wed, 11 Feb 2026 16:18:51 -0700
Subject: [PATCH 167/263] Minor reorganization to simplify zcash_keys module
 structure.

---
 .../src/data_api/ll/wallet.rs                 |  28 ++-
 zcash_client_sqlite/CHANGELOG.md              |   2 +-
 zcash_client_sqlite/src/error.rs              |   2 +-
 zcash_client_sqlite/src/lib.rs                |   4 +-
 zcash_client_sqlite/src/wallet/transparent.rs |  16 +-
 zcash_keys/CHANGELOG.md                       |  10 +-
 zcash_keys/src/keys/transparent.rs            |   2 +-
 zcash_keys/src/keys/transparent/gap_limits.rs | 208 +++++++++++++++++-
 .../src/keys/transparent/gap_limits/wallet.rs | 165 --------------
 zcash_keys/src/keys/transparent/wallet.rs     |  51 -----
 10 files changed, 233 insertions(+), 255 deletions(-)
 delete mode 100644 zcash_keys/src/keys/transparent/gap_limits/wallet.rs
 delete mode 100644 zcash_keys/src/keys/transparent/wallet.rs

diff --git a/zcash_client_backend/src/data_api/ll/wallet.rs b/zcash_client_backend/src/data_api/ll/wallet.rs
index c5fca75be4..2453b49d67 100644
--- a/zcash_client_backend/src/data_api/ll/wallet.rs
+++ b/zcash_client_backend/src/data_api/ll/wallet.rs
@@ -34,9 +34,8 @@ use {
     transparent::{bundle::OutPoint, keys::TransparentKeyScope},
     zcash_keys::keys::{
         ReceiverRequirement, UnifiedAddressRequest,
-        transparent::{
-            gap_limits::{self, GapLimits, wallet::GapAddressesError},
-            wallet::GapLimitsWalletAccess,
+        transparent::gap_limits::{
+            AddressStore, GapAddressesError, GapLimits, generate_gap_addresses,
         },
     },
 };
@@ -121,8 +120,7 @@ where
 /// Generates transparent gap addresses for a given account and key scope.
 ///
 /// This is a convenience function that resolves the account's viewing keys from the wallet
-/// database and delegates to
-/// [`gap_limits::wallet::generate_gap_addresses`](zcash_keys::keys::transparent::gap_limits::wallet::generate_gap_addresses).
+/// database and delegates to [`generate_gap_addresses`].
 #[cfg(feature = "transparent-inputs")]
 pub fn generate_transparent_gap_addresses<DbT, SE>(
     wallet_db: &mut DbT,
@@ -133,7 +131,7 @@ pub fn generate_transparent_gap_addresses<DbT, SE>(
 ) -> Result<(), GapAddressesError<SE>>
 where
     DbT: LowLevelWalletWrite<Error = SE>
-        + GapLimitsWalletAccess<Error = SE, AccountRef = <DbT as LowLevelWalletRead>::AccountRef>,
+        + AddressStore<Error = SE, AccountRef = <DbT as LowLevelWalletRead>::AccountRef>,
     DbT::TxRef: Eq + Hash,
 {
     let account_ref = wallet_db
@@ -145,7 +143,7 @@ where
         .map_err(GapAddressesError::Storage)?
         .ok_or(GapAddressesError::AccountUnknown)?;
 
-    gap_limits::wallet::generate_gap_addresses(
+    generate_gap_addresses(
         wallet_db,
         &gap_limits,
         account_ref,
@@ -189,7 +187,7 @@ impl<SE, TE> From<GapAddressesError<SE>> for PutBlocksError<SE, TE> {
 /// A trait alias capturing the database capabilities required by [`put_blocks`].
 ///
 /// When the `transparent-inputs` feature is enabled, this additionally requires
-/// [`GapLimitsWalletAccess`] so that transparent gap addresses can be maintained as new
+/// [`AddressStore`] so that transparent gap addresses can be maintained as new
 /// blocks are scanned.
 #[cfg(not(feature = "transparent-inputs"))]
 pub trait PutBlocksDbT<SE, TE, AR>:
@@ -206,13 +204,13 @@ impl<T: LowLevelWalletWrite<Error = SE> + WalletCommitmentTrees<Error = TE>, SE,
 /// A trait alias capturing the database capabilities required by [`put_blocks`].
 ///
 /// When the `transparent-inputs` feature is enabled, this additionally requires
-/// [`GapLimitsWalletAccess`] so that transparent gap addresses can be maintained as new
+/// [`AddressStore`] so that transparent gap addresses can be maintained as new
 /// blocks are scanned.
 #[cfg(feature = "transparent-inputs")]
 pub trait PutBlocksDbT<SE, TE, AR>:
     LowLevelWalletWrite<Error = SE>
     + WalletCommitmentTrees<Error = TE>
-    + GapLimitsWalletAccess<Error = SE, AccountRef = AR>
+    + AddressStore<Error = SE, AccountRef = AR>
 {
 }
 
@@ -220,7 +218,7 @@ pub trait PutBlocksDbT<SE, TE, AR>:
 impl<
     T: LowLevelWalletWrite<Error = SE>
         + WalletCommitmentTrees<Error = TE>
-        + GapLimitsWalletAccess<Error = SE, AccountRef = AR>,
+        + AddressStore<Error = SE, AccountRef = AR>,
     SE,
     TE,
     AR,
@@ -673,7 +671,7 @@ type GapError<DbT> = <DbT as LowLevelWalletRead>::Error;
 /// A trait alias capturing the database capabilities required by [`store_decrypted_tx`].
 ///
 /// When the `transparent-inputs` feature is enabled, this additionally requires
-/// [`GapLimitsWalletAccess`] so that transparent gap addresses can be regenerated after
+/// [`AddressStore`] so that transparent gap addresses can be regenerated after
 /// storing a decrypted transaction.
 #[cfg(not(feature = "transparent-inputs"))]
 pub trait StoreDecryptedTxDbT: LowLevelWalletWrite {}
@@ -687,12 +685,12 @@ type GapError<DbT> = GapAddressesError<<DbT as LowLevelWalletRead>::Error>;
 /// A trait alias capturing the database capabilities required by [`store_decrypted_tx`].
 ///
 /// When the `transparent-inputs` feature is enabled, this additionally requires
-/// [`GapLimitsWalletAccess`] so that transparent gap addresses can be regenerated after
+/// [`AddressStore`] so that transparent gap addresses can be regenerated after
 /// storing a decrypted transaction.
 #[cfg(feature = "transparent-inputs")]
 pub trait StoreDecryptedTxDbT:
     LowLevelWalletWrite
-    + GapLimitsWalletAccess<
+    + AddressStore<
         Error = <Self as LowLevelWalletRead>::Error,
         AccountRef = <Self as LowLevelWalletRead>::AccountRef,
     >
@@ -704,7 +702,7 @@ where
 #[cfg(feature = "transparent-inputs")]
 impl<
     T: LowLevelWalletWrite
-        + GapLimitsWalletAccess<
+        + AddressStore<
             Error = <T as LowLevelWalletRead>::Error,
             AccountRef = <T as LowLevelWalletRead>::AccountRef,
         >,
diff --git a/zcash_client_sqlite/CHANGELOG.md b/zcash_client_sqlite/CHANGELOG.md
index 89b4bea7f0..e7833f79c3 100644
--- a/zcash_client_sqlite/CHANGELOG.md
+++ b/zcash_client_sqlite/CHANGELOG.md
@@ -22,7 +22,7 @@ workspace.
 - `impl zcash_client_backend::data_api::ll::LowLevelWalletWrite for WalletDb`
 - `impl Hash for zcash_client_sqlite::{ReceivedNoteId, UtxoId, TxRef}`
 - `impl {PartialOrd, Ord} for zcash_client_sqlite::UtxoId`
-- `impl zcash_keys::keys::transparent::wallet::GapLimitsWalletAccess for WalletDb`
+- `impl zcash_keys::keys::transparent::gap_limits::AddressStore for WalletDb`
   (behind the `transparent-inputs` feature flag)
 - `zcash_client_sqlite::AccountRef` is now public.
 
diff --git a/zcash_client_sqlite/src/error.rs b/zcash_client_sqlite/src/error.rs
index ffdcdf77a3..9868fe9a9f 100644
--- a/zcash_client_sqlite/src/error.rs
+++ b/zcash_client_sqlite/src/error.rs
@@ -27,7 +27,7 @@ use {
     crate::wallet::transparent::SchedulingError,
     ::transparent::{address::TransparentAddress, keys::TransparentKeyScope},
     zcash_keys::{
-        encoding::TransparentCodecError, keys::transparent::gap_limits::wallet::GapAddressesError,
+        encoding::TransparentCodecError, keys::transparent::gap_limits::GapAddressesError,
     },
 };
 
diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs
index 32167ed2a0..8745bdfb20 100644
--- a/zcash_client_sqlite/src/lib.rs
+++ b/zcash_client_sqlite/src/lib.rs
@@ -122,7 +122,7 @@ use {
     },
     zcash_keys::{
         encoding::AddressCodec,
-        keys::transparent::{gap_limits::GapLimits, wallet::GapLimitsWalletAccess},
+        keys::transparent::gap_limits::{AddressStore, GapLimits},
     },
 };
 
@@ -2193,7 +2193,7 @@ impl<P: consensus::Parameters, CL, R> WalletCommitmentTrees
 
 #[cfg(feature = "transparent-inputs")]
 impl<'a, C: Borrow<rusqlite::Transaction<'a>>, P: consensus::Parameters, CL: Clock, R: RngCore>
-    GapLimitsWalletAccess for WalletDb<C, P, CL, R>
+    AddressStore for WalletDb<C, P, CL, R>
 {
     type Error = SqliteClientError;
     type AccountRef = AccountRef;
diff --git a/zcash_client_sqlite/src/wallet/transparent.rs b/zcash_client_sqlite/src/wallet/transparent.rs
index bcd62f734e..6153c83e6b 100644
--- a/zcash_client_sqlite/src/wallet/transparent.rs
+++ b/zcash_client_sqlite/src/wallet/transparent.rs
@@ -14,30 +14,30 @@ use rusqlite::types::Value;
 use rusqlite::{Connection, Row, named_params};
 use tracing::debug;
 
-use transparent::keys::TransparentKeyScope;
 use transparent::{
     address::{Script, TransparentAddress},
     bundle::{OutPoint, TxOut},
-    keys::{IncomingViewingKey, NonHardenedChildIndex},
+    keys::{IncomingViewingKey, NonHardenedChildIndex, TransparentKeyScope},
 };
 use zcash_address::unified::{Ivk, Uivk};
-use zcash_client_backend::data_api::WalletUtxo;
-use zcash_client_backend::wallet::{Exposure, GapMetadata, TransparentAddressSource};
 use zcash_client_backend::{
     data_api::{
         Account, AccountBalance, Balance, OutputStatusFilter, TransactionDataRequest,
-        TransactionStatusFilter,
+        TransactionStatusFilter, WalletUtxo,
         wallet::{ConfirmationsPolicy, TargetHeight},
     },
-    wallet::{TransparentAddressMetadata, WalletTransparentOutput},
+    wallet::{
+        Exposure, GapMetadata, TransparentAddressMetadata, TransparentAddressSource,
+        WalletTransparentOutput,
+    },
 };
-use zcash_keys::keys::transparent::gap_limits::{self, GapLimits};
 use zcash_keys::{
     address::Address,
     encoding::AddressCodec,
     keys::{
         AddressGenerationError, UnifiedAddressRequest, UnifiedFullViewingKey,
         UnifiedIncomingViewingKey,
+        transparent::gap_limits::{GapLimits, generate_address_list},
     },
 };
 use zcash_primitives::transaction::{builder::DEFAULT_TX_EXPIRY_DELTA, fees::zip317};
@@ -630,7 +630,7 @@ pub(crate) fn generate_address_range_internal<P: consensus::Parameters>(
     range_to_store: Range<NonHardenedChildIndex>,
     require_key: bool,
 ) -> Result<(), SqliteClientError> {
-    let address_list = gap_limits::wallet::generate_address_list(
+    let address_list = generate_address_list(
         account_uivk,
         account_ufvk,
         key_scope,
diff --git a/zcash_keys/CHANGELOG.md b/zcash_keys/CHANGELOG.md
index 4795a33f12..c2d8e39a23 100644
--- a/zcash_keys/CHANGELOG.md
+++ b/zcash_keys/CHANGELOG.md
@@ -12,16 +12,14 @@ workspace.
 ### Added
 - `zcash_keys::keys::OutgoingViewingKey`
 - `zcash_keys::keys::UnifiedFullViewingKey::select_ovk`
-- `zcash_keys::keys::transparent::gap_limits` module, containing the `GapLimits`
-  type (moved from `zcash_client_backend::wallet::transparent`).
-- `zcash_keys::keys::transparent::gap_limits::GapLimits::limit_for`
-- `zcash_keys::keys::transparent::gap_limits::wallet` module (behind the
+- `zcash_keys::keys::transparent::gap_limits` module (behind the
   `transparent-inputs` feature flag), containing:
+  - `GapLimits` type (moved from `zcash_client_backend::wallet::transparent`).
+  - `GapLimits::limit_for`
+  - `AddressStore` trait
   - `generate_gap_addresses`
   - `generate_address_list`
   - `GapAddressesError`
-- `zcash_keys::keys::transparent::wallet` module, containing:
-  - `GapLimitsWalletAccess` (behind the `transparent-inputs` feature flag)
 
 ### Changed
 - MSRV is now 1.85.1.
diff --git a/zcash_keys/src/keys/transparent.rs b/zcash_keys/src/keys/transparent.rs
index d2905f29a0..754cc7ae22 100644
--- a/zcash_keys/src/keys/transparent.rs
+++ b/zcash_keys/src/keys/transparent.rs
@@ -10,8 +10,8 @@ use secp256k1::{PublicKey, Secp256k1, SecretKey, Signing};
 use secrecy::{ExposeSecret, SecretString, SecretVec, Zeroize, zeroize::ZeroizeOnDrop};
 use zcash_protocol::consensus::NetworkConstants;
 
+#[cfg(feature = "transparent-inputs")]
 pub mod gap_limits;
-pub mod wallet;
 
 /// Errors that can occur in the parsing of Bitcoin-style base58-encoded secret key material
 #[derive(Debug)]
diff --git a/zcash_keys/src/keys/transparent/gap_limits.rs b/zcash_keys/src/keys/transparent/gap_limits.rs
index ed3835e56a..4d7d80c0f2 100644
--- a/zcash_keys/src/keys/transparent/gap_limits.rs
+++ b/zcash_keys/src/keys/transparent/gap_limits.rs
@@ -1,9 +1,25 @@
-//! Types and operations specific to handling of transparent addresses and transparent outputs
-//! received by the wallet.
-use transparent::keys::TransparentKeyScope;
+//! Types and operations specific to generation of transparent addresses using a "gap limit"
+//! strategy, as described by [`BIP 44`].
+//!
+//! [`BIP 44`]: https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki
 
-#[cfg(feature = "transparent-inputs")]
-pub mod wallet;
+use core::hash::Hash;
+use core::ops::Range;
+use std::vec::Vec;
+
+use crate::{
+    address::Address,
+    keys::{
+        AddressGenerationError, UnifiedAddressRequest, UnifiedFullViewingKey,
+        UnifiedIncomingViewingKey,
+    },
+};
+use transparent::{
+    address::TransparentAddress,
+    keys::{IncomingViewingKey, NonHardenedChildIndex, NonHardenedChildRange, TransparentKeyScope},
+};
+use zcash_address::unified::Typecode;
+use zip32::DiversifierIndex;
 
 /// Configuration for gap limits used in transparent address management.
 ///
@@ -103,3 +119,185 @@ impl Default for GapLimits {
         }
     }
 }
+
+/// A trait providing wallet storage operations required for transparent address gap limit
+/// management.
+///
+/// Implementations of this trait allow the gap limit logic in [`generate_gap_addresses`] to query
+/// and update the wallet's transparent address state without being coupled to a specific storage
+/// backend.
+pub trait AddressStore {
+    /// The type of errors produced by the wallet storage backend.
+    type Error;
+
+    /// A wallet-internal account identifier.
+    type AccountRef: Copy + Eq + Hash;
+
+    /// Returns the transparent address index at the start of the first gap of at least `gap_limit`
+    /// indices in the given account, considering only addresses derived for the specified key scope.
+    ///
+    /// Returns `Ok(None)` if the gap would start at an index greater than the maximum valid
+    /// non-hardened transparent child index.
+    fn find_gap_start(
+        &self,
+        account_ref: Self::AccountRef,
+        key_scope: TransparentKeyScope,
+        gap_limit: u32,
+    ) -> Result<Option<NonHardenedChildIndex>, Self::Error>;
+
+    /// Persists a range of derived transparent addresses to the wallet storage.
+    ///
+    /// Each entry in the list contains the wallet-level address, the raw transparent address,
+    /// and the child index from which the address was derived.
+    fn store_address_range(
+        &mut self,
+        account_id: Self::AccountRef,
+        key_scope: TransparentKeyScope,
+        list: Vec<(Address, TransparentAddress, NonHardenedChildIndex)>,
+    ) -> Result<(), Self::Error>;
+}
+
+fn generate_external_address(
+    uivk: &UnifiedIncomingViewingKey,
+    ua_request: UnifiedAddressRequest,
+    index: NonHardenedChildIndex,
+) -> Result<(Address, TransparentAddress), AddressGenerationError> {
+    let ua = uivk.address(index.into(), ua_request);
+    let transparent_address = uivk
+        .transparent()
+        .as_ref()
+        .ok_or(AddressGenerationError::KeyNotAvailable(Typecode::P2pkh))?
+        .derive_address(index)
+        .map_err(|_| {
+            AddressGenerationError::InvalidTransparentChildIndex(DiversifierIndex::from(index))
+        })?;
+    Ok((
+        ua.map_or_else(
+            |e| {
+                if matches!(e, AddressGenerationError::ShieldedReceiverRequired) {
+                    // fall back to the transparent-only address
+                    Ok(Address::from(transparent_address))
+                } else {
+                    // other address generation errors are allowed to propagate
+                    Err(e)
+                }
+            },
+            |addr| Ok(Address::from(addr)),
+        )?,
+        transparent_address,
+    ))
+}
+
+/// Generates a list of addresses for the given range of transparent child indices.
+///
+/// For external-scoped addresses, a unified address is generated using the provided
+/// [`UnifiedAddressRequest`]; for internal and ephemeral scopes, the raw transparent address is
+/// returned.
+///
+/// Returns an empty list if the account lacks a transparent key and `require_key` is `false`.
+/// Returns an error if the key is required but unavailable, or if the key scope is unsupported.
+pub fn generate_address_list(
+    account_uivk: &UnifiedIncomingViewingKey,
+    account_ufvk: Option<&UnifiedFullViewingKey>,
+    key_scope: TransparentKeyScope,
+    request: UnifiedAddressRequest,
+    range_to_store: Range<NonHardenedChildIndex>,
+    require_key: bool,
+) -> Result<Vec<(Address, TransparentAddress, NonHardenedChildIndex)>, AddressGenerationError> {
+    let account_pubkey = if let Some(k) = account_ufvk.and_then(|ufvk| ufvk.transparent()) {
+        k
+    } else if matches!(
+        key_scope,
+        TransparentKeyScope::INTERNAL | TransparentKeyScope::EPHEMERAL
+    ) && require_key
+    {
+        return Err(AddressGenerationError::KeyNotAvailable(Typecode::P2pkh));
+    } else {
+        // No addresses to generate
+        return Ok(vec![]);
+    };
+
+    let gen_addrs = |key_scope: TransparentKeyScope, index: NonHardenedChildIndex| match key_scope {
+        TransparentKeyScope::EXTERNAL => generate_external_address(account_uivk, request, index),
+        TransparentKeyScope::INTERNAL => {
+            let internal_address = account_pubkey
+                .derive_internal_ivk()?
+                .derive_address(index)?;
+            Ok((Address::from(internal_address), internal_address))
+        }
+        TransparentKeyScope::EPHEMERAL => {
+            let ephemeral_address = account_pubkey
+                .derive_ephemeral_ivk()?
+                .derive_ephemeral_address(index)?;
+            Ok((Address::from(ephemeral_address), ephemeral_address))
+        }
+        _ => Err(AddressGenerationError::UnsupportedTransparentKeyScope(
+            key_scope,
+        )),
+    };
+
+    NonHardenedChildRange::from(range_to_store)
+        .into_iter()
+        .map(|transparent_child_index| {
+            let (address, transparent_address) = gen_addrs(key_scope, transparent_child_index)?;
+            Ok((address, transparent_address, transparent_child_index))
+        })
+        .collect::<Result<Vec<_>, _>>()
+}
+
+/// Errors that can occur when generating transparent gap addresses.
+pub enum GapAddressesError<SE> {
+    /// An error occurred in the underlying wallet storage backend.
+    Storage(SE),
+    /// An error occurred while deriving a transparent address.
+    AddressGeneration(AddressGenerationError),
+    /// The specified account was not found in the wallet database.
+    AccountUnknown,
+}
+
+/// Generates transparent addresses to fill the gap for a given account and key scope.
+///
+/// This function queries the wallet backend (via [`AddressStore`]) to find the start
+/// of the first gap of unused addresses, then generates enough addresses to maintain the
+/// configured gap limit. If no gap exists (i.e., the address space is exhausted), this is a
+/// no-op.
+#[allow(clippy::too_many_arguments)]
+pub fn generate_gap_addresses<DbT, SE>(
+    wallet_db: &mut DbT,
+    gap_limits: &GapLimits,
+    account_id: DbT::AccountRef,
+    account_uivk: &UnifiedIncomingViewingKey,
+    account_ufvk: Option<&UnifiedFullViewingKey>,
+    key_scope: TransparentKeyScope,
+    request: UnifiedAddressRequest,
+    require_key: bool,
+) -> Result<(), GapAddressesError<SE>>
+where
+    DbT: AddressStore<Error = SE>,
+{
+    let gap_limit = gap_limits
+        .limit_for(key_scope)
+        .ok_or(GapAddressesError::AddressGeneration(
+            AddressGenerationError::UnsupportedTransparentKeyScope(key_scope),
+        ))?;
+
+    if let Some(gap_start) = wallet_db
+        .find_gap_start(account_id, key_scope, gap_limit)
+        .map_err(GapAddressesError::Storage)?
+    {
+        let address_list = generate_address_list(
+            account_uivk,
+            account_ufvk,
+            key_scope,
+            request,
+            gap_start..gap_start.saturating_add(gap_limit),
+            require_key,
+        )
+        .map_err(GapAddressesError::AddressGeneration)?;
+        wallet_db
+            .store_address_range(account_id, key_scope, address_list)
+            .map_err(GapAddressesError::Storage)?;
+    }
+
+    Ok(())
+}
diff --git a/zcash_keys/src/keys/transparent/gap_limits/wallet.rs b/zcash_keys/src/keys/transparent/gap_limits/wallet.rs
deleted file mode 100644
index 7d48f30858..0000000000
--- a/zcash_keys/src/keys/transparent/gap_limits/wallet.rs
+++ /dev/null
@@ -1,165 +0,0 @@
-//! Wallet-specific operations for transparent address gap limit management.
-//!
-//! This module provides functions for generating transparent addresses according to BIP-44
-//! gap limit rules, abstracting over the wallet storage backend via the
-//! [`GapLimitsWalletAccess`] trait.
-
-use super::GapLimits;
-use crate::address::Address;
-use crate::keys::{
-    AddressGenerationError, UnifiedAddressRequest, transparent::wallet::GapLimitsWalletAccess,
-};
-use crate::keys::{UnifiedFullViewingKey, UnifiedIncomingViewingKey};
-use core::ops::Range;
-use std::vec::Vec;
-use transparent::address::TransparentAddress;
-use transparent::keys::{
-    IncomingViewingKey, NonHardenedChildIndex, NonHardenedChildRange, TransparentKeyScope,
-};
-use zcash_address::unified::Typecode;
-use zip32::DiversifierIndex;
-
-fn generate_external_address(
-    uivk: &UnifiedIncomingViewingKey,
-    ua_request: UnifiedAddressRequest,
-    index: NonHardenedChildIndex,
-) -> Result<(Address, TransparentAddress), AddressGenerationError> {
-    let ua = uivk.address(index.into(), ua_request);
-    let transparent_address = uivk
-        .transparent()
-        .as_ref()
-        .ok_or(AddressGenerationError::KeyNotAvailable(Typecode::P2pkh))?
-        .derive_address(index)
-        .map_err(|_| {
-            AddressGenerationError::InvalidTransparentChildIndex(DiversifierIndex::from(index))
-        })?;
-    Ok((
-        ua.map_or_else(
-            |e| {
-                if matches!(e, AddressGenerationError::ShieldedReceiverRequired) {
-                    // fall back to the transparent-only address
-                    Ok(Address::from(transparent_address))
-                } else {
-                    // other address generation errors are allowed to propagate
-                    Err(e)
-                }
-            },
-            |addr| Ok(Address::from(addr)),
-        )?,
-        transparent_address,
-    ))
-}
-
-/// Generates a list of addresses for the given range of transparent child indices.
-///
-/// For external-scoped addresses, a unified address is generated using the provided
-/// [`UnifiedAddressRequest`]; for internal and ephemeral scopes, the raw transparent address is
-/// returned.
-///
-/// Returns an empty list if the account lacks a transparent key and `require_key` is `false`.
-/// Returns an error if the key is required but unavailable, or if the key scope is unsupported.
-pub fn generate_address_list(
-    account_uivk: &UnifiedIncomingViewingKey,
-    account_ufvk: Option<&UnifiedFullViewingKey>,
-    key_scope: TransparentKeyScope,
-    request: UnifiedAddressRequest,
-    range_to_store: Range<NonHardenedChildIndex>,
-    require_key: bool,
-) -> Result<Vec<(Address, TransparentAddress, NonHardenedChildIndex)>, AddressGenerationError> {
-    let account_pubkey = if let Some(k) = account_ufvk.and_then(|ufvk| ufvk.transparent()) {
-        k
-    } else if matches!(
-        key_scope,
-        TransparentKeyScope::INTERNAL | TransparentKeyScope::EPHEMERAL
-    ) && require_key
-    {
-        return Err(AddressGenerationError::KeyNotAvailable(Typecode::P2pkh));
-    } else {
-        // No addresses to generate
-        return Ok(vec![]);
-    };
-
-    let gen_addrs = |key_scope: TransparentKeyScope, index: NonHardenedChildIndex| match key_scope {
-        TransparentKeyScope::EXTERNAL => generate_external_address(account_uivk, request, index),
-        TransparentKeyScope::INTERNAL => {
-            let internal_address = account_pubkey
-                .derive_internal_ivk()?
-                .derive_address(index)?;
-            Ok((Address::from(internal_address), internal_address))
-        }
-        TransparentKeyScope::EPHEMERAL => {
-            let ephemeral_address = account_pubkey
-                .derive_ephemeral_ivk()?
-                .derive_ephemeral_address(index)?;
-            Ok((Address::from(ephemeral_address), ephemeral_address))
-        }
-        _ => Err(AddressGenerationError::UnsupportedTransparentKeyScope(
-            key_scope,
-        )),
-    };
-
-    NonHardenedChildRange::from(range_to_store)
-        .into_iter()
-        .map(|transparent_child_index| {
-            let (address, transparent_address) = gen_addrs(key_scope, transparent_child_index)?;
-            Ok((address, transparent_address, transparent_child_index))
-        })
-        .collect::<Result<Vec<_>, _>>()
-}
-
-/// Errors that can occur when generating transparent gap addresses.
-pub enum GapAddressesError<SE> {
-    /// An error occurred in the underlying wallet storage backend.
-    Storage(SE),
-    /// An error occurred while deriving a transparent address.
-    AddressGeneration(AddressGenerationError),
-    /// The specified account was not found in the wallet database.
-    AccountUnknown,
-}
-
-/// Generates transparent addresses to fill the gap for a given account and key scope.
-///
-/// This function queries the wallet backend (via [`GapLimitsWalletAccess`]) to find the start
-/// of the first gap of unused addresses, then generates enough addresses to maintain the
-/// configured gap limit. If no gap exists (i.e., the address space is exhausted), this is a
-/// no-op.
-#[allow(clippy::too_many_arguments)]
-pub fn generate_gap_addresses<DbT, SE>(
-    wallet_db: &mut DbT,
-    gap_limits: &GapLimits,
-    account_id: DbT::AccountRef,
-    account_uivk: &UnifiedIncomingViewingKey,
-    account_ufvk: Option<&UnifiedFullViewingKey>,
-    key_scope: TransparentKeyScope,
-    request: UnifiedAddressRequest,
-    require_key: bool,
-) -> Result<(), GapAddressesError<SE>>
-where
-    DbT: GapLimitsWalletAccess<Error = SE>,
-{
-    let gap_limit = gap_limits
-        .limit_for(key_scope)
-        .ok_or(GapAddressesError::AddressGeneration(
-            AddressGenerationError::UnsupportedTransparentKeyScope(key_scope),
-        ))?;
-
-    if let Some(gap_start) = wallet_db
-        .find_gap_start(account_id, key_scope, gap_limit)
-        .map_err(GapAddressesError::Storage)?
-    {
-        let address_list = generate_address_list(
-            account_uivk,
-            account_ufvk,
-            key_scope,
-            request,
-            gap_start..gap_start.saturating_add(gap_limit),
-            require_key,
-        )
-        .map_err(GapAddressesError::AddressGeneration)?;
-        wallet_db
-            .store_address_range(account_id, key_scope, address_list)
-            .map_err(GapAddressesError::Storage)?;
-    }
-
-    Ok(())
-}
diff --git a/zcash_keys/src/keys/transparent/wallet.rs b/zcash_keys/src/keys/transparent/wallet.rs
deleted file mode 100644
index 7489626ba8..0000000000
--- a/zcash_keys/src/keys/transparent/wallet.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-//! Wallet storage abstractions for transparent address gap limit management.
-//!
-//! This module defines the [`GapLimitsWalletAccess`] trait, which provides the storage
-//! operations needed by the gap limit address generation logic in
-//! [`super::gap_limits::wallet`].
-
-use crate::address::Address;
-use core::hash::Hash;
-use std::vec::Vec;
-use transparent::{
-    address::TransparentAddress,
-    keys::{NonHardenedChildIndex, TransparentKeyScope},
-};
-
-/// A trait providing wallet storage operations required for transparent address gap limit
-/// management.
-///
-/// Implementations of this trait allow the gap limit logic in
-/// [`gap_limits::wallet`](super::gap_limits::wallet) to query and update the wallet's
-/// transparent address state without being coupled to a specific storage backend.
-#[cfg(feature = "transparent-inputs")]
-pub trait GapLimitsWalletAccess {
-    /// The type of errors produced by the wallet storage backend.
-    type Error;
-
-    /// A wallet-internal account identifier.
-    type AccountRef: Copy + Eq + Hash;
-
-    /// Returns the transparent address index at the start of the first gap of at least `gap_limit`
-    /// indices in the given account, considering only addresses derived for the specified key scope.
-    ///
-    /// Returns `Ok(None)` if the gap would start at an index greater than the maximum valid
-    /// non-hardened transparent child index.
-    fn find_gap_start(
-        &self,
-        account_ref: Self::AccountRef,
-        key_scope: TransparentKeyScope,
-        gap_limit: u32,
-    ) -> Result<Option<NonHardenedChildIndex>, Self::Error>;
-
-    /// Persists a range of derived transparent addresses to the wallet storage.
-    ///
-    /// Each entry in the list contains the wallet-level address, the raw transparent address,
-    /// and the child index from which the address was derived.
-    fn store_address_range(
-        &mut self,
-        account_id: Self::AccountRef,
-        key_scope: TransparentKeyScope,
-        list: Vec<(Address, TransparentAddress, NonHardenedChildIndex)>,
-    ) -> Result<(), Self::Error>;
-}

From 83b6b27a7d30e338f3a28aa28815a400f950b1f9 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Wed, 11 Feb 2026 16:22:39 -0700
Subject: [PATCH 168/263] Fix feature-flagging errors.

---
 zcash_client_backend/src/data_api/testing/pool.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/zcash_client_backend/src/data_api/testing/pool.rs b/zcash_client_backend/src/data_api/testing/pool.rs
index 0f7ead518c..5850b3c226 100644
--- a/zcash_client_backend/src/data_api/testing/pool.rs
+++ b/zcash_client_backend/src/data_api/testing/pool.rs
@@ -8,17 +8,15 @@ use std::{
 use assert_matches::assert_matches;
 use incrementalmerkletree::{Level, Position, frontier::Frontier};
 use rand::{Rng, RngCore};
-use rand_core::OsRng;
 use secrecy::Secret;
 use shardtree::error::ShardTreeError;
 
-use transparent::{address::TransparentAddress, builder::TransparentSigningSet};
+use transparent::address::TransparentAddress;
 use zcash_keys::{address::Address, keys::UnifiedSpendingKey};
 use zcash_primitives::{
     block::BlockHash,
     transaction::{
         Transaction,
-        builder::{BuildConfig, Builder},
         fees::zip317::{FeeRule as Zip317FeeRule, MARGINAL_FEE, MINIMUM_FEE},
     },
 };
@@ -29,7 +27,6 @@ use zcash_protocol::{
     memo::{Memo, MemoBytes},
     value::Zatoshis,
 };
-use zcash_script::opcode::PushValue;
 use zip32::Scope;
 use zip321::{Payment, TransactionRequest};
 
@@ -84,7 +81,11 @@ use zcash_protocol::PoolType;
 #[cfg(feature = "pczt")]
 use {
     pczt::roles::{prover::Prover, signer::Signer},
+    rand_core::OsRng,
+    transparent::builder::TransparentSigningSet,
+    zcash_primitives::transaction::builder::{BuildConfig, Builder},
     zcash_proofs::prover::LocalTxProver,
+    zcash_script::opcode::PushValue,
 };
 
 pub mod dsl;

From 1754fa144b7155dbe0ff2fdc6a6c786dc7cec494 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Thu, 12 Feb 2026 18:23:22 -0700
Subject: [PATCH 169/263] Fix feature-flagging errors in zcash_keys transparent
 module

Items inside `transparent.rs` (ParseError, TryFromSliceError import,
test_vectors, and mod tests) compiled unconditionally and failed when
only `transparent-inputs` was active without `transparent-key-encoding`.

Gate these items on `transparent-key-encoding` and additionally gate
`ufvk_derivation`/`uivk_derivation` tests on having at least one
shielded pool, since they require `UnifiedAddressRequest` with
`Require` for shielded receivers.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 zcash_keys/src/keys.rs                        | 22 +++++++++----
 zcash_keys/src/keys/transparent.rs            | 32 +++++++++++++------
 zcash_keys/src/keys/transparent/gap_limits.rs |  2 +-
 3 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/zcash_keys/src/keys.rs b/zcash_keys/src/keys.rs
index f51f1cbe5c..cae6607dbd 100644
--- a/zcash_keys/src/keys.rs
+++ b/zcash_keys/src/keys.rs
@@ -82,7 +82,7 @@ pub mod sapling {
     }
 }
 
-#[cfg(feature = "transparent-key-encoding")]
+#[cfg(any(feature = "transparent-key-encoding", feature = "transparent-inputs"))]
 pub mod transparent;
 
 #[cfg(feature = "zcashd-compat")]
@@ -1686,14 +1686,18 @@ mod tests {
 
     #[cfg(feature = "transparent-inputs")]
     use {
-        crate::{address::Address, encoding::AddressCodec},
+        crate::encoding::AddressCodec,
         ::transparent::keys::{AccountPrivKey, IncomingViewingKey},
         alloc::string::ToString,
         alloc::vec::Vec,
-        zcash_address::test_vectors,
-        zip32::DiversifierIndex,
     };
 
+    #[cfg(all(
+        feature = "transparent-inputs",
+        any(feature = "orchard", feature = "sapling")
+    ))]
+    use {crate::address::Address, zcash_address::test_vectors, zip32::DiversifierIndex};
+
     #[cfg(feature = "unstable")]
     use super::{Era, UnifiedSpendingKey, testing::arb_unified_spending_key};
 
@@ -1851,7 +1855,10 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "transparent-inputs")]
+    #[cfg(all(
+        feature = "transparent-inputs",
+        any(feature = "orchard", feature = "sapling")
+    ))]
     fn ufvk_derivation() {
         use crate::keys::UnifiedAddressRequest;
 
@@ -2033,7 +2040,10 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "transparent-inputs")]
+    #[cfg(all(
+        feature = "transparent-inputs",
+        any(feature = "orchard", feature = "sapling")
+    ))]
     fn uivk_derivation() {
         use crate::keys::UnifiedAddressRequest;
 
diff --git a/zcash_keys/src/keys/transparent.rs b/zcash_keys/src/keys/transparent.rs
index 754cc7ae22..1bfde0aece 100644
--- a/zcash_keys/src/keys/transparent.rs
+++ b/zcash_keys/src/keys/transparent.rs
@@ -3,17 +3,20 @@
 //! These types are provided for compatibility with encodings used in zcashd RPC APIs and
 //! serialization formats.
 
-use core::array::TryFromSliceError;
-
-use bip32::{PrivateKey, PrivateKeyBytes};
-use secp256k1::{PublicKey, Secp256k1, SecretKey, Signing};
-use secrecy::{ExposeSecret, SecretString, SecretVec, Zeroize, zeroize::ZeroizeOnDrop};
-use zcash_protocol::consensus::NetworkConstants;
-
 #[cfg(feature = "transparent-inputs")]
 pub mod gap_limits;
 
+#[cfg(feature = "transparent-key-encoding")]
+use {
+    bip32::{PrivateKey, PrivateKeyBytes},
+    core::array::TryFromSliceError,
+    secp256k1::{PublicKey, Secp256k1, SecretKey, Signing},
+    secrecy::{ExposeSecret, SecretString, SecretVec, Zeroize, zeroize::ZeroizeOnDrop},
+    zcash_protocol::consensus::NetworkConstants,
+};
+
 /// Errors that can occur in the parsing of Bitcoin-style base58-encoded secret key material
+#[cfg(feature = "transparent-key-encoding")]
 #[derive(Debug)]
 pub enum ParseError {
     /// The data being decoded had an incorrect length, an incorrect prefix, or has the correct
@@ -25,18 +28,21 @@ pub enum ParseError {
     Bip32(bip32::Error),
 }
 
+#[cfg(feature = "transparent-key-encoding")]
 impl From<bs58::decode::Error> for ParseError {
     fn from(value: bs58::decode::Error) -> Self {
         ParseError::Base58(value)
     }
 }
 
+#[cfg(feature = "transparent-key-encoding")]
 impl From<TryFromSliceError> for ParseError {
     fn from(_: TryFromSliceError) -> Self {
         ParseError::InvalidEncoding
     }
 }
 
+#[cfg(feature = "transparent-key-encoding")]
 impl From<bip32::Error> for ParseError {
     fn from(value: bip32::Error) -> Self {
         ParseError::Bip32(value)
@@ -45,11 +51,13 @@ impl From<bip32::Error> for ParseError {
 
 /// A secp256k1 secret key, along with a flag indicating whether a compressed encoding should be
 /// used when performing DER serialization.
+#[cfg(feature = "transparent-key-encoding")]
 pub struct Key {
     secret: SecretKey,
     compressed: bool,
 }
 
+#[cfg(feature = "transparent-key-encoding")]
 impl Key {
     /// Constructs a new key value from a secret key and a flag indicating whether
     /// the compressed encoding should be used when performing DER serialization.
@@ -323,18 +331,23 @@ impl Key {
     }
 }
 
+#[cfg(feature = "transparent-key-encoding")]
 impl Zeroize for Key {
     fn zeroize(&mut self) {
         self.secret.non_secure_erase();
     }
 }
 
+#[cfg(feature = "transparent-key-encoding")]
 impl ZeroizeOnDrop for Key {}
 
-#[cfg(any(test, feature = "test-dependencies"))]
+#[cfg(all(
+    feature = "transparent-key-encoding",
+    any(test, feature = "test-dependencies")
+))]
 pub mod test_vectors;
 
-#[cfg(test)]
+#[cfg(all(test, feature = "transparent-key-encoding"))]
 mod tests {
     use rand::{Rng, SeedableRng as _};
     use rand_chacha::ChaChaRng;
@@ -350,6 +363,7 @@ mod tests {
     };
 
     #[test]
+    #[cfg(feature = "transparent-key-encoding")]
     fn der_encoding_roundtrip() {
         let mut rng = ChaChaRng::from_seed([0u8; 32]);
         let secp = Secp256k1::new();
diff --git a/zcash_keys/src/keys/transparent/gap_limits.rs b/zcash_keys/src/keys/transparent/gap_limits.rs
index 4d7d80c0f2..37c82c5798 100644
--- a/zcash_keys/src/keys/transparent/gap_limits.rs
+++ b/zcash_keys/src/keys/transparent/gap_limits.rs
@@ -3,9 +3,9 @@
 //!
 //! [`BIP 44`]: https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki
 
+use alloc::vec::Vec;
 use core::hash::Hash;
 use core::ops::Range;
-use std::vec::Vec;
 
 use crate::{
     address::Address,

From 1488770f6191cca05d0786d9767424779b264c80 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Thu, 12 Feb 2026 18:24:26 -0700
Subject: [PATCH 170/263] CI: test transparent sub-features individually

Add `transparent-inputs-only` and `transparent-key-encoding-only`
matrix states to `required-test` so that each transparent sub-feature
is tested in isolation, catching feature-gating regressions like the
one fixed in the prior commit.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .github/workflows/ci.yml | 6 ++++++
 zcash_keys/Cargo.toml    | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f5a7c4e9f5..76de8eb02e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,6 +21,8 @@ jobs:
           - Linux
         state:
           - transparent
+          - transparent-inputs-only
+          - transparent-key-encoding-only
           - Sapling-only
           - Orchard
           - all-pools
@@ -33,6 +35,10 @@ jobs:
 
           - state: transparent
             transparent-pool: true
+          - state: transparent-inputs-only
+            extra_flags: transparent-inputs
+          - state: transparent-key-encoding-only
+            extra_flags: transparent-key-encoding
           - state: Orchard
             orchard-pool: true
           - state: all-pools
diff --git a/zcash_keys/Cargo.toml b/zcash_keys/Cargo.toml
index 0ee42bda5d..5dcc13dd6f 100644
--- a/zcash_keys/Cargo.toml
+++ b/zcash_keys/Cargo.toml
@@ -105,7 +105,7 @@ transparent-inputs = [
 
 ## Enables use of zcashd-derived secp256k1 secret key encodings.
 transparent-key-encoding = [
-    "transparent-inputs",
+    "dep:bip32",
     "dep:secp256k1",
     "dep:zeroize",
 ]

From 944a153d0941a51532e5e7f8a5ebff476523a192 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Wed, 18 Feb 2026 17:16:24 -0700
Subject: [PATCH 171/263] zcash_primitives: Add Builder::propose_version for
 explicit tx version control

Store consensus_branch_id alongside tx_version in Builder to avoid
recomputation. Add propose_version() to allow callers to request a
specific transaction version (e.g. V4 at NU5+ heights), with validation
that the version supports all features required by the builder's current
inputs and outputs. The same check runs at build time to catch
incompatible inputs added after propose_version().

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 zcash_primitives/CHANGELOG.md               |  3 +-
 zcash_primitives/src/transaction/builder.rs | 83 +++++++++++++++++----
 2 files changed, 70 insertions(+), 16 deletions(-)

diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md
index fd5a32b0fd..752be3ab6d 100644
--- a/zcash_primitives/CHANGELOG.md
+++ b/zcash_primitives/CHANGELOG.md
@@ -14,12 +14,13 @@ workspace.
 - `zcash_primitives::transaction::builder`:
   - `impl<FE> From<coinbase::Error> for Error<FE>`
   - `Builder::add_transparent_p2pkh_input`
+  - `Builder::propose_version`
 
 ### Changed
 - MSRV is now 1.85.1.
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`.
 - `zcash_primitives::transaction::builder`:
-  - `Error` has a new `Coinbase` variant.
+  - `Error` has new `Coinbase` and `ProposedVersionIncompatible` variants.
   - `Builder::add_orchard_output`'s `value` parameter now has type `Zatoshis`
     instead of `u64`.
   - `Builder::add_transparent_input` now takes a `zcash_transparent::builder::TransparentInputInfo`
diff --git a/zcash_primitives/src/transaction/builder.rs b/zcash_primitives/src/transaction/builder.rs
index 3e8d6612b8..a5b7c9be9d 100644
--- a/zcash_primitives/src/transaction/builder.rs
+++ b/zcash_primitives/src/transaction/builder.rs
@@ -9,6 +9,7 @@ use ::transparent::{
     address::TransparentAddress, builder::TransparentBuilder, bundle::TxOut, coinbase,
 };
 use zcash_protocol::{
+    PoolType,
     consensus::{self, BlockHeight, BranchId, NetworkUpgrade, Parameters},
     memo::MemoBytes,
     value::{BalanceError, ZatBalance, Zatoshis},
@@ -109,6 +110,9 @@ pub enum Error<FE> {
     OrchardBuilderNotAvailable,
     /// An error occurred in constructing a coinbase transaction.
     Coinbase(coinbase::Error),
+    /// The proposed transaction version does not support a feature required
+    /// by the transaction under construction.
+    ProposedVersionIncompatible(TxVersion, PoolType),
     /// An error occurred in constructing the TZE parts of a transaction.
     #[cfg(zcash_unstable = "zfuture")]
     TzeBuild(tze::builder::Error),
@@ -144,6 +148,10 @@ impl<FE: fmt::Display> fmt::Display for Error<FE> {
                 f,
                 "An error occurred in constructing a coinbase transaction: {err}"
             ),
+            Error::ProposedVersionIncompatible(version, pool_type) => write!(
+                f,
+                "Proposed transaction version {version:?} does not support {pool_type}"
+            ),
             #[cfg(zcash_unstable = "zfuture")]
             Error::TzeBuild(err) => err.fmt(f),
         }
@@ -322,6 +330,8 @@ pub struct PcztParts<P: Parameters> {
 /// Generates a [`Transaction`] from its inputs and outputs.
 pub struct Builder<'a, P, U> {
     params: P,
+    tx_version: TxVersion,
+    consensus_branch_id: BranchId,
     build_config: BuildConfig,
     target_height: BlockHeight,
     expiry_height: BlockHeight,
@@ -379,6 +389,45 @@ impl<P, U> Builder<'_, P, U> {
             .as_ref()
             .map_or_else(|| &[][..], |b| b.outputs())
     }
+
+    /// Checks that the given version supports all features required by the inputs and
+    /// outputs already added to the builder.
+    fn check_version_compatibility<FE>(&self, version: TxVersion) -> Result<(), Error<FE>> {
+        if !version.has_sapling()
+            && (!self.sapling_inputs().is_empty() || !self.sapling_outputs().is_empty())
+        {
+            return Err(Error::ProposedVersionIncompatible(
+                version,
+                PoolType::SAPLING,
+            ));
+        }
+        if !version.has_orchard()
+            && self
+                .orchard_builder
+                .as_ref()
+                .is_some_and(|b| !b.spends().is_empty() || !b.outputs().is_empty())
+        {
+            return Err(Error::ProposedVersionIncompatible(
+                version,
+                PoolType::ORCHARD,
+            ));
+        }
+        Ok(())
+    }
+
+    /// Proposes a specific transaction version.
+    ///
+    /// Validates that the proposed version supports all features required by
+    /// the inputs and outputs already added to the builder. Returns
+    /// [`Error::ProposedVersionIncompatible`] if validation fails.
+    ///
+    /// The same validation is performed at build time to catch inputs/outputs
+    /// added after this call.
+    pub fn propose_version<FE>(&mut self, version: TxVersion) -> Result<(), Error<FE>> {
+        self.check_version_compatibility(version)?;
+        self.tx_version = version;
+        Ok(())
+    }
 }
 
 impl<'a, P: consensus::Parameters> Builder<'a, P, ()> {
@@ -423,8 +472,14 @@ impl<'a, P: consensus::Parameters> Builder<'a, P, ()> {
             target_height + DEFAULT_TX_EXPIRY_DELTA
         };
 
+        // Determine the default transaction version for the consensus branch
+        let consensus_branch_id = BranchId::for_height(&params, target_height);
+        let tx_version = TxVersion::suggested_for_branch(consensus_branch_id);
+
         Builder {
             params,
+            tx_version,
+            consensus_branch_id,
             build_config,
             target_height,
             expiry_height,
@@ -457,6 +512,8 @@ impl<'a, P: consensus::Parameters> Builder<'a, P, ()> {
     ) -> Builder<'a, P, Sender<Progress>> {
         Builder {
             params: self.params,
+            tx_version: self.tx_version,
+            consensus_branch_id: self.consensus_branch_id,
             build_config: self.build_config,
             target_height: self.target_height,
             expiry_height: self.expiry_height,
@@ -936,10 +993,7 @@ impl<P: consensus::Parameters, U: sapling::builder::ProverProgress> Builder<'_,
         SP: SpendProver,
         OP: OutputProver,
     {
-        let consensus_branch_id = BranchId::for_height(&self.params, self.target_height);
-
-        // determine transaction version
-        let version = TxVersion::suggested_for_branch(consensus_branch_id);
+        self.check_version_compatibility::<FE>(self.tx_version)?;
 
         //
         // Consistency checks
@@ -1012,8 +1066,8 @@ impl<P: consensus::Parameters, U: sapling::builder::ProverProgress> Builder<'_,
         let (tze_bundle, tze_signers) = build_future(self.tze_builder);
 
         let unauthed_tx: TransactionData<A> = TransactionData {
-            version,
-            consensus_branch_id,
+            version: self.tx_version,
+            consensus_branch_id: self.consensus_branch_id,
             lock_time: 0,
             expiry_height: self.expiry_height,
             #[cfg(all(
@@ -1129,12 +1183,7 @@ impl<P: consensus::Parameters, U> Builder<'_, P, U> {
         fee_rule: &FR,
     ) -> Result<PcztResult<P>, Error<FR::Error>> {
         let fee = self.get_fee(fee_rule).map_err(Error::Fee)?;
-        let consensus_branch_id = BranchId::for_height(&self.params, self.target_height);
-
-        // determine transaction version
-        let version = TxVersion::suggested_for_branch(consensus_branch_id);
-
-        let consensus_branch_id = BranchId::for_height(&self.params, self.target_height);
+        self.check_version_compatibility::<FR::Error>(self.tx_version)?;
 
         //
         // Consistency checks
@@ -1184,8 +1233,8 @@ impl<P: consensus::Parameters, U> Builder<'_, P, U> {
         Ok(PcztResult {
             pczt_parts: PcztParts {
                 params: self.params,
-                version,
-                consensus_branch_id,
+                version: self.tx_version,
+                consensus_branch_id: self.consensus_branch_id,
                 lock_time: 0,
                 expiry_height: self.expiry_height,
                 transparent: transparent_bundle,
@@ -1330,8 +1379,9 @@ mod tests {
 
     #[cfg(feature = "transparent-inputs")]
     use {
-        crate::transaction::{OutPoint, TxOut, builder::DEFAULT_TX_EXPIRY_DELTA},
+        crate::transaction::{OutPoint, TxOut, TxVersion, builder::DEFAULT_TX_EXPIRY_DELTA},
         ::transparent::keys::{AccountPrivKey, IncomingViewingKey},
+        zcash_protocol::consensus::BranchId,
         zip32::AccountId,
     };
 
@@ -1349,8 +1399,11 @@ mod tests {
             .unwrap();
 
         // Create a builder with 0 fee, so we can construct t outputs
+        let consensus_branch_id = BranchId::for_height(&TEST_NETWORK, sapling_activation_height);
         let mut builder = builder::Builder {
             params: TEST_NETWORK,
+            tx_version: TxVersion::suggested_for_branch(consensus_branch_id),
+            consensus_branch_id,
             build_config: BuildConfig::Standard {
                 sapling_anchor: Some(sapling::Anchor::empty_tree()),
                 orchard_anchor: Some(orchard::Anchor::empty_tree()),

From 8bad53b6bdefd74a18bc336190c01a387425c6e9 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Wed, 18 Feb 2026 17:16:29 -0700
Subject: [PATCH 172/263] zcash_client_backend: Add proposed_version parameter
 to create_proposed_transactions

Thread an optional TxVersion parameter through create_proposed_transactions,
gated behind the `unstable` feature flag, allowing callers to request a
specific transaction version for non-standard use cases (e.g. V4
transactions at NU5+ heights for Sapling/transparent-only transactions).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 zcash_client_backend/CHANGELOG.md            |  3 +++
 zcash_client_backend/src/data_api/testing.rs |  4 ++++
 zcash_client_backend/src/data_api/wallet.rs  | 19 +++++++++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index 10826fd605..2161c29a8c 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -26,6 +26,9 @@ workspace.
 - `zcash_client_backend::data_api::ll`
 
 ### Changed
+- `zcash_client_backend::data_api::wallet::create_proposed_transactions` now takes
+  an additional `proposed_version: Option<TxVersion>` parameter under the `unstable`
+  feature flag, allowing callers to request a specific transaction version.
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`, `zip321 0.7`
 - Migrated to `lightwallet-protocol v0.4.0`. This results in the following API
   changes:
diff --git a/zcash_client_backend/src/data_api/testing.rs b/zcash_client_backend/src/data_api/testing.rs
index 83b6f58736..dee69ffe80 100644
--- a/zcash_client_backend/src/data_api/testing.rs
+++ b/zcash_client_backend/src/data_api/testing.rs
@@ -967,6 +967,8 @@ where
             &SpendingKeys::from_unified_spending_key(usk.clone()),
             ovk_policy,
             &proposal,
+            #[cfg(feature = "unstable")]
+            None,
         )
     }
 
@@ -1131,6 +1133,8 @@ where
             &SpendingKeys::from_unified_spending_key(usk.clone()),
             ovk_policy,
             proposal,
+            #[cfg(feature = "unstable")]
+            None,
         )
     }
 
diff --git a/zcash_client_backend/src/data_api/wallet.rs b/zcash_client_backend/src/data_api/wallet.rs
index 5c1e8eb0ad..7278b67cb4 100644
--- a/zcash_client_backend/src/data_api/wallet.rs
+++ b/zcash_client_backend/src/data_api/wallet.rs
@@ -112,6 +112,9 @@ use {
     zcash_protocol::consensus::NetworkConstants,
 };
 
+#[cfg(feature = "unstable")]
+use zcash_primitives::transaction::TxVersion;
+
 pub mod input_selection;
 use input_selection::{GreedyInputSelector, InputSelector, InputSelectorError};
 
@@ -895,6 +898,7 @@ pub fn create_proposed_transactions<DbT, ParamsT, InputsErrT, FeeRuleT, ChangeEr
     spending_keys: &SpendingKeys,
     ovk_policy: OvkPolicy,
     proposal: &Proposal<FeeRuleT, N>,
+    #[cfg(feature = "unstable")] proposed_version: Option<TxVersion>,
 ) -> Result<NonEmpty<TxId>, CreateErrT<DbT, InputsErrT, FeeRuleT, ChangeErrT, N>>
 where
     DbT: WalletWrite + WalletCommitmentTrees,
@@ -929,6 +933,8 @@ where
             step,
             #[cfg(feature = "transparent-inputs")]
             &mut unused_transparent_outputs,
+            #[cfg(feature = "unstable")]
+            proposed_version,
         )?;
         step_results.push((step, step_result));
     }
@@ -1079,6 +1085,7 @@ fn build_proposed_transaction<DbT, ParamsT, InputsErrT, FeeRuleT, ChangeErrT, N>
         StepOutput,
         (TransparentAddress, OutPoint),
     >,
+    #[cfg(feature = "unstable")] proposed_version: Option<TxVersion>,
 ) -> Result<
     BuildState<'static, ParamsT, DbT::AccountId>,
     CreateErrT<DbT, InputsErrT, FeeRuleT, ChangeErrT, N>,
@@ -1218,6 +1225,11 @@ where
         },
     );
 
+    #[cfg(feature = "unstable")]
+    if let Some(version) = proposed_version {
+        builder.propose_version(version)?;
+    }
+
     #[cfg(all(feature = "transparent-inputs", not(feature = "orchard")))]
     let has_shielded_inputs = !sapling_inputs.is_empty();
     #[cfg(all(feature = "transparent-inputs", feature = "orchard"))]
@@ -1644,6 +1656,7 @@ fn create_proposed_transaction<DbT, ParamsT, InputsErrT, FeeRuleT, ChangeErrT, N
         StepOutput,
         (TransparentAddress, OutPoint),
     >,
+    #[cfg(feature = "unstable")] proposed_version: Option<TxVersion>,
 ) -> Result<
     StepResult<<DbT as WalletRead>::AccountId>,
     CreateErrT<DbT, InputsErrT, FeeRuleT, ChangeErrT, N>,
@@ -1664,6 +1677,8 @@ where
         proposal_step,
         #[cfg(feature = "transparent-inputs")]
         unused_transparent_outputs,
+        #[cfg(feature = "unstable")]
+        proposed_version,
     )?;
 
     // Build the transaction with the specified fee rule
@@ -1874,6 +1889,8 @@ where
         proposal_step,
         #[cfg(feature = "transparent-inputs")]
         unused_transparent_outputs,
+        #[cfg(feature = "unstable")]
+        None,
     )?;
 
     // Build the transaction with the specified fee rule
@@ -2599,5 +2616,7 @@ where
         spending_keys,
         OvkPolicy::Sender,
         &proposal,
+        #[cfg(feature = "unstable")]
+        None,
     )
 }

From 0d6e7fdc32321c60fa39b13a3017296a23e205ee Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Wed, 18 Feb 2026 20:04:26 -0700
Subject: [PATCH 173/263] zcash_client_backend: Thread proposed_version through
 proposal functions

Input selection now respects transaction version constraints by skipping
Orchard pools (for both inputs and outputs) when the proposed version
does not support them (e.g. V4). This prevents proposals that would fail
at build time due to incompatible pool selection.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 zcash_client_backend/CHANGELOG.md             |  8 ++++
 zcash_client_backend/src/data_api/testing.rs  |  6 +++
 zcash_client_backend/src/data_api/wallet.rs   |  6 +++
 .../src/data_api/wallet/input_selection.rs    | 37 ++++++++++++++++---
 4 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index 2161c29a8c..cb5788bfb7 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -29,6 +29,14 @@ workspace.
 - `zcash_client_backend::data_api::wallet::create_proposed_transactions` now takes
   an additional `proposed_version: Option<TxVersion>` parameter under the `unstable`
   feature flag, allowing callers to request a specific transaction version.
+- `zcash_client_backend::data_api::wallet::propose_transfer` and
+  `propose_standard_transfer_to_address` now take an additional
+  `proposed_version: Option<TxVersion>` parameter under the `unstable` feature
+  flag. When set, input selection avoids pools incompatible with the requested
+  transaction version.
+- `InputSelector::propose_transaction` trait method takes an additional
+  `proposed_version: Option<TxVersion>` parameter under the `unstable` feature
+  flag.
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`, `zip321 0.7`
 - Migrated to `lightwallet-protocol v0.4.0`. This results in the following API
   changes:
diff --git a/zcash_client_backend/src/data_api/testing.rs b/zcash_client_backend/src/data_api/testing.rs
index dee69ffe80..b71de25a94 100644
--- a/zcash_client_backend/src/data_api/testing.rs
+++ b/zcash_client_backend/src/data_api/testing.rs
@@ -957,6 +957,8 @@ where
             change_strategy,
             request,
             confirmations_policy,
+            #[cfg(feature = "unstable")]
+            None,
         )?;
 
         create_proposed_transactions(
@@ -998,6 +1000,8 @@ where
             change_strategy,
             request,
             confirmations_policy,
+            #[cfg(feature = "unstable")]
+            None,
         )
     }
 
@@ -1066,6 +1070,8 @@ where
             memo,
             change_memo,
             fallback_change_pool,
+            #[cfg(feature = "unstable")]
+            None,
         );
 
         if let Ok(proposal) = &result {
diff --git a/zcash_client_backend/src/data_api/wallet.rs b/zcash_client_backend/src/data_api/wallet.rs
index 7278b67cb4..1517825aec 100644
--- a/zcash_client_backend/src/data_api/wallet.rs
+++ b/zcash_client_backend/src/data_api/wallet.rs
@@ -616,6 +616,7 @@ pub fn propose_transfer<DbT, ParamsT, InputsT, ChangeT, CommitmentTreeErrT>(
     change_strategy: &ChangeT,
     request: zip321::TransactionRequest,
     confirmations_policy: ConfirmationsPolicy,
+    #[cfg(feature = "unstable")] proposed_version: Option<TxVersion>,
 ) -> Result<
     Proposal<ChangeT::FeeRule, <DbT as InputSource>::NoteRef>,
     ProposeTransferErrT<DbT, CommitmentTreeErrT, InputsT, ChangeT>,
@@ -646,6 +647,8 @@ where
         spend_from_account,
         request,
         change_strategy,
+        #[cfg(feature = "unstable")]
+        proposed_version,
     )?;
     Ok(proposal)
 }
@@ -688,6 +691,7 @@ pub fn propose_standard_transfer_to_address<DbT, ParamsT, CommitmentTreeErrT>(
     memo: Option<MemoBytes>,
     change_memo: Option<MemoBytes>,
     fallback_change_pool: ShieldedProtocol,
+    #[cfg(feature = "unstable")] proposed_version: Option<TxVersion>,
 ) -> Result<
     Proposal<StandardFeeRule, DbT::NoteRef>,
     ProposeTransferErrT<
@@ -734,6 +738,8 @@ where
         &change_strategy,
         request,
         confirmations_policy,
+        #[cfg(feature = "unstable")]
+        proposed_version,
     )
 }
 
diff --git a/zcash_client_backend/src/data_api/wallet/input_selection.rs b/zcash_client_backend/src/data_api/wallet/input_selection.rs
index 74eab24899..2a688f1ba5 100644
--- a/zcash_client_backend/src/data_api/wallet/input_selection.rs
+++ b/zcash_client_backend/src/data_api/wallet/input_selection.rs
@@ -50,6 +50,9 @@ use {
 #[cfg(feature = "orchard")]
 use crate::fees::orchard as orchard_fees;
 
+#[cfg(feature = "unstable")]
+use zcash_primitives::transaction::TxVersion;
+
 /// The type of errors that may be produced in input selection.
 #[derive(Debug)]
 pub enum InputSelectorError<DbErrT, SelectorErrT, ChangeErrT, N> {
@@ -198,6 +201,7 @@ pub trait InputSelector {
         account: <Self::InputSource as InputSource>::AccountId,
         transaction_request: TransactionRequest,
         change_strategy: &ChangeT,
+        #[cfg(feature = "unstable")] proposed_version: Option<TxVersion>,
     ) -> Result<
         Proposal<<ChangeT as ChangeStrategy>::FeeRule, <Self::InputSource as InputSource>::NoteRef>,
         InputSelectorError<
@@ -389,6 +393,7 @@ impl<DbT: InputSource> InputSelector for GreedyInputSelector<DbT> {
         account: <DbT as InputSource>::AccountId,
         transaction_request: TransactionRequest,
         change_strategy: &ChangeT,
+        #[cfg(feature = "unstable")] proposed_version: Option<TxVersion>,
     ) -> Result<
         Proposal<<ChangeT as ChangeStrategy>::FeeRule, DbT::NoteRef>,
         InputSelectorError<<DbT as InputSource>::Error, Self::Error, ChangeT::Error, DbT::NoteRef>,
@@ -398,6 +403,10 @@ impl<DbT: InputSource> InputSelector for GreedyInputSelector<DbT> {
         Self::InputSource: InputSource,
         ChangeT: ChangeStrategy<MetaSource = DbT>,
     {
+        // proposed_version is only used in orchard-gated code paths
+        #[cfg(all(feature = "unstable", not(feature = "orchard")))]
+        let _ = proposed_version;
+
         let mut transparent_outputs = vec![];
         let mut sapling_outputs = vec![];
         #[cfg(feature = "orchard")]
@@ -466,10 +475,17 @@ impl<DbT: InputSource> InputSelector for GreedyInputSelector<DbT> {
                 }
                 Address::Unified(addr) => {
                     #[cfg(feature = "orchard")]
-                    if addr.has_orchard() {
-                        payment_pools.insert(*idx, PoolType::ORCHARD);
-                        orchard_outputs.push(OrchardPayment(payment_amount));
-                        continue;
+                    {
+                        #[cfg(feature = "unstable")]
+                        let version_has_orchard = proposed_version.is_none_or(|v| v.has_orchard());
+                        #[cfg(not(feature = "unstable"))]
+                        let version_has_orchard = true;
+
+                        if addr.has_orchard() && version_has_orchard {
+                            payment_pools.insert(*idx, PoolType::ORCHARD);
+                            orchard_outputs.push(OrchardPayment(payment_amount));
+                            continue;
+                        }
                     }
 
                     if addr.has_sapling() {
@@ -678,7 +694,18 @@ impl<DbT: InputSource> InputSelector for GreedyInputSelector<DbT> {
             #[cfg(not(feature = "orchard"))]
             let selectable_pools = &[ShieldedProtocol::Sapling];
             #[cfg(feature = "orchard")]
-            let selectable_pools = &[ShieldedProtocol::Sapling, ShieldedProtocol::Orchard];
+            let selectable_pools = {
+                #[cfg(feature = "unstable")]
+                let version_has_orchard = proposed_version.is_none_or(|v| v.has_orchard());
+                #[cfg(not(feature = "unstable"))]
+                let version_has_orchard = true;
+
+                if version_has_orchard {
+                    &[ShieldedProtocol::Sapling, ShieldedProtocol::Orchard][..]
+                } else {
+                    &[ShieldedProtocol::Sapling][..]
+                }
+            };
 
             shielded_inputs = wallet_db
                 .select_spendable_notes(

From b7023502f0c1f2264b2ba49e24917c2c09038a42 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Thu, 19 Feb 2026 21:53:56 -0700
Subject: [PATCH 174/263] Improve builder & input selection compatibility
 checks.

---
 components/zcash_protocol/CHANGELOG.md        |  1 +
 components/zcash_protocol/src/consensus.rs    | 40 +++++++++++++++++
 .../src/data_api/wallet/input_selection.rs    | 45 +++++++++----------
 zcash_primitives/CHANGELOG.md                 |  2 +-
 zcash_primitives/src/transaction/builder.rs   | 25 ++++++-----
 5 files changed, 77 insertions(+), 36 deletions(-)

diff --git a/components/zcash_protocol/CHANGELOG.md b/components/zcash_protocol/CHANGELOG.md
index 7868f6c18a..4a088c2cb7 100644
--- a/components/zcash_protocol/CHANGELOG.md
+++ b/components/zcash_protocol/CHANGELOG.md
@@ -13,6 +13,7 @@ workspace.
 ### Added
 - `zcash_protocol::consensus::TxIndex`
 - `zcash_protocol::consensus::COINBASE_MATURITY_BLOCKS`
+- `zcash_protocol::consensus::BranchId::{has_sprout, has_sapling, has_orchard}`
 
 ## [0.7.2] - 2025-12-10
 
diff --git a/components/zcash_protocol/src/consensus.rs b/components/zcash_protocol/src/consensus.rs
index 33ae6005d1..5fce4a334f 100644
--- a/components/zcash_protocol/src/consensus.rs
+++ b/components/zcash_protocol/src/consensus.rs
@@ -863,6 +863,46 @@ impl BranchId {
     pub fn sprout_uses_groth_proofs(&self) -> bool {
         !matches!(self, BranchId::Sprout | BranchId::Overwinter)
     }
+
+    // Returns `true` for consensus branches that support the Sprout protocol, `false` otherwise..
+    pub fn has_sprout(&self) -> bool {
+        use BranchId::*;
+        match self {
+            Sprout | Overwinter | Sapling | Blossom | Heartwood | Canopy | Nu5 | Nu6 | Nu6_1 => {
+                true
+            }
+            #[cfg(zcash_unstable = "nu7")]
+            BranchId::Nu7 => false,
+            #[cfg(zcash_unstable = "zfuture")]
+            BranchId::ZFuture => false,
+        }
+    }
+
+    // Returns `true` for consensus branches that support the Sapling protocol, `false` otherwise..
+    pub fn has_sapling(&self) -> bool {
+        use BranchId::*;
+        match self {
+            Sprout | Overwinter => false,
+            Sapling | Blossom | Heartwood | Canopy | Nu5 | Nu6 | Nu6_1 => true,
+            #[cfg(zcash_unstable = "nu7")]
+            BranchId::Nu7 => true,
+            #[cfg(zcash_unstable = "zfuture")]
+            BranchId::ZFuture => true,
+        }
+    }
+
+    // Returns `true` for consensus branches that support the Orchard protocol, `false` otherwise.
+    pub fn has_orchard(&self) -> bool {
+        use BranchId::*;
+        match self {
+            Sprout | Overwinter | Sapling | Blossom | Heartwood | Canopy => false,
+            Nu5 | Nu6 | Nu6_1 => true,
+            #[cfg(zcash_unstable = "nu7")]
+            BranchId::Nu7 => true,
+            #[cfg(zcash_unstable = "zfuture")]
+            BranchId::ZFuture => true,
+        }
+    }
 }
 
 #[cfg(any(test, feature = "test-dependencies"))]
diff --git a/zcash_client_backend/src/data_api/wallet/input_selection.rs b/zcash_client_backend/src/data_api/wallet/input_selection.rs
index 2a688f1ba5..d7719b6558 100644
--- a/zcash_client_backend/src/data_api/wallet/input_selection.rs
+++ b/zcash_client_backend/src/data_api/wallet/input_selection.rs
@@ -403,9 +403,15 @@ impl<DbT: InputSource> InputSelector for GreedyInputSelector<DbT> {
         Self::InputSource: InputSource,
         ChangeT: ChangeStrategy<MetaSource = DbT>,
     {
-        // proposed_version is only used in orchard-gated code paths
-        #[cfg(all(feature = "unstable", not(feature = "orchard")))]
-        let _ = proposed_version;
+        #[cfg(feature = "unstable")]
+        let (sapling_supported, orchard_supported) = proposed_version.map_or((true, true), |v| {
+            (
+                v.has_sapling(),
+                cfg!(feature = "orchard") && v.has_orchard(),
+            )
+        });
+        #[cfg(not(feature = "unstable"))]
+        let (sapling_supported, orchard_supported) = (true, cfg!(feature = "orchard"));
 
         let mut transparent_outputs = vec![];
         let mut sapling_outputs = vec![];
@@ -475,20 +481,13 @@ impl<DbT: InputSource> InputSelector for GreedyInputSelector<DbT> {
                 }
                 Address::Unified(addr) => {
                     #[cfg(feature = "orchard")]
-                    {
-                        #[cfg(feature = "unstable")]
-                        let version_has_orchard = proposed_version.is_none_or(|v| v.has_orchard());
-                        #[cfg(not(feature = "unstable"))]
-                        let version_has_orchard = true;
-
-                        if addr.has_orchard() && version_has_orchard {
-                            payment_pools.insert(*idx, PoolType::ORCHARD);
-                            orchard_outputs.push(OrchardPayment(payment_amount));
-                            continue;
-                        }
+                    if addr.has_orchard() && orchard_supported {
+                        payment_pools.insert(*idx, PoolType::ORCHARD);
+                        orchard_outputs.push(OrchardPayment(payment_amount));
+                        continue;
                     }
 
-                    if addr.has_sapling() {
+                    if addr.has_sapling() && sapling_supported {
                         payment_pools.insert(*idx, PoolType::SAPLING);
                         sapling_outputs.push(SaplingPayment(payment_amount));
                         continue;
@@ -691,19 +690,15 @@ impl<DbT: InputSource> InputSelector for GreedyInputSelector<DbT> {
                 Err(other) => return Err(InputSelectorError::Change(other)),
             }
 
-            #[cfg(not(feature = "orchard"))]
-            let selectable_pools = &[ShieldedProtocol::Sapling];
-            #[cfg(feature = "orchard")]
             let selectable_pools = {
-                #[cfg(feature = "unstable")]
-                let version_has_orchard = proposed_version.is_none_or(|v| v.has_orchard());
-                #[cfg(not(feature = "unstable"))]
-                let version_has_orchard = true;
-
-                if version_has_orchard {
+                if orchard_supported && sapling_supported {
                     &[ShieldedProtocol::Sapling, ShieldedProtocol::Orchard][..]
-                } else {
+                } else if orchard_supported {
+                    &[ShieldedProtocol::Orchard][..]
+                } else if sapling_supported {
                     &[ShieldedProtocol::Sapling][..]
+                } else {
+                    &[]
                 }
             };
 
diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md
index 752be3ab6d..1e04f1eac0 100644
--- a/zcash_primitives/CHANGELOG.md
+++ b/zcash_primitives/CHANGELOG.md
@@ -20,7 +20,7 @@ workspace.
 - MSRV is now 1.85.1.
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`.
 - `zcash_primitives::transaction::builder`:
-  - `Error` has new `Coinbase` and `ProposedVersionIncompatible` variants.
+  - `Error` has new `Coinbase` and `TargetIncompatible` variants.
   - `Builder::add_orchard_output`'s `value` parameter now has type `Zatoshis`
     instead of `u64`.
   - `Builder::add_transparent_input` now takes a `zcash_transparent::builder::TransparentInputInfo`
diff --git a/zcash_primitives/src/transaction/builder.rs b/zcash_primitives/src/transaction/builder.rs
index a5b7c9be9d..b30d215521 100644
--- a/zcash_primitives/src/transaction/builder.rs
+++ b/zcash_primitives/src/transaction/builder.rs
@@ -110,9 +110,9 @@ pub enum Error<FE> {
     OrchardBuilderNotAvailable,
     /// An error occurred in constructing a coinbase transaction.
     Coinbase(coinbase::Error),
-    /// The proposed transaction version does not support a feature required
-    /// by the transaction under construction.
-    ProposedVersionIncompatible(TxVersion, PoolType),
+    /// The proposed transaction version or the consensus branch id for the target height does not
+    /// support a feature required by the transaction under construction.
+    TargetIncompatible(BranchId, TxVersion, PoolType),
     /// An error occurred in constructing the TZE parts of a transaction.
     #[cfg(zcash_unstable = "zfuture")]
     TzeBuild(tze::builder::Error),
@@ -148,9 +148,9 @@ impl<FE: fmt::Display> fmt::Display for Error<FE> {
                 f,
                 "An error occurred in constructing a coinbase transaction: {err}"
             ),
-            Error::ProposedVersionIncompatible(version, pool_type) => write!(
+            Error::TargetIncompatible(branch_id, version, pool_type) => write!(
                 f,
-                "Proposed transaction version {version:?} does not support {pool_type}"
+                "Proposed transaction version {version:?} or consensus branch {branch_id:?} does not support {pool_type}"
             ),
             #[cfg(zcash_unstable = "zfuture")]
             Error::TzeBuild(err) => err.fmt(f),
@@ -393,21 +393,26 @@ impl<P, U> Builder<'_, P, U> {
     /// Checks that the given version supports all features required by the inputs and
     /// outputs already added to the builder.
     fn check_version_compatibility<FE>(&self, version: TxVersion) -> Result<(), Error<FE>> {
-        if !version.has_sapling()
+        let sapling_available = version.has_sapling() && self.consensus_branch_id.has_sapling();
+        if !sapling_available
             && (!self.sapling_inputs().is_empty() || !self.sapling_outputs().is_empty())
         {
-            return Err(Error::ProposedVersionIncompatible(
+            return Err(Error::TargetIncompatible(
+                self.consensus_branch_id,
                 version,
                 PoolType::SAPLING,
             ));
         }
-        if !version.has_orchard()
+
+        let orchard_available = version.has_orchard() && self.consensus_branch_id.has_orchard();
+        if !orchard_available
             && self
                 .orchard_builder
                 .as_ref()
                 .is_some_and(|b| !b.spends().is_empty() || !b.outputs().is_empty())
         {
-            return Err(Error::ProposedVersionIncompatible(
+            return Err(Error::TargetIncompatible(
+                self.consensus_branch_id,
                 version,
                 PoolType::ORCHARD,
             ));
@@ -419,7 +424,7 @@ impl<P, U> Builder<'_, P, U> {
     ///
     /// Validates that the proposed version supports all features required by
     /// the inputs and outputs already added to the builder. Returns
-    /// [`Error::ProposedVersionIncompatible`] if validation fails.
+    /// [`Error::TargetIncompatible`] if validation fails.
     ///
     /// The same validation is performed at build time to catch inputs/outputs
     /// added after this call.

From 5eba0bb55a217cbea2a65ed3e76c4bf88d1cdba4 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Fri, 20 Feb 2026 10:45:03 -0700
Subject: [PATCH 175/263] Ensure compatibiltiy between transaction versions and
 consensus branch IDs.

This adds additional checks to proposal creation and transaction
construction to ensure compatibility between transaction version,
consensus branch, and the protocols enabled for that consensus branch.
---
 zcash_client_backend/CHANGELOG.md             |  3 +-
 .../src/data_api/wallet/input_selection.rs    | 20 ++++++----
 zcash_client_backend/src/proposal.rs          | 12 ++++++
 zcash_primitives/CHANGELOG.md                 |  1 +
 zcash_primitives/src/transaction/builder.rs   | 31 ++++++++++----
 zcash_primitives/src/transaction/mod.rs       | 40 +++++++++++++++++++
 6 files changed, 91 insertions(+), 16 deletions(-)

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index cb5788bfb7..19eb03d392 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -63,7 +63,8 @@ workspace.
     that would otherwise only be recoverable using the wallet's internal
     IVK.
 - `zcash_client_backend::data_api::WalletRead` has added method `get_received_outputs`.
-- `zcash_client_backend::proposal::ProposalError` has added variant `PaymentAmountMissing`
+- `zcash_client_backend::proposal::ProposalError` has added variants `PaymentAmountMissing`
+  and `IncompatibleTxVersion`
 - The associated type `zcash_client_backend::fees::ChangeStrategy::MetaSource` is now
   bounded on the newly added `MetaSource` type instead of
   `zcash_client_backend::data_api::InputSource`.
diff --git a/zcash_client_backend/src/data_api/wallet/input_selection.rs b/zcash_client_backend/src/data_api/wallet/input_selection.rs
index d7719b6558..03414be623 100644
--- a/zcash_client_backend/src/data_api/wallet/input_selection.rs
+++ b/zcash_client_backend/src/data_api/wallet/input_selection.rs
@@ -17,7 +17,7 @@ use zcash_primitives::transaction::fees::{
 };
 use zcash_protocol::{
     PoolType, ShieldedProtocol,
-    consensus::{self, BlockHeight},
+    consensus::{self, BlockHeight, BranchId},
     memo::MemoBytes,
     value::{BalanceError, Zatoshis},
 };
@@ -404,12 +404,18 @@ impl<DbT: InputSource> InputSelector for GreedyInputSelector<DbT> {
         ChangeT: ChangeStrategy<MetaSource = DbT>,
     {
         #[cfg(feature = "unstable")]
-        let (sapling_supported, orchard_supported) = proposed_version.map_or((true, true), |v| {
-            (
-                v.has_sapling(),
-                cfg!(feature = "orchard") && v.has_orchard(),
-            )
-        });
+        let (sapling_supported, orchard_supported) =
+            proposed_version.map_or(Ok((true, true)), |v| {
+                let branch_id = BranchId::for_height(params, BlockHeight::from(target_height));
+                if v.valid_in_branch(branch_id) {
+                    Ok((
+                        v.has_sapling(),
+                        cfg!(feature = "orchard") && v.has_orchard(),
+                    ))
+                } else {
+                    Err(ProposalError::IncompatibleTxVersion(branch_id))
+                }
+            })?;
         #[cfg(not(feature = "unstable"))]
         let (sapling_supported, orchard_supported) = (true, cfg!(feature = "orchard"));
 
diff --git a/zcash_client_backend/src/proposal.rs b/zcash_client_backend/src/proposal.rs
index e8b334b6a2..cefb8391bd 100644
--- a/zcash_client_backend/src/proposal.rs
+++ b/zcash_client_backend/src/proposal.rs
@@ -16,6 +16,9 @@ use crate::{
     wallet::{Note, ReceivedNote, WalletTransparentOutput},
 };
 
+#[cfg(feature = "unstable")]
+use zcash_protocol::consensus::BranchId;
+
 /// Errors that can occur in construction of a [`Step`].
 #[derive(Debug, Clone)]
 pub enum ProposalError {
@@ -67,6 +70,10 @@ pub enum ProposalError {
     /// activity.
     #[cfg(feature = "transparent-inputs")]
     EphemeralAddressLinkability,
+    /// The transaction version requested is not compatible with the consensus branch for which the
+    /// transaction is intended.
+    #[cfg(feature = "unstable")]
+    IncompatibleTxVersion(BranchId),
 }
 
 impl Display for ProposalError {
@@ -144,6 +151,11 @@ impl Display for ProposalError {
                 f,
                 "The proposal requested spending funds in a way that would link activity on an ephemeral address to other wallet activity."
             ),
+            #[cfg(feature = "unstable")]
+            ProposalError::IncompatibleTxVersion(branch_id) => write!(
+                f,
+                "The requested transaction version is incompatible with consensus branch {branch_id:?}"
+            ),
         }
     }
 }
diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md
index 1e04f1eac0..f7fbf5c041 100644
--- a/zcash_primitives/CHANGELOG.md
+++ b/zcash_primitives/CHANGELOG.md
@@ -15,6 +15,7 @@ workspace.
   - `impl<FE> From<coinbase::Error> for Error<FE>`
   - `Builder::add_transparent_p2pkh_input`
   - `Builder::propose_version`
+- `zcash_primitives::transaction::TxVersion::valid_in_branch`
 
 ### Changed
 - MSRV is now 1.85.1.
diff --git a/zcash_primitives/src/transaction/builder.rs b/zcash_primitives/src/transaction/builder.rs
index b30d215521..f2e48fa5b6 100644
--- a/zcash_primitives/src/transaction/builder.rs
+++ b/zcash_primitives/src/transaction/builder.rs
@@ -111,8 +111,9 @@ pub enum Error<FE> {
     /// An error occurred in constructing a coinbase transaction.
     Coinbase(coinbase::Error),
     /// The proposed transaction version or the consensus branch id for the target height does not
-    /// support a feature required by the transaction under construction.
-    TargetIncompatible(BranchId, TxVersion, PoolType),
+    /// support a feature required by the transaction under construction, or the proposed
+    /// transaction version is not supported on the given consensus branch.
+    TargetIncompatible(BranchId, TxVersion, Option<PoolType>),
     /// An error occurred in constructing the TZE parts of a transaction.
     #[cfg(zcash_unstable = "zfuture")]
     TzeBuild(tze::builder::Error),
@@ -148,10 +149,16 @@ impl<FE: fmt::Display> fmt::Display for Error<FE> {
                 f,
                 "An error occurred in constructing a coinbase transaction: {err}"
             ),
-            Error::TargetIncompatible(branch_id, version, pool_type) => write!(
-                f,
-                "Proposed transaction version {version:?} or consensus branch {branch_id:?} does not support {pool_type}"
-            ),
+            Error::TargetIncompatible(branch_id, version, pool_type) => match pool_type {
+                None => write!(
+                    f,
+                    "Proposed transaction version {version:?} is not valid for consensus branch {branch_id:?}"
+                ),
+                Some(t) => write!(
+                    f,
+                    "{t} is not supported for proposed transaction version {version:?} or consensus branch {branch_id:?}"
+                ),
+            },
             #[cfg(zcash_unstable = "zfuture")]
             Error::TzeBuild(err) => err.fmt(f),
         }
@@ -393,6 +400,14 @@ impl<P, U> Builder<'_, P, U> {
     /// Checks that the given version supports all features required by the inputs and
     /// outputs already added to the builder.
     fn check_version_compatibility<FE>(&self, version: TxVersion) -> Result<(), Error<FE>> {
+        if !version.valid_in_branch(self.consensus_branch_id) {
+            return Err(Error::TargetIncompatible(
+                self.consensus_branch_id,
+                version,
+                None,
+            ));
+        }
+
         let sapling_available = version.has_sapling() && self.consensus_branch_id.has_sapling();
         if !sapling_available
             && (!self.sapling_inputs().is_empty() || !self.sapling_outputs().is_empty())
@@ -400,7 +415,7 @@ impl<P, U> Builder<'_, P, U> {
             return Err(Error::TargetIncompatible(
                 self.consensus_branch_id,
                 version,
-                PoolType::SAPLING,
+                Some(PoolType::SAPLING),
             ));
         }
 
@@ -414,7 +429,7 @@ impl<P, U> Builder<'_, P, U> {
             return Err(Error::TargetIncompatible(
                 self.consensus_branch_id,
                 version,
-                PoolType::ORCHARD,
+                Some(PoolType::ORCHARD),
             ));
         }
         Ok(())
diff --git a/zcash_primitives/src/transaction/mod.rs b/zcash_primitives/src/transaction/mod.rs
index f6c4885ae6..b0b197d78e 100644
--- a/zcash_primitives/src/transaction/mod.rs
+++ b/zcash_primitives/src/transaction/mod.rs
@@ -242,6 +242,46 @@ impl TxVersion {
             BranchId::ZFuture => TxVersion::ZFuture,
         }
     }
+
+    /// Returns `true` if this transaction version is valid for us in the specified consensus
+    /// branch, `false` otherwise.
+    pub fn valid_in_branch(&self, consensus_branch_id: BranchId) -> bool {
+        use BranchId::*;
+        // Note: we intentionally use `match` expressions instead of the `matches!`
+        // macro below because we want exhaustivity.
+        match self {
+            TxVersion::Sprout(_) => consensus_branch_id == Sprout,
+            TxVersion::V3 => consensus_branch_id == Overwinter,
+            TxVersion::V4 => match consensus_branch_id {
+                Sprout | Overwinter => false,
+                Sapling | Blossom | Heartwood | Canopy | Nu5 | Nu6 | Nu6_1 => true,
+                #[cfg(zcash_unstable = "nu7")]
+                Nu7 => false,
+                #[cfg(zcash_unstable = "zfuture")]
+                ZFuture => false,
+            },
+            TxVersion::V5 => match consensus_branch_id {
+                Sprout | Overwinter | Sapling | Blossom | Heartwood | Canopy => false,
+                Nu5 | Nu6 | Nu6_1 => true,
+                #[cfg(zcash_unstable = "nu7")]
+                Nu7 => true,
+                #[cfg(zcash_unstable = "zfuture")]
+                ZFuture => true,
+            },
+            #[cfg(zcash_unstable = "nu7")]
+            TxVersion::V6 => match consensus_branch_id {
+                Sprout | Overwinter | Sapling | Blossom | Heartwood | Canopy | Nu5 | Nu6
+                | Nu6_1 => false,
+                Nu7 => true,
+            },
+            #[cfg(zcash_unstable = "zfuture")]
+            TxVersion::ZFuture => match consensus_branch_id {
+                Sprout | Overwinter | Sapling | Blossom | Heartwood | Canopy | Nu5 | Nu6
+                | Nu6_1 => false,
+                ZFuture => true,
+            },
+        }
+    }
 }
 
 /// Authorization state for a bundle of transaction data.

From 80ad4cbbad4b09aa2e44ea4dede57306b441f990 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Fri, 20 Feb 2026 16:08:38 -0700
Subject: [PATCH 176/263] Note that NU7 tx version policy currently implements
 ZIP 2003

---
 zcash_primitives/src/transaction/mod.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/zcash_primitives/src/transaction/mod.rs b/zcash_primitives/src/transaction/mod.rs
index b0b197d78e..9011b0c187 100644
--- a/zcash_primitives/src/transaction/mod.rs
+++ b/zcash_primitives/src/transaction/mod.rs
@@ -256,9 +256,9 @@ impl TxVersion {
                 Sprout | Overwinter => false,
                 Sapling | Blossom | Heartwood | Canopy | Nu5 | Nu6 | Nu6_1 => true,
                 #[cfg(zcash_unstable = "nu7")]
-                Nu7 => false,
+                Nu7 => false, // ZIP 2003
                 #[cfg(zcash_unstable = "zfuture")]
-                ZFuture => false,
+                ZFuture => false, // ZIP 2003
             },
             TxVersion::V5 => match consensus_branch_id {
                 Sprout | Overwinter | Sapling | Blossom | Heartwood | Canopy => false,
@@ -272,7 +272,7 @@ impl TxVersion {
             TxVersion::V6 => match consensus_branch_id {
                 Sprout | Overwinter | Sapling | Blossom | Heartwood | Canopy | Nu5 | Nu6
                 | Nu6_1 => false,
-                Nu7 => true,
+                Nu7 => true, // ZIP 230 or ZIP 248, whichever is chosen for activation
             },
             #[cfg(zcash_unstable = "zfuture")]
             TxVersion::ZFuture => match consensus_branch_id {

From 5754c79d54fb14086c504a0f5a5f995f01c70e9a Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Mon, 2 Feb 2026 16:40:34 -0700
Subject: [PATCH 177/263] Fix checkpoint height queries in truncation
 functions.

- Remove `#[cfg(feature = "orchard")]` branching from SQL queries that
  reference `orchard_tree_checkpoints`, since the table exists
  unconditionally (it is just empty when orchard is not active).

- Fix the min-checkpoint-height query to use MAX of per-tree MINs
  instead of a JOIN. The JOIN incorrectly required both trees to share
  a checkpoint at the same height; the correct semantics are to find
  the earliest height at which all non-empty trees have a checkpoint
  (i.e. max of the individual minimums).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 zcash_client_sqlite/src/wallet.rs | 51 +++++++++++++------------------
 1 file changed, 21 insertions(+), 30 deletions(-)

diff --git a/zcash_client_sqlite/src/wallet.rs b/zcash_client_sqlite/src/wallet.rs
index 4fcc143e95..5194f876fa 100644
--- a/zcash_client_sqlite/src/wallet.rs
+++ b/zcash_client_sqlite/src/wallet.rs
@@ -3173,25 +3173,18 @@ pub(crate) fn truncate_to_height<P: consensus::Parameters>(
     #[cfg(feature = "transparent-inputs")] gap_limits: &GapLimits,
     max_height: BlockHeight,
 ) -> Result<BlockHeight, SqliteClientError> {
-    // Determine a checkpoint to which we can rewind, if any.
-    #[cfg(not(feature = "orchard"))]
-    let truncation_height_query = r#"
-        SELECT MAX(height) FROM blocks
-        JOIN sapling_tree_checkpoints ON checkpoint_id = blocks.height
-        WHERE blocks.height <= :block_height
-    "#;
-
-    #[cfg(feature = "orchard")]
-    let truncation_height_query = r#"
-        SELECT MAX(height) FROM blocks
-        JOIN sapling_tree_checkpoints sc ON sc.checkpoint_id = blocks.height
-        JOIN orchard_tree_checkpoints oc ON oc.checkpoint_id = blocks.height
-        WHERE blocks.height <= :block_height
-    "#;
-
+    // Determine a checkpoint to which we can rewind, if any. We need a height
+    // that has a checkpoint in every tree that contains data. The orchard table
+    // exists unconditionally but is empty when the orchard feature is not active.
     let truncation_height = conn
         .query_row(
-            truncation_height_query,
+            r#"
+            SELECT MAX(height) FROM blocks
+            WHERE blocks.height <= :block_height
+            AND height IN (SELECT checkpoint_id FROM sapling_tree_checkpoints)
+            AND (height IN (SELECT checkpoint_id FROM orchard_tree_checkpoints)
+                 OR NOT EXISTS (SELECT 1 FROM orchard_tree_checkpoints))
+            "#,
             named_params! {":block_height": u32::from(max_height)},
             |row| row.get::<_, Option<u32>>(0),
         )
@@ -3201,20 +3194,18 @@ pub(crate) fn truncate_to_height<P: consensus::Parameters>(
             || {
                 // If we don't have a checkpoint at a height less than or equal to the requested
                 // truncation height, query for the minimum height to which it's possible for us to
-                // truncate so that we can report it to the caller.
-                #[cfg(not(feature = "orchard"))]
-                let min_checkpoint_height_query =
-                    "SELECT MIN(checkpoint_id) FROM sapling_tree_checkpoints";
-                #[cfg(feature = "orchard")]
-                let min_checkpoint_height_query = "SELECT MIN(sc.checkpoint_id)
-                     FROM sapling_tree_checkpoints sc
-                     JOIN orchard_tree_checkpoints oc
-                     ON oc.checkpoint_id = sc.checkpoint_id";
-
+                // truncate so that we can report it to the caller. We take the maximum of the per-tree
+                // minimums, since that is the earliest height at which all trees have a checkpoint.
                 let min_truncation_height = conn
-                    .query_row(min_checkpoint_height_query, [], |row| {
-                        row.get::<_, Option<u32>>(0)
-                    })
+                    .query_row(
+                        "SELECT MAX(m) FROM (
+                            SELECT MIN(checkpoint_id) AS m FROM sapling_tree_checkpoints
+                            UNION ALL
+                            SELECT MIN(checkpoint_id) AS m FROM orchard_tree_checkpoints
+                        )",
+                        [],
+                        |row| row.get::<_, Option<u32>>(0),
+                    )
                     .optional()?
                     .flatten()
                     .map(BlockHeight::from);

From 3e900344753f2c239890177f69af09071758a8c4 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Mon, 2 Feb 2026 16:40:34 -0700
Subject: [PATCH 178/263] Add `WalletWrite::truncate_to_chain_state` for
 precise rewind.

`truncate_to_height` fails when the target height's checkpoint has
been pruned from the note commitment tree (i.e. it is beyond
PRUNING_DEPTH blocks in the past). `truncate_to_chain_state` solves
this by accepting a `ChainState` whose frontiers are used to
reconstruct the checkpoint:

- If a usable checkpoint already exists, delegates directly to
  `truncate_to_height`.
- Otherwise, truncates to the earliest available checkpoint first,
  inserts the provided frontier as a new checkpoint at the target
  height, then truncates to that checkpoint.

Also adds `CachedBlock::chain_state()` accessor to the test
infrastructure and a test covering the pruned-checkpoint scenario.

Depends on incrementalmerkletree rev 7b6263ee (insert_frontier).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 Cargo.lock                                    |   4 +-
 Cargo.toml                                    |   2 +-
 zcash_client_backend/CHANGELOG.md             |   1 +
 zcash_client_backend/src/data_api.rs          |   9 ++
 zcash_client_backend/src/data_api/testing.rs  |   9 ++
 .../src/data_api/testing/pool.rs              | 112 ++++++++++++++++++
 zcash_client_memory/src/wallet_write.rs       |   4 +
 zcash_client_sqlite/src/chain.rs              |  11 ++
 zcash_client_sqlite/src/lib.rs                |   6 +-
 zcash_client_sqlite/src/testing/pool.rs       |   7 ++
 zcash_client_sqlite/src/wallet.rs             | 109 +++++++++++++++++
 11 files changed, 270 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index caf823d3c1..71f9daecca 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4457,9 +4457,9 @@ dependencies = [
 
 [[package]]
 name = "shardtree"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "637e95dcd06bc1bb3f86ed9db1e1832a70125f32daae071ef37dcb7701b7d4fe"
+checksum = "359e552886ae54d1642091645980d83f7db465fd9b5b0248e3680713c1773388"
 dependencies = [
  "assert_matches",
  "bitflags 2.9.0",
diff --git a/Cargo.toml b/Cargo.toml
index f2eb0bf0df..f54bc754ea 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -55,7 +55,7 @@ bellman = { version = "0.14", default-features = false, features = ["groth16"] }
 ff = { version = "0.13", default-features = false }
 group = "0.13"
 incrementalmerkletree = { version = "0.8.2", default-features = false }
-shardtree = "0.6.1"
+shardtree = "0.6.2"
 zcash_spec = "0.2"
 
 # Payment protocols
diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index 19eb03d392..8a18c2c06e 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -65,6 +65,7 @@ workspace.
 - `zcash_client_backend::data_api::WalletRead` has added method `get_received_outputs`.
 - `zcash_client_backend::proposal::ProposalError` has added variants `PaymentAmountMissing`
   and `IncompatibleTxVersion`
+- `zcash_client_backend::data_api::WalletWrite` has added method `truncate_to_chain_state`.
 - The associated type `zcash_client_backend::fees::ChangeStrategy::MetaSource` is now
   bounded on the newly added `MetaSource` type instead of
   `zcash_client_backend::data_api::InputSource`.
diff --git a/zcash_client_backend/src/data_api.rs b/zcash_client_backend/src/data_api.rs
index feea344744..c275d0fa1d 100644
--- a/zcash_client_backend/src/data_api.rs
+++ b/zcash_client_backend/src/data_api.rs
@@ -3096,6 +3096,15 @@ pub trait WalletWrite: WalletRead {
     /// given the current state of the wallet's note commitment tree.
     fn truncate_to_height(&mut self, max_height: BlockHeight) -> Result<BlockHeight, Self::Error>;
 
+    /// Truncates the wallet database to the specified chain state.
+    ///
+    /// In contrast to [`truncate_to_height`], this method allows the caller to truncate the wallet
+    /// database to a precise height by providing additional chain state information needed for
+    /// note commitment tree maintenance after the truncation.
+    ///
+    /// [`truncate_to_height`]: WalletWrite::truncate_to_height
+    fn truncate_to_chain_state(&mut self, chain_state: ChainState) -> Result<(), Self::Error>;
+
     /// Reserves the next `n` available ephemeral addresses for the given account.
     /// This cannot be undone, so as far as possible, errors associated with transaction
     /// construction should have been reported before calling this method.
diff --git a/zcash_client_backend/src/data_api/testing.rs b/zcash_client_backend/src/data_api/testing.rs
index b71de25a94..969aab5319 100644
--- a/zcash_client_backend/src/data_api/testing.rs
+++ b/zcash_client_backend/src/data_api/testing.rs
@@ -337,6 +337,11 @@ impl CachedBlock {
         }
     }
 
+    /// Returns the chain state as of the end of this block.
+    pub fn chain_state(&self) -> &ChainState {
+        &self.chain_state
+    }
+
     /// Returns the height of this block.
     pub fn height(&self) -> BlockHeight {
         self.chain_state.block_height()
@@ -2909,6 +2914,10 @@ impl WalletWrite for MockWalletDb {
         Err(())
     }
 
+    fn truncate_to_chain_state(&mut self, _chain_state: ChainState) -> Result<(), Self::Error> {
+        Err(())
+    }
+
     /// Adds a transparent UTXO received by the wallet to the data store.
     fn put_received_transparent_utxo(
         &mut self,
diff --git a/zcash_client_backend/src/data_api/testing/pool.rs b/zcash_client_backend/src/data_api/testing/pool.rs
index 5850b3c226..d7a3445dc2 100644
--- a/zcash_client_backend/src/data_api/testing/pool.rs
+++ b/zcash_client_backend/src/data_api/testing/pool.rs
@@ -4256,6 +4256,118 @@ where
     );
 }
 
+pub fn truncate_to_chain_state<T: ShieldedPoolTester, Dsf>(ds_factory: Dsf, cache: impl TestCache)
+where
+    Dsf: DataStoreFactory,
+    <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
+{
+    // Test plan:
+    // 1. Set up test environment with account
+    // 2. Generate and scan initial blocks to populate the note commitment tree
+    // 3. Capture the chain state at a specific height
+    // 4. Generate and scan blocks beyond PRUNING_DEPTH to ensure early checkpoints are pruned
+    // 5. Verify that normal truncate_to_height fails due to missing checkpoints
+    // 6. Test that truncate_to_chain_state succeeds using the captured chain state
+    // 7. Verify wallet state after truncation
+
+    use crate::data_api::ll::wallet::PRUNING_DEPTH;
+
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache).build::<T>();
+
+    let sapling_activation = st
+        .network()
+        .activation_height(consensus::NetworkUpgrade::Sapling)
+        .unwrap();
+
+    // Step 2: Generate and scan initial blocks to populate the note commitment tree.
+    // We use an "other" fvk so that notes won't be tracked by the wallet (keeping the
+    // test focused on tree state rather than wallet balances).
+    let seed = [1u8; 32];
+    let other_sk = T::sk(&seed);
+    let other_fvk = T::sk_to_fvk(&other_sk);
+
+    let initial_block_count = 8u32;
+    for _ in 0..initial_block_count {
+        st.generate_next_block(
+            &other_fvk,
+            AddressType::DefaultExternal,
+            Zatoshis::const_from_u64(10000),
+        );
+    }
+    let scan_start = sapling_activation;
+    st.scan_cached_blocks(scan_start, initial_block_count as usize);
+
+    // Step 3: Capture the chain state at the current tip. The CachedBlock tracks the
+    // exact frontier that corresponds to the end of each generated block.
+    let capture_height = sapling_activation + initial_block_count - 1;
+    let captured_chain_state = st
+        .latest_cached_block()
+        .expect("should have cached blocks")
+        .chain_state()
+        .clone();
+    assert_eq!(captured_chain_state.block_height(), capture_height);
+
+    // Step 4: Generate and scan blocks well beyond PRUNING_DEPTH so that the checkpoint
+    // at capture_height is pruned from the note commitment tree.
+    let extra_blocks = PRUNING_DEPTH + 10;
+    for _ in 0..extra_blocks {
+        st.generate_next_block(
+            &other_fvk,
+            AddressType::DefaultExternal,
+            Zatoshis::const_from_u64(5000),
+        );
+    }
+    st.scan_cached_blocks(capture_height + 1, extra_blocks as usize);
+
+    let tip = st
+        .wallet()
+        .chain_height()
+        .unwrap()
+        .expect("chain tip should be set");
+    assert!(
+        tip >= capture_height + PRUNING_DEPTH,
+        "tip should be beyond pruning depth from capture height"
+    );
+
+    // Step 5: Verify that truncate_to_height fails at capture_height because the
+    // checkpoint has been pruned.
+    let truncation_result = st.wallet_mut().truncate_to_height(capture_height);
+    assert!(
+        truncation_result.is_err(),
+        "truncate_to_height should fail when checkpoint has been pruned"
+    );
+
+    // Step 6: truncate_to_chain_state should succeed because it inserts the frontier
+    // as a checkpoint before truncating.
+    st.wallet_mut()
+        .truncate_to_chain_state(captured_chain_state.clone())
+        .expect("truncate_to_chain_state should succeed");
+
+    // Step 7: Verify wallet state after truncation.
+    // The chain tip should now be at the capture height.
+    let new_tip = st
+        .wallet()
+        .chain_height()
+        .unwrap()
+        .expect("chain tip should still be set after truncation");
+    assert_eq!(new_tip, capture_height);
+
+    // The block hash at capture_height should match what was in the captured chain state.
+    let hash_at_capture = st
+        .wallet()
+        .get_block_hash(capture_height)
+        .unwrap()
+        .expect("block hash should exist at capture height");
+    assert_eq!(hash_at_capture, captured_chain_state.block_hash());
+
+    // Blocks above the capture height should have been removed.
+    assert_eq!(
+        st.wallet().get_block_hash(capture_height + 1).unwrap(),
+        None,
+        "blocks above capture height should be removed"
+    );
+}
+
 pub fn reorg_to_checkpoint<T: ShieldedPoolTester, Dsf, C>(ds_factory: Dsf, cache: C)
 where
     Dsf: DataStoreFactory,
diff --git a/zcash_client_memory/src/wallet_write.rs b/zcash_client_memory/src/wallet_write.rs
index 8423f46e90..e8a5e3edcc 100644
--- a/zcash_client_memory/src/wallet_write.rs
+++ b/zcash_client_memory/src/wallet_write.rs
@@ -1061,6 +1061,10 @@ impl<P: consensus::Parameters> WalletWrite for MemoryWalletDb<P> {
         Ok(truncation_height)
     }
 
+    fn truncate_to_chain_state(&mut self, _chain_state: ChainState) -> Result<(), Self::Error> {
+        todo!()
+    }
+
     fn import_account_hd(
         &mut self,
         _account_name: &str,
diff --git a/zcash_client_sqlite/src/chain.rs b/zcash_client_sqlite/src/chain.rs
index 9904387371..36911c4680 100644
--- a/zcash_client_sqlite/src/chain.rs
+++ b/zcash_client_sqlite/src/chain.rs
@@ -362,6 +362,17 @@ mod tests {
         testing::pool::data_db_truncation::<OrchardPoolTester>()
     }
 
+    #[test]
+    fn truncate_to_chain_state_sapling() {
+        testing::pool::truncate_to_chain_state::<SaplingPoolTester>()
+    }
+
+    #[test]
+    #[cfg(feature = "orchard")]
+    fn truncate_to_chain_state_orchard() {
+        testing::pool::truncate_to_chain_state::<OrchardPoolTester>()
+    }
+
     #[test]
     fn reorg_to_checkpoint_sapling() {
         testing::pool::reorg_to_checkpoint::<SaplingPoolTester>()
diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs
index 8745bdfb20..8f188fb37d 100644
--- a/zcash_client_sqlite/src/lib.rs
+++ b/zcash_client_sqlite/src/lib.rs
@@ -1481,6 +1481,10 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
         })
     }
 
+    fn truncate_to_chain_state(&mut self, chain_state: ChainState) -> Result<(), Self::Error> {
+        self.transactionally(|wdb| wallet::truncate_to_chain_state(wdb, chain_state))
+    }
+
     #[cfg(feature = "transparent-inputs")]
     fn reserve_next_n_ephemeral_addresses(
         &mut self,
@@ -1939,7 +1943,7 @@ impl<'a, C: Borrow<rusqlite::Transaction<'a>>, P: consensus::Parameters, CL: Clo
     fn queue_transparent_input_retrieval(
         &mut self,
         tx_ref: Self::TxRef,
-        d_tx: &data_api::DecryptedTransaction<Transaction, Self::AccountId>,
+        d_tx: &DecryptedTransaction<Transaction, Self::AccountId>,
     ) -> Result<(), Self::Error> {
         wallet::queue_transparent_input_retrieval(self.conn.borrow(), tx_ref, d_tx)
     }
diff --git a/zcash_client_sqlite/src/testing/pool.rs b/zcash_client_sqlite/src/testing/pool.rs
index bb90db6fe7..0fcaa40a21 100644
--- a/zcash_client_sqlite/src/testing/pool.rs
+++ b/zcash_client_sqlite/src/testing/pool.rs
@@ -305,6 +305,13 @@ pub(crate) fn data_db_truncation<T: ShieldedPoolTester>() {
     )
 }
 
+pub(crate) fn truncate_to_chain_state<T: ShieldedPoolTester>() {
+    zcash_client_backend::data_api::testing::pool::truncate_to_chain_state::<T, _>(
+        TestDbFactory::default(),
+        BlockCache::new(),
+    )
+}
+
 pub(crate) fn reorg_to_checkpoint<T: ShieldedPoolTester>() {
     zcash_client_backend::data_api::testing::pool::reorg_to_checkpoint::<T, _, _>(
         TestDbFactory::default(),
diff --git a/zcash_client_sqlite/src/wallet.rs b/zcash_client_sqlite/src/wallet.rs
index 5194f876fa..6e861e9ace 100644
--- a/zcash_client_sqlite/src/wallet.rs
+++ b/zcash_client_sqlite/src/wallet.rs
@@ -92,6 +92,7 @@ use zcash_client_backend::{
         AddressSource, BlockMetadata, Progress, Ratio, ReceivedTransactionOutput,
         SAPLING_SHARD_HEIGHT, SentTransaction, SentTransactionOutput, TransactionDataRequest,
         TransactionStatus, WalletSummary, Zip32Derivation,
+        chain::ChainState,
         scanning::{ScanPriority, ScanRange},
         wallet::{ConfirmationsPolicy, TargetHeight},
     },
@@ -3321,6 +3322,114 @@ pub(crate) fn truncate_to_height<P: consensus::Parameters>(
     Ok(truncation_height)
 }
 
+/// Truncates the wallet database to a precise block height using note commitment tree frontiers
+/// from the provided `ChainState`.
+///
+/// This function enables precise truncation even when the target height's checkpoint has been
+/// pruned from the note commitment tree. It works in two cases:
+///
+/// - If a checkpoint exists at or below the target height, it delegates to
+///   [`truncate_to_height`] directly.
+/// - If the target height is below the oldest available checkpoint, it first truncates to the
+///   oldest checkpoint (freeing space), then inserts the provided frontier as a new checkpoint
+///   at the target height, and finally truncates to that new checkpoint.
+pub(crate) fn truncate_to_chain_state<P: consensus::Parameters, CL, R>(
+    wdb: &mut WalletDb<SqlTransaction<'_>, P, CL, R>,
+    chain_state: ChainState,
+) -> Result<(), SqliteClientError> {
+    let target_height = chain_state.block_height();
+
+    // Try the simple case first: if a checkpoint exists at or below the target height,
+    // truncate_to_height will succeed directly.
+    match truncate_to_height(
+        wdb.conn.0,
+        &wdb.params,
+        #[cfg(feature = "transparent-inputs")]
+        &wdb.gap_limits,
+        target_height,
+    ) {
+        Ok(_) => return Ok(()),
+        Err(SqliteClientError::RequestedRewindInvalid { .. }) => {
+            // The target height is below the oldest checkpoint. We need to use the
+            // frontier-based approach.
+        }
+        Err(e) => return Err(e),
+    }
+
+    // Step 1: Truncate to the earliest available checkpoint. This removes all later
+    // checkpoints and tree data, making room for the frontier insertion.
+    //
+    // We find the minimum checkpoint height for each tree and take the maximum of those
+    // minimums, since that is the earliest height at which all trees have a checkpoint.
+    // The orchard table exists unconditionally but is empty when the feature is not active;
+    // MAX ignores NULLs, so this correctly returns only the sapling minimum in that case.
+    let min_checkpoint_height_query = "SELECT MAX(m) FROM (
+             SELECT MIN(checkpoint_id) AS m FROM sapling_tree_checkpoints
+             UNION ALL
+             SELECT MIN(checkpoint_id) AS m FROM orchard_tree_checkpoints
+         )";
+
+    let min_checkpoint_height: Option<BlockHeight> = wdb
+        .conn
+        .0
+        .query_row(min_checkpoint_height_query, [], |row| {
+            row.get::<_, Option<u32>>(0)
+        })
+        .optional()?
+        .flatten()
+        .map(BlockHeight::from);
+
+    // If there are checkpoints, truncate to the earliest common one first. If there are
+    // no checkpoints at all, we can skip this step and proceed directly to inserting the
+    // frontier.
+    if let Some(min_checkpoint_height) = min_checkpoint_height {
+        truncate_to_height(
+            wdb.conn.0,
+            &wdb.params,
+            #[cfg(feature = "transparent-inputs")]
+            &wdb.gap_limits,
+            min_checkpoint_height,
+        )?;
+    }
+
+    // Step 2: Insert the frontier from the chain state, creating a checkpoint at
+    // the target height. Because we just truncated down to a single checkpoint,
+    // there is room for this new one.
+    wdb.with_sapling_tree_mut(|tree| {
+        tree.insert_frontier(
+            chain_state.final_sapling_tree().clone(),
+            Retention::Checkpoint {
+                id: target_height,
+                marking: Marking::None,
+            },
+        )?;
+        Ok::<_, SqliteClientError>(())
+    })?;
+
+    #[cfg(feature = "orchard")]
+    wdb.with_orchard_tree_mut(|tree| {
+        tree.insert_frontier(
+            chain_state.final_orchard_tree().clone(),
+            Retention::Checkpoint {
+                id: target_height,
+                marking: Marking::None,
+            },
+        )?;
+        Ok::<_, SqliteClientError>(())
+    })?;
+
+    // Step 3: Now truncate to the target height checkpoint we just created.
+    truncate_to_height(
+        wdb.conn.0,
+        &wdb.params,
+        #[cfg(feature = "transparent-inputs")]
+        &wdb.gap_limits,
+        target_height,
+    )?;
+
+    Ok(())
+}
+
 /// Returns a vector with the IDs of all accounts known to this wallet.
 ///
 /// Note that this is called from db migration code.

From f0da41c8eae0bd0ce67875770cc456eef2d381ae Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Mon, 16 Feb 2026 10:11:59 -0700
Subject: [PATCH 179/263] zcash_client_sqlite: Factor out duplicated min
 checkpoint height code.

---
 zcash_client_sqlite/src/wallet.rs | 63 ++++++++++++++-----------------
 1 file changed, 28 insertions(+), 35 deletions(-)

diff --git a/zcash_client_sqlite/src/wallet.rs b/zcash_client_sqlite/src/wallet.rs
index 6e861e9ace..6921f9e88c 100644
--- a/zcash_client_sqlite/src/wallet.rs
+++ b/zcash_client_sqlite/src/wallet.rs
@@ -3197,20 +3197,7 @@ pub(crate) fn truncate_to_height<P: consensus::Parameters>(
                 // truncation height, query for the minimum height to which it's possible for us to
                 // truncate so that we can report it to the caller. We take the maximum of the per-tree
                 // minimums, since that is the earliest height at which all trees have a checkpoint.
-                let min_truncation_height = conn
-                    .query_row(
-                        "SELECT MAX(m) FROM (
-                            SELECT MIN(checkpoint_id) AS m FROM sapling_tree_checkpoints
-                            UNION ALL
-                            SELECT MIN(checkpoint_id) AS m FROM orchard_tree_checkpoints
-                        )",
-                        [],
-                        |row| row.get::<_, Option<u32>>(0),
-                    )
-                    .optional()?
-                    .flatten()
-                    .map(BlockHeight::from);
-
+                let min_truncation_height = min_shared_checkpoint_height(conn)?;
                 Err(SqliteClientError::RequestedRewindInvalid {
                     safe_rewind_height: min_truncation_height,
                     requested_height: max_height,
@@ -3322,6 +3309,29 @@ pub(crate) fn truncate_to_height<P: consensus::Parameters>(
     Ok(truncation_height)
 }
 
+// Find the minimum checkpoint height for each tree and take the maximum of those minima.
+//
+// This returns the earliest height at which all trees have a checkpoint. The orchard table exists
+// unconditionally but is empty when the `orchard` feature is not active; MAX ignores NULLs, so
+// this correctly returns only the sapling minimum in that case.
+fn min_shared_checkpoint_height(
+    conn: &rusqlite::Connection,
+) -> Result<Option<BlockHeight>, SqliteClientError> {
+    Ok(conn
+        .query_row(
+            "SELECT MAX(m) FROM (
+                 SELECT MIN(checkpoint_id) AS m FROM sapling_tree_checkpoints
+                 UNION ALL
+                 SELECT MIN(checkpoint_id) AS m FROM orchard_tree_checkpoints
+             )",
+            [],
+            |row| row.get::<_, Option<u32>>(0),
+        )
+        .optional()?
+        .flatten()
+        .map(BlockHeight::from))
+}
+
 /// Truncates the wallet database to a precise block height using note commitment tree frontiers
 /// from the provided `ChainState`.
 ///
@@ -3353,31 +3363,14 @@ pub(crate) fn truncate_to_chain_state<P: consensus::Parameters, CL, R>(
             // The target height is below the oldest checkpoint. We need to use the
             // frontier-based approach.
         }
-        Err(e) => return Err(e),
+        Err(e) => {
+            return Err(e);
+        }
     }
 
     // Step 1: Truncate to the earliest available checkpoint. This removes all later
     // checkpoints and tree data, making room for the frontier insertion.
-    //
-    // We find the minimum checkpoint height for each tree and take the maximum of those
-    // minimums, since that is the earliest height at which all trees have a checkpoint.
-    // The orchard table exists unconditionally but is empty when the feature is not active;
-    // MAX ignores NULLs, so this correctly returns only the sapling minimum in that case.
-    let min_checkpoint_height_query = "SELECT MAX(m) FROM (
-             SELECT MIN(checkpoint_id) AS m FROM sapling_tree_checkpoints
-             UNION ALL
-             SELECT MIN(checkpoint_id) AS m FROM orchard_tree_checkpoints
-         )";
-
-    let min_checkpoint_height: Option<BlockHeight> = wdb
-        .conn
-        .0
-        .query_row(min_checkpoint_height_query, [], |row| {
-            row.get::<_, Option<u32>>(0)
-        })
-        .optional()?
-        .flatten()
-        .map(BlockHeight::from);
+    let min_checkpoint_height = min_shared_checkpoint_height(wdb.conn.0)?;
 
     // If there are checkpoints, truncate to the earliest common one first. If there are
     // no checkpoints at all, we can skip this step and proceed directly to inserting the

From 11c7ed67cbb2ef1ec48c6273ea091584bb13fa47 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Thu, 19 Feb 2026 13:21:17 -0700
Subject: [PATCH 180/263] Address comments from code review.

---
 zcash_client_sqlite/src/wallet.rs | 215 +++++++++++++++++-------------
 1 file changed, 126 insertions(+), 89 deletions(-)

diff --git a/zcash_client_sqlite/src/wallet.rs b/zcash_client_sqlite/src/wallet.rs
index 6921f9e88c..feffb9afbf 100644
--- a/zcash_client_sqlite/src/wallet.rs
+++ b/zcash_client_sqlite/src/wallet.rs
@@ -3160,6 +3160,69 @@ pub(crate) fn set_transaction_status<P: consensus::Parameters>(
     Ok(())
 }
 
+/// Find the minimum checkpoint height for each tree and take the maximum of those minima.
+///
+/// This returns the earliest height at which all trees have a checkpoint. The orchard table exists
+/// unconditionally but is empty when the `orchard` feature is not active; MAX ignores NULLs, so
+/// this correctly returns only the sapling minimum in that case.
+fn min_shared_checkpoint_height(
+    conn: &rusqlite::Connection,
+) -> Result<Option<BlockHeight>, SqliteClientError> {
+    Ok(conn
+        .query_row(
+            "SELECT MAX(m) FROM (
+                 SELECT MIN(checkpoint_id) AS m FROM sapling_tree_checkpoints
+                 UNION ALL
+                 SELECT MIN(checkpoint_id) AS m FROM orchard_tree_checkpoints
+             )",
+            [],
+            |row| row.get::<_, Option<u32>>(0),
+        )
+        .optional()?
+        .flatten()
+        .map(BlockHeight::from))
+}
+
+/// Determine an existing checkpoint height to which we can rewind, if any.
+///
+/// If no checkpoint exists at the requested height, this will return the maximum height at which a
+/// checkpoint exists for all active pools that is less than or equal to the requested height, where
+/// "active" is defined according to the features enabled on this crate.
+///
+/// This will return the height that has a checkpoint in every tree that contains data. The orchard
+/// table exists unconditionally but is empty when the orchard feature is not active.
+fn select_truncation_height(
+    conn: &rusqlite::Transaction,
+    requested_height: BlockHeight,
+) -> Result<BlockHeight, SqliteClientError> {
+    conn.query_row(
+        r#"
+            SELECT MAX(height) FROM blocks
+            WHERE height <= :requested_height
+            AND height IN (SELECT checkpoint_id FROM sapling_tree_checkpoints)
+            AND (height IN (SELECT checkpoint_id FROM orchard_tree_checkpoints)
+                 OR NOT EXISTS (SELECT 1 FROM orchard_tree_checkpoints))
+            "#,
+        named_params! {":requested_height": u32::from(requested_height)},
+        |row| row.get::<_, Option<u32>>(0),
+    )
+    .optional()?
+    .flatten()
+    .map_or_else(
+        || {
+            // If we don't have a checkpoint at a height less than or equal to the requested
+            // truncation height, query for the minimum height to which it's possible for us to
+            // truncate so that we can report it to the caller. We take the maximum of the per-tree
+            // minimums, since that is the earliest height at which all trees have a checkpoint.
+            Err(SqliteClientError::RequestedRewindInvalid {
+                safe_rewind_height: min_shared_checkpoint_height(conn)?,
+                requested_height,
+            })
+        },
+        |h| Ok(BlockHeight::from(h)),
+    )
+}
+
 /// Truncates the database to at most the given height.
 ///
 /// If the requested height is greater than or equal to the height of the last scanned
@@ -3174,38 +3237,22 @@ pub(crate) fn truncate_to_height<P: consensus::Parameters>(
     #[cfg(feature = "transparent-inputs")] gap_limits: &GapLimits,
     max_height: BlockHeight,
 ) -> Result<BlockHeight, SqliteClientError> {
-    // Determine a checkpoint to which we can rewind, if any. We need a height
-    // that has a checkpoint in every tree that contains data. The orchard table
-    // exists unconditionally but is empty when the orchard feature is not active.
-    let truncation_height = conn
-        .query_row(
-            r#"
-            SELECT MAX(height) FROM blocks
-            WHERE blocks.height <= :block_height
-            AND height IN (SELECT checkpoint_id FROM sapling_tree_checkpoints)
-            AND (height IN (SELECT checkpoint_id FROM orchard_tree_checkpoints)
-                 OR NOT EXISTS (SELECT 1 FROM orchard_tree_checkpoints))
-            "#,
-            named_params! {":block_height": u32::from(max_height)},
-            |row| row.get::<_, Option<u32>>(0),
-        )
-        .optional()?
-        .flatten()
-        .map_or_else(
-            || {
-                // If we don't have a checkpoint at a height less than or equal to the requested
-                // truncation height, query for the minimum height to which it's possible for us to
-                // truncate so that we can report it to the caller. We take the maximum of the per-tree
-                // minimums, since that is the earliest height at which all trees have a checkpoint.
-                let min_truncation_height = min_shared_checkpoint_height(conn)?;
-                Err(SqliteClientError::RequestedRewindInvalid {
-                    safe_rewind_height: min_truncation_height,
-                    requested_height: max_height,
-                })
-            },
-            |h| Ok(BlockHeight::from(h)),
-        )?;
+    let truncation_height = select_truncation_height(conn, max_height)?;
+    truncate_to_height_internal(
+        conn,
+        params,
+        #[cfg(feature = "transparent-inputs")]
+        gap_limits,
+        truncation_height,
+    )
+}
 
+pub(crate) fn truncate_to_height_internal<P: consensus::Parameters>(
+    conn: &rusqlite::Transaction,
+    params: &P,
+    #[cfg(feature = "transparent-inputs")] gap_limits: &GapLimits,
+    truncation_height: BlockHeight,
+) -> Result<BlockHeight, SqliteClientError> {
     let last_scanned_height = conn.query_row("SELECT MAX(height) FROM blocks", [], |row| {
         let h = row.get::<_, Option<u32>>(0)?;
 
@@ -3309,29 +3356,6 @@ pub(crate) fn truncate_to_height<P: consensus::Parameters>(
     Ok(truncation_height)
 }
 
-// Find the minimum checkpoint height for each tree and take the maximum of those minima.
-//
-// This returns the earliest height at which all trees have a checkpoint. The orchard table exists
-// unconditionally but is empty when the `orchard` feature is not active; MAX ignores NULLs, so
-// this correctly returns only the sapling minimum in that case.
-fn min_shared_checkpoint_height(
-    conn: &rusqlite::Connection,
-) -> Result<Option<BlockHeight>, SqliteClientError> {
-    Ok(conn
-        .query_row(
-            "SELECT MAX(m) FROM (
-                 SELECT MIN(checkpoint_id) AS m FROM sapling_tree_checkpoints
-                 UNION ALL
-                 SELECT MIN(checkpoint_id) AS m FROM orchard_tree_checkpoints
-             )",
-            [],
-            |row| row.get::<_, Option<u32>>(0),
-        )
-        .optional()?
-        .flatten()
-        .map(BlockHeight::from))
-}
-
 /// Truncates the wallet database to a precise block height using note commitment tree frontiers
 /// from the provided `ChainState`.
 ///
@@ -3341,8 +3365,9 @@ fn min_shared_checkpoint_height(
 /// - If a checkpoint exists at or below the target height, it delegates to
 ///   [`truncate_to_height`] directly.
 /// - If the target height is below the oldest available checkpoint, it first truncates to the
-///   oldest checkpoint (freeing space), then inserts the provided frontier as a new checkpoint
-///   at the target height, and finally truncates to that new checkpoint.
+///   oldest checkpoint to ensure that the a checkpoint added at the provided frontier position does
+///   not get immediately pruned, then inserts the provided frontier as a new checkpoint at the
+///   target height, and finally truncates to that new checkpoint.
 pub(crate) fn truncate_to_chain_state<P: consensus::Parameters, CL, R>(
     wdb: &mut WalletDb<SqlTransaction<'_>, P, CL, R>,
     chain_state: ChainState,
@@ -3351,43 +3376,53 @@ pub(crate) fn truncate_to_chain_state<P: consensus::Parameters, CL, R>(
 
     // Try the simple case first: if a checkpoint exists at or below the target height,
     // truncate_to_height will succeed directly.
-    match truncate_to_height(
-        wdb.conn.0,
-        &wdb.params,
-        #[cfg(feature = "transparent-inputs")]
-        &wdb.gap_limits,
-        target_height,
-    ) {
-        Ok(_) => return Ok(()),
-        Err(SqliteClientError::RequestedRewindInvalid { .. }) => {
-            // The target height is below the oldest checkpoint. We need to use the
-            // frontier-based approach.
+    match select_truncation_height(wdb.conn.0, target_height) {
+        Ok(h) => {
+            if h == target_height {
+                // There is a checkpoint for the requested height, we can just truncate to it and
+                // return.
+                return truncate_to_height_internal(
+                    wdb.conn.0,
+                    &wdb.params,
+                    #[cfg(feature = "transparent-inputs")]
+                    &wdb.gap_limits,
+                    h,
+                )
+                .map(|_| ());
+            } else {
+                // The returned height corresponds to a checkpoint that is below the requested
+                // height. Inserting a checkpoint at a height *greater* than this returned height
+                // may cause an older checkpoint to be deleted, but that's fine, so we just fall
+                // through here.
+            }
+        }
+        Err(SqliteClientError::RequestedRewindInvalid {
+            safe_rewind_height, ..
+        }) => {
+            // The safe rewind height is at a position greater than the requested height, so we
+            // truncate to that height first to clear out checkpoints that would otherwise cause
+            // the checkpoint we're about to insert to be immediately pruned, then, we fall through
+            // to insertion of the frontier.
+            if let Some(min_checkpoint_height) = safe_rewind_height {
+                truncate_to_height(
+                    wdb.conn.0,
+                    &wdb.params,
+                    #[cfg(feature = "transparent-inputs")]
+                    &wdb.gap_limits,
+                    min_checkpoint_height,
+                )?;
+            }
         }
         Err(e) => {
             return Err(e);
         }
-    }
+    };
 
-    // Step 1: Truncate to the earliest available checkpoint. This removes all later
-    // checkpoints and tree data, making room for the frontier insertion.
-    let min_checkpoint_height = min_shared_checkpoint_height(wdb.conn.0)?;
-
-    // If there are checkpoints, truncate to the earliest common one first. If there are
-    // no checkpoints at all, we can skip this step and proceed directly to inserting the
-    // frontier.
-    if let Some(min_checkpoint_height) = min_checkpoint_height {
-        truncate_to_height(
-            wdb.conn.0,
-            &wdb.params,
-            #[cfg(feature = "transparent-inputs")]
-            &wdb.gap_limits,
-            min_checkpoint_height,
-        )?;
-    }
+    // If there are checkpoints, truncate to the earliest common one first. If there are no
+    // checkpoints at all, we can skip this step and proceed directly to inserting the frontier.
 
-    // Step 2: Insert the frontier from the chain state, creating a checkpoint at
-    // the target height. Because we just truncated down to a single checkpoint,
-    // there is room for this new one.
+    // Insert the frontier from the chain state, creating a checkpoint at the target height.
+    // Because we just truncated down to a single checkpoint, there is room for this new one.
     wdb.with_sapling_tree_mut(|tree| {
         tree.insert_frontier(
             chain_state.final_sapling_tree().clone(),
@@ -3411,8 +3446,8 @@ pub(crate) fn truncate_to_chain_state<P: consensus::Parameters, CL, R>(
         Ok::<_, SqliteClientError>(())
     })?;
 
-    // Step 3: Now truncate to the target height checkpoint we just created.
-    truncate_to_height(
+    // Now truncate to the target height checkpoint we just created.
+    let truncated_height = truncate_to_height(
         wdb.conn.0,
         &wdb.params,
         #[cfg(feature = "transparent-inputs")]
@@ -3420,6 +3455,8 @@ pub(crate) fn truncate_to_chain_state<P: consensus::Parameters, CL, R>(
         target_height,
     )?;
 
+    assert_eq!(truncated_height, target_height);
+
     Ok(())
 }
 

From a2614108de60aeb5365f16e4663d9c80aaea8c36 Mon Sep 17 00:00:00 2001
From: John Boyd <john@coldnoise.net>
Date: Sun, 22 Feb 2026 21:52:28 -0600
Subject: [PATCH 181/263] zcash_client_sqlite: Fix unresolved import w/
 transparent-inputs

---
 zcash_client_sqlite/src/lib.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs
index 8745bdfb20..292646bd93 100644
--- a/zcash_client_sqlite/src/lib.rs
+++ b/zcash_client_sqlite/src/lib.rs
@@ -130,11 +130,10 @@ use {
 use {
     rusqlite::named_params,
     zcash_client_backend::data_api::{OutputOfSentTx, WalletTest, testing::TransactionSummary},
-    zcash_keys::address::Address,
 };
 
 #[cfg(any(test, feature = "test-dependencies", feature = "transparent-inputs"))]
-use crate::wallet::encoding::KeyScope;
+use {crate::wallet::encoding::KeyScope, zcash_keys::address::Address};
 
 #[cfg(any(test, feature = "test-dependencies", not(feature = "orchard")))]
 use zcash_protocol::PoolType;

From 92be8ec756652c769ae8a1a5cca8618414a2925d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Feb 2026 05:39:58 +0000
Subject: [PATCH 182/263] build(deps): bump taiki-e/install-action from 2.67.18
 to 2.68.8

Bumps [taiki-e/install-action](https://github.com/taiki-e/install-action) from 2.67.18 to 2.68.8.
- [Release notes](https://github.com/taiki-e/install-action/releases)
- [Changelog](https://github.com/taiki-e/install-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/taiki-e/install-action/compare/650c5ca14212efbbf3e580844b04bdccf68dac31...cfdb446e391c69574ebc316dfb7d7849ec12b940)

---
updated-dependencies:
- dependency-name: taiki-e/install-action
  dependency-version: 2.68.8
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/mutants.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/mutants.yml b/.github/workflows/mutants.yml
index c792b6e0be..3caefb7255 100644
--- a/.github/workflows/mutants.yml
+++ b/.github/workflows/mutants.yml
@@ -96,7 +96,7 @@ jobs:
         shell: sh
         env:
           TOOLCHAIN: ${{steps.toolchain.outputs.name}}
-      - uses: taiki-e/install-action@650c5ca14212efbbf3e580844b04bdccf68dac31 # v2.67.18
+      - uses: taiki-e/install-action@cfdb446e391c69574ebc316dfb7d7849ec12b940 # v2.68.8
         with:
           tool: cargo-mutants
       - run: cargo mutants --package "${{ matrix.package }}" --all-features -vV --in-place

From 09ab0f54e1a90f2023bad019cb9fa67dbcb51a89 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Mon, 23 Feb 2026 09:37:23 -0700
Subject: [PATCH 183/263] Update `cargo vet` metadata to reflect `shardtree`
 bump.

---
 supply-chain/audits.toml  | 2 +-
 supply-chain/imports.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
index 9330f0efe1..5666c5ea81 100644
--- a/supply-chain/audits.toml
+++ b/supply-chain/audits.toml
@@ -2057,7 +2057,7 @@ end = "2026-10-26"
 criteria = "safe-to-deploy"
 user-id = 169181 # Kris Nuttycombe (nuttycom)
 start = "2022-12-15"
-end = "2025-04-22"
+end = "2027-02-23"
 
 [[trusted.sinsemilla]]
 criteria = "safe-to-deploy"
diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index f13e467fe2..483eacd9dc 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -114,8 +114,8 @@ user-login = "str4d"
 user-name = "Jack Grigg"
 
 [[publisher.shardtree]]
-version = "0.6.1"
-when = "2025-01-31"
+version = "0.6.2"
+when = "2026-02-21"
 user-id = 169181
 user-login = "nuttycom"
 user-name = "Kris Nuttycombe"

From b822585cf53cff70fb966b04952b2782c6067102 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Tue, 27 Jan 2026 14:06:01 +0000
Subject: [PATCH 184/263] eip681: Replace qualified `nom` paths with `use`s

We do not do streamed parsing, and `eip681::parse` is only for `nom`
parsing, so importing `nom` parsers within the module is fine.
---
 components/eip681/src/parse.rs | 70 +++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index a244613fe9..5082defba2 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -2,7 +2,14 @@
 
 use std::{borrow::Cow, collections::BTreeMap};
 
-use nom::{AsChar, Parser};
+use nom::{
+    AsChar, Parser,
+    bytes::complete::{is_not, tag, take_till, take_till1, take_while, take_while1},
+    character::complete::char,
+    combinator::opt,
+    multi::separated_list0,
+    sequence::preceded,
+};
 use primitive_types::U256;
 use sha3::{Digest, Keccak256};
 use snafu::{OptionExt, ResultExt};
@@ -99,7 +106,7 @@ impl Digits {
 /// Parse at least `min` digits.
 pub fn parse_min(i: &str, min: usize, is_hex: bool) -> nom::IResult<&str, Vec<u8>, ParseError<'_>> {
     let radix = if is_hex { 16 } else { 10 };
-    let (i, chars) = nom::bytes::complete::take_while(|c: char| c.is_digit(radix))(i)?;
+    let (i, chars) = take_while(|c: char| c.is_digit(radix))(i)?;
     let data = chars
         .chars()
         .map(|c| {
@@ -246,7 +253,7 @@ impl core::fmt::Display for HexDigits {
 impl HexDigits {
     /// Parse at least `min` digits.
     pub fn parse_min(i: &str, min: usize) -> nom::IResult<&str, Self, ParseError<'_>> {
-        let (i, data) = nom::bytes::complete::take_while(|c: char| c.is_ascii_hexdigit())(i)?;
+        let (i, data) = take_while(|c: char| c.is_ascii_hexdigit())(i)?;
         snafu::ensure!(
             data.len() >= min,
             DigitsMinimumSnafu {
@@ -410,36 +417,36 @@ impl Number {
     /// ```
     pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
         // Parse [ "-" / "+" ]
-        let parse_signum_pos = nom::character::complete::char('+').map(|_| true);
-        let parse_signum_neg = nom::character::complete::char('-').map(|_| false);
+        let parse_signum_pos = char('+').map(|_| true);
+        let parse_signum_neg = char('-').map(|_| false);
         let parse_signum = parse_signum_pos.or(parse_signum_neg);
-        let (i, signum) = nom::combinator::opt(parse_signum)(i)?;
+        let (i, signum) = opt(parse_signum)(i)?;
 
         // Parse *DIGIT
         let (i, integer) = Digits::parse_min(i, 0)?;
 
         // Parse [ "." 1*DIGIT ]
         fn parse_decimal(i: &str) -> nom::IResult<&str, Digits, ParseError<'_>> {
-            let (i, _dot) = nom::character::complete::char('.')(i)?;
+            let (i, _dot) = char('.')(i)?;
             let (i, digits) = Digits::parse_min(i, 1)?;
             Ok((i, digits))
         }
-        let (i, decimal) = nom::combinator::opt(parse_decimal)(i)?;
+        let (i, decimal) = opt(parse_decimal)(i)?;
 
         // Parse [ ( "e" / "E" ) [ 1*DIGIT ] ]
         fn parse_exponent(i: &str) -> nom::IResult<&str, (bool, Option<Digits>), ParseError<'_>> {
             // Parse ( "e" / "E" )
-            let parse_little_e = nom::character::complete::char('e').map(|_| true);
-            let parse_big_e = nom::character::complete::char('E').map(|_| false);
+            let parse_little_e = char('e').map(|_| true);
+            let parse_big_e = char('E').map(|_| false);
             let mut parse_e = parse_little_e.or(parse_big_e);
             let (i, little_e) = parse_e.parse(i)?;
 
             // Parse [ 1*DIGIT ]
-            let (i, maybe_exp) = nom::combinator::opt(|i| Digits::parse_min(i, 1))(i)?;
+            let (i, maybe_exp) = opt(|i| Digits::parse_min(i, 1))(i)?;
 
             Ok((i, (little_e, maybe_exp)))
         }
-        let (i, exponent) = nom::combinator::opt(parse_exponent)(i)?;
+        let (i, exponent) = opt(parse_exponent)(i)?;
 
         Ok((
             i,
@@ -652,7 +659,7 @@ impl EnsName {
             !c.is_whitespace() && !EnsName::DELIMITERS.contains(&c)
         }
 
-        let (i, name) = nom::bytes::complete::take_till(|c| !continue_parsing(c))(i)?;
+        let (i, name) = take_till(|c| !continue_parsing(c))(i)?;
         snafu::ensure!(!name.is_empty(), EnsMissingSnafu);
         snafu::ensure!(name.contains('.'), EnsDomainSnafu);
 
@@ -699,7 +706,7 @@ impl AddressOrEnsName {
     pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
         // Parse "0x" and then 40+ hex digits
         fn parse_40plus_hex(i: &str) -> nom::IResult<&str, AddressOrEnsName, ParseError<'_>> {
-            let (i, _) = nom::bytes::complete::tag("0x")(i)?;
+            let (i, _) = tag("0x")(i)?;
             let (i, digits) = HexDigits::parse_min(i, 40)?;
             Ok((i, AddressOrEnsName::Address(digits)))
         }
@@ -748,7 +755,7 @@ impl UrlEncodedUnicodeString {
         fn should_continue_parsing(c: char) -> bool {
             c.is_alphanumeric() || c == '%'
         }
-        let (i, s) = nom::bytes::complete::take_while(should_continue_parsing)(i)?;
+        let (i, s) = take_while(should_continue_parsing)(i)?;
         Ok((i, UrlEncodedUnicodeString(s.to_string())))
     }
 
@@ -875,7 +882,7 @@ impl EthereumAbiTypeName {
             ];
             c.is_alphanum() || chars.contains(&c)
         }
-        let (i, s) = nom::bytes::complete::take_while1(is_type_char)(i)?;
+        let (i, s) = take_while1(is_type_char)(i)?;
         Ok((i, EthereumAbiTypeName { name: s.to_owned() }))
     }
 }
@@ -943,8 +950,8 @@ impl Parameter {
 
     pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
         // Parse the key blob
-        let (i, key_blob) = nom::bytes::complete::take_till1(|c| c == '=')(i)?;
-        let (i, _) = nom::bytes::complete::tag("=")(i)?;
+        let (i, key_blob) = take_till1(|c| c == '=')(i)?;
+        let (i, _) = tag("=")(i)?;
 
         fn parse_number(
             i: &str,
@@ -1019,10 +1026,7 @@ impl Parameters {
     /// This parser never fails.
     pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
         // First parse into parameter "blobs", separated by '&'
-        let (i, blobs) = nom::multi::separated_list0(
-            nom::bytes::complete::tag("&"),
-            nom::bytes::complete::take_till1(|c| c == '&'),
-        )(i)?;
+        let (i, blobs) = separated_list0(tag("&"), take_till1(|c| c == '&'))(i)?;
         let mut params = vec![];
         for blob in blobs.into_iter() {
             let (j, param) = Parameter::parse(blob)?;
@@ -1159,9 +1163,9 @@ impl core::fmt::Display for SchemaPrefix {
 
 impl SchemaPrefix {
     pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
-        let (i, prefix) = nom::bytes::complete::take_till1(|c| c == ':')(i)?;
-        let (i, _) = nom::character::complete::char(':')(i)?;
-        let (i, maybe_pay) = nom::combinator::opt(nom::bytes::complete::tag("pay-"))(i)?;
+        let (i, prefix) = take_till1(|c| c == ':')(i)?;
+        let (i, _) = char(':')(i)?;
+        let (i, maybe_pay) = opt(tag("pay-"))(i)?;
         let has_pay = maybe_pay.is_some();
         Ok((
             i,
@@ -1233,7 +1237,7 @@ impl RawTransactionRequest {
     /// Parse a transaction request.
     pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
         let (i, schema_prefix) = SchemaPrefix::parse(i)?;
-        let (i, address_blob) = nom::bytes::complete::is_not("@/?")(i)?;
+        let (i, address_blob) = is_not("@/?")(i)?;
         let (remaining_address_input, target_address) = AddressOrEnsName::parse(address_blob)?;
         snafu::ensure!(
             remaining_address_input.is_empty(),
@@ -1242,17 +1246,13 @@ impl RawTransactionRequest {
             }
         );
 
-        let parse_chain_id =
-            nom::sequence::preceded(nom::bytes::complete::tag("@"), |i| Digits::parse_min(i, 1));
-        let (i, chain_id) = nom::combinator::opt(parse_chain_id)(i)?;
+        let parse_chain_id = preceded(tag("@"), |i| Digits::parse_min(i, 1));
+        let (i, chain_id) = opt(parse_chain_id)(i)?;
 
-        let parse_function_name = nom::sequence::preceded(
-            nom::bytes::complete::tag("/"),
-            UrlEncodedUnicodeString::parse,
-        );
-        let (i, function_name) = nom::combinator::opt(parse_function_name)(i)?;
+        let parse_function_name = preceded(tag("/"), UrlEncodedUnicodeString::parse);
+        let (i, function_name) = opt(parse_function_name)(i)?;
 
-        let (i, _) = nom::combinator::opt(nom::bytes::complete::tag("?"))(i)?;
+        let (i, _) = opt(tag("?"))(i)?;
         let (i, parameters) = Parameters::parse(i)?;
         Ok((
             i,

From 639542990684b2f9dd070c46731a954cdd9a5f47 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Tue, 27 Jan 2026 14:14:46 +0000
Subject: [PATCH 185/263] eip681: Separate grammar-level arguments from parser
 input

---
 components/eip681/src/parse.rs | 129 ++++++++++++++++++---------------
 1 file changed, 70 insertions(+), 59 deletions(-)

diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index 5082defba2..1d48ad8296 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -97,32 +97,40 @@ impl Digits {
     }
 
     /// Parse at least `min` digits.
-    pub fn parse_min(i: &str, min: usize) -> nom::IResult<&str, Self, ParseError<'_>> {
-        let (i, places) = parse_min(i, min, false)?;
-        Ok((i, Digits { places }))
+    pub fn parse_min(min: usize) -> impl Fn(&str) -> nom::IResult<&str, Self, ParseError<'_>> {
+        move |i| {
+            parse_min(min, false)
+                .map(|places| Digits { places })
+                .parse(i)
+        }
     }
 }
 
 /// Parse at least `min` digits.
-pub fn parse_min(i: &str, min: usize, is_hex: bool) -> nom::IResult<&str, Vec<u8>, ParseError<'_>> {
-    let radix = if is_hex { 16 } else { 10 };
-    let (i, chars) = take_while(|c: char| c.is_digit(radix))(i)?;
-    let data = chars
-        .chars()
-        .map(|c| {
-            c.to_digit(radix)
-                .expect("we already checked that this char was a digit") as u8
-        })
-        .collect::<Vec<_>>();
-    snafu::ensure!(
-        data.len() >= min,
-        DigitsMinimumSnafu {
-            min,
-            digits_len: data.len(),
-            input: i
-        }
-    );
-    Ok((i, data))
+pub fn parse_min(
+    min: usize,
+    is_hex: bool,
+) -> impl Fn(&str) -> nom::IResult<&str, Vec<u8>, ParseError<'_>> {
+    move |i| {
+        let radix = if is_hex { 16 } else { 10 };
+        let (i, chars) = take_while(|c: char| c.is_digit(radix))(i)?;
+        let data = chars
+            .chars()
+            .map(|c| {
+                c.to_digit(radix)
+                    .expect("we already checked that this char was a digit") as u8
+            })
+            .collect::<Vec<_>>();
+        snafu::ensure!(
+            data.len() >= min,
+            DigitsMinimumSnafu {
+                min,
+                digits_len: data.len(),
+                input: i
+            }
+        );
+        Ok((i, data))
+    }
 }
 
 /// One case-sensitive hexadecimal digit.
@@ -252,22 +260,24 @@ impl core::fmt::Display for HexDigits {
 
 impl HexDigits {
     /// Parse at least `min` digits.
-    pub fn parse_min(i: &str, min: usize) -> nom::IResult<&str, Self, ParseError<'_>> {
-        let (i, data) = take_while(|c: char| c.is_ascii_hexdigit())(i)?;
-        snafu::ensure!(
-            data.len() >= min,
-            DigitsMinimumSnafu {
-                min,
-                digits_len: data.len(),
-                input: i
+    pub fn parse_min(min: usize) -> impl Fn(&str) -> nom::IResult<&str, Self, ParseError<'_>> {
+        move |i| {
+            let (i, data) = take_while(|c: char| c.is_ascii_hexdigit())(i)?;
+            snafu::ensure!(
+                data.len() >= min,
+                DigitsMinimumSnafu {
+                    min,
+                    digits_len: data.len(),
+                    input: i
+                }
+            );
+            let mut places = vec![];
+            for c in data.chars() {
+                let digit = CaseSensitiveHexDigit::from_char(c)?;
+                places.push(digit);
             }
-        );
-        let mut places = vec![];
-        for c in data.chars() {
-            let digit = CaseSensitiveHexDigit::from_char(c)?;
-            places.push(digit);
+            Ok((i, HexDigits { places }))
         }
-        Ok((i, HexDigits { places }))
     }
 
     /// Returns whether all alphabetic digits are lowercase.
@@ -423,12 +433,12 @@ impl Number {
         let (i, signum) = opt(parse_signum)(i)?;
 
         // Parse *DIGIT
-        let (i, integer) = Digits::parse_min(i, 0)?;
+        let (i, integer) = Digits::parse_min(0)(i)?;
 
         // Parse [ "." 1*DIGIT ]
         fn parse_decimal(i: &str) -> nom::IResult<&str, Digits, ParseError<'_>> {
             let (i, _dot) = char('.')(i)?;
-            let (i, digits) = Digits::parse_min(i, 1)?;
+            let (i, digits) = Digits::parse_min(1)(i)?;
             Ok((i, digits))
         }
         let (i, decimal) = opt(parse_decimal)(i)?;
@@ -442,7 +452,7 @@ impl Number {
             let (i, little_e) = parse_e.parse(i)?;
 
             // Parse [ 1*DIGIT ]
-            let (i, maybe_exp) = opt(|i| Digits::parse_min(i, 1))(i)?;
+            let (i, maybe_exp) = opt(Digits::parse_min(1))(i)?;
 
             Ok((i, (little_e, maybe_exp)))
         }
@@ -707,7 +717,7 @@ impl AddressOrEnsName {
         // Parse "0x" and then 40+ hex digits
         fn parse_40plus_hex(i: &str) -> nom::IResult<&str, AddressOrEnsName, ParseError<'_>> {
             let (i, _) = tag("0x")(i)?;
-            let (i, digits) = HexDigits::parse_min(i, 40)?;
+            let (i, digits) = HexDigits::parse_min(40)(i)?;
             Ok((i, AddressOrEnsName::Address(digits)))
         }
         let parse_ens = EnsName::parse.map(AddressOrEnsName::Name);
@@ -954,25 +964,26 @@ impl Parameter {
         let (i, _) = tag("=")(i)?;
 
         fn parse_number(
-            i: &str,
             f: fn(Number) -> Parameter,
-        ) -> nom::IResult<&str, Parameter, ParseError<'_>> {
-            let (i, number) =
-                Number::parse
-                    .parse(i)
-                    .map_err(|_| ParseError::InvalidParameterValue {
-                        ty: "Number".to_string(),
-                    })?;
-            Ok((i, f(number)))
+        ) -> impl Fn(&str) -> nom::IResult<&str, Parameter, ParseError<'_>> {
+            move |i| {
+                let (i, number) =
+                    Number::parse
+                        .parse(i)
+                        .map_err(|_| ParseError::InvalidParameterValue {
+                            ty: "Number".to_string(),
+                        })?;
+                Ok((i, f(number)))
+            }
         }
         // If key in the parameter list is value, gasLimit, gasPrice or gas then
         // value MUST be a number. Otherwise, it must correspond to the TYPE
         // string used as key.
         Ok(match key_blob {
-            "value" => parse_number(i, Parameter::Value)?,
-            "gas" => parse_number(i, Parameter::Gas)?,
-            "gasLimit" => parse_number(i, Parameter::GasLimit)?,
-            "gasPrice" => parse_number(i, Parameter::GasPrice)?,
+            "value" => parse_number(Parameter::Value)(i)?,
+            "gas" => parse_number(Parameter::Gas)(i)?,
+            "gasLimit" => parse_number(Parameter::GasLimit)(i)?,
+            "gasPrice" => parse_number(Parameter::GasPrice)(i)?,
             other_key_blob => {
                 let (remaining_name_input, type_name) = EthereumAbiTypeName::parse(other_key_blob)?;
                 snafu::ensure!(
@@ -1246,7 +1257,7 @@ impl RawTransactionRequest {
             }
         );
 
-        let parse_chain_id = preceded(tag("@"), |i| Digits::parse_min(i, 1));
+        let parse_chain_id = preceded(tag("@"), Digits::parse_min(1));
         let (i, chain_id) = opt(parse_chain_id)(i)?;
 
         let parse_function_name = preceded(tag("/"), UrlEncodedUnicodeString::parse);
@@ -1369,7 +1380,7 @@ mod test {
 
     #[test]
     fn parse_digits_sanity() {
-        let (i, seen_digits) = Digits::parse_min("256", 0).unwrap();
+        let (i, seen_digits) = Digits::parse_min(0)("256").unwrap();
         assert!(i.is_empty());
         assert_eq!(256, seen_digits.as_u64().unwrap())
     }
@@ -1378,7 +1389,7 @@ mod test {
         #[test]
         fn parse_digits(digits in arb_digits(1)) {
             let s = digits.to_string();
-            let (i, seen_digits) = Digits::parse_min(&s, 1).unwrap();
+            let (i, seen_digits) = Digits::parse_min(1)(&s).unwrap();
             assert_eq!("", i);
             assert_eq!(digits, seen_digits);
         }
@@ -2029,7 +2040,7 @@ mod test {
         ];
 
         for addy in addresses {
-            let (i, hexdigits) = HexDigits::parse_min(addy, 40).unwrap();
+            let (i, hexdigits) = HexDigits::parse_min(40)(addy).unwrap();
             assert!(i.is_empty(), "Should consume all input");
             let validation_result = hexdigits.validate_erc55();
             assert!(
@@ -2053,7 +2064,7 @@ mod test {
         ];
 
         for addy in borked_cases {
-            let (i, hexdigits) = HexDigits::parse_min(addy, 40).unwrap();
+            let (i, hexdigits) = HexDigits::parse_min(40)(addy).unwrap();
             assert!(i.is_empty(), "Should consume all input");
             let validation_result = hexdigits.validate_erc55();
             assert!(
@@ -2066,7 +2077,7 @@ mod test {
     #[test]
     fn digits_as_decimal_ratio_sanity() {
         let input = "0001234";
-        let (_, digits) = Digits::parse_min(input, 1).unwrap();
+        let (_, digits) = Digits::parse_min(1)(input).unwrap();
         let ratio = digits.as_decimal_ratio().unwrap();
         assert_eq!((1234, 10_000_000), ratio);
         assert_eq!(0.0001234, ratio.0 as f32 / ratio.1 as f32);

From fdfbd5a8d1a72a13841268a0276ff640ad703670 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Tue, 27 Jan 2026 15:49:38 +0000
Subject: [PATCH 186/263] eip681: Test round-trip encoding with empty
 parameters

---
 components/eip681/src/parse.rs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index 1d48ad8296..8dc0fc56d4 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -2089,4 +2089,16 @@ mod test {
         let (_, n) = Number::parse(input).unwrap();
         assert_eq!(n.as_i128().unwrap(), 0);
     }
+
+    #[test]
+    fn round_trip_empty_params() {
+        let input = "ethereum:0x4040404040404040404040404040404040404040?";
+        let (i, seen) = RawTransactionRequest::parse(input)
+            .unwrap_or_else(|e| panic!("could not parse '{input}': {e}"));
+        pretty_assertions::assert_str_eq!(
+            input,
+            seen.to_string().as_str(),
+            "input: {input}\ni: {i}"
+        );
+    }
 }

From 5976de4013bf81ff6d4ce9f5985c38f985f9124e Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Tue, 27 Jan 2026 15:51:37 +0000
Subject: [PATCH 187/263] eip681: Fix round-trip encoding bug in
 `RawTransactionRequest`

This was not caught by the proptests, because they only produced values
representable by `RawTransactionRequest` and were explictly mapping
these two encodings to the same in-memory representation.
---
 components/eip681/src/parse.rs   | 13 +++++-----
 components/eip681/src/request.rs | 41 +++++++++++++++++++-------------
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index 8dc0fc56d4..2497d7d963 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -1213,7 +1213,7 @@ pub struct RawTransactionRequest {
     pub target_address: AddressOrEnsName,
     pub chain_id: Option<Digits>,
     pub function_name: Option<UrlEncodedUnicodeString>,
-    pub parameters: Parameters,
+    pub parameters: Option<Parameters>,
 }
 
 impl core::fmt::Display for RawTransactionRequest {
@@ -1235,7 +1235,7 @@ impl core::fmt::Display for RawTransactionRequest {
             f.write_str("/")?;
             fn_name.fmt(f)?;
         }
-        if !parameters.0.is_empty() {
+        if let Some(parameters) = parameters {
             f.write_str("?")?;
             parameters.fmt(f)?;
         }
@@ -1263,8 +1263,7 @@ impl RawTransactionRequest {
         let parse_function_name = preceded(tag("/"), UrlEncodedUnicodeString::parse);
         let (i, function_name) = opt(parse_function_name)(i)?;
 
-        let (i, _) = opt(tag("?"))(i)?;
-        let (i, parameters) = Parameters::parse(i)?;
+        let (i, parameters) = opt(preceded(tag("?"), Parameters::parse))(i)?;
         Ok((
             i,
             Self {
@@ -1976,13 +1975,13 @@ mod test {
             prop::option::of(arb_parameters()),
         )
             .prop_map(
-                |(schema_prefix, target_address, chain_id, function_name, paramaters)| {
+                |(schema_prefix, target_address, chain_id, function_name, parameters)| {
                     RawTransactionRequest {
                         schema_prefix,
                         target_address,
                         chain_id,
                         function_name,
-                        parameters: paramaters.unwrap_or(Parameters(vec![])),
+                        parameters,
                     }
                 },
             )
@@ -2016,7 +2015,7 @@ mod test {
             "0xfb6916095ca1df60bb79Ce92ce3ea74c37c5d359",
             seen.target_address.to_string()
         );
-        let number = seen.parameters.value().unwrap().unwrap();
+        let number = seen.parameters.unwrap().value().unwrap().unwrap();
         assert_eq!(2, number.integer().unwrap());
         assert_eq!(2.014e18 as i128, number.as_i128().unwrap());
     }
diff --git a/components/eip681/src/request.rs b/components/eip681/src/request.rs
index 155d77ded8..a211fe2d6e 100644
--- a/components/eip681/src/request.rs
+++ b/components/eip681/src/request.rs
@@ -157,20 +157,23 @@ impl TryFrom<&RawTransactionRequest> for NativeRequest {
     fn try_from(raw: &RawTransactionRequest) -> Result<Self, Self::Error> {
         // A notive request cannot have a function name
         ensure!(raw.function_name.is_none(), HasFunctionNameSnafu);
-        // A native request cannot have ABI parameters
-        ensure!(
-            raw.parameters.abi_parameters().next().is_none(),
-            HasAbiParametersSnafu
-        );
 
-        for p in raw.parameters.iter() {
-            let v = p.value();
-            let n = v
-                .as_number()
-                .context(ParameterNotNumberSnafu { key: p.key() })?;
-            let _uint256 = n
-                .as_uint256()
-                .context(ParameterInvalidSnafu { key: p.key() })?;
+        if let Some(parameters) = &raw.parameters {
+            // A native request cannot have ABI parameters
+            ensure!(
+                parameters.abi_parameters().next().is_none(),
+                HasAbiParametersSnafu
+            );
+
+            for p in parameters.iter() {
+                let v = p.value();
+                let n = v
+                    .as_number()
+                    .context(ParameterNotNumberSnafu { key: p.key() })?;
+                let _uint256 = n
+                    .as_uint256()
+                    .context(ParameterInvalidSnafu { key: p.key() })?;
+            }
         }
 
         Ok(NativeRequest {
@@ -211,7 +214,7 @@ impl NativeRequest {
     pub fn value_atomic(&self) -> Option<U256> {
         // Swallowing errors with `??` is ok here as we already validated these parameters
         // to construct the request.
-        let value = self.inner.parameters.value().ok()??;
+        let value = self.inner.parameters.as_ref()?.value().ok()??;
         value.as_uint256().ok()
     }
 
@@ -219,7 +222,7 @@ impl NativeRequest {
     pub fn gas_limit(&self) -> Option<U256> {
         // Swallowing errors with `??` is ok here as we already validated these parameters
         // to construct the request.
-        let limit = self.inner.parameters.gas_limit().ok()??;
+        let limit = self.inner.parameters.as_ref()?.gas_limit().ok()??;
         limit.as_uint256().ok()
     }
 
@@ -227,7 +230,7 @@ impl NativeRequest {
     pub fn gas_price(&self) -> Option<U256> {
         // Swallowing errors with `??` is ok here as we already validated these parameters
         // to construct the request.
-        let price = self.inner.parameters.gas_price().ok()??;
+        let price = self.inner.parameters.as_ref()?.gas_price().ok()??;
         price.as_uint256().ok()
     }
 }
@@ -307,7 +310,11 @@ impl TryFrom<&RawTransactionRequest> for Erc20Request {
         );
 
         // Check ABI parameters - must have exactly address and uint256
-        let abi_params: Vec<_> = raw.parameters.abi_parameters().collect();
+        let abi_params: Vec<_> = raw
+            .parameters
+            .iter()
+            .flat_map(|p| p.abi_parameters())
+            .collect();
         ensure!(
             abi_params.len() == 2,
             AbiParameterLenSnafu {

From 0919772b135e6ce9cd1287d7395fc02167ba1d17 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Tue, 27 Jan 2026 15:52:05 +0000
Subject: [PATCH 188/263] eip681: Use combinatorial parsing more often

This makes several of the parsers easier to map to their ABNF, which
resulted in bug discovery (fixed in prior commits).
---
 components/eip681/src/parse.rs | 177 ++++++++++++++++-----------------
 1 file changed, 84 insertions(+), 93 deletions(-)

diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index 2497d7d963..9d9c5b5a8f 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -4,11 +4,12 @@ use std::{borrow::Cow, collections::BTreeMap};
 
 use nom::{
     AsChar, Parser,
+    branch::alt,
     bytes::complete::{is_not, tag, take_till, take_till1, take_while, take_while1},
     character::complete::char,
-    combinator::opt,
+    combinator::{map_parser, opt, success, value},
     multi::separated_list0,
-    sequence::preceded,
+    sequence::{preceded, separated_pair, terminated, tuple},
 };
 use primitive_types::U256;
 use sha3::{Digest, Keccak256};
@@ -16,6 +17,23 @@ use snafu::{OptionExt, ResultExt};
 
 use crate::error::*;
 
+/// Succeeds if all the input has been consumed by its child parser.
+///
+/// Identical to [`nom::combinator::all_consuming`] except it only accepts `&str` inputs
+/// and returns a different error.
+fn all_consuming<'i, O, F>(
+    mut f: F,
+) -> impl FnMut(&'i str) -> nom::IResult<&'i str, O, ParseError<'i>>
+where
+    F: Parser<&'i str, O, ParseError<'i>>,
+{
+    move |input| {
+        let (input, res) = f.parse(input)?;
+        snafu::ensure!(input.is_empty(), UnexpectedLeftoverInputSnafu { input });
+        Ok((input, res))
+    }
+}
+
 /// Zero or more consecutive digits.
 ///
 /// ```abnf
@@ -426,47 +444,36 @@ impl Number {
     /// number = [ "-" / "+" ] *DIGIT [ "." 1*DIGIT ] [ ( "e" / "E" ) [ 1*DIGIT ] ]
     /// ```
     pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
-        // Parse [ "-" / "+" ]
-        let parse_signum_pos = char('+').map(|_| true);
-        let parse_signum_neg = char('-').map(|_| false);
-        let parse_signum = parse_signum_pos.or(parse_signum_neg);
-        let (i, signum) = opt(parse_signum)(i)?;
+        // Parse [ "-" / "+" ], returning `true` if "+"
+        let parse_signum = opt(char('+').map(|_| true).or(char('-').map(|_| false)));
 
         // Parse *DIGIT
-        let (i, integer) = Digits::parse_min(0)(i)?;
+        let parse_integer = Digits::parse_min(0);
 
         // Parse [ "." 1*DIGIT ]
-        fn parse_decimal(i: &str) -> nom::IResult<&str, Digits, ParseError<'_>> {
-            let (i, _dot) = char('.')(i)?;
-            let (i, digits) = Digits::parse_min(1)(i)?;
-            Ok((i, digits))
-        }
-        let (i, decimal) = opt(parse_decimal)(i)?;
+        let parse_decimal = opt(preceded(char('.'), Digits::parse_min(1)));
 
         // Parse [ ( "e" / "E" ) [ 1*DIGIT ] ]
-        fn parse_exponent(i: &str) -> nom::IResult<&str, (bool, Option<Digits>), ParseError<'_>> {
-            // Parse ( "e" / "E" )
-            let parse_little_e = char('e').map(|_| true);
-            let parse_big_e = char('E').map(|_| false);
-            let mut parse_e = parse_little_e.or(parse_big_e);
-            let (i, little_e) = parse_e.parse(i)?;
+        fn parse_exponent(
+            i: &str,
+        ) -> nom::IResult<&str, Option<(bool, Option<Digits>)>, ParseError<'_>> {
+            // Parse ( "e" / "E" ), returning `true` if "e"
+            let parse_e = char('e').map(|_| true).or(char('E').map(|_| false));
 
             // Parse [ 1*DIGIT ]
-            let (i, maybe_exp) = opt(Digits::parse_min(1))(i)?;
+            let maybe_exp = opt(Digits::parse_min(1));
 
-            Ok((i, (little_e, maybe_exp)))
+            opt(tuple((parse_e, maybe_exp))).parse(i)
         }
-        let (i, exponent) = opt(parse_exponent)(i)?;
 
-        Ok((
-            i,
-            Self {
+        tuple((parse_signum, parse_integer, parse_decimal, parse_exponent))
+            .map(|(signum, integer, decimal, exponent)| Self {
                 signum,
                 integer,
                 decimal,
                 exponent,
-            },
-        ))
+            })
+            .parse(i)
     }
 
     /// Returns the value of the integer portion of the number.
@@ -715,15 +722,12 @@ impl AddressOrEnsName {
     /// Parse an `EthereumAddress`.
     pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
         // Parse "0x" and then 40+ hex digits
-        fn parse_40plus_hex(i: &str) -> nom::IResult<&str, AddressOrEnsName, ParseError<'_>> {
-            let (i, _) = tag("0x")(i)?;
-            let (i, digits) = HexDigits::parse_min(40)(i)?;
-            Ok((i, AddressOrEnsName::Address(digits)))
-        }
-        let parse_ens = EnsName::parse.map(AddressOrEnsName::Name);
-        let mut parse_address = parse_40plus_hex.or(parse_ens);
-        let (i, address) = parse_address.parse(i)?;
-        Ok((i, address))
+        let parse_40plus_hex = preceded(tag("0x"), HexDigits::parse_min(40));
+
+        parse_40plus_hex
+            .map(AddressOrEnsName::Address)
+            .or(EnsName::parse.map(AddressOrEnsName::Name))
+            .parse(i)
     }
 
     /// Returns the ERC-55 validated string representation of the address, or the ENS name, if possible.
@@ -762,11 +766,9 @@ impl core::fmt::Display for UrlEncodedUnicodeString {
 
 impl UrlEncodedUnicodeString {
     pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
-        fn should_continue_parsing(c: char) -> bool {
-            c.is_alphanumeric() || c == '%'
-        }
-        let (i, s) = take_while(should_continue_parsing)(i)?;
-        Ok((i, UrlEncodedUnicodeString(s.to_string())))
+        take_while(|c: char| c.is_alphanumeric() || c == '%')
+            .map(|s: &str| UrlEncodedUnicodeString(s.to_string()))
+            .parse(i)
     }
 
     pub fn encode(input: impl AsRef<str>) -> Self {
@@ -892,8 +894,9 @@ impl EthereumAbiTypeName {
             ];
             c.is_alphanum() || chars.contains(&c)
         }
-        let (i, s) = take_while1(is_type_char)(i)?;
-        Ok((i, EthereumAbiTypeName { name: s.to_owned() }))
+        take_while1(is_type_char)
+            .map(|s: &str| EthereumAbiTypeName { name: s.to_owned() })
+            .parse(i)
     }
 }
 
@@ -960,20 +963,18 @@ impl Parameter {
 
     pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
         // Parse the key blob
-        let (i, key_blob) = take_till1(|c| c == '=')(i)?;
-        let (i, _) = tag("=")(i)?;
+        let (i, key_blob) = terminated(take_till1(|c| c == '='), tag("="))(i)?;
 
         fn parse_number(
             f: fn(Number) -> Parameter,
         ) -> impl Fn(&str) -> nom::IResult<&str, Parameter, ParseError<'_>> {
             move |i| {
-                let (i, number) =
-                    Number::parse
-                        .parse(i)
-                        .map_err(|_| ParseError::InvalidParameterValue {
-                            ty: "Number".to_string(),
-                        })?;
-                Ok((i, f(number)))
+                Number::parse.map(f).parse(i).map_err(|_| {
+                    ParseError::InvalidParameterValue {
+                        ty: "Number".to_string(),
+                    }
+                    .into()
+                })
             }
         }
         // If key in the parameter list is value, gasLimit, gasPrice or gas then
@@ -1037,14 +1038,12 @@ impl Parameters {
     /// This parser never fails.
     pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
         // First parse into parameter "blobs", separated by '&'
-        let (i, blobs) = separated_list0(tag("&"), take_till1(|c| c == '&'))(i)?;
-        let mut params = vec![];
-        for blob in blobs.into_iter() {
-            let (j, param) = Parameter::parse(blob)?;
-            snafu::ensure!(j.is_empty(), UnexpectedLeftoverInputSnafu { input: j });
-            params.push(param);
-        }
-        Ok((i, Parameters(params)))
+        separated_list0(
+            tag("&"),
+            map_parser(take_till1(|c| c == '&'), all_consuming(Parameter::parse)),
+        )
+        .map(Parameters)
+        .parse(i)
     }
 
     /// Return an iterator over all parameters.
@@ -1174,17 +1173,16 @@ impl core::fmt::Display for SchemaPrefix {
 
 impl SchemaPrefix {
     pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
-        let (i, prefix) = take_till1(|c| c == ':')(i)?;
-        let (i, _) = char(':')(i)?;
-        let (i, maybe_pay) = opt(tag("pay-"))(i)?;
-        let has_pay = maybe_pay.is_some();
-        Ok((
-            i,
-            SchemaPrefix {
-                prefix: prefix.to_string(),
-                has_pay,
-            },
-        ))
+        separated_pair(
+            take_till1(|c| c == ':'),
+            char(':'),
+            alt((value(true, tag("pay-")), success(false))),
+        )
+        .map(|(prefix, has_pay): (&str, _)| SchemaPrefix {
+            prefix: prefix.to_string(),
+            has_pay,
+        })
+        .parse(i)
     }
 
     /// Returns the schema prefix.
@@ -1247,33 +1245,26 @@ impl core::fmt::Display for RawTransactionRequest {
 impl RawTransactionRequest {
     /// Parse a transaction request.
     pub fn parse(i: &str) -> nom::IResult<&str, Self, ParseError<'_>> {
-        let (i, schema_prefix) = SchemaPrefix::parse(i)?;
-        let (i, address_blob) = is_not("@/?")(i)?;
-        let (remaining_address_input, target_address) = AddressOrEnsName::parse(address_blob)?;
-        snafu::ensure!(
-            remaining_address_input.is_empty(),
-            UnexpectedLeftoverInputSnafu {
-                input: remaining_address_input
-            }
-        );
-
-        let parse_chain_id = preceded(tag("@"), Digits::parse_min(1));
-        let (i, chain_id) = opt(parse_chain_id)(i)?;
-
-        let parse_function_name = preceded(tag("/"), UrlEncodedUnicodeString::parse);
-        let (i, function_name) = opt(parse_function_name)(i)?;
-
-        let (i, parameters) = opt(preceded(tag("?"), Parameters::parse))(i)?;
-        Ok((
-            i,
-            Self {
+        let chain_id = Digits::parse_min(1);
+        let function_name = UrlEncodedUnicodeString::parse;
+
+        tuple((
+            SchemaPrefix::parse,
+            map_parser(is_not("@/?"), all_consuming(AddressOrEnsName::parse)),
+            opt(preceded(tag("@"), chain_id)),
+            opt(preceded(tag("/"), function_name)),
+            opt(preceded(tag("?"), Parameters::parse)),
+        ))
+        .map(
+            |(schema_prefix, target_address, chain_id, function_name, parameters)| Self {
                 schema_prefix,
                 target_address,
                 chain_id,
                 function_name,
                 parameters,
             },
-        ))
+        )
+        .parse(i)
     }
 }
 

From 4db2c327b89d270cdb15176d5aed7b602f8cbabd Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Tue, 3 Feb 2026 02:06:02 +0000
Subject: [PATCH 189/263] eip681: Inline decimal `parse_min` implementation

The `is_hex` argument was unused after 920006d184e5bfe80685f45b273d34fe7ed757ea.
---
 components/eip681/src/parse.rs | 50 +++++++++++++---------------------
 1 file changed, 19 insertions(+), 31 deletions(-)

diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index 9d9c5b5a8f..111e0ca17f 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -6,7 +6,7 @@ use nom::{
     AsChar, Parser,
     branch::alt,
     bytes::complete::{is_not, tag, take_till, take_till1, take_while, take_while1},
-    character::complete::char,
+    character::complete::{char, digit0},
     combinator::{map_parser, opt, success, value},
     multi::separated_list0,
     sequence::{preceded, separated_pair, terminated, tuple},
@@ -117,40 +117,28 @@ impl Digits {
     /// Parse at least `min` digits.
     pub fn parse_min(min: usize) -> impl Fn(&str) -> nom::IResult<&str, Self, ParseError<'_>> {
         move |i| {
-            parse_min(min, false)
-                .map(|places| Digits { places })
-                .parse(i)
+            let (i, chars) = digit0(i)?;
+            let places = chars
+                .chars()
+                .map(|c| {
+                    c.to_digit(10)
+                        .expect("we already checked that this char was a digit")
+                        as u8
+                })
+                .collect::<Vec<_>>();
+            snafu::ensure!(
+                places.len() >= min,
+                DigitsMinimumSnafu {
+                    min,
+                    digits_len: places.len(),
+                    input: i
+                }
+            );
+            Ok((i, Digits { places }))
         }
     }
 }
 
-/// Parse at least `min` digits.
-pub fn parse_min(
-    min: usize,
-    is_hex: bool,
-) -> impl Fn(&str) -> nom::IResult<&str, Vec<u8>, ParseError<'_>> {
-    move |i| {
-        let radix = if is_hex { 16 } else { 10 };
-        let (i, chars) = take_while(|c: char| c.is_digit(radix))(i)?;
-        let data = chars
-            .chars()
-            .map(|c| {
-                c.to_digit(radix)
-                    .expect("we already checked that this char was a digit") as u8
-            })
-            .collect::<Vec<_>>();
-        snafu::ensure!(
-            data.len() >= min,
-            DigitsMinimumSnafu {
-                min,
-                digits_len: data.len(),
-                input: i
-            }
-        );
-        Ok((i, data))
-    }
-}
-
 /// One case-sensitive hexadecimal digit.
 #[repr(u8)]
 #[derive(Clone, Copy, Debug, PartialEq, PartialOrd)]

From db6bec0b73c6769cff5d5d8c6778d5e3a69290ed Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Tue, 24 Feb 2026 03:41:22 +0000
Subject: [PATCH 190/263] zcash_client_backend: Fix clippy lint

`consensus::BranchId` was only used behind the `unstable` feature flag,
but was imported at all times. We now use the `consensus` module IMPORT
(which is already used elsewhere) as a prefix.
---
 zcash_client_backend/src/data_api/wallet/input_selection.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/zcash_client_backend/src/data_api/wallet/input_selection.rs b/zcash_client_backend/src/data_api/wallet/input_selection.rs
index 03414be623..f7e6c87aa7 100644
--- a/zcash_client_backend/src/data_api/wallet/input_selection.rs
+++ b/zcash_client_backend/src/data_api/wallet/input_selection.rs
@@ -17,7 +17,7 @@ use zcash_primitives::transaction::fees::{
 };
 use zcash_protocol::{
     PoolType, ShieldedProtocol,
-    consensus::{self, BlockHeight, BranchId},
+    consensus::{self, BlockHeight},
     memo::MemoBytes,
     value::{BalanceError, Zatoshis},
 };
@@ -406,7 +406,8 @@ impl<DbT: InputSource> InputSelector for GreedyInputSelector<DbT> {
         #[cfg(feature = "unstable")]
         let (sapling_supported, orchard_supported) =
             proposed_version.map_or(Ok((true, true)), |v| {
-                let branch_id = BranchId::for_height(params, BlockHeight::from(target_height));
+                let branch_id =
+                    consensus::BranchId::for_height(params, BlockHeight::from(target_height));
                 if v.valid_in_branch(branch_id) {
                     Ok((
                         v.has_sapling(),

From 2cdbc756e5cd709117c298a79ae70da01cc43030 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Fri, 6 Feb 2026 23:49:10 +0000
Subject: [PATCH 191/263] zcb: Associate the `DecryptedOutput` type with the tx
 type being decrypted

---
 zcash_client_backend/CHANGELOG.md    |  9 +++++---
 zcash_client_backend/src/data_api.rs | 31 +++++++++++++++++++---------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index 8a18c2c06e..0efb0f10f1 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -11,8 +11,11 @@ workspace.
 ## [Unreleased]
 
 ### Added
-- `zcash_client_backend::data_api::ReceivedTransactionOutput`
-- `zcash_client_backend::data_api::wallet::ConfirmationsPolicy::confirmations_until_spendable`
+- `zcash_client_backend::data_api`:
+  - `ll` module
+  - `wallet::ConfirmationsPolicy::confirmations_until_spendable`
+  - `DecryptableTransaction`
+  - `ReceivedTransactionOutput`
 - in `zcash_client_backend::proto::compact_formats`:
   - `CompactTx` has added fields `vin` and `vout`
   - Added types `CompactTxIn`, `TxOut`
@@ -23,7 +26,7 @@ workspace.
   - `GetMempoolTxRequest` (previously named `Exclude`) has added field `pool_types`
 - `impl From<zcash_client_backend::proposal::ProposalError> for zcash_client_backend::data_api::wallet::input_selection::InputSelectorError<...>`
 - `zcash_client_backend::fees::MetaSource`
-- `zcash_client_backend::data_api::ll`
+- `zcash_client_backend::wallet::transparent` module, behind the `transparent-inputs` feature flag.
 
 ### Changed
 - `zcash_client_backend::data_api::wallet::create_proposed_transactions` now takes
diff --git a/zcash_client_backend/src/data_api.rs b/zcash_client_backend/src/data_api.rs
index c275d0fa1d..4c500faa49 100644
--- a/zcash_client_backend/src/data_api.rs
+++ b/zcash_client_backend/src/data_api.rs
@@ -2338,28 +2338,39 @@ impl<A> ScannedBlock<A> {
     }
 }
 
+/// A trait representing a decryptable transaction.
+pub trait DecryptableTransaction<AccountId> {
+    type DecryptedSaplingOutput;
+    #[cfg(feature = "orchard")]
+    type DecryptedOrchardOutput;
+}
+
+impl<AccountId> DecryptableTransaction<AccountId> for Transaction {
+    type DecryptedSaplingOutput = DecryptedOutput<sapling::Note, AccountId>;
+    #[cfg(feature = "orchard")]
+    type DecryptedOrchardOutput = DecryptedOutput<orchard::Note, AccountId>;
+}
+
 /// A transaction that was detected during scanning of the blockchain,
 /// including its decrypted Sapling and/or Orchard outputs.
 ///
 /// The purpose of this struct is to permit atomic updates of the
 /// wallet database when transactions are successfully decrypted.
-pub struct DecryptedTransaction<'a, Tx, AccountId> {
+pub struct DecryptedTransaction<'a, Tx: DecryptableTransaction<AccountId>, AccountId> {
     mined_height: Option<BlockHeight>,
     tx: &'a Tx,
-    sapling_outputs: Vec<DecryptedOutput<sapling::Note, AccountId>>,
+    sapling_outputs: Vec<Tx::DecryptedSaplingOutput>,
     #[cfg(feature = "orchard")]
-    orchard_outputs: Vec<DecryptedOutput<orchard::note::Note, AccountId>>,
+    orchard_outputs: Vec<Tx::DecryptedOrchardOutput>,
 }
 
-impl<'a, Tx, AccountId> DecryptedTransaction<'a, Tx, AccountId> {
+impl<'a, Tx: DecryptableTransaction<AccountId>, AccountId> DecryptedTransaction<'a, Tx, AccountId> {
     /// Constructs a new [`DecryptedTransaction`] from its constituent parts.
     pub fn new(
         mined_height: Option<BlockHeight>,
         tx: &'a Tx,
-        sapling_outputs: Vec<DecryptedOutput<sapling::Note, AccountId>>,
-        #[cfg(feature = "orchard")] orchard_outputs: Vec<
-            DecryptedOutput<orchard::note::Note, AccountId>,
-        >,
+        sapling_outputs: Vec<Tx::DecryptedSaplingOutput>,
+        #[cfg(feature = "orchard")] orchard_outputs: Vec<Tx::DecryptedOrchardOutput>,
     ) -> Self {
         Self {
             mined_height,
@@ -2379,12 +2390,12 @@ impl<'a, Tx, AccountId> DecryptedTransaction<'a, Tx, AccountId> {
         self.tx
     }
     /// Returns the Sapling outputs that were decrypted from the transaction.
-    pub fn sapling_outputs(&self) -> &[DecryptedOutput<sapling::Note, AccountId>] {
+    pub fn sapling_outputs(&self) -> &[Tx::DecryptedSaplingOutput] {
         &self.sapling_outputs
     }
     /// Returns the Orchard outputs that were decrypted from the transaction.
     #[cfg(feature = "orchard")]
-    pub fn orchard_outputs(&self) -> &[DecryptedOutput<orchard::note::Note, AccountId>] {
+    pub fn orchard_outputs(&self) -> &[Tx::DecryptedOrchardOutput] {
         &self.orchard_outputs
     }
 

From b6d3302bba16ac431e0c31b5c88f4f2a0147b00c Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Sat, 7 Feb 2026 00:15:22 +0000
Subject: [PATCH 192/263] zcb: Extract a common `ll::ReceivedShieldedOutput`
 trait

---
 zcash_client_backend/src/data_api/ll.rs | 68 ++++++++++++++-----------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/zcash_client_backend/src/data_api/ll.rs b/zcash_client_backend/src/data_api/ll.rs
index b22fbd64a4..c7f77cb74a 100644
--- a/zcash_client_backend/src/data_api/ll.rs
+++ b/zcash_client_backend/src/data_api/ll.rs
@@ -592,16 +592,18 @@ pub trait LowLevelWalletWrite: LowLevelWalletRead {
     ) -> Result<(), Self::Error>;
 }
 
-/// This trait provides a generalization over shielded Sapling output representations.
-pub trait ReceivedSaplingOutput {
+/// This trait provides a generalization over output representations.
+pub trait ReceivedShieldedOutput {
     type AccountId;
+    type Note;
+    type Nullifier;
 
-    /// Returns the index of the Sapling output within the Sapling bundle.
+    /// Returns the index of the output within its corresponding bundle.
     fn index(&self) -> usize;
     /// Returns the account ID for the account that received this output.
     fn account_id(&self) -> Self::AccountId;
     /// Returns the received note.
-    fn note(&self) -> &::sapling::Note;
+    fn note(&self) -> &Self::Note;
     /// Returns any memo associated with the output.
     fn memo(&self) -> Option<&MemoBytes>;
     /// Returns whether or not the received output is counted as wallet-internal change, for the
@@ -609,7 +611,7 @@ pub trait ReceivedSaplingOutput {
     fn is_change(&self) -> bool;
     /// Returns the nullifier that will be revealed when the note is spent, if the output was
     /// observed using a key that provides the capability for nullifier computation.
-    fn nullifier(&self) -> Option<&::sapling::Nullifier>;
+    fn nullifier(&self) -> Option<&Self::Nullifier>;
     /// Returns the position of the note in the note commitment tree, if the transaction that
     /// produced the output has been mined.
     fn note_commitment_tree_position(&self) -> Option<Position>;
@@ -617,8 +619,20 @@ pub trait ReceivedSaplingOutput {
     fn recipient_key_scope(&self) -> Option<Scope>;
 }
 
-impl<AccountId: Copy> ReceivedSaplingOutput for WalletSaplingOutput<AccountId> {
+/// This trait provides a generalization over shielded Sapling output representations.
+pub trait ReceivedSaplingOutput:
+    ReceivedShieldedOutput<Note = ::sapling::Note, Nullifier = ::sapling::Nullifier>
+{
+}
+impl<T: ReceivedShieldedOutput<Note = ::sapling::Note, Nullifier = ::sapling::Nullifier>>
+    ReceivedSaplingOutput for T
+{
+}
+
+impl<AccountId: Copy> ReceivedShieldedOutput for WalletSaplingOutput<AccountId> {
     type AccountId = AccountId;
+    type Note = ::sapling::Note;
+    type Nullifier = ::sapling::Nullifier;
 
     fn index(&self) -> usize {
         self.index()
@@ -646,8 +660,10 @@ impl<AccountId: Copy> ReceivedSaplingOutput for WalletSaplingOutput<AccountId> {
     }
 }
 
-impl<AccountId: Copy> ReceivedSaplingOutput for DecryptedOutput<::sapling::Note, AccountId> {
+impl<AccountId: Copy> ReceivedShieldedOutput for DecryptedOutput<::sapling::Note, AccountId> {
     type AccountId = AccountId;
+    type Note = ::sapling::Note;
+    type Nullifier = ::sapling::Nullifier;
 
     fn index(&self) -> usize {
         self.index()
@@ -681,33 +697,21 @@ impl<AccountId: Copy> ReceivedSaplingOutput for DecryptedOutput<::sapling::Note,
 
 /// This trait provides a generalization over shielded Orchard output representations.
 #[cfg(feature = "orchard")]
-pub trait ReceivedOrchardOutput {
-    type AccountId;
-
-    /// Returns the index of the Orchard action that produced this output within the Orchard bundle.
-    fn index(&self) -> usize;
-    /// Returns the account ID for the account that received this output.
-    fn account_id(&self) -> Self::AccountId;
-    /// Returns the received note.
-    fn note(&self) -> &::orchard::note::Note;
-    /// Returns any memo associated with the output.
-    fn memo(&self) -> Option<&MemoBytes>;
-    /// Returns whether or not the received output is counted as wallet-internal change, for the
-    /// purpose of display.
-    fn is_change(&self) -> bool;
-    /// Returns the nullifier that will be revealed when the note is spent, if the output was
-    /// observed using a key that provides the capability for nullifier computation.
-    fn nullifier(&self) -> Option<&::orchard::note::Nullifier>;
-    /// Returns the position of the note in the note commitment tree, if the transaction that
-    /// produced the output has been mined.
-    fn note_commitment_tree_position(&self) -> Option<Position>;
-    /// Returns the HD derivation scope of the viewing key that decrypted the note, if known.
-    fn recipient_key_scope(&self) -> Option<Scope>;
+pub trait ReceivedOrchardOutput:
+    ReceivedShieldedOutput<Note = ::orchard::Note, Nullifier = ::orchard::note::Nullifier>
+{
+}
+#[cfg(feature = "orchard")]
+impl<T: ReceivedShieldedOutput<Note = ::orchard::Note, Nullifier = ::orchard::note::Nullifier>>
+    ReceivedOrchardOutput for T
+{
 }
 
 #[cfg(feature = "orchard")]
-impl<AccountId: Copy> ReceivedOrchardOutput for WalletOrchardOutput<AccountId> {
+impl<AccountId: Copy> ReceivedShieldedOutput for WalletOrchardOutput<AccountId> {
     type AccountId = AccountId;
+    type Note = ::orchard::Note;
+    type Nullifier = ::orchard::note::Nullifier;
 
     fn index(&self) -> usize {
         self.index()
@@ -736,8 +740,10 @@ impl<AccountId: Copy> ReceivedOrchardOutput for WalletOrchardOutput<AccountId> {
 }
 
 #[cfg(feature = "orchard")]
-impl<AccountId: Copy> ReceivedOrchardOutput for DecryptedOutput<::orchard::note::Note, AccountId> {
+impl<AccountId: Copy> ReceivedShieldedOutput for DecryptedOutput<::orchard::Note, AccountId> {
     type AccountId = AccountId;
+    type Note = ::orchard::Note;
+    type Nullifier = ::orchard::note::Nullifier;
 
     fn index(&self) -> usize {
         self.index()

From b97c5e96b5a281af4a3b9ce1d56ee4176a41c752 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Sat, 7 Feb 2026 00:15:22 +0000
Subject: [PATCH 193/263] zcb: Use `ll::ReceivedShieldedOutput` in
 `ll::wallet::put_shielded_outputs`

---
 zcash_client_backend/CHANGELOG.md             |  6 +-
 zcash_client_backend/src/data_api/ll.rs       | 32 ++++++++-
 .../src/data_api/ll/wallet.rs                 | 72 +++++++++----------
 zcash_client_backend/src/wallet.rs            | 24 ++++++-
 4 files changed, 93 insertions(+), 41 deletions(-)

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index 0efb0f10f1..d33bff52bd 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -26,7 +26,11 @@ workspace.
   - `GetMempoolTxRequest` (previously named `Exclude`) has added field `pool_types`
 - `impl From<zcash_client_backend::proposal::ProposalError> for zcash_client_backend::data_api::wallet::input_selection::InputSelectorError<...>`
 - `zcash_client_backend::fees::MetaSource`
-- `zcash_client_backend::wallet::transparent` module, behind the `transparent-inputs` feature flag.
+- `zcash_client_backend::wallet`:
+  - `transparent` module, behind the `transparent-inputs` feature flag.
+  - `Note::receiver`
+  - `impl From<sapling_crypto::Note> for Note`
+  - `impl From<orchard::Note> for Note`
 
 ### Changed
 - `zcash_client_backend::data_api::wallet::create_proposed_transactions` now takes
diff --git a/zcash_client_backend/src/data_api/ll.rs b/zcash_client_backend/src/data_api/ll.rs
index c7f77cb74a..ae3f852ffd 100644
--- a/zcash_client_backend/src/data_api/ll.rs
+++ b/zcash_client_backend/src/data_api/ll.rs
@@ -20,7 +20,7 @@ use zcash_primitives::{
     transaction::{Transaction, TransactionData},
 };
 use zcash_protocol::{
-    ShieldedProtocol, TxId,
+    PoolType, ShieldedProtocol, TxId,
     consensus::{BlockHeight, TxIndex},
     memo::MemoBytes,
     value::{BalanceError, Zatoshis},
@@ -594,8 +594,9 @@ pub trait LowLevelWalletWrite: LowLevelWalletRead {
 
 /// This trait provides a generalization over output representations.
 pub trait ReceivedShieldedOutput {
+    const POOL_TYPE: PoolType;
     type AccountId;
-    type Note;
+    type Note: Into<crate::wallet::Note>;
     type Nullifier;
 
     /// Returns the index of the output within its corresponding bundle.
@@ -606,6 +607,9 @@ pub trait ReceivedShieldedOutput {
     fn note(&self) -> &Self::Note;
     /// Returns any memo associated with the output.
     fn memo(&self) -> Option<&MemoBytes>;
+    /// Returns a [`TransferType`] value that is determined based upon what type of key was used to
+    /// decrypt the transaction.
+    fn transfer_type(&self) -> TransferType;
     /// Returns whether or not the received output is counted as wallet-internal change, for the
     /// purpose of display.
     fn is_change(&self) -> bool;
@@ -630,6 +634,7 @@ impl<T: ReceivedShieldedOutput<Note = ::sapling::Note, Nullifier = ::sapling::Nu
 }
 
 impl<AccountId: Copy> ReceivedShieldedOutput for WalletSaplingOutput<AccountId> {
+    const POOL_TYPE: PoolType = PoolType::SAPLING;
     type AccountId = AccountId;
     type Note = ::sapling::Note;
     type Nullifier = ::sapling::Nullifier;
@@ -646,6 +651,13 @@ impl<AccountId: Copy> ReceivedShieldedOutput for WalletSaplingOutput<AccountId>
     fn memo(&self) -> Option<&MemoBytes> {
         None
     }
+    fn transfer_type(&self) -> TransferType {
+        if self.is_change() {
+            TransferType::WalletInternal
+        } else {
+            TransferType::Incoming
+        }
+    }
     fn is_change(&self) -> bool {
         WalletSaplingOutput::is_change(self)
     }
@@ -661,6 +673,7 @@ impl<AccountId: Copy> ReceivedShieldedOutput for WalletSaplingOutput<AccountId>
 }
 
 impl<AccountId: Copy> ReceivedShieldedOutput for DecryptedOutput<::sapling::Note, AccountId> {
+    const POOL_TYPE: PoolType = PoolType::SAPLING;
     type AccountId = AccountId;
     type Note = ::sapling::Note;
     type Nullifier = ::sapling::Nullifier;
@@ -677,6 +690,9 @@ impl<AccountId: Copy> ReceivedShieldedOutput for DecryptedOutput<::sapling::Note
     fn memo(&self) -> Option<&MemoBytes> {
         Some(self.memo())
     }
+    fn transfer_type(&self) -> TransferType {
+        self.transfer_type()
+    }
     fn is_change(&self) -> bool {
         self.transfer_type() == TransferType::WalletInternal
     }
@@ -709,6 +725,7 @@ impl<T: ReceivedShieldedOutput<Note = ::orchard::Note, Nullifier = ::orchard::no
 
 #[cfg(feature = "orchard")]
 impl<AccountId: Copy> ReceivedShieldedOutput for WalletOrchardOutput<AccountId> {
+    const POOL_TYPE: PoolType = PoolType::ORCHARD;
     type AccountId = AccountId;
     type Note = ::orchard::Note;
     type Nullifier = ::orchard::note::Nullifier;
@@ -725,6 +742,13 @@ impl<AccountId: Copy> ReceivedShieldedOutput for WalletOrchardOutput<AccountId>
     fn memo(&self) -> Option<&MemoBytes> {
         None
     }
+    fn transfer_type(&self) -> TransferType {
+        if self.is_change() {
+            TransferType::WalletInternal
+        } else {
+            TransferType::Incoming
+        }
+    }
     fn is_change(&self) -> bool {
         WalletOrchardOutput::is_change(self)
     }
@@ -741,6 +765,7 @@ impl<AccountId: Copy> ReceivedShieldedOutput for WalletOrchardOutput<AccountId>
 
 #[cfg(feature = "orchard")]
 impl<AccountId: Copy> ReceivedShieldedOutput for DecryptedOutput<::orchard::Note, AccountId> {
+    const POOL_TYPE: PoolType = PoolType::ORCHARD;
     type AccountId = AccountId;
     type Note = ::orchard::Note;
     type Nullifier = ::orchard::note::Nullifier;
@@ -757,6 +782,9 @@ impl<AccountId: Copy> ReceivedShieldedOutput for DecryptedOutput<::orchard::Note
     fn memo(&self) -> Option<&MemoBytes> {
         Some(self.memo())
     }
+    fn transfer_type(&self) -> TransferType {
+        self.transfer_type()
+    }
     fn is_change(&self) -> bool {
         self.transfer_type() == TransferType::WalletInternal
     }
diff --git a/zcash_client_backend/src/data_api/ll/wallet.rs b/zcash_client_backend/src/data_api/ll/wallet.rs
index 2453b49d67..27b770fab1 100644
--- a/zcash_client_backend/src/data_api/ll/wallet.rs
+++ b/zcash_client_backend/src/data_api/ll/wallet.rs
@@ -17,12 +17,12 @@ use zcash_protocol::{
 };
 
 use crate::{
-    DecryptedOutput, TransferType,
+    TransferType,
     data_api::{
         DecryptedTransaction, SAPLING_SHARD_HEIGHT, ScannedBlock, TransactionStatus,
-        WalletCommitmentTrees, chain::ChainState,
+        WalletCommitmentTrees, chain::ChainState, ll::ReceivedShieldedOutput,
     },
-    wallet::{Note, Recipient},
+    wallet::Recipient,
 };
 
 use super::{LowLevelWalletRead, LowLevelWalletWrite, TxMeta};
@@ -855,10 +855,6 @@ where
         tx_ref,
         funding_account,
         d_tx.sapling_outputs(),
-        PoolType::SAPLING,
-        Note::Sapling,
-        |note| Receiver::Sapling(note.recipient()),
-        |output| output.note_value(),
         |wallet_db, output, tx_ref| {
             wallet_db.put_received_sapling_note(output, tx_ref, d_tx.mined_height(), None)
         },
@@ -875,10 +871,6 @@ where
         tx_ref,
         funding_account,
         d_tx.orchard_outputs(),
-        PoolType::ORCHARD,
-        Note::Orchard,
-        |note| Receiver::Orchard(note.recipient()),
-        |output| output.note_value(),
         |wallet_db, output, tx_ref| {
             wallet_db.put_received_orchard_note(output, tx_ref, d_tx.mined_height(), None)
         },
@@ -1052,19 +1044,15 @@ where
 }
 
 #[allow(clippy::too_many_arguments)]
-fn put_shielded_outputs<DbT, P, N>(
+fn put_shielded_outputs<DbT, P, Output>(
     wallet_db: &mut DbT,
     params: &P,
     tx_ref: <DbT as LowLevelWalletRead>::TxRef,
     funding_account: Option<DbT::AccountId>,
-    outputs: &[DecryptedOutput<N, <DbT as LowLevelWalletRead>::AccountId>],
-    output_pool: PoolType,
-    note: impl Fn(N) -> Note,
-    receiver: impl Fn(&N) -> Receiver,
-    value: impl Fn(&DecryptedOutput<N, <DbT as LowLevelWalletRead>::AccountId>) -> Zatoshis,
+    outputs: &[Output],
     put_received_note: impl Fn(
         &mut DbT,
-        &DecryptedOutput<N, <DbT as LowLevelWalletRead>::AccountId>,
+        &Output,
         <DbT as LowLevelWalletRead>::TxRef,
     ) -> Result<(), <DbT as LowLevelWalletRead>::Error>,
     mut on_external_account: impl FnMut(<DbT as LowLevelWalletRead>::AccountId),
@@ -1072,69 +1060,79 @@ fn put_shielded_outputs<DbT, P, N>(
 where
     DbT: LowLevelWalletWrite,
     P: consensus::Parameters,
-    N: Clone,
+    Output: ReceivedShieldedOutput<AccountId = <DbT as LowLevelWalletRead>::AccountId>,
+    Output::Note: Clone,
 {
     for output in outputs {
         match output.transfer_type() {
             TransferType::Outgoing => {
+                let note = output.note().clone().into();
+                let receiver = note.receiver();
+                let value = note.value();
+
                 let recipient = {
-                    let receiver = receiver(output.note());
                     let recipient_address = wallet_db
-                        .select_receiving_address(*output.account(), &receiver)?
+                        .select_receiving_address(output.account_id(), &receiver)?
                         .unwrap_or_else(|| receiver.to_zcash_address(params.network_type()));
 
                     Recipient::External {
                         recipient_address,
-                        output_pool,
+                        output_pool: Output::POOL_TYPE,
                     }
                 };
 
                 wallet_db.put_sent_output(
-                    *output.account(),
+                    output.account_id(),
                     tx_ref,
                     output.index(),
                     &recipient,
-                    value(output),
-                    Some(output.memo()),
+                    value,
+                    output.memo(),
                 )?;
             }
             TransferType::WalletInternal => {
                 put_received_note(wallet_db, output, tx_ref)?;
 
+                let note = output.note().clone().into();
+                let value = note.value();
+
                 let recipient = Recipient::InternalAccount {
-                    receiving_account: *output.account(),
+                    receiving_account: output.account_id(),
                     external_address: None,
-                    note: Box::new(note(output.note().clone())),
+                    note: Box::new(note),
                 };
 
                 wallet_db.put_sent_output(
-                    *output.account(),
+                    output.account_id(),
                     tx_ref,
                     output.index(),
                     &recipient,
-                    value(output),
-                    Some(output.memo()),
+                    value,
+                    output.memo(),
                 )?;
             }
             TransferType::Incoming => {
                 put_received_note(wallet_db, output, tx_ref)?;
-                on_external_account(*output.account());
+                on_external_account(output.account_id());
 
                 if let Some(account_id) = funding_account {
+                    let note = output.note().clone().into();
+                    let receiver = note.receiver();
+                    let value = note.value();
+
                     // Even if the recipient address is external, record the send as internal.
                     let recipient = Recipient::InternalAccount {
-                        receiving_account: *output.account(),
+                        receiving_account: output.account_id(),
                         external_address: {
-                            let receiver = receiver(output.note());
                             Some(
                                 wallet_db
-                                    .select_receiving_address(*output.account(), &receiver)?
+                                    .select_receiving_address(output.account_id(), &receiver)?
                                     .unwrap_or_else(|| {
                                         receiver.to_zcash_address(params.network_type())
                                     }),
                             )
                         },
-                        note: Box::new(note(output.note().clone())),
+                        note: Box::new(note),
                     };
 
                     wallet_db.put_sent_output(
@@ -1142,8 +1140,8 @@ where
                         tx_ref,
                         output.index(),
                         &recipient,
-                        value(output),
-                        Some(output.memo()),
+                        value,
+                        output.memo(),
                     )?;
                 }
             }
diff --git a/zcash_client_backend/src/wallet.rs b/zcash_client_backend/src/wallet.rs
index 42fe6ab3a5..2390c725b1 100644
--- a/zcash_client_backend/src/wallet.rs
+++ b/zcash_client_backend/src/wallet.rs
@@ -9,7 +9,7 @@ use ::transparent::{
     bundle::{OutPoint, TxOut},
 };
 use zcash_address::ZcashAddress;
-use zcash_keys::keys::OutgoingViewingKey;
+use zcash_keys::{address::Receiver, keys::OutgoingViewingKey};
 use zcash_note_encryption::EphemeralKeyBytes;
 use zcash_primitives::transaction::{TxId, fees::transparent as transparent_fees};
 use zcash_protocol::{
@@ -368,7 +368,29 @@ pub enum Note {
     Orchard(orchard::Note),
 }
 
+impl From<sapling::Note> for Note {
+    fn from(note: sapling::Note) -> Self {
+        Note::Sapling(note)
+    }
+}
+
+#[cfg(feature = "orchard")]
+impl From<orchard::Note> for Note {
+    fn from(note: orchard::Note) -> Self {
+        Note::Orchard(note)
+    }
+}
+
 impl Note {
+    /// Returns the receiver of this note.
+    pub fn receiver(&self) -> Receiver {
+        match self {
+            Note::Sapling(n) => Receiver::Sapling(n.recipient()),
+            #[cfg(feature = "orchard")]
+            Note::Orchard(n) => Receiver::Orchard(n.recipient()),
+        }
+    }
+
     pub fn value(&self) -> Zatoshis {
         match self {
             Note::Sapling(n) => n.value().inner().try_into().expect(

From 83203ae48ff79d15aa3640e1089c407ebff98ac1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 25 Feb 2026 05:29:49 +0000
Subject: [PATCH 194/263] build(deps): bump taiki-e/install-action from 2.68.8
 to 2.68.9

Bumps [taiki-e/install-action](https://github.com/taiki-e/install-action) from 2.68.8 to 2.68.9.
- [Release notes](https://github.com/taiki-e/install-action/releases)
- [Changelog](https://github.com/taiki-e/install-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/taiki-e/install-action/compare/cfdb446e391c69574ebc316dfb7d7849ec12b940...7f491e26f71f4ec2e6902c7c95c73043f209ab79)

---
updated-dependencies:
- dependency-name: taiki-e/install-action
  dependency-version: 2.68.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/mutants.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/mutants.yml b/.github/workflows/mutants.yml
index 3caefb7255..ac490fb9bb 100644
--- a/.github/workflows/mutants.yml
+++ b/.github/workflows/mutants.yml
@@ -96,7 +96,7 @@ jobs:
         shell: sh
         env:
           TOOLCHAIN: ${{steps.toolchain.outputs.name}}
-      - uses: taiki-e/install-action@cfdb446e391c69574ebc316dfb7d7849ec12b940 # v2.68.8
+      - uses: taiki-e/install-action@7f491e26f71f4ec2e6902c7c95c73043f209ab79 # v2.68.9
         with:
           tool: cargo-mutants
       - run: cargo mutants --package "${{ matrix.package }}" --all-features -vV --in-place

From f580a502d6aacf7bb99bb0d97dc88036f9e716f0 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Tue, 24 Feb 2026 15:02:55 -0700
Subject: [PATCH 195/263] zcash_client_sqlite: Fix inconsistency in uneconomic
 value determination.

The only possible use for notes having value exactly equal to the
marginal fee is in constructing zero-valued, memo-only transactions
within a shielded pool. Transparent outputs with value exactly equal to
the marginal fee are entirely uneconomic under ZIP 317 fee rules.

This commit eliminates complexity by treating transparent outputs and
shielded outputs consistently; after this change, all outputs must have
value greater than the marginal fee in order to be considered to have
economic utility.

Fixed #2167
---
 zcash_client_backend/CHANGELOG.md              |  6 ++++++
 zcash_client_backend/src/data_api.rs           |  4 ++--
 .../src/data_api/testing/pool.rs               |  4 ++--
 zcash_client_backend/src/fees/common.rs        |  4 ++--
 zcash_client_sqlite/CHANGELOG.md               |  5 +++++
 zcash_client_sqlite/src/wallet/common.rs       |  2 +-
 zcash_client_sqlite/src/wallet/transparent.rs  | 18 +++++++++---------
 7 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index d33bff52bd..3ebe5758f4 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -89,6 +89,12 @@ workspace.
 - Type parameters to `zcash_client_backend::data_api::DecryptedTransaction`
   have been modified. It now abstracts over the transaction type, to permit
   use with partial or compact transaction data instead of full transactions.
+- The semantics of `zcash_client_backend::data_api::NoteFilter::ExceedsMinValue`
+  have changed; this filter now selects notes having value strictly greater
+  than the provided minimum value, instead of notes having value greater
+  than or equal to the provided minimum value. This fixes an inconsistency
+  in the various tests related to notes having no economic value in
+  `zcash_client_sqlite`.
 
 ### Removed
 - `zcash_client_backend::data_api::testing::transparent::GapLimits` use
diff --git a/zcash_client_backend/src/data_api.rs b/zcash_client_backend/src/data_api.rs
index 4c500faa49..c23c7b7d8a 100644
--- a/zcash_client_backend/src/data_api.rs
+++ b/zcash_client_backend/src/data_api.rs
@@ -250,7 +250,7 @@ impl Balance {
         Ok(())
     }
 
-    /// Returns the value in the account of notes that have value less than the marginal
+    /// Returns the value in the account of notes that have value less than or equal to the marginal
     /// fee, and consequently cannot be spent except as a grace input.
     pub fn uneconomic_value(&self) -> Zatoshis {
         self.uneconomic_value
@@ -1401,7 +1401,7 @@ impl<const MAX: u8> From<BoundedU8<MAX>> for usize {
 /// contexts.
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum NoteFilter {
-    /// Selects notes having value greater than or equal to the provided value.
+    /// Selects notes having value strictly greater than the provided value.
     ExceedsMinValue(Zatoshis),
     /// Selects notes having value greater than or equal to approximately the n'th percentile of
     /// previously sent notes in the account, irrespective of pool. The wrapped value must be in
diff --git a/zcash_client_backend/src/data_api/testing/pool.rs b/zcash_client_backend/src/data_api/testing/pool.rs
index d7a3445dc2..f45fa42ae4 100644
--- a/zcash_client_backend/src/data_api/testing/pool.rs
+++ b/zcash_client_backend/src/data_api/testing/pool.rs
@@ -4714,12 +4714,12 @@ pub fn metadata_queries_exclude_unwanted_notes<T: ShieldedPoolTester, Dsf, TC>(
     test_meta(
         &st,
         NoteFilter::ExceedsMinValue(Zatoshis::const_from_u64(1000_0000)),
-        Some(1),
+        Some(0),
     );
     test_meta(
         &st,
         NoteFilter::ExceedsMinValue(Zatoshis::const_from_u64(500_0000)),
-        Some(6),
+        Some(5),
     );
     test_meta(
         &st,
diff --git a/zcash_client_backend/src/fees/common.rs b/zcash_client_backend/src/fees/common.rs
index a256531b90..e199feb18d 100644
--- a/zcash_client_backend/src/fees/common.rs
+++ b/zcash_client_backend/src/fees/common.rs
@@ -558,11 +558,11 @@ where
 }
 
 /// Returns a `[ChangeStrategy::DustInputs]` error if some of the inputs provided
-/// to the transaction have value less than the marginal fee, and could not be
+/// to the transaction have value less than or equal to the marginal fee, and could not be
 /// determined to have any economic value in the context of this input selection.
 ///
 /// This determination is potentially conservative in the sense that outputs
-/// with value less than the marginal fee might be excluded, even though in
+/// with value less than or equal to the marginal fee might be excluded, even though in
 /// practice they would not cause the fee to increase. Outputs with value
 /// greater than the marginal fee will never be excluded.
 ///
diff --git a/zcash_client_sqlite/CHANGELOG.md b/zcash_client_sqlite/CHANGELOG.md
index b3288d4469..9cd326004a 100644
--- a/zcash_client_sqlite/CHANGELOG.md
+++ b/zcash_client_sqlite/CHANGELOG.md
@@ -34,6 +34,11 @@ workspace.
 - `zcash_client_sqlite::GapLimits` use `zcash_keys::keys::transparent::GapLimits` instead.
 - `zcash_client_sqlite::UtxoId` contents are now private.
 
+### Fixed
+- Notes are now consistently treated as having "uneconomic value" if their value is less
+  than **or equal to** the marginal fee. Previously, some call sites only considered
+  note uneconomic if their value was less than the marginal fee.
+
 ## [0.19.3] - 2026-02-19
 ### Fixed
 - Migration no longer crashes in regtest mode.
diff --git a/zcash_client_sqlite/src/wallet/common.rs b/zcash_client_sqlite/src/wallet/common.rs
index 25f7193ebf..bc543742e6 100644
--- a/zcash_client_sqlite/src/wallet/common.rs
+++ b/zcash_client_sqlite/src/wallet/common.rs
@@ -797,7 +797,7 @@ pub(crate) fn unspent_notes_meta(
                  INNER JOIN transactions ON transactions.id_tx = rn.transaction_id
                  WHERE a.uuid = :account_uuid
                  AND a.ufvk IS NOT NULL
-                 AND rn.value >= :min_value
+                 AND rn.value > :min_value
                  AND transactions.mined_height IS NOT NULL
                  AND rn.id NOT IN rarray(:exclude)
                  AND rn.id NOT IN ({})",
diff --git a/zcash_client_sqlite/src/wallet/transparent.rs b/zcash_client_sqlite/src/wallet/transparent.rs
index 6153c83e6b..5604567a95 100644
--- a/zcash_client_sqlite/src/wallet/transparent.rs
+++ b/zcash_client_sqlite/src/wallet/transparent.rs
@@ -1115,7 +1115,7 @@ pub(crate) fn get_spendable_transparent_outputs<P: consensus::Parameters>(
          JOIN accounts ON accounts.id = u.account_id
          JOIN addresses ON addresses.id = u.address_id
          WHERE u.address = :address
-         AND u.value_zat >= :min_value
+         AND u.value_zat > :min_value
          AND ({}) -- the transaction is mined or unexpired with minconf 0
          AND u.id NOT IN ({}) -- and the output is unspent
          AND ({}) -- exclude likely-spent wallet-internal ephemeral outputs
@@ -1213,7 +1213,7 @@ pub(crate) fn get_transparent_balances<P: consensus::Parameters>(
             })?;
 
         let entry = result.entry(taddr).or_insert((key_scope, Balance::ZERO));
-        if value < zip317::MARGINAL_FEE {
+        if value <= zip317::MARGINAL_FEE {
             entry.1.add_uneconomic_value(value)?;
         } else {
             entry.1.add_spendable_value(value)?;
@@ -1272,7 +1272,7 @@ pub(crate) fn get_transparent_balances<P: consensus::Parameters>(
                 })?;
 
             let entry = result.entry(taddr).or_insert((key_scope, Balance::ZERO));
-            if value < zip317::MARGINAL_FEE {
+            if value <= zip317::MARGINAL_FEE {
                 entry.1.add_uneconomic_value(value)?;
             } else {
                 entry.1.add_spendable_value(value)?;
@@ -1329,10 +1329,10 @@ pub(crate) fn add_transparent_account_balances(
             .entry(account)
             .or_insert(AccountBalance::ZERO)
             .with_unshielded_balance_mut(|bal| {
-                if value >= zip317::MARGINAL_FEE {
-                    bal.add_spendable_value(value)
-                } else {
+                if value <= zip317::MARGINAL_FEE {
                     bal.add_uneconomic_value(value)
+                } else {
+                    bal.add_spendable_value(value)
                 }
             })?;
     }
@@ -1383,10 +1383,10 @@ pub(crate) fn add_transparent_account_balances(
                 .entry(account)
                 .or_insert(AccountBalance::ZERO)
                 .with_unshielded_balance_mut(|bal| {
-                    if value >= zip317::MARGINAL_FEE {
-                        bal.add_pending_spendable_value(value)
-                    } else {
+                    if value <= zip317::MARGINAL_FEE {
                         bal.add_uneconomic_value(value)
+                    } else {
+                        bal.add_pending_spendable_value(value)
                     }
                 })?;
         }

From c6f76f68c90cc34f12a254e4bcab96525cef2ce7 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Tue, 3 Mar 2026 09:58:26 -0700
Subject: [PATCH 196/263] CI: Use a variable to allow configuration of larger
 runners.

By using a variable to provide the larger runner configurations, we make
it possible to both run CI jobs on forks, and ensure that we can fall
back to the slower default runners if larger runners are not available.
---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 76de8eb02e..58562684bd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ jobs:
 
         include:
           - target: Linux
-            os: ubuntu-latest-8cores
+            os: ${{ vars.UBUNTU_LARGE_RUNNER || 'ubuntu-latest' }}
 
           - state: transparent
             transparent-pool: true
@@ -103,7 +103,7 @@ jobs:
           - target: macOS
             os: macOS-latest
           - target: Windows
-            os: windows-latest-8cores
+            os: ${{ vars.WINDOWS_LARGE_RUNNER || 'windows-latest' }}
 
           - state: transparent
             transparent-pool: true
@@ -173,7 +173,7 @@ jobs:
 
         include:
           - target: Linux
-            os: ubuntu-latest-8cores
+            os: ${{ vars.UBUNTU_LARGE_RUNNER || 'ubuntu-latest' }}
 
           - state: transparent
             transparent-pool: true

From e4fbb089c5b9b0f142356bfc7405c2be677888cc Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Tue, 3 Mar 2026 00:51:16 +0000
Subject: [PATCH 197/263] zcash_primitives: Remove unused dependencies

---
 Cargo.lock                                  | 11 ----------
 README.md                                   |  1 -
 zcash_primitives/Cargo.toml                 | 23 +--------------------
 zcash_primitives/src/transaction/builder.rs |  6 +++---
 4 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1e939fc320..c91ec81ca1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7312,10 +7312,8 @@ name = "zcash_primitives"
 version = "0.26.4"
 dependencies = [
  "assert_matches",
- "bip32",
  "blake2b_simd",
  "block-buffer 0.11.0-rc.3",
- "bs58",
  "chacha20poly1305",
  "core2",
  "criterion 0.5.1",
@@ -7323,9 +7321,6 @@ dependencies = [
  "document-features",
  "equihash",
  "ff",
- "fpe",
- "getset",
- "group",
  "hex",
  "incrementalmerkletree",
  "jubjub",
@@ -7334,22 +7329,16 @@ dependencies = [
  "orchard",
  "pprof",
  "proptest",
- "rand 0.8.5",
  "rand_core 0.6.4",
  "rand_xorshift",
  "redjubjub",
- "ripemd 0.1.3",
  "sapling-crypto",
  "secp256k1",
  "sha2 0.10.8",
- "subtle",
- "tracing",
- "zcash_address",
  "zcash_encoding",
  "zcash_note_encryption",
  "zcash_protocol",
  "zcash_script",
- "zcash_spec",
  "zcash_transparent",
  "zip32",
 ]
diff --git a/README.md b/README.md
index 635a6a6053..bee7faf71b 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,6 @@ graph TB
     zcash_primitives --> zcash_protocol
     zcash_primitives --> equihash
     zcash_primitives --> zcash_encoding
-    zcash_primitives --> zcash_address
     zcash_primitives --> zcash_transparent
     zcash_primitives --> sapling
     zcash_primitives --> orchard
diff --git a/zcash_primitives/Cargo.toml b/zcash_primitives/Cargo.toml
index b094f9bebc..e1406c332e 100644
--- a/zcash_primitives/Cargo.toml
+++ b/zcash_primitives/Cargo.toml
@@ -20,16 +20,13 @@ rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
 equihash.workspace = true
-zcash_address.workspace = true
 zcash_encoding.workspace = true
 zcash_protocol.workspace = true
 zcash_script.workspace = true
-zip32.workspace = true
 
 # Dependencies exposed in a public API:
 # (Breaking upgrades to these require a breaking upgrade to this crate.)
 # - CSPRNG
-rand.workspace = true
 rand_core.workspace = true
 
 # - Digests (output types exposed)
@@ -38,19 +35,13 @@ sha2.workspace = true
 
 # - Logging and metrics
 memuse.workspace = true
-tracing = { workspace = true, default-features = false }
-
-# - Secret management
-subtle.workspace = true
 
 # - Shielded protocols
 ff.workspace = true
-group.workspace = true
 jubjub.workspace = true
 nonempty.workspace = true
 orchard.workspace = true
 sapling.workspace = true
-zcash_spec.workspace = true
 
 # - Note Commitment Trees
 incrementalmerkletree = { workspace = true, features = ["legacy-api"] }
@@ -62,8 +53,6 @@ proptest = { workspace = true, optional = true }
 transparent.workspace = true
 
 # - Transparent inputs
-#   - `Error` type exposed
-bip32.workspace = true
 block-buffer.workspace = true # remove after edition2024 upgrade
 crypto-common.workspace = true # remove after edition2024 upgrade
 #   - `SecretKey` and `PublicKey` types exposed
@@ -71,25 +60,15 @@ secp256k1 = { workspace = true, optional = true }
 
 # Dependencies used internally:
 # (Breaking upgrades to these are usually backwards-compatible, but check MSRVs.)
-# - Boilerplate
-getset.workspace = true
-
 # - Documentation
 document-features = { workspace = true, optional = true }
 
 # - Encodings
-bs58.workspace = true
 hex.workspace = true
 
 # - Shielded protocols
 redjubjub.workspace = true
 
-# - Transparent protocol
-ripemd.workspace = true
-
-# - ZIP 32
-fpe.workspace = true
-
 # No-std support
 core2.workspace = true
 
@@ -108,6 +87,7 @@ transparent = { workspace = true, features = ["test-dependencies"] }
 sapling = { workspace = true, features = ["test-dependencies"] }
 orchard = { workspace = true, features = ["test-dependencies"] }
 zcash_protocol = { workspace = true, features = ["test-dependencies"] }
+zip32.workspace = true
 
 [target.'cfg(unix)'.dev-dependencies]
 pprof = { version = "0.15", features = ["criterion", "flamegraph"] }
@@ -132,7 +112,6 @@ multicore = ["orchard/multicore", "sapling/multicore"]
 ## Enables spending transparent notes with the transaction builder.
 transparent-inputs = [
     "transparent/transparent-inputs",
-    "bip32/secp256k1-ffi",
     "dep:secp256k1",
 ]
 
diff --git a/zcash_primitives/src/transaction/builder.rs b/zcash_primitives/src/transaction/builder.rs
index f2e48fa5b6..894982c74c 100644
--- a/zcash_primitives/src/transaction/builder.rs
+++ b/zcash_primitives/src/transaction/builder.rs
@@ -2,7 +2,8 @@
 
 use core::cmp::Ordering;
 use core::fmt;
-use rand::{CryptoRng, RngCore};
+
+use rand_core::{CryptoRng, RngCore};
 
 use ::sapling::{Note, PaymentAddress, builder::SaplingMetadata};
 use ::transparent::{
@@ -1319,8 +1320,7 @@ impl<'a, P: consensus::Parameters, U: sapling::builder::ProverProgress> Extensio
 
 #[cfg(all(any(test, feature = "test-dependencies"), feature = "circuits"))]
 mod testing {
-    use rand::RngCore;
-    use rand_core::CryptoRng;
+    use rand_core::{CryptoRng, RngCore};
 
     use ::sapling::prover::mock::{MockOutputProver, MockSpendProver};
     use ::transparent::builder::TransparentSigningSet;

From 6b88baf0412a9e96499eccf447541b03010d985e Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Tue, 3 Mar 2026 01:02:39 +0000
Subject: [PATCH 198/263] zcash_transparent: Remove unused dependency

---
 Cargo.lock                   | 1 -
 zcash_transparent/Cargo.toml | 7 +++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c91ec81ca1..f9f626ea61 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7411,7 +7411,6 @@ name = "zcash_transparent"
 version = "0.6.3"
 dependencies = [
  "bip32",
- "blake2b_simd",
  "bs58",
  "core2",
  "document-features",
diff --git a/zcash_transparent/Cargo.toml b/zcash_transparent/Cargo.toml
index a2eb8d8fcf..ff85429bfc 100644
--- a/zcash_transparent/Cargo.toml
+++ b/zcash_transparent/Cargo.toml
@@ -25,10 +25,6 @@ zip32.workspace = true
 
 # Dependencies exposed in a public API:
 # (Breaking upgrades to these require a breaking upgrade to this crate.)
-# - Digests (output types exposed)
-blake2b_simd.workspace = true
-sha2.workspace = true
-
 # - Encodings
 core2.workspace = true
 
@@ -54,6 +50,9 @@ zcash_script = { workspace = true, features = ["descriptor"] }
 getset.workspace = true
 nonempty.workspace = true
 
+# - Digests
+sha2.workspace = true
+
 # - Documentation
 document-features = { workspace = true, optional = true }
 

From 899abe7e2572292d0c94efe7f97c1e1a16b3b1e6 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Tue, 3 Mar 2026 02:30:47 +0000
Subject: [PATCH 199/263] Reformat dependency graph in README

---
 README.md | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index bee7faf71b..5489a3241f 100644
--- a/README.md
+++ b/README.md
@@ -8,34 +8,34 @@ graph TB
     subgraph librustzcash
         direction TB
         subgraph main
-        zcash_address
-        zcash_primitives
-        zcash_transparent
-        zcash_proofs
-        zcash_protocol
-        pczt
-        zcash_client_backend
-        zcash_client_sqlite
-        zcash_keys
-        zip321
+            zcash_address
+            zcash_primitives
+            zcash_transparent
+            zcash_proofs
+            zcash_protocol
+            pczt
+            zcash_client_backend
+            zcash_client_sqlite
+            zcash_keys
+            zip321
         end
 
         subgraph standalone_components
-        equihash
-        f4jumble
-        zcash_encoding
+            equihash
+            f4jumble
+            zcash_encoding
         end
     end
 
     subgraph shielded_protocols
-    sapling[sapling-crypto]
-    orchard[orchard]
+        sapling-crypto
+        orchard
     end
 
     subgraph protocol_components
-    zcash_note_encryption
-    zip32
-    zcash_spec
+        zcash_note_encryption
+        zip32
+        zcash_spec
     end
 
     zcash_client_sqlite --> zcash_client_backend
@@ -49,14 +49,14 @@ graph TB
     zcash_primitives --> equihash
     zcash_primitives --> zcash_encoding
     zcash_primitives --> zcash_transparent
-    zcash_primitives --> sapling
+    zcash_primitives --> sapling-crypto
     zcash_primitives --> orchard
     zcash_keys --> zcash_address
     zcash_keys --> zcash_encoding
     zcash_keys --> zip32
     zcash_keys --> zcash_transparent
     zcash_keys --> orchard
-    zcash_keys --> sapling
+    zcash_keys --> sapling-crypto
     zcash_transparent --> zcash_protocol
     zcash_transparent --> zcash_address
     zcash_transparent --> zip32
@@ -65,9 +65,9 @@ graph TB
     zcash_address --> zcash_protocol
     zcash_address --> f4jumble
     zcash_address --> zcash_encoding
-    sapling --> zcash_note_encryption
-    sapling --> zip32
-    sapling --> zcash_spec
+    sapling-crypto --> zcash_note_encryption
+    sapling-crypto --> zip32
+    sapling-crypto --> zcash_spec
     orchard --> zcash_note_encryption
     orchard --> zip32
     orchard --> zcash_spec
@@ -90,7 +90,7 @@ graph TB
     click equihash "https://docs.rs/equihash/" _blank
     click f4jumble "https://docs.rs/f4jumble/" _blank
     click zcash_encoding "https://docs.rs/zcash_encoding/" _blank
-    click sapling "https://docs.rs/sapling-crypto/" _blank
+    click sapling-crypto "https://docs.rs/sapling-crypto/" _blank
     click orchard "https://docs.rs/orchard/" _blank
     click zcash_note_encryption "https://docs.rs/zcash_note_encryption/" _blank
     click zip32 "https://docs.rs/zip32/" _blank

From 78ff5fc30daafef2dc0b984d66cd541f9b36aa7e Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Tue, 3 Mar 2026 02:35:44 +0000
Subject: [PATCH 200/263] CI: Add lint step to check the readme dependency
 graph

---
 .github/helpers/check-dep-graph.py | 109 +++++++++++++++++++++++++++++
 .github/workflows/ci.yml           |  10 +++
 README.md                          |   4 ++
 3 files changed, 123 insertions(+)
 create mode 100644 .github/helpers/check-dep-graph.py

diff --git a/.github/helpers/check-dep-graph.py b/.github/helpers/check-dep-graph.py
new file mode 100644
index 0000000000..d6e5762a04
--- /dev/null
+++ b/.github/helpers/check-dep-graph.py
@@ -0,0 +1,109 @@
+#!/usr/bin/env python3
+
+import os
+import subprocess
+import sys
+
+CRATES_IN_GRAPH = set([
+    # ./components
+    'eip681',
+    'equihash',
+    'f4jumble',
+    'zcash_address',
+    'zcash_encoding',
+    'zcash_protocol',
+    'zip321',
+    # ./
+    'pczt',
+    'zcash_client_backend',
+    'zcash_client_memory',
+    'zcash_client_sqlite',
+    'zcash_extensions',
+    'zcash_history',
+    'zcash_keys',
+    'zcash_primitives',
+    'zcash_proofs',
+    'zcash_transparent',
+    # Other repos
+    'orchard',
+    'sapling-crypto',
+    'zcash_note_encryption',
+    'zcash_spec',
+    'zip32',
+])
+
+def main():
+    script_dir = os.path.dirname(os.path.realpath(__file__))
+    base_dir = os.path.dirname(os.path.dirname(script_dir))
+    readme = os.path.join(base_dir, 'README.md')
+
+    # Extract the dependency graph edges from the readme.
+    readme_edges = []
+    with open(readme, 'r', encoding='utf8') as f:
+        line = ''
+        while not 'START mermaid-dependency-graph' in line:
+            line = f.readline()
+        line = f.readline()
+        while not 'END mermaid-dependency-graph' in line:
+            if '-->' in line:
+                (crate, dependency) = line.strip().split(' --> ', 1)
+                if crate in CRATES_IN_GRAPH and dependency in CRATES_IN_GRAPH:
+                    readme_edges.append((crate, dependency))
+            line = f.readline()
+
+    # Check for duplicate edges.
+    readme_edges_set = set(readme_edges)
+    has_duplicate_edges = len(readme_edges) != len(readme_edges_set)
+    if has_duplicate_edges:
+        duplicate_edges = readme_edges
+        for edge in readme_edges_set:
+            duplicate_edges.remove(edge)
+        duplicate_edges = ['%s --> %s' % edge for edge in duplicate_edges]
+        print('WARNING: Duplicate edges in README.md dependency graph:')
+        for edge in sorted(duplicate_edges):
+            print('    %s --> %s' % edge)
+
+    # Extract the dependency graph edges from the Rust workspace.
+    cargo_graph = subprocess.run(
+        ['cargo', 'tree', '--all-features', '-e', 'normal', '--prefix', 'depth', '-f', ' {p}'],
+        stdout=subprocess.PIPE,
+        universal_newlines=True)
+    cargo_edges = set()
+    crate_stack = []
+    for line in cargo_graph.stdout.splitlines():
+        if len(line.strip()) == 0:
+            continue
+        (depth, crate, _) = line.strip().split(' ', 2)
+        depth = int(depth)
+
+        if depth == 0:
+            crate_stack = [crate]
+            continue
+
+        while len(crate_stack) > depth:
+            crate_stack.pop()
+        if crate_stack[-1] in CRATES_IN_GRAPH and crate in CRATES_IN_GRAPH:
+            cargo_edges.add((crate_stack[-1], crate))
+        crate_stack.append(crate)
+
+    # Check for missing edges.
+    missing_edges = cargo_edges.difference(readme_edges_set)
+    has_missing_edges = len(missing_edges) > 0
+    if has_missing_edges:
+        print('ERROR: Missing edges from README.md dependency graph:')
+        for edge in sorted(missing_edges):
+            print('    %s --> %s' % edge)
+
+    # Check for stale edges.
+    stale_edges = readme_edges_set.difference(cargo_edges)
+    has_stale_edges = len(stale_edges) > 0
+    if has_stale_edges:
+        print('ERROR: Stale edges in README.md dependency graph:')
+        for edge in sorted(stale_edges):
+            print('    %s --> %s' % edge)
+
+    if has_duplicate_edges or has_missing_edges or has_stale_edges:
+        sys.exit(1)
+
+if __name__ == '__main__':
+    main()
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 58562684bd..5f5612dc7b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -558,6 +558,16 @@ jobs:
       - name: Check formatting
         run: cargo fmt --all -- --check
 
+  readme-graph:
+    name: Readme dependency graph
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+      - name: Check consistency
+        run: python3 .github/helpers/check-dep-graph.py
+
   protobuf:
     name: protobuf consistency
     runs-on: ubuntu-latest
diff --git a/README.md b/README.md
index 5489a3241f..f66ce734b0 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,8 @@
 This repository contains a (work-in-progress) set of Rust crates for working
 with Zcash.
 
+<!-- START mermaid-dependency-graph -->
+
 ```mermaid
 graph TB
     subgraph librustzcash
@@ -97,6 +99,8 @@ graph TB
     click zcash_spec "https://docs.rs/zcash_spec/" _blank
 ```
 
+<!-- END mermaid-dependency-graph -->
+
 ### Crates
 
 [librustzcash: a Rust Crates Walkthrough w/ nuttycom](https://free2z.cash/uploadz/public/ZcashTutorial/librustzcash-a-rust-crates.mp4)

From ca64d656d757a3c60435aad899f19612e045bbeb Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Tue, 3 Mar 2026 08:46:22 +0000
Subject: [PATCH 201/263] Fix README dependency graph to show all direct
 dependencies

---
 README.md | 129 ++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 95 insertions(+), 34 deletions(-)

diff --git a/README.md b/README.md
index f66ce734b0..7e94b4b4b4 100644
--- a/README.md
+++ b/README.md
@@ -14,9 +14,11 @@ graph TB
             zcash_primitives
             zcash_transparent
             zcash_proofs
+            zcash_extensions
             zcash_protocol
             pczt
             zcash_client_backend
+            zcash_client_memory
             zcash_client_sqlite
             zcash_keys
             zip321
@@ -41,62 +43,121 @@ graph TB
     end
 
     zcash_client_sqlite --> zcash_client_backend
-    zcash_client_backend --> zcash_primitives
-    zcash_client_backend --> zip321
-    zcash_client_backend --> zcash_keys
+    zcash_client_memory --> zcash_client_backend
+
     zcash_client_backend --> pczt
-    pczt --> zcash_primitives
+
+    zcash_client_sqlite --> zcash_keys
+    zcash_client_memory --> zcash_keys
+    zcash_client_backend --> zcash_keys
+
+    zcash_client_backend --> zcash_proofs
+
     zcash_proofs --> zcash_primitives
-    zcash_primitives --> zcash_protocol
-    zcash_primitives --> equihash
-    zcash_primitives --> zcash_encoding
-    zcash_primitives --> zcash_transparent
-    zcash_primitives --> sapling-crypto
-    zcash_primitives --> orchard
-    zcash_keys --> zcash_address
-    zcash_keys --> zcash_encoding
-    zcash_keys --> zip32
+    pczt --> zcash_primitives
+    zcash_client_backend --> zcash_primitives
+    zcash_client_sqlite --> zcash_primitives
+    zcash_client_memory --> zcash_primitives
+    zcash_extensions --> zcash_primitives
+
+    zcash_client_sqlite --> zcash_transparent
+    zcash_client_memory --> zcash_transparent
+    zcash_client_backend --> zcash_transparent
+    pczt --> zcash_transparent
     zcash_keys --> zcash_transparent
-    zcash_keys --> orchard
-    zcash_keys --> sapling-crypto
-    zcash_transparent --> zcash_protocol
+    zcash_primitives --> zcash_transparent
+
+    zcash_client_backend --> zip321
+
     zcash_transparent --> zcash_address
-    zcash_transparent --> zip32
+    zcash_keys --> zcash_address
+    zcash_client_backend --> zcash_address
+    zcash_client_sqlite --> zcash_address
+    zcash_client_memory --> zcash_address
     zip321 --> zcash_address
-    zip321 --> zcash_protocol
+
+    zcash_transparent --> zcash_protocol
+    zcash_keys --> zcash_protocol
+    zcash_client_sqlite --> zcash_protocol
+    zcash_client_memory --> zcash_protocol
+    zcash_primitives --> zcash_protocol
+    zcash_client_backend --> zcash_protocol
+    pczt --> zcash_protocol
+    zcash_extensions --> zcash_protocol
     zcash_address --> zcash_protocol
-    zcash_address --> f4jumble
+    zip321 --> zcash_protocol
+
+    zcash_client_sqlite --> zcash_encoding
+    zcash_transparent --> zcash_encoding
+    zcash_client_memory --> zcash_encoding
+    zcash_client_backend --> zcash_encoding
+    zcash_keys --> zcash_encoding
+    zcash_primitives --> zcash_encoding
     zcash_address --> zcash_encoding
-    sapling-crypto --> zcash_note_encryption
-    sapling-crypto --> zip32
-    sapling-crypto --> zcash_spec
+    zcash_protocol --> zcash_encoding
+
+    zcash_primitives --> equihash
+    zcash_address --> f4jumble
+
+    zcash_keys --> orchard
+    zcash_primitives --> orchard
+    pczt --> orchard
+    zcash_client_sqlite --> orchard
+    zcash_client_memory --> orchard
+    zcash_client_backend --> orchard
+
+    zcash_client_sqlite --> sapling-crypto
+    zcash_client_memory --> sapling-crypto
+    zcash_client_backend --> sapling-crypto
+    zcash_proofs --> sapling-crypto
+    pczt --> sapling-crypto
+    zcash_keys --> sapling-crypto
+    zcash_primitives --> sapling-crypto
+
     orchard --> zcash_note_encryption
+    sapling-crypto --> zcash_note_encryption
+    zcash_primitives --> zcash_note_encryption
+    pczt --> zcash_note_encryption
+    zcash_client_backend --> zcash_note_encryption
+
+    zcash_client_sqlite --> zip32
+    zcash_client_memory --> zip32
+    zcash_client_backend --> zip32
+    zcash_keys --> zip32
+    zcash_transparent --> zip32
     orchard --> zip32
+    sapling-crypto --> zip32
+
+    zcash_transparent --> zcash_spec
     orchard --> zcash_spec
+    sapling-crypto --> zcash_spec
+    zip32 --> zcash_spec
 
     main --> standalone_components
 
     librustzcash --> shielded_protocols
     shielded_protocols --> protocol_components
 
+    click equihash "https://docs.rs/equihash/" _blank
+    click f4jumble "https://docs.rs/f4jumble/" _blank
+    click orchard "https://docs.rs/orchard/" _blank
+    click pczt "https://docs.rs/pczt/" _blank
+    click sapling-crypto "https://docs.rs/sapling-crypto/" _blank
     click zcash_address "https://docs.rs/zcash_address/" _blank
+    click zcash_encoding "https://docs.rs/zcash_encoding/" _blank
+    click zcash_client_backend "https://docs.rs/zcash_client_backend/" _blank
+    click zcash_client_memory "https://docs.rs/zcash_client_memory/" _blank
+    click zcash_client_sqlite "https://docs.rs/zcash_client_sqlite/" _blank
+    click zcash_extensions "https://docs.rs/zcash_extensions/" _blank
+    click zcash_keys "https://docs.rs/zcash_keys/" _blank
+    click zcash_note_encryption "https://docs.rs/zcash_note_encryption/" _blank
     click zcash_primitives "https://docs.rs/zcash_primitives/" _blank
-    click zcash_transparent "https://docs.rs/zcash_transparent/" _blank
     click zcash_proofs "https://docs.rs/zcash_proofs/" _blank
     click zcash_protocol "https://docs.rs/zcash_protocol/" _blank
-    click zcash_keys "https://docs.rs/zcash_keys/" _blank
+    click zcash_spec "https://docs.rs/zcash_spec/" _blank
+    click zcash_transparent "https://docs.rs/zcash_transparent/" _blank
     click zip321 "https://docs.rs/zip321/" _blank
-    click pczt "https://docs.rs/pczt/" _blank
-    click zcash_client_backend "https://docs.rs/zcash_client_backend/" _blank
-    click zcash_client_sqlite "https://docs.rs/zcash_client_sqlite/" _blank
-    click equihash "https://docs.rs/equihash/" _blank
-    click f4jumble "https://docs.rs/f4jumble/" _blank
-    click zcash_encoding "https://docs.rs/zcash_encoding/" _blank
-    click sapling-crypto "https://docs.rs/sapling-crypto/" _blank
-    click orchard "https://docs.rs/orchard/" _blank
-    click zcash_note_encryption "https://docs.rs/zcash_note_encryption/" _blank
     click zip32 "https://docs.rs/zip32/" _blank
-    click zcash_spec "https://docs.rs/zcash_spec/" _blank
 ```
 
 <!-- END mermaid-dependency-graph -->

From 20c4525a773a43365651a4d9021945cf57bf9170 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Tue, 3 Mar 2026 09:08:56 +0000
Subject: [PATCH 202/263] README: Comment out direct edges where transitives
 exist

This still preserves the effective dependency graph, while making it
easier to read. The linter still checks for the presence of all direct
dependencies, but permits any edges to be commented out.
---
 .github/helpers/check-dep-graph.py |   4 ++
 README.md                          | 111 +++++++++++++++--------------
 2 files changed, 61 insertions(+), 54 deletions(-)

diff --git a/.github/helpers/check-dep-graph.py b/.github/helpers/check-dep-graph.py
index d6e5762a04..d3aec508a6 100644
--- a/.github/helpers/check-dep-graph.py
+++ b/.github/helpers/check-dep-graph.py
@@ -46,6 +46,10 @@ def main():
         line = f.readline()
         while not 'END mermaid-dependency-graph' in line:
             if '-->' in line:
+                # Include commented-out edges for linting purposes.
+                line = line.strip()
+                if line.startswith('%% '):
+                    line = line[3:]
                 (crate, dependency) = line.strip().split(' --> ', 1)
                 if crate in CRATES_IN_GRAPH and dependency in CRATES_IN_GRAPH:
                     readme_edges.append((crate, dependency))
diff --git a/README.md b/README.md
index 7e94b4b4b4..552ada37d4 100644
--- a/README.md
+++ b/README.md
@@ -42,95 +42,98 @@ graph TB
         zcash_spec
     end
 
+    %% Direct edges that also have a transitive path are left in (so the linter checks
+    %% they are deliberate edges) but commented out (to simplify the graph).
+
     zcash_client_sqlite --> zcash_client_backend
     zcash_client_memory --> zcash_client_backend
 
     zcash_client_backend --> pczt
 
-    zcash_client_sqlite --> zcash_keys
-    zcash_client_memory --> zcash_keys
+    %% zcash_client_sqlite --> zcash_keys
+    %% zcash_client_memory --> zcash_keys
     zcash_client_backend --> zcash_keys
 
     zcash_client_backend --> zcash_proofs
 
+    zcash_extensions --> zcash_primitives
     zcash_proofs --> zcash_primitives
     pczt --> zcash_primitives
-    zcash_client_backend --> zcash_primitives
-    zcash_client_sqlite --> zcash_primitives
-    zcash_client_memory --> zcash_primitives
-    zcash_extensions --> zcash_primitives
-
-    zcash_client_sqlite --> zcash_transparent
-    zcash_client_memory --> zcash_transparent
-    zcash_client_backend --> zcash_transparent
-    pczt --> zcash_transparent
+    %% zcash_client_backend --> zcash_primitives
+    %% zcash_client_sqlite --> zcash_primitives
+    %% zcash_client_memory --> zcash_primitives
+
+    %% zcash_client_sqlite --> zcash_transparent
+    %% zcash_client_memory --> zcash_transparent
+    %% zcash_client_backend --> zcash_transparent
+    %% pczt --> zcash_transparent
     zcash_keys --> zcash_transparent
     zcash_primitives --> zcash_transparent
 
     zcash_client_backend --> zip321
 
     zcash_transparent --> zcash_address
-    zcash_keys --> zcash_address
-    zcash_client_backend --> zcash_address
-    zcash_client_sqlite --> zcash_address
-    zcash_client_memory --> zcash_address
+    %% zcash_keys --> zcash_address
+    %% zcash_client_backend --> zcash_address
+    %% zcash_client_sqlite --> zcash_address
+    %% zcash_client_memory --> zcash_address
     zip321 --> zcash_address
 
-    zcash_transparent --> zcash_protocol
-    zcash_keys --> zcash_protocol
-    zcash_client_sqlite --> zcash_protocol
-    zcash_client_memory --> zcash_protocol
-    zcash_primitives --> zcash_protocol
-    zcash_client_backend --> zcash_protocol
-    pczt --> zcash_protocol
-    zcash_extensions --> zcash_protocol
+    %% zcash_transparent --> zcash_protocol
+    %% zcash_keys --> zcash_protocol
+    %% zcash_client_sqlite --> zcash_protocol
+    %% zcash_client_memory --> zcash_protocol
+    %% zcash_primitives --> zcash_protocol
+    %% zcash_client_backend --> zcash_protocol
+    %% pczt --> zcash_protocol
+    %% zcash_extensions --> zcash_protocol
     zcash_address --> zcash_protocol
-    zip321 --> zcash_protocol
-
-    zcash_client_sqlite --> zcash_encoding
-    zcash_transparent --> zcash_encoding
-    zcash_client_memory --> zcash_encoding
-    zcash_client_backend --> zcash_encoding
-    zcash_keys --> zcash_encoding
-    zcash_primitives --> zcash_encoding
-    zcash_address --> zcash_encoding
+    %% zip321 --> zcash_protocol
+
+    %% zcash_client_sqlite --> zcash_encoding
+    %% zcash_transparent --> zcash_encoding
+    %% zcash_client_memory --> zcash_encoding
+    %% zcash_client_backend --> zcash_encoding
+    %% zcash_keys --> zcash_encoding
+    %% zcash_primitives --> zcash_encoding
+    %% zcash_address --> zcash_encoding
     zcash_protocol --> zcash_encoding
 
     zcash_primitives --> equihash
     zcash_address --> f4jumble
 
+    %% zcash_client_backend --> orchard
+    %% pczt --> orchard
     zcash_keys --> orchard
     zcash_primitives --> orchard
-    pczt --> orchard
-    zcash_client_sqlite --> orchard
-    zcash_client_memory --> orchard
-    zcash_client_backend --> orchard
-
-    zcash_client_sqlite --> sapling-crypto
-    zcash_client_memory --> sapling-crypto
-    zcash_client_backend --> sapling-crypto
-    zcash_proofs --> sapling-crypto
-    pczt --> sapling-crypto
+    %% zcash_client_sqlite --> orchard
+    %% zcash_client_memory --> orchard
+
+    %% zcash_client_sqlite --> sapling-crypto
+    %% zcash_client_memory --> sapling-crypto
+    %% zcash_client_backend --> sapling-crypto
     zcash_keys --> sapling-crypto
+    %% zcash_proofs --> sapling-crypto
     zcash_primitives --> sapling-crypto
+    %% pczt --> sapling-crypto
 
     orchard --> zcash_note_encryption
     sapling-crypto --> zcash_note_encryption
-    zcash_primitives --> zcash_note_encryption
-    pczt --> zcash_note_encryption
-    zcash_client_backend --> zcash_note_encryption
-
-    zcash_client_sqlite --> zip32
-    zcash_client_memory --> zip32
-    zcash_client_backend --> zip32
-    zcash_keys --> zip32
-    zcash_transparent --> zip32
+    %% zcash_primitives --> zcash_note_encryption
+    %% pczt --> zcash_note_encryption
+    %% zcash_client_backend --> zcash_note_encryption
+
+    %% zcash_client_sqlite --> zip32
+    %% zcash_client_memory --> zip32
+    %% zcash_client_backend --> zip32
+    %% zcash_keys --> zip32
     orchard --> zip32
     sapling-crypto --> zip32
+    zcash_transparent --> zip32
 
-    zcash_transparent --> zcash_spec
-    orchard --> zcash_spec
-    sapling-crypto --> zcash_spec
+    %% zcash_transparent --> zcash_spec
+    %% orchard --> zcash_spec
+    %% sapling-crypto --> zcash_spec
     zip32 --> zcash_spec
 
     main --> standalone_components

From c277b04cb3706b08ff86a2c56c8331c03f96455f Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Tue, 3 Mar 2026 22:32:51 +0000
Subject: [PATCH 203/263] CI: Remove CodeCov job

Sometime in the last year, the job started taking forever. We have not
been using the results to inform our testing, and we shouldn't continue
to use up runner minutes on it (the vast majority of our runner minutes
are spent on this job).
---
 .github/workflows/ci.yml | 35 -----------------------------------
 1 file changed, 35 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 58562684bd..4927861295 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -485,41 +485,6 @@ jobs:
           args: >
             -W clippy::all
 
-  codecov:
-    name: Code coverage
-    runs-on: ubuntu-latest
-    container:
-      image: xd009642/tarpaulin:develop-nightly
-      options: --security-opt seccomp=unconfined
-
-    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          persist-credentials: false
-      - id: prepare
-        uses: ./.github/actions/prepare
-      - uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: codecov-cargo-${{ hashFiles('**/Cargo.lock') }}
-      - name: Generate coverage report
-        run: >
-          cargo tarpaulin
-          --engine llvm
-          ${{ steps.prepare.outputs.feature-flags }}
-          --release
-          --timeout 600
-          --out xml
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-
   # This is run with nightly and `RUSTDOCFLAGS` to emulate the documentation renders on
   # docs.rs and in `.github/workflows/book.yml` as closely as possible.
   doc-links:

From 7dd68dfcc392ce61f0cbc0f0257a21c35a898765 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Tue, 3 Mar 2026 10:13:39 -0700
Subject: [PATCH 204/263] Migrate to `Swatinem/rust-cache` action.

This eliminates some manual cache configuration and ensures correct use
of `restore-keys`.
---
 .github/workflows/ci.yml | 54 +++++++++++-----------------------------
 1 file changed, 14 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4927861295..b318929363 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -65,15 +65,10 @@ jobs:
           all-pools: ${{ matrix.all-pools || false }}
           all-features: ${{ matrix.all-features || false }}
           extra-features: ${{ matrix.extra_flags || '' }}
-      - uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
+      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
         with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-cargo-msrv-${{ hashFiles('**/Cargo.lock') }}
+          shared-key: msrv
+          save-if: ${{ matrix.state == 'all-features' }}
       - name: Run tests
         run: >
           cargo test
@@ -139,15 +134,10 @@ jobs:
           all-pools: ${{ matrix.all-pools || false }}
           all-features: ${{ matrix.all-features || false }}
           extra-features: ${{ matrix.extra_flags || '' }}
-      - uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
+      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
         with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-cargo-msrv-${{ hashFiles('**/Cargo.lock') }}
+          shared-key: msrv
+          save-if: ${{ matrix.state == 'all-features' }}
       - name: Run tests
         run: >
           cargo test
@@ -201,15 +191,10 @@ jobs:
           all-pools: false
           all-features: ${{ matrix.all-features || false }}
           extra-features: ${{ matrix.extra_flags || '' }}
-      - uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
+      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
         with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-cargo-msrv-${{ hashFiles('**/Cargo.lock') }}
+          shared-key: msrv
+          save-if: "false"
       - name: Run slow tests
         run: >
           cargo test
@@ -260,15 +245,10 @@ jobs:
         with:
           all-features: ${{ matrix.all-features || false }}
           extra-features: ${{ matrix.extra_flags || '' }}
-      - uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
+      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
         with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-cargo-msrv-${{ hashFiles('**/Cargo.lock') }}
+          shared-key: msrv
+          save-if: "false"
       - name: Run check
         run: >
           cargo check
@@ -291,15 +271,9 @@ jobs:
           persist-credentials: false
       - id: prepare
         uses: ./.github/actions/prepare
-      - uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
+      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
         with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-cargo-latest
+          shared-key: latest
       - uses: dtolnay/rust-toolchain@stable
         id: toolchain
       - run: rustup override set "${TOOLCHAIN}"

From e8e7271780073881d288e47fab9af96cf791b96a Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Tue, 3 Mar 2026 10:39:54 -0700
Subject: [PATCH 205/263] Switch book deployment to official GitHub Pages
 actions

Replace `peaceiris/actions-gh-pages` with `actions/upload-pages-artifact`
and `actions/deploy-pages` for OIDC-based deployment.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .github/workflows/book.yml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/book.yml b/.github/workflows/book.yml
index a210d9faf7..852c88e70d 100644
--- a/.github/workflows/book.yml
+++ b/.github/workflows/book.yml
@@ -5,9 +5,16 @@ on:
     branches:
       - main
 
+permissions:
+  pages: write
+  id-token: write
+
 jobs:
   deploy:
     runs-on: ubuntu-latest
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
@@ -36,8 +43,11 @@ jobs:
           mkdir -p ./book/book/rustdoc
           mv ./target/doc ./book/book/rustdoc/latest
 
-      - name: Deploy to GitHub Pages
-        uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4.0.0
+      - name: Upload Pages artifact
+        uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v4.0.0
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./book/book
+          path: ./book/book
+
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4.0.5

From 6e3940b5012786a80c91690d0c66cf246154fea3 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Tue, 3 Mar 2026 11:17:22 +1300
Subject: [PATCH 206/263] fix: use actual prefix in SchemaPrefix Display impl

The Display implementation for SchemaPrefix was hardcoded to write
"ethereum:" instead of using the actual parsed prefix. This caused
roundtrip failures for any non-ethereum schema prefix.

Fixes a bug introduced in #2134.
---
 components/eip681/src/parse.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index 111e0ca17f..2ffe0ed731 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -3,13 +3,13 @@
 use std::{borrow::Cow, collections::BTreeMap};
 
 use nom::{
-    AsChar, Parser,
     branch::alt,
     bytes::complete::{is_not, tag, take_till, take_till1, take_while, take_while1},
     character::complete::{char, digit0},
     combinator::{map_parser, opt, success, value},
     multi::separated_list0,
     sequence::{preceded, separated_pair, terminated, tuple},
+    AsChar, Parser,
 };
 use primitive_types::U256;
 use sha3::{Digest, Keccak256};
@@ -1151,7 +1151,8 @@ pub struct SchemaPrefix {
 
 impl core::fmt::Display for SchemaPrefix {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_str("ethereum:")?;
+        f.write_str(&self.prefix)?;
+        f.write_str(":")?;
         if self.has_pay {
             f.write_str("pay-")?;
         }

From d273e432710ece33d008865acfe848e9d32edf9f Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Tue, 3 Mar 2026 11:18:13 +1300
Subject: [PATCH 207/263] feat: eip681 TransactionRequest from parts

Add constructors for TransactionRequest from parts, useful for FFI when
constructing a request address from previously parsed pieces.

- TransactionRequest::from_native_request_parts()
- TransactionRequest::from_erc20_request_parts()
- Proptest roundtrip tests for both constructors
- Do not use "zcash" as a test schema prefix (EIP-681 != ZIP 321)
- Use full U256 range in arb_u256() (two u128s)
- Use U256 for parameter deduplication in Parameters::value(),
  gas_limit(), and gas_price() instead of i128
---
 components/eip681/src/parse.rs   |  10 +-
 components/eip681/src/request.rs | 185 ++++++++++++++++++++++++++++++-
 2 files changed, 189 insertions(+), 6 deletions(-)

diff --git a/components/eip681/src/parse.rs b/components/eip681/src/parse.rs
index 2ffe0ed731..9ad89ecb15 100644
--- a/components/eip681/src/parse.rs
+++ b/components/eip681/src/parse.rs
@@ -3,13 +3,13 @@
 use std::{borrow::Cow, collections::BTreeMap};
 
 use nom::{
+    AsChar, Parser,
     branch::alt,
     bytes::complete::{is_not, tag, take_till, take_till1, take_while, take_while1},
     character::complete::{char, digit0},
     combinator::{map_parser, opt, success, value},
     multi::separated_list0,
     sequence::{preceded, separated_pair, terminated, tuple},
-    AsChar, Parser,
 };
 use primitive_types::U256;
 use sha3::{Digest, Keccak256};
@@ -1048,7 +1048,7 @@ impl Parameters {
         let mut values = BTreeMap::default();
         for p in self.iter() {
             let (number, n) = match p {
-                Parameter::Value(n) => (n.as_i128()?, n),
+                Parameter::Value(n) => (n.as_uint256()?, n),
                 _ => continue,
             };
             values.insert(("value", number), n.clone());
@@ -1075,8 +1075,8 @@ impl Parameters {
         let mut values = BTreeMap::default();
         for p in self.iter() {
             let (k, number, n) = match p {
-                Parameter::Gas(n) => ("gas", n.as_i128()?, n),
-                Parameter::GasLimit(n) => ("gasLimit", n.as_i128()?, n),
+                Parameter::Gas(n) => ("gas", n.as_uint256()?, n),
+                Parameter::GasLimit(n) => ("gasLimit", n.as_uint256()?, n),
                 _ => continue,
             };
             // Also return the actual key for error reporting
@@ -1105,7 +1105,7 @@ impl Parameters {
         let mut values = BTreeMap::default();
         for p in self.iter() {
             let (number, n) = match p {
-                Parameter::GasPrice(n) => (n.as_i128()?, n),
+                Parameter::GasPrice(n) => (n.as_uint256()?, n),
                 _ => continue,
             };
             values.insert(("gasPrice", number), n.clone());
diff --git a/components/eip681/src/request.rs b/components/eip681/src/request.rs
index a211fe2d6e..529e04bc13 100644
--- a/components/eip681/src/request.rs
+++ b/components/eip681/src/request.rs
@@ -52,6 +52,52 @@ pub enum TransactionRequest {
 }
 
 impl TransactionRequest {
+    /// Construct a `TransactionRequest` from `NativeRequest` parts, if possible.
+    pub fn from_native_request_parts(
+        schema_prefix: &str,
+        has_pay: bool,
+        chain_id: Option<u64>,
+        recipient: &str,
+        value: Option<U256>,
+        gas_limit: Option<U256>,
+        gas_price: Option<U256>,
+    ) -> Result<Self, Error> {
+        let chain_id = chain_id.map(|id| format!("@{id}")).unwrap_or_default();
+        let value = value.map(|v| format!("value={v}"));
+        let gas_limit = gas_limit.map(|v| format!("gasLimit={v}"));
+        let gas_price = gas_price.map(|v| format!("gasPrice={v}"));
+        let params: String = [value, gas_limit, gas_price]
+            .into_iter()
+            .flatten()
+            .collect::<Vec<_>>()
+            .join("&");
+        let pay = if has_pay { "pay-" } else { "" };
+        let query = if params.is_empty() {
+            String::new()
+        } else {
+            format!("?{params}")
+        };
+        let req = format!("{schema_prefix}:{pay}{recipient}{chain_id}{query}");
+        Self::parse(&req)
+    }
+
+    /// Construct a `TransactionRequest` from `Erc20Request` parts, if possible.
+    pub fn from_erc20_request_parts(
+        schema_prefix: &str,
+        has_pay: bool,
+        chain_id: Option<u64>,
+        token_contract_address: &str,
+        recipient_address: &str,
+        value: U256,
+    ) -> Result<Self, Error> {
+        let chain_id = chain_id.map(|id| format!("@{id}")).unwrap_or_default();
+        let pay = if has_pay { "pay-" } else { "" };
+        let req = format!(
+            "{schema_prefix}:{pay}{token_contract_address}{chain_id}/transfer?address={recipient_address}&uint256={value}"
+        );
+        Self::parse(&req)
+    }
+
     /// Parse an EIP-681 URI into a categorized transaction request.
     ///
     /// The request is automatically categorized based on its structure:
@@ -155,7 +201,7 @@ impl TryFrom<&RawTransactionRequest> for NativeRequest {
     type Error = NativeTransferError;
 
     fn try_from(raw: &RawTransactionRequest) -> Result<Self, Self::Error> {
-        // A notive request cannot have a function name
+        // A native request cannot have a function name
         ensure!(raw.function_name.is_none(), HasFunctionNameSnafu);
 
         if let Some(parameters) = &raw.parameters {
@@ -197,6 +243,11 @@ impl NativeRequest {
         self.inner.schema_prefix.prefix()
     }
 
+    /// Returns whether the request has a "pay-" appendage after the schema prefix.
+    pub fn has_pay(&self) -> bool {
+        self.inner.schema_prefix.has_pay()
+    }
+
     /// Returns the chain ID, if specified.
     pub fn chain_id(&self) -> Option<u64> {
         self.chain_id
@@ -350,6 +401,16 @@ impl TryFrom<&RawTransactionRequest> for Erc20Request {
 }
 
 impl Erc20Request {
+    /// Returns the schema prefix.
+    pub fn schema_prefix(&self) -> &str {
+        self.inner.schema_prefix.prefix()
+    }
+
+    /// Returns whether the request shows a "pay-" appendage after the schema prefix.
+    pub fn has_pay(&self) -> bool {
+        self.inner.schema_prefix.has_pay()
+    }
+
     /// Returns the chain ID, if specified.
     pub fn chain_id(&self) -> Option<u64> {
         let digits = self.inner.chain_id.as_ref()?;
@@ -459,4 +520,126 @@ mod test {
             _ => panic!("Roundtrip changed request type"),
         }
     }
+
+    use proptest::prelude::*;
+
+    /// Valid ERC-55 addresses for use in proptests.
+    const ERC55_ADDRESSES: &[&str] = &[
+        "0xfB6916095ca1df60bB79Ce92cE3Ea74c37c5d359",
+        "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+        "0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed",
+        "0xdbF03B407c01E7cD3CBea99509d93f8DDDC8C6FB",
+    ];
+
+    fn arb_erc55_address() -> impl Strategy<Value = &'static str> {
+        prop::sample::select(ERC55_ADDRESSES)
+    }
+
+    fn arb_schema_prefix() -> impl Strategy<Value = &'static str> {
+        prop::sample::select(&["ethereum", "chaos_emerald"][..])
+    }
+
+    fn arb_u256() -> impl Strategy<Value = U256> {
+        (any::<u128>(), any::<u128>())
+            .prop_map(|(upper, lower)| (U256::from(upper) << 128) | U256::from(lower))
+    }
+
+    fn arb_opt_u256() -> impl Strategy<Value = Option<U256>> {
+        prop::option::of(arb_u256())
+    }
+
+    fn arb_opt_chain_id() -> impl Strategy<Value = Option<u64>> {
+        prop::option::of(1..=u64::MAX)
+    }
+
+    proptest! {
+        #[test]
+        fn from_native_request_parts_roundtrip(
+            schema_prefix in arb_schema_prefix(),
+            has_pay in any::<bool>(),
+            chain_id in arb_opt_chain_id(),
+            recipient in arb_erc55_address(),
+            value in arb_opt_u256(),
+            gas_limit in arb_opt_u256(),
+            gas_price in arb_opt_u256(),
+        ) {
+            let request = TransactionRequest::from_native_request_parts(
+                schema_prefix,
+                has_pay,
+                chain_id,
+                recipient,
+                value,
+                gas_limit,
+                gas_price,
+            )
+            .unwrap();
+
+            let native = request.as_native().expect("Expected NativeRequest");
+            assert_eq!(native.schema_prefix(), schema_prefix);
+            assert_eq!(native.has_pay(), has_pay);
+            assert_eq!(native.chain_id(), chain_id);
+            assert_eq!(native.recipient_address(), recipient);
+            assert_eq!(native.value_atomic(), value);
+            assert_eq!(native.gas_limit(), gas_limit);
+            assert_eq!(native.gas_price(), gas_price);
+
+            // Display -> reparse roundtrip
+            let output = request.to_string();
+            let reparsed = TransactionRequest::parse(&output).unwrap();
+            let native_b = reparsed
+                .as_native()
+                .expect("Roundtrip changed request type");
+            assert_eq!(native.schema_prefix(), native_b.schema_prefix());
+            assert_eq!(native.has_pay(), native_b.has_pay());
+            assert_eq!(native.chain_id(), native_b.chain_id());
+            assert_eq!(native.recipient_address(), native_b.recipient_address());
+            assert_eq!(native.value_atomic(), native_b.value_atomic());
+            assert_eq!(native.gas_limit(), native_b.gas_limit());
+            assert_eq!(native.gas_price(), native_b.gas_price());
+        }
+    }
+
+    proptest! {
+        #[test]
+        fn from_erc20_request_parts_roundtrip(
+            schema_prefix in arb_schema_prefix(),
+            has_pay in any::<bool>(),
+            chain_id in arb_opt_chain_id(),
+            token_contract_address in arb_erc55_address(),
+            recipient_address in arb_erc55_address(),
+            value in arb_u256(),
+        ) {
+            let request = TransactionRequest::from_erc20_request_parts(
+                schema_prefix,
+                has_pay,
+                chain_id,
+                token_contract_address,
+                recipient_address,
+                value,
+            )
+            .unwrap();
+
+            let erc20 = request.as_erc20().expect("Expected Erc20Request");
+            assert_eq!(erc20.schema_prefix(), schema_prefix);
+            assert_eq!(erc20.has_pay(), has_pay);
+            assert_eq!(erc20.chain_id(), chain_id);
+            assert_eq!(erc20.token_contract_address(), token_contract_address);
+            assert_eq!(erc20.recipient_address(), recipient_address);
+            assert_eq!(erc20.value_atomic(), value);
+
+            // Display -> reparse roundtrip
+            let output = request.to_string();
+            let reparsed = TransactionRequest::parse(&output).unwrap();
+            let erc20_b = reparsed.as_erc20().expect("Roundtrip changed request type");
+            assert_eq!(erc20.schema_prefix(), erc20_b.schema_prefix());
+            assert_eq!(erc20.has_pay(), erc20_b.has_pay());
+            assert_eq!(erc20.chain_id(), erc20_b.chain_id());
+            assert_eq!(
+                erc20.token_contract_address(),
+                erc20_b.token_contract_address()
+            );
+            assert_eq!(erc20.recipient_address(), erc20_b.recipient_address());
+            assert_eq!(erc20.value_atomic(), erc20_b.value_atomic());
+        }
+    }
 }

From c3a6a198d803237b0e1536ff25fb333517e956d2 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Fri, 27 Feb 2026 10:28:01 -0700
Subject: [PATCH 208/263] Extract pczt bundle data from bundle references
 rather than owned values.

Updates to `orchard 6b12c77260aa7fac0d804983fc31b71b584d48e0` and
`sapling 4f95c2286dbe90f05e6f44d634bc2924b992fab4` to take advantage
of the ability to extract from PCZT bundles by reference, and updates
`zcash_transparent` to follow the same pattern.
---
 Cargo.lock                                 | 6 ++----
 Cargo.toml                                 | 4 ++++
 zcash_transparent/CHANGELOG.md             | 1 +
 zcash_transparent/src/pczt/tx_extractor.rs | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1e939fc320..9b5226a6d0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2970,8 +2970,7 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 [[package]]
 name = "orchard"
 version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c01cd4ea711aab5f263f2b7aa6966687a2d6c7df4f78eb1b97a66a7a4e78e3b"
+source = "git+https://github.com/zcash/orchard.git?rev=6b12c77260aa7fac0d804983fc31b71b584d48e0#6b12c77260aa7fac0d804983fc31b71b584d48e0"
 dependencies = [
  "aes",
  "bitvec",
@@ -4128,8 +4127,7 @@ dependencies = [
 [[package]]
 name = "sapling-crypto"
 version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5433ab8c1cd52dfad3b903143e371d5bdd514ab7952f71414e6d66a5da8223cd"
+source = "git+https://github.com/zcash/sapling-crypto.git?rev=4f95c2286dbe90f05e6f44d634bc2924b992fab4#4f95c2286dbe90f05e6f44d634bc2924b992fab4"
 dependencies = [
  "aes",
  "bellman",
diff --git a/Cargo.toml b/Cargo.toml
index f54bc754ea..9f6aa94f03 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -228,3 +228,7 @@ unexpected_cfgs = { level = "warn", check-cfg = [
   'cfg(zcash_unstable, values("zfuture", "nu7"))',
   'cfg(live_network_tests)',
 ] }
+
+[patch.crates-io]
+sapling = { package = "sapling-crypto", git = "https://github.com/zcash/sapling-crypto.git", rev = "4f95c2286dbe90f05e6f44d634bc2924b992fab4" }
+orchard = { package = "orchard", git = "https://github.com/zcash/orchard.git", rev = "6b12c77260aa7fac0d804983fc31b71b584d48e0" }
diff --git a/zcash_transparent/CHANGELOG.md b/zcash_transparent/CHANGELOG.md
index ee6664dc12..ed7029af45 100644
--- a/zcash_transparent/CHANGELOG.md
+++ b/zcash_transparent/CHANGELOG.md
@@ -25,6 +25,7 @@ workspace.
 ### Changed
 - MSRV is now 1.85.1.
 - `zcash_transparent::pczt`:
+  - `Bundle::extract` now takes its `self` argument by reference.
   - `SignerError` has added variants:
     - `InvalidExternalSignature`
     - `MissingPreimage`
diff --git a/zcash_transparent/src/pczt/tx_extractor.rs b/zcash_transparent/src/pczt/tx_extractor.rs
index fae0b3dfe7..7b2f134bb8 100644
--- a/zcash_transparent/src/pczt/tx_extractor.rs
+++ b/zcash_transparent/src/pczt/tx_extractor.rs
@@ -27,7 +27,7 @@ impl super::Bundle {
     /// This is used by the Transaction Extractor role to produce the final transaction.
     ///
     /// [regular `Bundle`]: super::Bundle
-    pub fn extract(self) -> Result<Option<crate::bundle::Bundle<Unbound>>, TxExtractorError> {
+    pub fn extract(&self) -> Result<Option<crate::bundle::Bundle<Unbound>>, TxExtractorError> {
         self.to_tx_data(
             |input| {
                 input

From f7de56b2f1cee74fe40d021415e0ce6c5ae1a32e Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Thu, 26 Feb 2026 21:46:49 -0700
Subject: [PATCH 209/263] pczt: Extract pczt_to_tx_data into shared tx_data
 module

Move pczt_to_tx_data, EffectsOnly, and sighash out of the signer module
into a shared tx_data module so that io_finalizer can use them without
depending on the signer feature. This also removes redundant tx version
checks that were duplicated after pczt_to_tx_data calls.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 pczt/Cargo.toml                    |   2 +-
 pczt/src/lib.rs                    |   8 +--
 pczt/src/roles.rs                  |   3 +
 pczt/src/roles/io_finalizer/mod.rs |  38 ++---------
 pczt/src/roles/signer/mod.rs       | 106 +++--------------------------
 pczt/src/roles/tx_data.rs          |  97 ++++++++++++++++++++++++++
 6 files changed, 120 insertions(+), 134 deletions(-)
 create mode 100644 pczt/src/roles/tx_data.rs

diff --git a/pczt/Cargo.toml b/pczt/Cargo.toml
index cd72e8a86d..527f08f694 100644
--- a/pczt/Cargo.toml
+++ b/pczt/Cargo.toml
@@ -107,12 +107,12 @@ zcp-builder = ["dep:zcash_primitives"]
 
 ## Enables the I/O Finalizer role.
 io-finalizer = [
+    "dep:blake2b_simd",
     "dep:rand_core",
     "rand_core/getrandom",
     "dep:zcash_primitives",
     "orchard",
     "sapling",
-    "signer",
     "transparent",
 ]
 
diff --git a/pczt/src/lib.rs b/pczt/src/lib.rs
index c29c6e9367..440a92cfb2 100644
--- a/pczt/src/lib.rs
+++ b/pczt/src/lib.rs
@@ -26,8 +26,8 @@ use alloc::vec::Vec;
 use getset::Getters;
 use serde::{Deserialize, Serialize};
 
-#[cfg(feature = "signer")]
-use {roles::signer::EffectsOnly, zcash_primitives::transaction::TransactionData};
+#[cfg(any(feature = "io-finalizer", feature = "signer"))]
+use {roles::tx_data::EffectsOnly, zcash_primitives::transaction::TransactionData};
 
 pub mod roles;
 
@@ -89,7 +89,7 @@ impl Pczt {
     }
 
     /// Gets the effects of this transaction.
-    #[cfg(feature = "signer")]
+    #[cfg(any(feature = "io-finalizer", feature = "signer"))]
     pub fn into_effects(self) -> Option<TransactionData<EffectsOnly>> {
         let Self {
             global,
@@ -102,7 +102,7 @@ impl Pczt {
         let sapling = sapling.into_parsed().ok()?;
         let orchard = orchard.into_parsed().ok()?;
 
-        roles::signer::pczt_to_tx_data(&global, &transparent, &sapling, &orchard).ok()
+        roles::tx_data::pczt_to_tx_data(&global, &transparent, &sapling, &orchard).ok()
     }
 }
 
diff --git a/pczt/src/roles.rs b/pczt/src/roles.rs
index a2e9d58236..be4e023bb9 100644
--- a/pczt/src/roles.rs
+++ b/pczt/src/roles.rs
@@ -10,6 +10,9 @@
 
 pub mod creator;
 
+#[cfg(any(feature = "io-finalizer", feature = "signer"))]
+pub(crate) mod tx_data;
+
 #[cfg(feature = "io-finalizer")]
 pub mod io_finalizer;
 
diff --git a/pczt/src/roles/io_finalizer/mod.rs b/pczt/src/roles/io_finalizer/mod.rs
index ec4c70dc62..8e2eeb04b5 100644
--- a/pczt/src/roles/io_finalizer/mod.rs
+++ b/pczt/src/roles/io_finalizer/mod.rs
@@ -4,10 +4,9 @@
 //! - Updates the various bsk values using the rcv information from spends and outputs.
 
 use rand_core::OsRng;
-use zcash_primitives::transaction::{
-    sighash::SignableInput, sighash_v5::v5_signature_hash, txid::TxIdDigester,
-};
+use zcash_primitives::transaction::{sighash::SignableInput, txid::TxIdDigester};
 
+use super::tx_data::{pczt_to_tx_data, sighash};
 use crate::{
     Pczt,
     common::{
@@ -15,9 +14,6 @@ use crate::{
         FLAG_TRANSPARENT_OUTPUTS_MODIFIABLE,
     },
 };
-use zcash_protocol::constants::{V5_TX_VERSION, V5_VERSION_GROUP_ID};
-
-use super::signer::pczt_to_tx_data;
 
 pub struct IoFinalizer {
     pczt: Pczt,
@@ -68,19 +64,7 @@ impl IoFinalizer {
 
         let tx_data = pczt_to_tx_data(&global, &transparent, &sapling, &orchard)?;
         let txid_parts = tx_data.digest(TxIdDigester);
-
-        // TODO: Pick sighash based on tx version.
-        match (global.tx_version, global.version_group_id) {
-            (V5_TX_VERSION, V5_VERSION_GROUP_ID) => Ok(()),
-            (version, version_group_id) => Err(Error::UnsupportedTxVersion {
-                version,
-                version_group_id,
-            }),
-        }?;
-        let shielded_sighash = v5_signature_hash(&tx_data, &SignableInput::Shielded, &txid_parts)
-            .as_ref()
-            .try_into()
-            .expect("correct length");
+        let shielded_sighash = sighash(&tx_data, &SignableInput::Shielded, &txid_parts);
 
         sapling
             .finalize_io(shielded_sighash, OsRng)
@@ -107,20 +91,12 @@ pub enum Error {
     OrchardParse(orchard::pczt::ParseError),
     SaplingFinalize(sapling::pczt::IoFinalizerError),
     SaplingParse(sapling::pczt::ParseError),
-    Sign(super::signer::Error),
     TransparentParse(transparent::pczt::ParseError),
-    UnsupportedTxVersion { version: u32, version_group_id: u32 },
+    TxData(super::tx_data::Error),
 }
 
-impl From<super::signer::Error> for Error {
-    fn from(e: super::signer::Error) -> Self {
-        match e {
-            super::signer::Error::OrchardParse(parse_error) => Error::OrchardParse(parse_error),
-            super::signer::Error::SaplingParse(parse_error) => Error::SaplingParse(parse_error),
-            super::signer::Error::TransparentParse(parse_error) => {
-                Error::TransparentParse(parse_error)
-            }
-            _ => Error::Sign(e),
-        }
+impl From<super::tx_data::Error> for Error {
+    fn from(e: super::tx_data::Error) -> Self {
+        Error::TxData(e)
     }
 }
diff --git a/pczt/src/roles/signer/mod.rs b/pczt/src/roles/signer/mod.rs
index 3b01244358..3a5282f119 100644
--- a/pczt/src/roles/signer/mod.rs
+++ b/pczt/src/roles/signer/mod.rs
@@ -19,15 +19,8 @@ use rand_core::OsRng;
 
 use ::transparent::sighash::{SIGHASH_ANYONECANPAY, SIGHASH_NONE, SIGHASH_SINGLE};
 use zcash_primitives::transaction::{
-    Authorization, TransactionData, TxDigests, TxVersion, sighash::SignableInput,
-    sighash_v5::v5_signature_hash, txid::TxIdDigester,
+    TransactionData, TxDigests, sighash::SignableInput, txid::TxIdDigester,
 };
-use zcash_protocol::consensus::BranchId;
-#[cfg(all(
-    any(zcash_unstable = "nu7", zcash_unstable = "zfuture"),
-    feature = "zip-233"
-))]
-use zcash_protocol::value::Zatoshis;
 
 use crate::{
     Pczt,
@@ -37,10 +30,8 @@ use crate::{
     },
 };
 
-use crate::common::determine_lock_time;
-
-const V5_TX_VERSION: u32 = 5;
-const V5_VERSION_GROUP_ID: u32 = 0x26A7270A;
+pub use super::tx_data::EffectsOnly;
+use super::tx_data::{pczt_to_tx_data, sighash};
 
 pub struct Signer {
     global: Global,
@@ -70,15 +61,6 @@ impl Signer {
 
         let tx_data = pczt_to_tx_data(&global, &transparent, &sapling, &orchard)?;
         let txid_parts = tx_data.digest(TxIdDigester);
-
-        // TODO: Pick sighash based on tx version.
-        match (global.tx_version, global.version_group_id) {
-            (V5_TX_VERSION, V5_VERSION_GROUP_ID) => Ok(()),
-            (version, version_group_id) => Err(Error::Global(GlobalError::UnsupportedTxVersion {
-                version,
-                version_group_id,
-            })),
-        }?;
         let shielded_sighash = sighash(&tx_data, &SignableInput::Shielded, &txid_parts);
 
         Ok(Self {
@@ -357,95 +339,23 @@ impl Signer {
     }
 }
 
-/// Extracts an unauthorized `TransactionData` from the PCZT.
-///
-/// We don't care about existing proofs or signatures here, because they do not affect the
-/// sighash; we only want the effects of the transaction.
-pub(crate) fn pczt_to_tx_data(
-    global: &Global,
-    transparent: &transparent::pczt::Bundle,
-    sapling: &sapling::pczt::Bundle,
-    orchard: &orchard::pczt::Bundle,
-) -> Result<TransactionData<EffectsOnly>, Error> {
-    let version = match (global.tx_version, global.version_group_id) {
-        (V5_TX_VERSION, V5_VERSION_GROUP_ID) => Ok(TxVersion::V5),
-        (version, version_group_id) => Err(Error::Global(GlobalError::UnsupportedTxVersion {
-            version,
-            version_group_id,
-        })),
-    }?;
-
-    let consensus_branch_id = BranchId::try_from(global.consensus_branch_id)
-        .map_err(|_| Error::Global(GlobalError::UnknownConsensusBranchId))?;
-
-    let transparent_bundle = transparent
-        .extract_effects()
-        .map_err(Error::TransparentExtract)?;
-
-    let sapling_bundle = sapling.extract_effects().map_err(Error::SaplingExtract)?;
-
-    let orchard_bundle = orchard.extract_effects().map_err(Error::OrchardExtract)?;
-
-    Ok(TransactionData::from_parts(
-        version,
-        consensus_branch_id,
-        determine_lock_time(global, transparent.inputs()).ok_or(Error::IncompatibleLockTimes)?,
-        global.expiry_height.into(),
-        #[cfg(all(
-            any(zcash_unstable = "nu7", zcash_unstable = "zfuture"),
-            feature = "zip-233"
-        ))]
-        Zatoshis::ZERO,
-        transparent_bundle,
-        None,
-        sapling_bundle,
-        orchard_bundle,
-    ))
-}
-
-pub struct EffectsOnly;
-
-impl Authorization for EffectsOnly {
-    type TransparentAuth = transparent::bundle::EffectsOnly;
-    type SaplingAuth = sapling::bundle::EffectsOnly;
-    type OrchardAuth = orchard::bundle::EffectsOnly;
-    #[cfg(zcash_unstable = "zfuture")]
-    type TzeAuth = core::convert::Infallible;
-}
-
-/// Helper to produce the correct sighash for a PCZT.
-fn sighash(
-    tx_data: &TransactionData<EffectsOnly>,
-    signable_input: &SignableInput,
-    txid_parts: &TxDigests<Blake2bHash>,
-) -> [u8; 32] {
-    v5_signature_hash(tx_data, signable_input, txid_parts)
-        .as_ref()
-        .try_into()
-        .expect("correct length")
-}
-
 /// Errors that can occur while creating signatures for a PCZT.
 #[derive(Debug)]
 pub enum Error {
-    Global(GlobalError),
-    IncompatibleLockTimes,
     InvalidIndex,
-    OrchardExtract(orchard::pczt::TxExtractorError),
     OrchardParse(orchard::pczt::ParseError),
     OrchardSign(orchard::pczt::SignerError),
     OrchardVerify(orchard::pczt::VerifyError),
-    SaplingExtract(sapling::pczt::TxExtractorError),
     SaplingParse(sapling::pczt::ParseError),
     SaplingSign(sapling::pczt::SignerError),
     SaplingVerify(sapling::pczt::VerifyError),
-    TransparentExtract(transparent::pczt::TxExtractorError),
     TransparentParse(transparent::pczt::ParseError),
     TransparentSign(transparent::pczt::SignerError),
+    TxData(super::tx_data::Error),
 }
 
-#[derive(Debug)]
-pub enum GlobalError {
-    UnknownConsensusBranchId,
-    UnsupportedTxVersion { version: u32, version_group_id: u32 },
+impl From<super::tx_data::Error> for Error {
+    fn from(e: super::tx_data::Error) -> Self {
+        Error::TxData(e)
+    }
 }
diff --git a/pczt/src/roles/tx_data.rs b/pczt/src/roles/tx_data.rs
new file mode 100644
index 0000000000..b2e7ce8ffe
--- /dev/null
+++ b/pczt/src/roles/tx_data.rs
@@ -0,0 +1,97 @@
+//! Shared utilities for extracting transaction data from a PCZT.
+
+use blake2b_simd::Hash as Blake2bHash;
+use zcash_primitives::transaction::{
+    Authorization, TransactionData, TxDigests, TxVersion, sighash::SignableInput,
+    sighash_v5::v5_signature_hash,
+};
+use zcash_protocol::consensus::BranchId;
+#[cfg(all(
+    any(zcash_unstable = "nu7", zcash_unstable = "zfuture"),
+    feature = "zip-233"
+))]
+use zcash_protocol::value::Zatoshis;
+
+use crate::common::{Global, determine_lock_time};
+
+const V5_TX_VERSION: u32 = 5;
+const V5_VERSION_GROUP_ID: u32 = 0x26A7270A;
+
+/// Extracts an unauthorized `TransactionData` from the PCZT.
+///
+/// We don't care about existing proofs or signatures here, because they do not affect the
+/// sighash; we only want the effects of the transaction.
+pub(crate) fn pczt_to_tx_data(
+    global: &Global,
+    transparent: &transparent::pczt::Bundle,
+    sapling: &sapling::pczt::Bundle,
+    orchard: &orchard::pczt::Bundle,
+) -> Result<TransactionData<EffectsOnly>, Error> {
+    let version = match (global.tx_version, global.version_group_id) {
+        (V5_TX_VERSION, V5_VERSION_GROUP_ID) => Ok(TxVersion::V5),
+        (version, version_group_id) => Err(Error::UnsupportedTxVersion {
+            version,
+            version_group_id,
+        }),
+    }?;
+
+    let consensus_branch_id = BranchId::try_from(global.consensus_branch_id)
+        .map_err(|_| Error::UnknownConsensusBranchId)?;
+
+    let transparent_bundle = transparent
+        .extract_effects()
+        .map_err(Error::TransparentExtract)?;
+
+    let sapling_bundle = sapling.extract_effects().map_err(Error::SaplingExtract)?;
+
+    let orchard_bundle = orchard.extract_effects().map_err(Error::OrchardExtract)?;
+
+    Ok(TransactionData::from_parts(
+        version,
+        consensus_branch_id,
+        determine_lock_time(global, transparent.inputs()).ok_or(Error::IncompatibleLockTimes)?,
+        global.expiry_height.into(),
+        #[cfg(all(
+            any(zcash_unstable = "nu7", zcash_unstable = "zfuture"),
+            feature = "zip-233"
+        ))]
+        Zatoshis::ZERO,
+        transparent_bundle,
+        None,
+        sapling_bundle,
+        orchard_bundle,
+    ))
+}
+
+pub struct EffectsOnly;
+
+impl Authorization for EffectsOnly {
+    type TransparentAuth = transparent::bundle::EffectsOnly;
+    type SaplingAuth = sapling::bundle::EffectsOnly;
+    type OrchardAuth = orchard::bundle::EffectsOnly;
+    #[cfg(zcash_unstable = "zfuture")]
+    type TzeAuth = core::convert::Infallible;
+}
+
+/// Helper to produce the correct sighash for a PCZT.
+pub(crate) fn sighash(
+    tx_data: &TransactionData<EffectsOnly>,
+    signable_input: &SignableInput,
+    txid_parts: &TxDigests<Blake2bHash>,
+) -> [u8; 32] {
+    v5_signature_hash(tx_data, signable_input, txid_parts)
+        .as_ref()
+        .try_into()
+        .expect("correct length")
+}
+
+/// Errors that can occur while extracting transaction data from a PCZT.
+#[derive(Debug)]
+pub enum Error {
+    IncompatibleLockTimes,
+    OrchardExtract(orchard::pczt::TxExtractorError),
+    SaplingExtract(sapling::pczt::TxExtractorError),
+    TransparentExtract(transparent::pczt::TxExtractorError),
+    UnknownConsensusBranchId,
+    UnsupportedTxVersion { version: u32, version_group_id: u32 },
+}

From 21794007549149d935cd9537fd01234d18eb9048 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Thu, 26 Feb 2026 22:10:24 -0700
Subject: [PATCH 210/263] pczt: Extract shared pczt_to_tx_data for all PCZT
 roles

Generalizes pczt_to_tx_data to parse PCZT bundles, validate the
transaction version and consensus branch ID, compute lock time, and
construct TransactionData, all in a single generic function shared by
io_finalizer, signer, and tx_extractor.

Adds pczt::ExtractError for shared parse/extract error handling.
Changes Pczt::into_effects to return Result instead of Option.
Wraps ExtractError in signer::Error and io_finalizer::Error.
Removes tx_extractor::GlobalError (replaced by tx_data::Error).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 pczt/CHANGELOG.md                          |  11 ++
 pczt/Cargo.toml                            |   1 +
 pczt/src/lib.rs                            |  51 ++++++---
 pczt/src/roles.rs                          |   2 +-
 pczt/src/roles/io_finalizer/mod.rs         |  38 ++++---
 pczt/src/roles/signer/mod.rs               |  33 +++---
 pczt/src/roles/tx_data.rs                  | 117 +++++++++++++++------
 pczt/src/roles/tx_extractor/mod.rs         |  83 ++++++---------
 pczt/src/roles/tx_extractor/orchard.rs     |  12 +--
 pczt/src/roles/tx_extractor/sapling.rs     |  11 --
 pczt/src/roles/tx_extractor/transparent.rs |  12 +--
 11 files changed, 214 insertions(+), 157 deletions(-)

diff --git a/pczt/CHANGELOG.md b/pczt/CHANGELOG.md
index ab3dff04bf..43831b7285 100644
--- a/pczt/CHANGELOG.md
+++ b/pczt/CHANGELOG.md
@@ -11,6 +11,7 @@ workspace.
 ## [Unreleased]
 
 ### Added
+- `pczt::ExtractError`
 - `pczt::roles::signer`:
   - `Signer::sighash`
   - `Signer::append_transparent_signature`
@@ -19,6 +20,16 @@ workspace.
 
 ### Changed
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`.
+- `Pczt::into_effects` now returns `Result<TransactionData<EffectsOnly>, ExtractError>`
+  instead of `Option<TransactionData<EffectsOnly>>`.
+- `pczt::roles::io_finalizer::Error` now wraps parse and extract errors
+  via `Extract(ExtractError)` instead of individual variants.
+- `pczt::roles::signer::Error` now wraps parse and extract errors
+  via `Extract(ExtractError)` instead of individual variants.
+
+### Removed
+- `pczt::roles::tx_extractor::GlobalError` (replaced by
+  `pczt::roles::tx_extractor::Error::TxData`).
 
 ## [0.4.1, 0.5.1] - 2026-02-26
 
diff --git a/pczt/Cargo.toml b/pczt/Cargo.toml
index 527f08f694..70a10e4ec0 100644
--- a/pczt/Cargo.toml
+++ b/pczt/Cargo.toml
@@ -141,6 +141,7 @@ spend-finalizer = ["transparent"]
 
 ## Enables the Transaction Extractor role.
 tx-extractor = [
+    "dep:blake2b_simd",
     "dep:rand_core",
     "rand_core/getrandom",
     "dep:zcash_primitives",
diff --git a/pczt/src/lib.rs b/pczt/src/lib.rs
index 440a92cfb2..9a114e38cb 100644
--- a/pczt/src/lib.rs
+++ b/pczt/src/lib.rs
@@ -90,19 +90,44 @@ impl Pczt {
 
     /// Gets the effects of this transaction.
     #[cfg(any(feature = "io-finalizer", feature = "signer"))]
-    pub fn into_effects(self) -> Option<TransactionData<EffectsOnly>> {
-        let Self {
-            global,
-            transparent,
-            sapling,
-            orchard,
-        } = self;
-
-        let transparent = transparent.into_parsed().ok()?;
-        let sapling = sapling.into_parsed().ok()?;
-        let orchard = orchard.into_parsed().ok()?;
-
-        roles::tx_data::pczt_to_tx_data(&global, &transparent, &sapling, &orchard).ok()
+    pub fn into_effects(self) -> Result<TransactionData<EffectsOnly>, ExtractError> {
+        roles::tx_data::pczt_to_tx_data(
+            self,
+            |t| {
+                t.extract_effects()
+                    .map_err(ExtractError::TransparentExtract)
+            },
+            |s| s.extract_effects().map_err(ExtractError::SaplingExtract),
+            |o| o.extract_effects().map_err(ExtractError::OrchardExtract),
+        )
+        .map(|parsed| parsed.tx_data)
+    }
+}
+
+/// Errors that can occur while extracting effects-only transaction data from a PCZT.
+#[cfg(any(feature = "io-finalizer", feature = "signer"))]
+#[derive(Debug)]
+pub enum ExtractError {
+    OrchardExtract(::orchard::pczt::TxExtractorError),
+    OrchardParse(::orchard::pczt::ParseError),
+    SaplingExtract(::sapling::pczt::TxExtractorError),
+    SaplingParse(::sapling::pczt::ParseError),
+    TransparentExtract(::transparent::pczt::TxExtractorError),
+    TransparentParse(::transparent::pczt::ParseError),
+    TxData(roles::tx_data::Error),
+}
+
+#[cfg(any(feature = "io-finalizer", feature = "signer"))]
+impl From<roles::tx_data::Error> for ExtractError {
+    fn from(e: roles::tx_data::Error) -> Self {
+        match e {
+            roles::tx_data::Error::TransparentParse(e) => ExtractError::TransparentParse(e),
+            roles::tx_data::Error::SaplingParse(e) => ExtractError::SaplingParse(e),
+            roles::tx_data::Error::OrchardParse(e) => ExtractError::OrchardParse(e),
+            other @ (roles::tx_data::Error::IncompatibleLockTimes
+            | roles::tx_data::Error::UnknownConsensusBranchId
+            | roles::tx_data::Error::UnsupportedTxVersion { .. }) => ExtractError::TxData(other),
+        }
     }
 }
 
diff --git a/pczt/src/roles.rs b/pczt/src/roles.rs
index be4e023bb9..0ea132f8d7 100644
--- a/pczt/src/roles.rs
+++ b/pczt/src/roles.rs
@@ -10,7 +10,7 @@
 
 pub mod creator;
 
-#[cfg(any(feature = "io-finalizer", feature = "signer"))]
+#[cfg(any(feature = "io-finalizer", feature = "signer", feature = "tx-extractor"))]
 pub(crate) mod tx_data;
 
 #[cfg(feature = "io-finalizer")]
diff --git a/pczt/src/roles/io_finalizer/mod.rs b/pczt/src/roles/io_finalizer/mod.rs
index 8e2eeb04b5..cc2b585ec1 100644
--- a/pczt/src/roles/io_finalizer/mod.rs
+++ b/pczt/src/roles/io_finalizer/mod.rs
@@ -8,7 +8,7 @@ use zcash_primitives::transaction::{sighash::SignableInput, txid::TxIdDigester};
 
 use super::tx_data::{pczt_to_tx_data, sighash};
 use crate::{
-    Pczt,
+    ExtractError, Pczt,
     common::{
         FLAG_SHIELDED_MODIFIABLE, FLAG_TRANSPARENT_INPUTS_MODIFIABLE,
         FLAG_TRANSPARENT_OUTPUTS_MODIFIABLE,
@@ -43,12 +43,21 @@ impl IoFinalizer {
             return Err(Error::NoOutputs);
         }
 
-        let Pczt {
+        let super::tx_data::ParsedPczt {
             mut global,
             transparent,
-            sapling,
-            orchard,
-        } = pczt;
+            mut sapling,
+            mut orchard,
+            tx_data,
+        } = pczt_to_tx_data(
+            pczt,
+            |t| {
+                t.extract_effects()
+                    .map_err(ExtractError::TransparentExtract)
+            },
+            |s| s.extract_effects().map_err(ExtractError::SaplingExtract),
+            |o| o.extract_effects().map_err(ExtractError::OrchardExtract),
+        )?;
 
         // After shielded IO finalization, the transaction effects cannot be modified
         // because dummy spends will have been signed.
@@ -57,12 +66,6 @@ impl IoFinalizer {
                 | FLAG_TRANSPARENT_OUTPUTS_MODIFIABLE
                 | FLAG_SHIELDED_MODIFIABLE);
         }
-
-        let transparent = transparent.into_parsed().map_err(Error::TransparentParse)?;
-        let mut sapling = sapling.into_parsed().map_err(Error::SaplingParse)?;
-        let mut orchard = orchard.into_parsed().map_err(Error::OrchardParse)?;
-
-        let tx_data = pczt_to_tx_data(&global, &transparent, &sapling, &orchard)?;
         let txid_parts = tx_data.digest(TxIdDigester);
         let shielded_sighash = sighash(&tx_data, &SignableInput::Shielded, &txid_parts);
 
@@ -85,18 +88,21 @@ impl IoFinalizer {
 /// Errors that can occur while finalizing the IO of a PCZT.
 #[derive(Debug)]
 pub enum Error {
+    Extract(crate::ExtractError),
     NoOutputs,
     NoSpends,
     OrchardFinalize(orchard::pczt::IoFinalizerError),
-    OrchardParse(orchard::pczt::ParseError),
     SaplingFinalize(sapling::pczt::IoFinalizerError),
-    SaplingParse(sapling::pczt::ParseError),
-    TransparentParse(transparent::pczt::ParseError),
-    TxData(super::tx_data::Error),
+}
+
+impl From<crate::ExtractError> for Error {
+    fn from(e: crate::ExtractError) -> Self {
+        Error::Extract(e)
+    }
 }
 
 impl From<super::tx_data::Error> for Error {
     fn from(e: super::tx_data::Error) -> Self {
-        Error::TxData(e)
+        Error::Extract(crate::ExtractError::from(e))
     }
 }
diff --git a/pczt/src/roles/signer/mod.rs b/pczt/src/roles/signer/mod.rs
index 3a5282f119..cd73d62d8b 100644
--- a/pczt/src/roles/signer/mod.rs
+++ b/pczt/src/roles/signer/mod.rs
@@ -32,6 +32,7 @@ use crate::{
 
 pub use super::tx_data::EffectsOnly;
 use super::tx_data::{pczt_to_tx_data, sighash};
+use crate::ExtractError;
 
 pub struct Signer {
     global: Global,
@@ -48,18 +49,21 @@ pub struct Signer {
 impl Signer {
     /// Instantiates the Signer role with the given PCZT.
     pub fn new(pczt: Pczt) -> Result<Self, Error> {
-        let Pczt {
+        let super::tx_data::ParsedPczt {
             global,
             transparent,
             sapling,
             orchard,
-        } = pczt;
-
-        let transparent = transparent.into_parsed().map_err(Error::TransparentParse)?;
-        let sapling = sapling.into_parsed().map_err(Error::SaplingParse)?;
-        let orchard = orchard.into_parsed().map_err(Error::OrchardParse)?;
-
-        let tx_data = pczt_to_tx_data(&global, &transparent, &sapling, &orchard)?;
+            tx_data,
+        } = pczt_to_tx_data(
+            pczt,
+            |t| {
+                t.extract_effects()
+                    .map_err(ExtractError::TransparentExtract)
+            },
+            |s| s.extract_effects().map_err(ExtractError::SaplingExtract),
+            |o| o.extract_effects().map_err(ExtractError::OrchardExtract),
+        )?;
         let txid_parts = tx_data.digest(TxIdDigester);
         let shielded_sighash = sighash(&tx_data, &SignableInput::Shielded, &txid_parts);
 
@@ -342,20 +346,23 @@ impl Signer {
 /// Errors that can occur while creating signatures for a PCZT.
 #[derive(Debug)]
 pub enum Error {
+    Extract(crate::ExtractError),
     InvalidIndex,
-    OrchardParse(orchard::pczt::ParseError),
     OrchardSign(orchard::pczt::SignerError),
     OrchardVerify(orchard::pczt::VerifyError),
-    SaplingParse(sapling::pczt::ParseError),
     SaplingSign(sapling::pczt::SignerError),
     SaplingVerify(sapling::pczt::VerifyError),
-    TransparentParse(transparent::pczt::ParseError),
     TransparentSign(transparent::pczt::SignerError),
-    TxData(super::tx_data::Error),
+}
+
+impl From<crate::ExtractError> for Error {
+    fn from(e: crate::ExtractError) -> Self {
+        Error::Extract(e)
+    }
 }
 
 impl From<super::tx_data::Error> for Error {
     fn from(e: super::tx_data::Error) -> Self {
-        Error::TxData(e)
+        Error::Extract(crate::ExtractError::from(e))
     }
 }
diff --git a/pczt/src/roles/tx_data.rs b/pczt/src/roles/tx_data.rs
index b2e7ce8ffe..e560dfd6ee 100644
--- a/pczt/src/roles/tx_data.rs
+++ b/pczt/src/roles/tx_data.rs
@@ -1,32 +1,79 @@
 //! Shared utilities for extracting transaction data from a PCZT.
 
-use blake2b_simd::Hash as Blake2bHash;
-use zcash_primitives::transaction::{
-    Authorization, TransactionData, TxDigests, TxVersion, sighash::SignableInput,
-    sighash_v5::v5_signature_hash,
-};
+use crate::Pczt;
+use crate::common::{Global, determine_lock_time};
+
+use zcash_primitives::transaction::{Authorization, TransactionData, TxVersion};
 use zcash_protocol::consensus::BranchId;
+use zcash_protocol::constants::{V5_TX_VERSION, V5_VERSION_GROUP_ID};
 #[cfg(all(
     any(zcash_unstable = "nu7", zcash_unstable = "zfuture"),
     feature = "zip-233"
 ))]
 use zcash_protocol::value::Zatoshis;
 
-use crate::common::{Global, determine_lock_time};
+#[cfg(any(feature = "io-finalizer", feature = "signer"))]
+use blake2b_simd::Hash as Blake2bHash;
+#[cfg(any(feature = "io-finalizer", feature = "signer"))]
+use zcash_primitives::transaction::{
+    TxDigests, sighash::SignableInput, sighash_v5::v5_signature_hash,
+};
 
-const V5_TX_VERSION: u32 = 5;
-const V5_VERSION_GROUP_ID: u32 = 0x26A7270A;
+/// The result of parsing a PCZT and constructing its `TransactionData`.
+#[cfg_attr(
+    not(any(feature = "io-finalizer", feature = "signer")),
+    allow(dead_code)
+)]
+pub(crate) struct ParsedPczt<A: Authorization> {
+    pub(crate) global: Global,
+    pub(crate) transparent: transparent::pczt::Bundle,
+    pub(crate) sapling: sapling::pczt::Bundle,
+    pub(crate) orchard: orchard::pczt::Bundle,
+    pub(crate) tx_data: TransactionData<A>,
+}
 
-/// Extracts an unauthorized `TransactionData` from the PCZT.
+/// Parses a PCZT's bundles and constructs a `TransactionData` using caller-provided
+/// bundle extraction closures.
 ///
-/// We don't care about existing proofs or signatures here, because they do not affect the
-/// sighash; we only want the effects of the transaction.
-pub(crate) fn pczt_to_tx_data(
-    global: &Global,
-    transparent: &transparent::pczt::Bundle,
-    sapling: &sapling::pczt::Bundle,
-    orchard: &orchard::pczt::Bundle,
-) -> Result<TransactionData<EffectsOnly>, Error> {
+/// This handles bundle parsing, version validation, consensus branch ID parsing,
+/// lock time computation, and final assembly, delegating bundle extraction to the
+/// caller via closures that receive references to the parsed bundles.
+pub(crate) fn pczt_to_tx_data<A, E>(
+    pczt: Pczt,
+    extract_transparent: impl FnOnce(
+        &transparent::pczt::Bundle,
+    ) -> Result<
+        Option<transparent::bundle::Bundle<A::TransparentAuth>>,
+        E,
+    >,
+    extract_sapling: impl FnOnce(
+        &sapling::pczt::Bundle,
+    ) -> Result<
+        Option<sapling::Bundle<A::SaplingAuth, zcash_protocol::value::ZatBalance>>,
+        E,
+    >,
+    extract_orchard: impl FnOnce(
+        &orchard::pczt::Bundle,
+    ) -> Result<
+        Option<orchard::Bundle<A::OrchardAuth, zcash_protocol::value::ZatBalance>>,
+        E,
+    >,
+) -> Result<ParsedPczt<A>, E>
+where
+    A: Authorization,
+    E: From<Error>,
+{
+    let Pczt {
+        global,
+        transparent,
+        sapling,
+        orchard,
+    } = pczt;
+
+    let transparent = transparent.into_parsed().map_err(Error::TransparentParse)?;
+    let sapling = sapling.into_parsed().map_err(Error::SaplingParse)?;
+    let orchard = orchard.into_parsed().map_err(Error::OrchardParse)?;
+
     let version = match (global.tx_version, global.version_group_id) {
         (V5_TX_VERSION, V5_VERSION_GROUP_ID) => Ok(TxVersion::V5),
         (version, version_group_id) => Err(Error::UnsupportedTxVersion {
@@ -38,18 +85,17 @@ pub(crate) fn pczt_to_tx_data(
     let consensus_branch_id = BranchId::try_from(global.consensus_branch_id)
         .map_err(|_| Error::UnknownConsensusBranchId)?;
 
-    let transparent_bundle = transparent
-        .extract_effects()
-        .map_err(Error::TransparentExtract)?;
-
-    let sapling_bundle = sapling.extract_effects().map_err(Error::SaplingExtract)?;
+    let lock_time =
+        determine_lock_time(&global, transparent.inputs()).ok_or(Error::IncompatibleLockTimes)?;
 
-    let orchard_bundle = orchard.extract_effects().map_err(Error::OrchardExtract)?;
+    let transparent_bundle = extract_transparent(&transparent)?;
+    let sapling_bundle = extract_sapling(&sapling)?;
+    let orchard_bundle = extract_orchard(&orchard)?;
 
-    Ok(TransactionData::from_parts(
+    let tx_data = TransactionData::from_parts(
         version,
         consensus_branch_id,
-        determine_lock_time(global, transparent.inputs()).ok_or(Error::IncompatibleLockTimes)?,
+        lock_time,
         global.expiry_height.into(),
         #[cfg(all(
             any(zcash_unstable = "nu7", zcash_unstable = "zfuture"),
@@ -60,11 +106,21 @@ pub(crate) fn pczt_to_tx_data(
         None,
         sapling_bundle,
         orchard_bundle,
-    ))
+    );
+
+    Ok(ParsedPczt {
+        global,
+        transparent,
+        sapling,
+        orchard,
+        tx_data,
+    })
 }
 
+#[cfg(any(feature = "io-finalizer", feature = "signer"))]
 pub struct EffectsOnly;
 
+#[cfg(any(feature = "io-finalizer", feature = "signer"))]
 impl Authorization for EffectsOnly {
     type TransparentAuth = transparent::bundle::EffectsOnly;
     type SaplingAuth = sapling::bundle::EffectsOnly;
@@ -74,6 +130,7 @@ impl Authorization for EffectsOnly {
 }
 
 /// Helper to produce the correct sighash for a PCZT.
+#[cfg(any(feature = "io-finalizer", feature = "signer"))]
 pub(crate) fn sighash(
     tx_data: &TransactionData<EffectsOnly>,
     signable_input: &SignableInput,
@@ -85,13 +142,13 @@ pub(crate) fn sighash(
         .expect("correct length")
 }
 
-/// Errors that can occur while extracting transaction data from a PCZT.
+/// Errors that can occur while parsing and constructing transaction data from PCZT fields.
 #[derive(Debug)]
 pub enum Error {
     IncompatibleLockTimes,
-    OrchardExtract(orchard::pczt::TxExtractorError),
-    SaplingExtract(sapling::pczt::TxExtractorError),
-    TransparentExtract(transparent::pczt::TxExtractorError),
+    OrchardParse(orchard::pczt::ParseError),
+    SaplingParse(sapling::pczt::ParseError),
+    TransparentParse(transparent::pczt::ParseError),
     UnknownConsensusBranchId,
     UnsupportedTxVersion { version: u32, version_group_id: u32 },
 }
diff --git a/pczt/src/roles/tx_extractor/mod.rs b/pczt/src/roles/tx_extractor/mod.rs
index 22c0033d7c..8e724deaac 100644
--- a/pczt/src/roles/tx_extractor/mod.rs
+++ b/pczt/src/roles/tx_extractor/mod.rs
@@ -6,21 +6,12 @@ use core::marker::PhantomData;
 use rand_core::OsRng;
 
 use zcash_primitives::transaction::{
-    Authorization, Transaction, TransactionData, TxVersion,
+    Authorization, Transaction,
     sighash::{SignableInput, signature_hash},
     txid::TxIdDigester,
 };
-#[cfg(all(
-    any(zcash_unstable = "nu7", zcash_unstable = "zfuture"),
-    feature = "zip-233"
-))]
-use zcash_protocol::value::Zatoshis;
-use zcash_protocol::{
-    consensus::BranchId,
-    constants::{V5_TX_VERSION, V5_VERSION_GROUP_ID},
-};
 
-use crate::{Pczt, common::determine_lock_time};
+use crate::Pczt;
 
 mod orchard;
 pub use self::orchard::OrchardError;
@@ -85,40 +76,22 @@ impl<'a> TransactionExtractor<'a> {
             _unused,
         } = self;
 
-        let version = match (pczt.global.tx_version, pczt.global.version_group_id) {
-            (V5_TX_VERSION, V5_VERSION_GROUP_ID) => Ok(TxVersion::V5),
-            (version, version_group_id) => Err(Error::Global(GlobalError::UnsupportedTxVersion {
-                version,
-                version_group_id,
-            })),
-        }?;
-
-        let consensus_branch_id = BranchId::try_from(pczt.global.consensus_branch_id)
-            .map_err(|_| Error::Global(GlobalError::UnknownConsensusBranchId))?;
-
-        let lock_time = determine_lock_time(&pczt.global, &pczt.transparent.inputs)
-            .ok_or(Error::IncompatibleLockTimes)?;
-
-        let transparent_bundle =
-            transparent::extract_bundle(pczt.transparent).map_err(Error::Transparent)?;
-        let sapling_bundle = sapling::extract_bundle(pczt.sapling).map_err(Error::Sapling)?;
-        let orchard_bundle = orchard::extract_bundle(pczt.orchard).map_err(Error::Orchard)?;
-
-        let tx_data = TransactionData::<Unbound>::from_parts(
-            version,
-            consensus_branch_id,
-            lock_time,
-            pczt.global.expiry_height.into(),
-            #[cfg(all(
-                any(zcash_unstable = "nu7", zcash_unstable = "zfuture"),
-                feature = "zip-233"
-            ))]
-            Zatoshis::ZERO,
-            transparent_bundle,
-            None,
-            sapling_bundle,
-            orchard_bundle,
-        );
+        let super::tx_data::ParsedPczt { tx_data, .. } =
+            super::tx_data::pczt_to_tx_data::<Unbound, Error>(
+                pczt,
+                |t| {
+                    t.extract()
+                        .map_err(|e| Error::Transparent(TransparentError::Extract(e)))
+                },
+                |s| {
+                    s.extract()
+                        .map_err(|e| Error::Sapling(SaplingError::Extract(e)))
+                },
+                |o| {
+                    o.extract()
+                        .map_err(|e| Error::Orchard(OrchardError::Extract(e)))
+                },
+            )?;
 
         // The commitment being signed is shared across all shielded inputs.
         let txid_parts = tx_data.digest(TxIdDigester);
@@ -176,17 +149,25 @@ impl Authorization for Unbound {
 /// Errors that can occur while extracting a transaction from a PCZT.
 #[derive(Debug)]
 pub enum Error {
-    Global(GlobalError),
-    IncompatibleLockTimes,
     Orchard(OrchardError),
     Sapling(SaplingError),
     SaplingRequired,
     SighashMismatch,
     Transparent(TransparentError),
+    TxData(super::tx_data::Error),
 }
 
-#[derive(Debug)]
-pub enum GlobalError {
-    UnknownConsensusBranchId,
-    UnsupportedTxVersion { version: u32, version_group_id: u32 },
+impl From<super::tx_data::Error> for Error {
+    fn from(e: super::tx_data::Error) -> Self {
+        match e {
+            super::tx_data::Error::TransparentParse(e) => {
+                Error::Transparent(TransparentError::Parse(e))
+            }
+            super::tx_data::Error::SaplingParse(e) => Error::Sapling(SaplingError::Parse(e)),
+            super::tx_data::Error::OrchardParse(e) => Error::Orchard(OrchardError::Parse(e)),
+            other @ (super::tx_data::Error::IncompatibleLockTimes
+            | super::tx_data::Error::UnknownConsensusBranchId
+            | super::tx_data::Error::UnsupportedTxVersion { .. }) => Error::TxData(other),
+        }
+    }
 }
diff --git a/pczt/src/roles/tx_extractor/orchard.rs b/pczt/src/roles/tx_extractor/orchard.rs
index d359ee4596..755b9f36e8 100644
--- a/pczt/src/roles/tx_extractor/orchard.rs
+++ b/pczt/src/roles/tx_extractor/orchard.rs
@@ -1,17 +1,7 @@
-use orchard::{Bundle, bundle::Authorized, circuit::VerifyingKey, pczt::Unbound};
+use orchard::{Bundle, bundle::Authorized, circuit::VerifyingKey};
 use rand_core::OsRng;
 use zcash_protocol::value::ZatBalance;
 
-pub(super) fn extract_bundle(
-    bundle: crate::orchard::Bundle,
-) -> Result<Option<Bundle<Unbound, ZatBalance>>, OrchardError> {
-    bundle
-        .into_parsed()
-        .map_err(OrchardError::Parse)?
-        .extract()
-        .map_err(OrchardError::Extract)
-}
-
 pub(super) fn verify_bundle(
     bundle: &Bundle<Authorized, ZatBalance>,
     orchard_vk: Option<&VerifyingKey>,
diff --git a/pczt/src/roles/tx_extractor/sapling.rs b/pczt/src/roles/tx_extractor/sapling.rs
index e98db19c55..b265c88a9c 100644
--- a/pczt/src/roles/tx_extractor/sapling.rs
+++ b/pczt/src/roles/tx_extractor/sapling.rs
@@ -3,20 +3,9 @@ use sapling::{
     BatchValidator, Bundle,
     bundle::Authorized,
     circuit::{OutputVerifyingKey, SpendVerifyingKey},
-    pczt::Unbound,
 };
 use zcash_protocol::value::ZatBalance;
 
-pub(super) fn extract_bundle(
-    bundle: crate::sapling::Bundle,
-) -> Result<Option<Bundle<Unbound, ZatBalance>>, SaplingError> {
-    bundle
-        .into_parsed()
-        .map_err(SaplingError::Parse)?
-        .extract()
-        .map_err(SaplingError::Extract)
-}
-
 pub(super) fn verify_bundle(
     bundle: &Bundle<Authorized, ZatBalance>,
     spend_vk: &SpendVerifyingKey,
diff --git a/pczt/src/roles/tx_extractor/transparent.rs b/pczt/src/roles/tx_extractor/transparent.rs
index 5c291c1f8e..3dc6a51d46 100644
--- a/pczt/src/roles/tx_extractor/transparent.rs
+++ b/pczt/src/roles/tx_extractor/transparent.rs
@@ -1,18 +1,8 @@
 use transparent::{
-    bundle::{Authorization, Authorized, Bundle, MapAuth},
+    bundle::{Authorization, Authorized, MapAuth},
     pczt::{ParseError, TxExtractorError, Unbound},
 };
 
-pub(super) fn extract_bundle(
-    bundle: crate::transparent::Bundle,
-) -> Result<Option<Bundle<Unbound>>, TransparentError> {
-    bundle
-        .into_parsed()
-        .map_err(TransparentError::Parse)?
-        .extract()
-        .map_err(TransparentError::Extract)
-}
-
 pub(super) struct RemoveInputInfo;
 
 impl MapAuth<Unbound, Authorized> for RemoveInputInfo {

From 68954437cfac5d792f0c2195463558edbffab2a5 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Thu, 26 Feb 2026 22:10:24 -0700
Subject: [PATCH 211/263] pczt: Consolidate pczt_to_tx_data into
 Pczt::extract_tx_data

Moves pczt_to_tx_data from the tx_data module into a method on Pczt, and
eliminates the tx_data module entirely. All three consumer roles
(signer, io_finalizer, tx_extractor) now uniformly wrap a common
ExtractError error type instead of reproducing it in the variants
of each of those error types.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 pczt/CHANGELOG.md                          |  14 +-
 pczt/src/lib.rs                            | 186 ++++++++++++++++++---
 pczt/src/roles.rs                          |   3 -
 pczt/src/roles/io_finalizer/mod.rs         |  15 +-
 pczt/src/roles/signer/mod.rs               |  18 +-
 pczt/src/roles/tx_data.rs                  | 154 -----------------
 pczt/src/roles/tx_extractor/mod.rs         |  47 ++----
 pczt/src/roles/tx_extractor/orchard.rs     |   1 -
 pczt/src/roles/tx_extractor/sapling.rs     |   1 -
 pczt/src/roles/tx_extractor/transparent.rs |   3 +-
 10 files changed, 207 insertions(+), 235 deletions(-)
 delete mode 100644 pczt/src/roles/tx_data.rs

diff --git a/pczt/CHANGELOG.md b/pczt/CHANGELOG.md
index 43831b7285..9ebc18732b 100644
--- a/pczt/CHANGELOG.md
+++ b/pczt/CHANGELOG.md
@@ -12,6 +12,7 @@ workspace.
 
 ### Added
 - `pczt::ExtractError`
+- `pczt::EffectsOnly`
 - `pczt::roles::signer`:
   - `Signer::sighash`
   - `Signer::append_transparent_signature`
@@ -26,10 +27,19 @@ workspace.
   via `Extract(ExtractError)` instead of individual variants.
 - `pczt::roles::signer::Error` now wraps parse and extract errors
   via `Extract(ExtractError)` instead of individual variants.
+- `pczt::roles::tx_extractor::Error` now wraps parse and extract errors
+  via `Extract(ExtractError)` instead of `Global(GlobalError)`,
+  `IncompatibleLockTimes`, and protocol-specific `Parse` variants.
 
 ### Removed
-- `pczt::roles::tx_extractor::GlobalError` (replaced by
-  `pczt::roles::tx_extractor::Error::TxData`).
+- `pczt::roles::tx_extractor::GlobalError` (replaced by `pczt::ExtractError`).
+- `pczt::roles::tx_extractor::TransparentError::Parse` (parse errors now
+  flow through `pczt::ExtractError`).
+- `pczt::roles::tx_extractor::SaplingError::Parse` (parse errors now
+  flow through `pczt::ExtractError`).
+- `pczt::roles::tx_extractor::OrchardError::Parse` (parse errors now
+  flow through `pczt::ExtractError`).
+- `pczt::roles::signer::EffectsOnly` (use `pczt::EffectsOnly` instead).
 
 ## [0.4.1, 0.5.1] - 2026-02-26
 
diff --git a/pczt/src/lib.rs b/pczt/src/lib.rs
index 9a114e38cb..aea274f0aa 100644
--- a/pczt/src/lib.rs
+++ b/pczt/src/lib.rs
@@ -26,8 +26,27 @@ use alloc::vec::Vec;
 use getset::Getters;
 use serde::{Deserialize, Serialize};
 
+#[cfg(all(
+    any(feature = "io-finalizer", feature = "signer", feature = "tx-extractor"),
+    any(zcash_unstable = "nu7", zcash_unstable = "zfuture"),
+    feature = "zip-233",
+))]
+use zcash_protocol::value::Zatoshis;
+#[cfg(any(feature = "io-finalizer", feature = "signer", feature = "tx-extractor"))]
+use {
+    common::{Global, determine_lock_time},
+    zcash_primitives::transaction::{Authorization, TransactionData, TxVersion},
+    zcash_protocol::consensus::BranchId,
+    zcash_protocol::constants::{V5_TX_VERSION, V5_VERSION_GROUP_ID},
+};
+
 #[cfg(any(feature = "io-finalizer", feature = "signer"))]
-use {roles::tx_data::EffectsOnly, zcash_primitives::transaction::TransactionData};
+use {
+    blake2b_simd::Hash as Blake2bHash,
+    zcash_primitives::transaction::{
+        TxDigests, sighash::SignableInput, sighash_v5::v5_signature_hash,
+    },
+};
 
 pub mod roles;
 
@@ -88,11 +107,98 @@ impl Pczt {
         postcard::to_extend(self, bytes).expect("can serialize into memory")
     }
 
+    /// Parses this PCZT's bundles and constructs a `TransactionData` using caller-provided
+    /// bundle extraction closures.
+    ///
+    /// This handles bundle parsing, version validation, consensus branch ID parsing,
+    /// lock time computation, and final assembly, delegating bundle extraction to the
+    /// caller via closures that receive references to the parsed bundles.
+    #[cfg(any(feature = "io-finalizer", feature = "signer", feature = "tx-extractor"))]
+    pub(crate) fn extract_tx_data<A, E>(
+        self,
+        extract_transparent: impl FnOnce(
+            &::transparent::pczt::Bundle,
+        ) -> Result<
+            Option<::transparent::bundle::Bundle<A::TransparentAuth>>,
+            E,
+        >,
+        extract_sapling: impl FnOnce(
+            &::sapling::pczt::Bundle,
+        ) -> Result<
+            Option<::sapling::Bundle<A::SaplingAuth, zcash_protocol::value::ZatBalance>>,
+            E,
+        >,
+        extract_orchard: impl FnOnce(
+            &::orchard::pczt::Bundle,
+        ) -> Result<
+            Option<::orchard::Bundle<A::OrchardAuth, zcash_protocol::value::ZatBalance>>,
+            E,
+        >,
+    ) -> Result<ParsedPczt<A>, E>
+    where
+        A: Authorization,
+        E: From<ExtractError>,
+    {
+        let Pczt {
+            global,
+            transparent,
+            sapling,
+            orchard,
+        } = self;
+
+        let transparent = transparent
+            .into_parsed()
+            .map_err(ExtractError::TransparentParse)?;
+        let sapling = sapling.into_parsed().map_err(ExtractError::SaplingParse)?;
+        let orchard = orchard.into_parsed().map_err(ExtractError::OrchardParse)?;
+
+        let version = match (global.tx_version, global.version_group_id) {
+            (V5_TX_VERSION, V5_VERSION_GROUP_ID) => Ok(TxVersion::V5),
+            (version, version_group_id) => Err(ExtractError::UnsupportedTxVersion {
+                version,
+                version_group_id,
+            }),
+        }?;
+
+        let consensus_branch_id = BranchId::try_from(global.consensus_branch_id)
+            .map_err(|_| ExtractError::UnknownConsensusBranchId)?;
+
+        let lock_time = determine_lock_time(&global, transparent.inputs())
+            .ok_or(ExtractError::IncompatibleLockTimes)?;
+
+        let transparent_bundle = extract_transparent(&transparent)?;
+        let sapling_bundle = extract_sapling(&sapling)?;
+        let orchard_bundle = extract_orchard(&orchard)?;
+
+        let tx_data = TransactionData::from_parts(
+            version,
+            consensus_branch_id,
+            lock_time,
+            global.expiry_height.into(),
+            #[cfg(all(
+                any(zcash_unstable = "nu7", zcash_unstable = "zfuture"),
+                feature = "zip-233"
+            ))]
+            Zatoshis::ZERO,
+            transparent_bundle,
+            None,
+            sapling_bundle,
+            orchard_bundle,
+        );
+
+        Ok(ParsedPczt {
+            global,
+            transparent,
+            sapling,
+            orchard,
+            tx_data,
+        })
+    }
+
     /// Gets the effects of this transaction.
     #[cfg(any(feature = "io-finalizer", feature = "signer"))]
     pub fn into_effects(self) -> Result<TransactionData<EffectsOnly>, ExtractError> {
-        roles::tx_data::pczt_to_tx_data(
-            self,
+        self.extract_tx_data(
             |t| {
                 t.extract_effects()
                     .map_err(ExtractError::TransparentExtract)
@@ -104,31 +210,73 @@ impl Pczt {
     }
 }
 
-/// Errors that can occur while extracting effects-only transaction data from a PCZT.
+/// The result of parsing a PCZT and constructing its `TransactionData`.
+#[cfg(any(feature = "io-finalizer", feature = "signer", feature = "tx-extractor"))]
+#[cfg_attr(
+    not(any(feature = "io-finalizer", feature = "signer")),
+    allow(dead_code)
+)]
+pub(crate) struct ParsedPczt<A: Authorization> {
+    pub(crate) global: Global,
+    pub(crate) transparent: ::transparent::pczt::Bundle,
+    pub(crate) sapling: ::sapling::pczt::Bundle,
+    pub(crate) orchard: ::orchard::pczt::Bundle,
+    pub(crate) tx_data: TransactionData<A>,
+}
+
 #[cfg(any(feature = "io-finalizer", feature = "signer"))]
+pub struct EffectsOnly;
+
+#[cfg(any(feature = "io-finalizer", feature = "signer"))]
+impl Authorization for EffectsOnly {
+    type TransparentAuth = ::transparent::bundle::EffectsOnly;
+    type SaplingAuth = ::sapling::bundle::EffectsOnly;
+    type OrchardAuth = ::orchard::bundle::EffectsOnly;
+    #[cfg(zcash_unstable = "zfuture")]
+    type TzeAuth = core::convert::Infallible;
+}
+
+/// Helper to produce the correct sighash for a PCZT.
+///
+/// At present, only V5 transaction signature hashes are supported, and a version check *MUST* be
+/// performed prior to invoking this function. It is intended for use exclusively for use in the
+/// context of a callback to the `extract_tx_data` function, which performs this check.
+#[cfg(any(feature = "io-finalizer", feature = "signer"))]
+pub(crate) fn sighash(
+    tx_data: &TransactionData<EffectsOnly>,
+    signable_input: &SignableInput,
+    txid_parts: &TxDigests<Blake2bHash>,
+) -> [u8; 32] {
+    // TODO: Pick sighash based on tx version
+    v5_signature_hash(tx_data, signable_input, txid_parts)
+        .as_ref()
+        .try_into()
+        .expect("correct length")
+}
+
+/// Errors that can occur while parsing PCZT bundles and extracting transaction data.
+#[cfg(any(feature = "io-finalizer", feature = "signer", feature = "tx-extractor"))]
 #[derive(Debug)]
+#[non_exhaustive]
 pub enum ExtractError {
+    /// The PCZT's transparent inputs have incompatible lock time requirements.
+    IncompatibleLockTimes,
+    /// An error occurred extracting the Orchard protocol bundle from the Orchard PCZT bundle.
     OrchardExtract(::orchard::pczt::TxExtractorError),
+    /// An error occurred parsing the Orchard PCZT bundle from the PCZT data.
     OrchardParse(::orchard::pczt::ParseError),
+    /// An error occurred extracting the Sapling protocol bundle from the Sapling PCZT bundle.
     SaplingExtract(::sapling::pczt::TxExtractorError),
+    /// An error occurred parsing the Sapling PCZT bundle from the PCZT data.
     SaplingParse(::sapling::pczt::ParseError),
+    /// An error occurred extracting the transparent protocol bundle from the transparent PCZT bundle.
     TransparentExtract(::transparent::pczt::TxExtractorError),
+    /// An error occurred parsing the transparent PCZT bundle from the PCZT data.
     TransparentParse(::transparent::pczt::ParseError),
-    TxData(roles::tx_data::Error),
-}
-
-#[cfg(any(feature = "io-finalizer", feature = "signer"))]
-impl From<roles::tx_data::Error> for ExtractError {
-    fn from(e: roles::tx_data::Error) -> Self {
-        match e {
-            roles::tx_data::Error::TransparentParse(e) => ExtractError::TransparentParse(e),
-            roles::tx_data::Error::SaplingParse(e) => ExtractError::SaplingParse(e),
-            roles::tx_data::Error::OrchardParse(e) => ExtractError::OrchardParse(e),
-            other @ (roles::tx_data::Error::IncompatibleLockTimes
-            | roles::tx_data::Error::UnknownConsensusBranchId
-            | roles::tx_data::Error::UnsupportedTxVersion { .. }) => ExtractError::TxData(other),
-        }
-    }
+    /// The consensus branch ID requested by the PCZT does not correspond to a known network upgrade.
+    UnknownConsensusBranchId,
+    /// The PCZT specifies an unsupported transaction version.
+    UnsupportedTxVersion { version: u32, version_group_id: u32 },
 }
 
 /// Errors that can occur while parsing a PCZT.
diff --git a/pczt/src/roles.rs b/pczt/src/roles.rs
index 0ea132f8d7..a2e9d58236 100644
--- a/pczt/src/roles.rs
+++ b/pczt/src/roles.rs
@@ -10,9 +10,6 @@
 
 pub mod creator;
 
-#[cfg(any(feature = "io-finalizer", feature = "signer", feature = "tx-extractor"))]
-pub(crate) mod tx_data;
-
 #[cfg(feature = "io-finalizer")]
 pub mod io_finalizer;
 
diff --git a/pczt/src/roles/io_finalizer/mod.rs b/pczt/src/roles/io_finalizer/mod.rs
index cc2b585ec1..1419f073d7 100644
--- a/pczt/src/roles/io_finalizer/mod.rs
+++ b/pczt/src/roles/io_finalizer/mod.rs
@@ -6,13 +6,13 @@
 use rand_core::OsRng;
 use zcash_primitives::transaction::{sighash::SignableInput, txid::TxIdDigester};
 
-use super::tx_data::{pczt_to_tx_data, sighash};
 use crate::{
-    ExtractError, Pczt,
+    ExtractError, ParsedPczt, Pczt,
     common::{
         FLAG_SHIELDED_MODIFIABLE, FLAG_TRANSPARENT_INPUTS_MODIFIABLE,
         FLAG_TRANSPARENT_OUTPUTS_MODIFIABLE,
     },
+    sighash,
 };
 
 pub struct IoFinalizer {
@@ -43,14 +43,13 @@ impl IoFinalizer {
             return Err(Error::NoOutputs);
         }
 
-        let super::tx_data::ParsedPczt {
+        let ParsedPczt {
             mut global,
             transparent,
             mut sapling,
             mut orchard,
             tx_data,
-        } = pczt_to_tx_data(
-            pczt,
+        } = pczt.extract_tx_data(
             |t| {
                 t.extract_effects()
                     .map_err(ExtractError::TransparentExtract)
@@ -100,9 +99,3 @@ impl From<crate::ExtractError> for Error {
         Error::Extract(e)
     }
 }
-
-impl From<super::tx_data::Error> for Error {
-    fn from(e: super::tx_data::Error) -> Self {
-        Error::Extract(crate::ExtractError::from(e))
-    }
-}
diff --git a/pczt/src/roles/signer/mod.rs b/pczt/src/roles/signer/mod.rs
index cd73d62d8b..4235a3b473 100644
--- a/pczt/src/roles/signer/mod.rs
+++ b/pczt/src/roles/signer/mod.rs
@@ -23,16 +23,15 @@ use zcash_primitives::transaction::{
 };
 
 use crate::{
-    Pczt,
+    ExtractError, ParsedPczt, Pczt,
     common::{
         FLAG_HAS_SIGHASH_SINGLE, FLAG_SHIELDED_MODIFIABLE, FLAG_TRANSPARENT_INPUTS_MODIFIABLE,
         FLAG_TRANSPARENT_OUTPUTS_MODIFIABLE, Global,
     },
 };
 
-pub use super::tx_data::EffectsOnly;
-use super::tx_data::{pczt_to_tx_data, sighash};
-use crate::ExtractError;
+pub use crate::EffectsOnly;
+use crate::sighash;
 
 pub struct Signer {
     global: Global,
@@ -49,14 +48,13 @@ pub struct Signer {
 impl Signer {
     /// Instantiates the Signer role with the given PCZT.
     pub fn new(pczt: Pczt) -> Result<Self, Error> {
-        let super::tx_data::ParsedPczt {
+        let ParsedPczt {
             global,
             transparent,
             sapling,
             orchard,
             tx_data,
-        } = pczt_to_tx_data(
-            pczt,
+        } = pczt.extract_tx_data(
             |t| {
                 t.extract_effects()
                     .map_err(ExtractError::TransparentExtract)
@@ -360,9 +358,3 @@ impl From<crate::ExtractError> for Error {
         Error::Extract(e)
     }
 }
-
-impl From<super::tx_data::Error> for Error {
-    fn from(e: super::tx_data::Error) -> Self {
-        Error::Extract(crate::ExtractError::from(e))
-    }
-}
diff --git a/pczt/src/roles/tx_data.rs b/pczt/src/roles/tx_data.rs
deleted file mode 100644
index e560dfd6ee..0000000000
--- a/pczt/src/roles/tx_data.rs
+++ /dev/null
@@ -1,154 +0,0 @@
-//! Shared utilities for extracting transaction data from a PCZT.
-
-use crate::Pczt;
-use crate::common::{Global, determine_lock_time};
-
-use zcash_primitives::transaction::{Authorization, TransactionData, TxVersion};
-use zcash_protocol::consensus::BranchId;
-use zcash_protocol::constants::{V5_TX_VERSION, V5_VERSION_GROUP_ID};
-#[cfg(all(
-    any(zcash_unstable = "nu7", zcash_unstable = "zfuture"),
-    feature = "zip-233"
-))]
-use zcash_protocol::value::Zatoshis;
-
-#[cfg(any(feature = "io-finalizer", feature = "signer"))]
-use blake2b_simd::Hash as Blake2bHash;
-#[cfg(any(feature = "io-finalizer", feature = "signer"))]
-use zcash_primitives::transaction::{
-    TxDigests, sighash::SignableInput, sighash_v5::v5_signature_hash,
-};
-
-/// The result of parsing a PCZT and constructing its `TransactionData`.
-#[cfg_attr(
-    not(any(feature = "io-finalizer", feature = "signer")),
-    allow(dead_code)
-)]
-pub(crate) struct ParsedPczt<A: Authorization> {
-    pub(crate) global: Global,
-    pub(crate) transparent: transparent::pczt::Bundle,
-    pub(crate) sapling: sapling::pczt::Bundle,
-    pub(crate) orchard: orchard::pczt::Bundle,
-    pub(crate) tx_data: TransactionData<A>,
-}
-
-/// Parses a PCZT's bundles and constructs a `TransactionData` using caller-provided
-/// bundle extraction closures.
-///
-/// This handles bundle parsing, version validation, consensus branch ID parsing,
-/// lock time computation, and final assembly, delegating bundle extraction to the
-/// caller via closures that receive references to the parsed bundles.
-pub(crate) fn pczt_to_tx_data<A, E>(
-    pczt: Pczt,
-    extract_transparent: impl FnOnce(
-        &transparent::pczt::Bundle,
-    ) -> Result<
-        Option<transparent::bundle::Bundle<A::TransparentAuth>>,
-        E,
-    >,
-    extract_sapling: impl FnOnce(
-        &sapling::pczt::Bundle,
-    ) -> Result<
-        Option<sapling::Bundle<A::SaplingAuth, zcash_protocol::value::ZatBalance>>,
-        E,
-    >,
-    extract_orchard: impl FnOnce(
-        &orchard::pczt::Bundle,
-    ) -> Result<
-        Option<orchard::Bundle<A::OrchardAuth, zcash_protocol::value::ZatBalance>>,
-        E,
-    >,
-) -> Result<ParsedPczt<A>, E>
-where
-    A: Authorization,
-    E: From<Error>,
-{
-    let Pczt {
-        global,
-        transparent,
-        sapling,
-        orchard,
-    } = pczt;
-
-    let transparent = transparent.into_parsed().map_err(Error::TransparentParse)?;
-    let sapling = sapling.into_parsed().map_err(Error::SaplingParse)?;
-    let orchard = orchard.into_parsed().map_err(Error::OrchardParse)?;
-
-    let version = match (global.tx_version, global.version_group_id) {
-        (V5_TX_VERSION, V5_VERSION_GROUP_ID) => Ok(TxVersion::V5),
-        (version, version_group_id) => Err(Error::UnsupportedTxVersion {
-            version,
-            version_group_id,
-        }),
-    }?;
-
-    let consensus_branch_id = BranchId::try_from(global.consensus_branch_id)
-        .map_err(|_| Error::UnknownConsensusBranchId)?;
-
-    let lock_time =
-        determine_lock_time(&global, transparent.inputs()).ok_or(Error::IncompatibleLockTimes)?;
-
-    let transparent_bundle = extract_transparent(&transparent)?;
-    let sapling_bundle = extract_sapling(&sapling)?;
-    let orchard_bundle = extract_orchard(&orchard)?;
-
-    let tx_data = TransactionData::from_parts(
-        version,
-        consensus_branch_id,
-        lock_time,
-        global.expiry_height.into(),
-        #[cfg(all(
-            any(zcash_unstable = "nu7", zcash_unstable = "zfuture"),
-            feature = "zip-233"
-        ))]
-        Zatoshis::ZERO,
-        transparent_bundle,
-        None,
-        sapling_bundle,
-        orchard_bundle,
-    );
-
-    Ok(ParsedPczt {
-        global,
-        transparent,
-        sapling,
-        orchard,
-        tx_data,
-    })
-}
-
-#[cfg(any(feature = "io-finalizer", feature = "signer"))]
-pub struct EffectsOnly;
-
-#[cfg(any(feature = "io-finalizer", feature = "signer"))]
-impl Authorization for EffectsOnly {
-    type TransparentAuth = transparent::bundle::EffectsOnly;
-    type SaplingAuth = sapling::bundle::EffectsOnly;
-    type OrchardAuth = orchard::bundle::EffectsOnly;
-    #[cfg(zcash_unstable = "zfuture")]
-    type TzeAuth = core::convert::Infallible;
-}
-
-/// Helper to produce the correct sighash for a PCZT.
-#[cfg(any(feature = "io-finalizer", feature = "signer"))]
-pub(crate) fn sighash(
-    tx_data: &TransactionData<EffectsOnly>,
-    signable_input: &SignableInput,
-    txid_parts: &TxDigests<Blake2bHash>,
-) -> [u8; 32] {
-    v5_signature_hash(tx_data, signable_input, txid_parts)
-        .as_ref()
-        .try_into()
-        .expect("correct length")
-}
-
-/// Errors that can occur while parsing and constructing transaction data from PCZT fields.
-#[derive(Debug)]
-pub enum Error {
-    IncompatibleLockTimes,
-    OrchardParse(orchard::pczt::ParseError),
-    SaplingParse(sapling::pczt::ParseError),
-    TransparentParse(transparent::pczt::ParseError),
-    UnknownConsensusBranchId,
-    UnsupportedTxVersion { version: u32, version_group_id: u32 },
-}
diff --git a/pczt/src/roles/tx_extractor/mod.rs b/pczt/src/roles/tx_extractor/mod.rs
index 8e724deaac..0b32541198 100644
--- a/pczt/src/roles/tx_extractor/mod.rs
+++ b/pczt/src/roles/tx_extractor/mod.rs
@@ -76,22 +76,20 @@ impl<'a> TransactionExtractor<'a> {
             _unused,
         } = self;
 
-        let super::tx_data::ParsedPczt { tx_data, .. } =
-            super::tx_data::pczt_to_tx_data::<Unbound, Error>(
-                pczt,
-                |t| {
-                    t.extract()
-                        .map_err(|e| Error::Transparent(TransparentError::Extract(e)))
-                },
-                |s| {
-                    s.extract()
-                        .map_err(|e| Error::Sapling(SaplingError::Extract(e)))
-                },
-                |o| {
-                    o.extract()
-                        .map_err(|e| Error::Orchard(OrchardError::Extract(e)))
-                },
-            )?;
+        let crate::ParsedPczt { tx_data, .. } = pczt.extract_tx_data::<Unbound, Error>(
+            |t| {
+                t.extract()
+                    .map_err(|e| Error::Transparent(TransparentError::Extract(e)))
+            },
+            |s| {
+                s.extract()
+                    .map_err(|e| Error::Sapling(SaplingError::Extract(e)))
+            },
+            |o| {
+                o.extract()
+                    .map_err(|e| Error::Orchard(OrchardError::Extract(e)))
+            },
+        )?;
 
         // The commitment being signed is shared across all shielded inputs.
         let txid_parts = tx_data.digest(TxIdDigester);
@@ -149,25 +147,16 @@ impl Authorization for Unbound {
 /// Errors that can occur while extracting a transaction from a PCZT.
 #[derive(Debug)]
 pub enum Error {
+    Extract(crate::ExtractError),
     Orchard(OrchardError),
     Sapling(SaplingError),
     SaplingRequired,
     SighashMismatch,
     Transparent(TransparentError),
-    TxData(super::tx_data::Error),
 }
 
-impl From<super::tx_data::Error> for Error {
-    fn from(e: super::tx_data::Error) -> Self {
-        match e {
-            super::tx_data::Error::TransparentParse(e) => {
-                Error::Transparent(TransparentError::Parse(e))
-            }
-            super::tx_data::Error::SaplingParse(e) => Error::Sapling(SaplingError::Parse(e)),
-            super::tx_data::Error::OrchardParse(e) => Error::Orchard(OrchardError::Parse(e)),
-            other @ (super::tx_data::Error::IncompatibleLockTimes
-            | super::tx_data::Error::UnknownConsensusBranchId
-            | super::tx_data::Error::UnsupportedTxVersion { .. }) => Error::TxData(other),
-        }
+impl From<crate::ExtractError> for Error {
+    fn from(e: crate::ExtractError) -> Self {
+        Error::Extract(e)
     }
 }
diff --git a/pczt/src/roles/tx_extractor/orchard.rs b/pczt/src/roles/tx_extractor/orchard.rs
index 755b9f36e8..a0df2f1aee 100644
--- a/pczt/src/roles/tx_extractor/orchard.rs
+++ b/pczt/src/roles/tx_extractor/orchard.rs
@@ -32,5 +32,4 @@ pub(super) fn verify_bundle(
 pub enum OrchardError {
     Extract(orchard::pczt::TxExtractorError),
     InvalidProof,
-    Parse(orchard::pczt::ParseError),
 }
diff --git a/pczt/src/roles/tx_extractor/sapling.rs b/pczt/src/roles/tx_extractor/sapling.rs
index b265c88a9c..6e55e41a98 100644
--- a/pczt/src/roles/tx_extractor/sapling.rs
+++ b/pczt/src/roles/tx_extractor/sapling.rs
@@ -30,5 +30,4 @@ pub enum SaplingError {
     ConsensusRuleViolation,
     Extract(sapling::pczt::TxExtractorError),
     InvalidProofsOrSignatures,
-    Parse(sapling::pczt::ParseError),
 }
diff --git a/pczt/src/roles/tx_extractor/transparent.rs b/pczt/src/roles/tx_extractor/transparent.rs
index 3dc6a51d46..9b98dcb642 100644
--- a/pczt/src/roles/tx_extractor/transparent.rs
+++ b/pczt/src/roles/tx_extractor/transparent.rs
@@ -1,6 +1,6 @@
 use transparent::{
     bundle::{Authorization, Authorized, MapAuth},
-    pczt::{ParseError, TxExtractorError, Unbound},
+    pczt::{TxExtractorError, Unbound},
 };
 
 pub(super) struct RemoveInputInfo;
@@ -21,5 +21,4 @@ impl MapAuth<Unbound, Authorized> for RemoveInputInfo {
 #[derive(Debug)]
 pub enum TransparentError {
     Extract(TxExtractorError),
-    Parse(ParseError),
 }

From 719f78a6c1ceeafc3d4b128bff5257bcbd4b89c1 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Wed, 4 Mar 2026 16:27:41 -0700
Subject: [PATCH 212/263] zip321: Return Result<Self, PaymentError> from
 Payment::new

Changes `Payment::new` to return `Result<Self, PaymentError>` instead of
`Option<Self>`, giving callers a meaningful error when payment construction
fails. The new `PaymentError` enum distinguishes between sending a memo to
a transparent recipient and creating a zero-valued transparent output.

Closes #1794.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 components/zip321/CHANGELOG.md                | 11 +++-
 components/zip321/src/lib.rs                  | 52 ++++++++++++++++---
 zcash_client_backend/CHANGELOG.md             |  3 ++
 zcash_client_backend/src/data_api/error.rs    |  9 ++--
 .../src/data_api/testing/pool.rs              |  4 +-
 zcash_client_backend/src/data_api/wallet.rs   |  6 +--
 .../src/data_api/wallet/input_selection.rs    |  8 +--
 7 files changed, 68 insertions(+), 25 deletions(-)

diff --git a/components/zip321/CHANGELOG.md b/components/zip321/CHANGELOG.md
index 1a89e3d27b..5383321cc2 100644
--- a/components/zip321/CHANGELOG.md
+++ b/components/zip321/CHANGELOG.md
@@ -10,8 +10,16 @@ workspace.
 
 ## [0.7.0] - PENDING
 
+### Added
+- `zip321::PaymentError` enum for errors in constructing a `Payment`.
+- `zip321::PaymentError::with_index` method to convert a `PaymentError` into a
+  `Zip321Error` with an associated payment index.
+
 ### Changed
 - MSRV is now 1.85.1.
+- `zip321::Payment::new` now returns `Result<Self, PaymentError>` instead of
+  `Option<Self>`, providing a meaningful error when a memo is sent to a
+  transparent recipient or a zero-valued output is sent to a transparent address.
 - `zip321::Payment::amount` now returns `Option<Zatoshis>` instead of `Zatoshis`.
   Previously, the amount field of the payment would be set to zero if no amount
   parameter was present; however, this behavior is not specified by ZIP 321.
@@ -19,8 +27,7 @@ workspace.
   specified by a payment request, this should be interpreted to mean that the
   sender of the transaction should specify an amount for the payment.
 - `zip321::Payment::new` now takes its `amount` parameter as `Option<Zatoshis>`
-  instead of `Zatoshis`. It now returns `None` if the payment requests that a
-  zero-valued output OR a memo be sent to a transparent-only address.
+  instead of `Zatoshis`.
 - `zip321::Zip321Error` has added variant `Zip321Error::ZeroValuedTransparentOutput`.
   Zero-valued transparent outputs are rejected by the Zcash consensus rules,
   and so payments to transparent addresses with the `amount` parameter explicitly
diff --git a/components/zip321/src/lib.rs b/components/zip321/src/lib.rs
index 9e46e95346..a3b57ac5e6 100644
--- a/components/zip321/src/lib.rs
+++ b/components/zip321/src/lib.rs
@@ -23,6 +23,44 @@ use zcash_protocol::{
     value::Zatoshis,
 };
 
+/// Errors that may be produced in constructing a [`Payment`].
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum PaymentError {
+    /// A memo was provided for a recipient address that cannot receive a memo.
+    TransparentMemo,
+    /// A zero-valued output was requested for a transparent recipient address, which is
+    /// disallowed by the Zcash consensus rules.
+    ZeroValuedTransparentOutput,
+}
+
+impl Display for PaymentError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            PaymentError::TransparentMemo => {
+                write!(f, "Cannot send a memo to a transparent recipient address")
+            }
+            PaymentError::ZeroValuedTransparentOutput => write!(
+                f,
+                "Zero-valued transparent outputs are disallowed by consensus"
+            ),
+        }
+    }
+}
+
+impl std::error::Error for PaymentError {}
+
+impl PaymentError {
+    /// Adds a payment index to this error to produce a [`Zip321Error`].
+    pub fn with_index(self, index: usize) -> Zip321Error {
+        match self {
+            PaymentError::TransparentMemo => Zip321Error::TransparentMemo(index),
+            PaymentError::ZeroValuedTransparentOutput => {
+                Zip321Error::ZeroValuedTransparentOutput(index)
+            }
+        }
+    }
+}
+
 /// Errors that may be produced in decoding of payment requests.
 #[derive(Debug, Clone, PartialEq, Eq)]
 #[non_exhaustive]
@@ -157,7 +195,7 @@ impl Payment {
     ///   purpose of this payment within the larger structure of the transaction request.
     /// - `other_params`: A list of other arbitrary key/value pairs associated with this payment.
     ///
-    /// Returns `None` if the payment requests that a memo be sent to a recipient that cannot
+    /// Returns an error if the payment requests that a memo be sent to a recipient that cannot
     /// receive a memo or a zero-valued output be sent to a transparent address.
     pub fn new(
         recipient_address: ZcashAddress,
@@ -166,13 +204,13 @@ impl Payment {
         label: Option<String>,
         message: Option<String>,
         other_params: Vec<(String, String)>,
-    ) -> Option<Self> {
-        if (recipient_address.is_transparent_only() && amount == Some(Zatoshis::ZERO))
-            || (memo.is_some() && !recipient_address.can_receive_memo())
-        {
-            None
+    ) -> Result<Self, PaymentError> {
+        if memo.is_some() && !recipient_address.can_receive_memo() {
+            Err(PaymentError::TransparentMemo)
+        } else if recipient_address.is_transparent_only() && amount == Some(Zatoshis::ZERO) {
+            Err(PaymentError::ZeroValuedTransparentOutput)
         } else {
-            Some(Self {
+            Ok(Self {
                 recipient_address,
                 amount,
                 memo,
diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index afbeaeaec7..a2da368f6a 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -33,6 +33,9 @@ workspace.
   - `impl From<orchard::Note> for Note`
 
 ### Changed
+- `zcash_client_backend::data_api::error::Error::MemoForbidden` has been replaced
+  by `Error::Payment(zip321::PaymentError)`, which can represent both memo-to-transparent
+  and zero-valued-transparent-output errors.
 - `zcash_client_backend::data_api::wallet::create_proposed_transactions` now takes
   an additional `proposed_version: Option<TxVersion>` parameter under the `unstable`
   feature flag, allowing callers to request a specific transaction version.
diff --git a/zcash_client_backend/src/data_api/error.rs b/zcash_client_backend/src/data_api/error.rs
index 83025398ff..fb28cf45da 100644
--- a/zcash_client_backend/src/data_api/error.rs
+++ b/zcash_client_backend/src/data_api/error.rs
@@ -72,8 +72,8 @@ pub enum Error<DataSourceError, CommitmentTreeError, SelectionError, FeeError, C
     /// An error occurred building a new transaction.
     Builder(builder::Error<FeeError>),
 
-    /// It is forbidden to provide a memo when constructing a transparent output.
-    MemoForbidden,
+    /// An error occurred constructing a payment for the transaction.
+    Payment(zip321::PaymentError),
 
     /// Attempted to send change to an unsupported pool.
     ///
@@ -211,10 +211,7 @@ where
             ),
             Error::ScanRequired => write!(f, "Must scan blocks first"),
             Error::Builder(e) => write!(f, "An error occurred building the transaction: {e}"),
-            Error::MemoForbidden => write!(
-                f,
-                "It is not possible to send a memo to a transparent address."
-            ),
+            Error::Payment(e) => write!(f, "An error occurred constructing a payment: {e}"),
             Error::UnsupportedChangeType(t) => write!(
                 f,
                 "Attempted to send change to an unsupported pool type: {t}"
diff --git a/zcash_client_backend/src/data_api/testing/pool.rs b/zcash_client_backend/src/data_api/testing/pool.rs
index f45fa42ae4..5c604cf553 100644
--- a/zcash_client_backend/src/data_api/testing/pool.rs
+++ b/zcash_client_backend/src/data_api/testing/pool.rs
@@ -787,7 +787,9 @@ pub fn fails_to_send_max_spendable_to_transparent_with_memo<T: ShieldedPoolTeste
             MaxSpendMode::Everything,
             ConfirmationsPolicy::MIN
         ),
-        Err(data_api::error::Error::MemoForbidden)
+        Err(data_api::error::Error::Payment(
+            zip321::PaymentError::TransparentMemo
+        ))
     );
 }
 
diff --git a/zcash_client_backend/src/data_api/wallet.rs b/zcash_client_backend/src/data_api/wallet.rs
index 1517825aec..6adec1562d 100644
--- a/zcash_client_backend/src/data_api/wallet.rs
+++ b/zcash_client_backend/src/data_api/wallet.rs
@@ -716,7 +716,7 @@ where
             None,
             vec![],
         )
-        .ok_or(Error::MemoForbidden)?,
+        .map_err(Error::Payment)?,
     ])
     .expect(
         "It should not be possible for this to violate ZIP 321 request construction invariants.",
@@ -774,7 +774,7 @@ where
         .ok_or_else(|| Error::from(InputSelectorError::SyncRequired))?;
 
     if memo.is_some() && !recipient.can_receive_memo() {
-        return Err(Error::MemoForbidden);
+        return Err(Error::Payment(zip321::PaymentError::TransparentMemo));
     }
 
     let proposal = propose_send_max(
@@ -1472,7 +1472,7 @@ where
              to: TransparentAddress|
              -> Result<(), CreateErrT<DbT, InputsErrT, FeeRuleT, ChangeErrT, N>> {
                 if payment.memo().is_some() {
-                    return Err(Error::MemoForbidden);
+                    return Err(Error::Payment(zip321::PaymentError::TransparentMemo));
                 }
                 builder.add_transparent_output(&to, payment_amount)?;
                 transparent_output_meta.push((
diff --git a/zcash_client_backend/src/data_api/wallet/input_selection.rs b/zcash_client_backend/src/data_api/wallet/input_selection.rs
index f7e6c87aa7..a4f416790f 100644
--- a/zcash_client_backend/src/data_api/wallet/input_selection.rs
+++ b/zcash_client_backend/src/data_api/wallet/input_selection.rs
@@ -471,7 +471,7 @@ impl<DbT: InputSource> InputSelector for GreedyInputSelector<DbT> {
                             payment.message().cloned(),
                             payment.other_params().to_vec(),
                         )
-                        .expect("cannot fail because memo is None"),
+                        .expect("cannot fail because memo is None and amount is nonzero"),
                     );
                     total_ephemeral = (total_ephemeral + payment_amount)
                         .ok_or(GreedyInputSelectorError::Balance(BalanceError::Overflow))?;
@@ -924,11 +924,7 @@ where
         None,
         vec![],
     )
-    .ok_or_else(|| {
-        InputSelectorError::Proposal(ProposalError::Zip321(zip321::Zip321Error::TransparentMemo(
-            0,
-        )))
-    })?;
+    .map_err(|e| InputSelectorError::Proposal(ProposalError::Zip321(e.with_index(0))))?;
 
     let transaction_request =
         TransactionRequest::new(vec![payment.clone()]).map_err(|payment_error| {

From 2c4f0ce89788826537ba0540a6276c908bf3bf2b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Mar 2026 05:39:19 +0000
Subject: [PATCH 213/263] build(deps): bump zizmorcore/zizmor-action from 0.5.0
 to 0.5.2

Bumps [zizmorcore/zizmor-action](https://github.com/zizmorcore/zizmor-action) from 0.5.0 to 0.5.2.
- [Release notes](https://github.com/zizmorcore/zizmor-action/releases)
- [Commits](https://github.com/zizmorcore/zizmor-action/compare/0dce2577a4760a2749d8cfb7a84b7d5585ebcb7d...71321a20a9ded102f6e9ce5718a2fcec2c4f70d8)

---
updated-dependencies:
- dependency-name: zizmorcore/zizmor-action
  dependency-version: 0.5.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/zizmor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml
index c782955fe2..9a54d4c923 100644
--- a/.github/workflows/zizmor.yml
+++ b/.github/workflows/zizmor.yml
@@ -21,4 +21,4 @@ jobs:
           persist-credentials: false
 
       - name: Run zizmor 🌈
-        uses: zizmorcore/zizmor-action@0dce2577a4760a2749d8cfb7a84b7d5585ebcb7d # v0.5.0
+        uses: zizmorcore/zizmor-action@71321a20a9ded102f6e9ce5718a2fcec2c4f70d8 # v0.5.2

From 39355cd05282d39ae3f9e54e6267aa9628a81641 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Mon, 16 Feb 2026 13:41:26 +1300
Subject: [PATCH 214/263] chore: AGENTS.md file

Co-authored-by: Kris Nuttycombe <kris.nuttycombe@gmail.com>
Co-authored-by: Daira-Emma Hopwood <daira@jacaranda.org>
Co-authored-by: Jack Grigg <thestr4d@gmail.com>
---
 AGENTS.md | 345 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 345 insertions(+)
 create mode 100644 AGENTS.md

diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 0000000000..bd49d955e9
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,345 @@
+# Zcash Rust crates - Agent Guidelines
+
+> This file is read by AI coding agents (Claude Code, GitHub Copilot, Cursor, Devin, etc.).
+> It provides project context and contribution policies.
+>
+> For the full contribution guide, see [CONTRIBUTING.md](CONTRIBUTING.md).
+
+This is a Rust workspace of cryptographic library crates for the Zcash protocol.
+Our priorities are **security, performance, and convenience** — in that order.
+Rigor is highly valued throughout the codebase.
+
+Many people depend on these libraries and we prefer to "do it right" the first time,
+then "make it fast".
+
+## MUST READ FIRST — CONTRIBUTION GATE (DO NOT SKIP)
+
+**STOP. Do not open or draft a PR until this gate is satisfied.**
+
+For any contribution that might become a PR, the agent must ask the user these checks
+first:
+
+- "PR COMPLIANCE CHECK: Have you discussed this change with the librustzcash team in a
+  GitHub issue?"
+- "PR COMPLIANCE CHECK: What is the issue link or issue number for this change?"
+- "PR COMPLIANCE CHECK: Has a librustzcash team member responded to that issue
+  acknowledging the proposed work?"
+
+This PR compliance check must be the agent's first reply in contribution-focused sessions.
+
+**An issue existing is not enough.** The issue must have a response or acknowledgment from
+a team member (a maintainer). An issue with no team response does not satisfy this gate.
+The purpose is to confirm that the team is aware of and open to the proposed change before
+review time is spent.
+
+If the user cannot provide prior discussion with team acknowledgment:
+
+- Do not open a PR.
+- Offer to help create or refine the issue first.
+- Remind the user to wait for a team member to respond before starting work.
+- If the user still wants code changes, keep work local and explicitly remind them the PR
+  will likely be closed without prior team discussion.
+
+This gate is mandatory for all agents, **unless the user is a repository maintainer** as
+described in the next subsection.
+
+### Maintainer Bypass
+
+If `gh` CLI is authenticated, the agent can check maintainer status:
+
+```bash
+gh api repos/zcash/librustzcash --jq '.permissions | .admin or .maintain or .push'
+```
+
+If this returns `true`, the user has write access (or higher) and the contribution gate
+can be skipped. Team members with write access manage their own priorities and don't need
+to gate on issue discussion for their own work.
+
+### Contribution Policy
+
+Before contributing please see the [CONTRIBUTING.md] file.
+
+- All PRs require human review from a maintainer. This incurs a cost upon the dev team,
+  so ensure your changes are not frivolous.
+- Keep changes focused — avoid unsolicited refactors or broad "improvement" PRs.
+- See also the license and contribution terms in `README.md`.
+
+### AI Disclosure
+
+If AI tools were used in the preparation of a commit, the contributor MUST include
+`Co-Authored-By:` metadata in the commit message identifying the AI system. Failure to
+include this is grounds for closing the pull request. The contributor is the sole
+responsible author — "the AI generated it" is not a justification during review.
+
+Example:
+```
+Co-Authored-By: Claude <noreply@anthropic.com>
+```
+
+## Crate Architecture
+
+See `README.md` for the full dependency graph (Mermaid diagram). Below is a text summary
+since LLMs cannot render diagrams.
+
+### Zcash Protocol
+
+| Crate | Role |
+| --- | --- |
+| `zcash_protocol` | Constants, consensus parameters, bounded value types (`Zatoshis`, `ZatBalance`), memo types |
+| `zcash_transparent` | Bitcoin-derived transparent addresses, inputs, outputs, bundles; transparent PCZT support |
+| `zcash_primitives` | Primary transaction data type, transaction builder(s), proving/signing/serialization, low-level fee types |
+| `zcash_proofs` | Sprout circuit and Sapling proving system |
+
+### Keys, Addresses & Wallet Support
+
+| Crate | Role |
+| --- | --- |
+| `zcash_address` | Parsing & serialization of Zcash addresses (unified address/fvk/ivk containers); no protocol-specific deps |
+| `zip321` | Parsing & serialization for ZIP 321 payment requests |
+| `eip681` | Parsing & serialization for EIP 681 payment requests |
+| `zcash_keys` | Spending keys, viewing keys, addresses; ZIP 32 key derivation; Unified spending/viewing keys |
+| `pczt` | Partially Constructed Zcash Transaction types and role interfaces |
+| `zcash_client_backend` | Wallet framework: storage APIs, chain scanning, light client protocol, fee calculation, transaction proposals |
+| `zcash_client_sqlite` | SQLite-based implementation of `zcash_client_backend` storage APIs |
+| `zcash_client_memory` | In-memory implementation of `zcash_client_backend` storage APIs |
+
+### Utilities & Standalone Components
+
+| Crate | Role |
+| --- | --- |
+| `f4jumble` | Encoding for Unified addresses |
+| `zcash_encoding` | Bitcoin-derived transaction encoding utilities |
+| `equihash` | Proof-of-work protocol implementation |
+
+### External Protocol Crates (separate repos, depended upon here)
+
+| Crate | Role |
+| --- | --- |
+| `sapling-crypto` | Sapling shielded protocol |
+| `orchard` | Orchard shielded protocol |
+| `zcash_note_encryption` | Note encryption shared across shielded protocols |
+| `zip32` | HD key derivation (ZIP 32) |
+| `zcash_spec` | Zcash specification utilities |
+
+### Dependency Rules
+
+- Dependencies flow **downward**: higher-level crates depend on lower-level ones, never
+  the reverse.
+- `zcash_protocol` is the lowest layer in this repo — most crates depend on it.
+- `zcash_client_sqlite` sits at the top, depending on `zcash_client_backend`.
+
+## Build & Test Commands
+
+For the most part we follow standard Rust `cargo` practices.
+
+**Important:** This workspace requires `--all-features` for builds and tests to match CI.
+Any change should not cause any regression in building or testing using
+`--no-default-features` or other combinations of features that may interact
+with the changed code (such as `orchard` and/or `transparent-inputs`).
+
+```sh
+# Check without codegen (fastest iteration)
+cargo check --workspace --all-features
+
+# Build entire workspace
+cargo build --workspace --all-features
+
+# Test entire workspace (matches CI)
+cargo test --workspace --all-features
+
+# Test with feature combinations relevant to the changed code, e.g.
+cargo test --workspace --features orchard
+cargo test --workspace --features transparent-inputs
+```
+
+### Test Performance
+
+Tests are computationally expensive (cryptographic proofs). The `[profile.test]` uses
+`opt-level = 3` by default. This means compilation is slow but test execution is fast.
+
+Using `--profile=dev` trades this: compilation is fast but tests run ~10x slower because
+cryptographic operations are unoptimized. Only use it when iterating on compilation errors,
+not when you need to actually run tests to completion.
+
+```sh
+# Fast compile, slow run — only for checking compilation
+cargo test --profile=dev -p <crate_name> <test_name>
+
+# Expensive/slow tests (CI runs these separately)
+cargo test --workspace --all-features --features expensive-tests
+
+# NU7 unstable network upgrade tests
+RUSTFLAGS='--cfg zcash_unstable="nu7"' cargo test --workspace --all-features
+```
+
+## Lint & Format
+
+```sh
+# Format (CI runs this with --check)
+cargo fmt --all
+cargo fmt --all -- --check
+
+# Clippy — must pass with zero warnings (CI uses -D warnings)
+cargo clippy --all-features --all-targets -- -D warnings
+
+# Doc link validation (CI uses nightly)
+cargo doc --no-deps --workspace --all-features --document-private-items
+```
+
+## Feature Flags
+
+### Common Workspace Feature Flags
+
+These feature flags are used consistently across crates in the repository:
+
+- `test-dependencies` — exposes proptest strategies and mock types for downstream testing
+
+### Key Crate-Specific Feature Flags
+
+- `transparent-inputs`, `transparent-key-import`, `transparent-key-encoding`
+- `orchard` — Orchard shielded protocol support
+- `bundled-prover`, `download-params` — Sapling proving
+- `lightwalletd-tonic`, `sync` — light client gRPC and sync
+- `unstable`, `unstable-serialization`, `unstable-spanning-tree`
+- `expensive-tests` — computationally expensive test suite
+
+### Unstable Cfg Flags
+
+These are `cfg` flags (not Cargo feature flags) that enable unstable or
+in-development functionality:
+
+- `zcash_unstable="zfuture"`
+- `zcash_unstable="nu7"`
+
+## Code Style
+
+Standard Rust naming conventions are enforced by `clippy` and `rustfmt`. The following
+are project-specific conventions beyond those defaults.
+
+### Imports
+
+Group imports in three blocks separated by blank lines:
+
+1. `core` / `alloc` / `std` (standard library)
+2. External crates (alphabetical)
+3. `crate::` and `self::` (internal)
+
+Feature-gated imports go at the end, separately. Consolidate multi-item imports with
+nested `use` syntax: `use zcash_protocol::{PoolType, consensus::BlockHeight};`
+
+### Error Handling
+
+- Always use `Result<T, E>` with custom error `enum`s.
+  * In the past we've used `thiserror`, but have had good results with `snafu` and prefer to
+    continue with `snafu`.
+- Provide `From` implementations for error conversion between layers.
+- Generic error type parameters are used in wallet crates to stay storage-agnostic.
+
+### Type Safety
+
+Type safety is paramount. This is a security-critical codebase.
+
+- Struct fields must be private (or `pub(crate)`). Expose constructors returning
+  `Result` or `Option` that enforce invariants, plus accessor methods.
+- Make invalid states unrepresentable.
+- Error enum types (and ONLY error enum types) should be non-exhaustive.
+- Use newtypes over bare integers, strings, and byte arrays. Avoid `usize` except for
+  Rust collection indexing.
+- Use `enum`s liberally. Prefer custom `enum` variants with semantic meaning over
+  boolean arguments/return values.
+- Prefer immutability. Only use `mut` when strictly needed for performance.
+- When structured enum variants are needed, wrap an immutable type rather than using
+  inline fields, to ensure safe construction. This can be relaxed for error enum types.
+
+### Naming — Project-Specific Conventions
+
+- Feature flags: `kebab-case` — `transparent-inputs`, `test-dependencies`
+- Acronyms as words in types: `TxId`, `Pczt`, `Ufvk` (not `TXID`, `PCZT`)
+- Proptest generators: `arb_` prefix — `arb_bundle`, `arb_transparent_addr`
+  * If possible use `proptest` for rigorous testing, especially when parsing
+
+### Visibility
+
+- `pub` items MUST be intentionally part of the public API. No public types in private
+  modules (exception: sealed trait pattern).
+- Use `pub(crate)` for internal sharing between modules.
+- Test-only constructors/utilities go behind `#[cfg(any(test, feature = "test-dependencies"))]`.
+
+### Documentation
+
+- All public API items MUST have complete `rustdoc` doc comments (`///`).
+  * Document all error cases
+- Crate-level docs use `//!` at the top of `lib.rs`.
+- Reference ZIP/BIP specs with markdown links: `/// [ZIP 316]: https://zips.z.cash/zip-0316`
+- Use backtick links for cross-references to other items.
+- All crates must have `#![deny(rustdoc::broken_intra_doc_links)]`.
+
+### Serialization
+
+- All serialized data MUST be versioned at the top level.
+- Do NOT use derived `serde` serialization except in explicitly marked cases (e.g. `pczt`).
+- Serialization-critical types must not be modified after public release.
+
+### Side Effects & Capability-Oriented Programming
+
+- Write referentially transparent functions where possible.
+- Use `for` loops (not `map`/iterator chains) when the body produces side effects.
+- Provide side-effect capabilities as explicit trait arguments (e.g., `clock: impl Clock`).
+- Define capability traits in terms of domain types, not implementation details.
+
+## Architecture Patterns
+
+- **Authorization typestate**: Bundles are parameterized by `Authorization` associated
+  types to enforce compile-time correctness of transaction construction stages.
+- **`no_std` by default**: Most crates use `#![no_std]` with `extern crate alloc`.
+  The `std` feature is optional.
+- **`MapAuth` trait**: Transforms authorization types during transaction construction.
+- **`from_parts` constructors**: Preferred over public struct fields.
+- **`testing` submodules**: Exposed via `test-dependencies` feature for cross-crate
+  test utilities (proptest strategies, mock implementations).
+
+## Branching & Merging
+
+This repository uses a **merge-based workflow**. Squash merges are not permitted.
+
+### SemVer Policy
+
+We enforce strict **Rust-Flavored SemVer** compliance. MSRV (Minimum Supported Rust
+Version) bumps are considered **SemVer-breaking changes**.
+
+### Branching for Bug Fixes
+
+Maintenance branches exist for released crate versions (e.g. `maint/zcash_client_sqlite-0.18.x`,
+`maint/zcash_primitives-0.26.x`). When fixing a bug in released code:
+
+1. Branch from the **earliest existing `maint/` branch** for the crate in question, so
+   that the fix can be included in a semver-compatible release.
+2. If no `maint/` branch exists for the crate, branch from the latest release tag at the
+   Rust-flavored semver "breaking" version (i.e. `x.y.z` for `0.x` crates, or `x.0.0`
+   for `1.x+` crates) depended upon by the earliest `maint/zcash_client_sqlite` branch
+   available.
+3. The fix is then forward-merged into newer `maint/` branches and eventually `main`.
+
+### Feature Work
+
+New features and non-fix changes should branch from `main`.
+
+## Changelog & Commit Discipline
+
+- Update the crate's `CHANGELOG.md` for any public API change, bug fix, or semantic change.
+- Commits must be discrete semantic changes — no WIP commits in final PR history.
+- Each commit that alters public API must also update docs and changelog in the same commit.
+- Use `git revise` to maintain clean history within a PR.
+- Commit messages: short title (<120 chars), body with motivation for the change.
+
+## CI Checks (all must pass)
+
+- `cargo test --workspace` across 6 feature-flag configurations
+- `cargo clippy --all-features --all-targets -- -D warnings`
+- `cargo fmt --all -- --check`
+- Intra-doc link validation (nightly)
+- Protobuf generated code consistency
+- UUID validity for SQLite migrations
+- `cargo-deny` license checking, `cargo-vet` supply chain audits — adding or
+  bumping dependencies requires new audit entries, so dependency changes have
+  a real review cost; avoid unnecessary dependency churn

From cdf1da113e4b25cd8938730dbe4f6562f5e62109 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Wed, 11 Mar 2026 16:47:02 +1300
Subject: [PATCH 215/263] AGENTS.md feature flag mentions

---
 AGENTS.md | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index bd49d955e9..f26937c7bd 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -193,14 +193,19 @@ cargo doc --no-deps --workspace --all-features --document-private-items
 These feature flags are used consistently across crates in the repository:
 
 - `test-dependencies` — exposes proptest strategies and mock types for downstream testing
+- `transparent-inputs` — transparent transaction input support
+- `orchard` — Orchard shielded protocol support
+- `sapling` — Sapling shielded protocol support
+- `unstable` — unstable or in-development functionality
+- `multicore` — multi-threaded proving
+- `std` — standard library support (most crates are `no_std` by default)
 
 ### Key Crate-Specific Feature Flags
 
-- `transparent-inputs`, `transparent-key-import`, `transparent-key-encoding`
-- `orchard` — Orchard shielded protocol support
+- `transparent-key-import`, `transparent-key-encoding`
 - `bundled-prover`, `download-params` — Sapling proving
 - `lightwalletd-tonic`, `sync` — light client gRPC and sync
-- `unstable`, `unstable-serialization`, `unstable-spanning-tree`
+- `unstable-serialization`, `unstable-spanning-tree`
 - `expensive-tests` — computationally expensive test suite
 
 ### Unstable Cfg Flags

From 8d23838938095c1f9ed65583015ae25b1e3c316e Mon Sep 17 00:00:00 2001
From: John Boyd <john@coldnoise.net>
Date: Fri, 6 Mar 2026 01:17:27 -0600
Subject: [PATCH 216/263] Fix get_transparent_balances to handle foreign key
 scopes

`zcash_client_sqlite::wallet::get_transparent_balances()` converts
`KeyScope` into `TransparentKeyScope`, which errors if `KeyScope ==
None`. This fails to handle standalone transparent addresses, which have
no derivation or `TransparentKeyScope`.

This commit change return type to use `Option<TransparentKeyScope>` and
updates return handling at all callsites. This allows standalone
transparent addresses to be counted in transparent balances.
---
 zcash_client_backend/CHANGELOG.md             |  4 +++
 zcash_client_backend/src/data_api.rs          |  6 ++++-
 zcash_client_backend/src/data_api/testing.rs  | 11 +++++---
 zcash_client_memory/src/wallet_read.rs        | 11 ++++----
 zcash_client_sqlite/CHANGELOG.md              |  3 +++
 zcash_client_sqlite/src/lib.rs                |  4 +--
 zcash_client_sqlite/src/testing/db.rs         |  6 +----
 zcash_client_sqlite/src/wallet/encoding.rs    | 15 ++++++++++-
 zcash_client_sqlite/src/wallet/transparent.rs | 26 +++++--------------
 9 files changed, 47 insertions(+), 39 deletions(-)

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index 6f7e03523c..e5011d3cb2 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -12,6 +12,7 @@ workspace.
 
 ### Added
 - `zcash_client_backend::data_api`:
+  - `TransparentBalances` type alias (behind the `transparent-inputs` feature flag).
   - `ll` module
   - `wallet::ConfirmationsPolicy::confirmations_until_spendable`
   - `DecryptableTransaction`
@@ -69,6 +70,9 @@ workspace.
     key that will be used to encrypt any wallet-internal change outputs
     that would otherwise only be recoverable using the wallet's internal
     IVK.
+- `zcash_client_backend::data_api::WalletRead::get_transparent_balances` now returns
+  `TransparentBalances` (using `Option<TransparentKeyScope>`) to support standalone
+  transparent addresses that have no key scope.
 - `zcash_client_backend::data_api::WalletRead` has added method `get_received_outputs`.
 - `zcash_client_backend::proposal::ProposalError` has added variants `PaymentAmountMissing`
   and `IncompatibleTxVersion`
diff --git a/zcash_client_backend/src/data_api.rs b/zcash_client_backend/src/data_api.rs
index c23c7b7d8a..e7f5867a1f 100644
--- a/zcash_client_backend/src/data_api.rs
+++ b/zcash_client_backend/src/data_api.rs
@@ -132,6 +132,10 @@ pub mod wallet;
 #[cfg(any(test, feature = "test-dependencies"))]
 pub mod testing;
 
+/// A mapping from transparent addresses to their key scope and balance.
+#[cfg(feature = "transparent-inputs")]
+pub type TransparentBalances = HashMap<TransparentAddress, (Option<TransparentKeyScope>, Balance)>;
+
 /// The height of subtree roots in the Sapling note commitment tree.
 ///
 /// This conforms to the structure of subtree data returned by
@@ -1834,7 +1838,7 @@ pub trait WalletRead {
         _account: Self::AccountId,
         _target_height: TargetHeight,
         _confirmations_policy: ConfirmationsPolicy,
-    ) -> Result<HashMap<TransparentAddress, (TransparentKeyScope, Balance)>, Self::Error> {
+    ) -> Result<TransparentBalances, Self::Error> {
         unimplemented!(
             "WalletRead::get_transparent_balances must be overridden for wallets to use the `transparent-inputs` feature"
         )
diff --git a/zcash_client_backend/src/data_api/testing.rs b/zcash_client_backend/src/data_api/testing.rs
index 969aab5319..3e8a734887 100644
--- a/zcash_client_backend/src/data_api/testing.rs
+++ b/zcash_client_backend/src/data_api/testing.rs
@@ -74,9 +74,12 @@ use crate::{
 
 #[cfg(feature = "transparent-inputs")]
 use {
-    super::{TransactionsInvolvingAddress, wallet::input_selection::ShieldingSelector},
-    crate::{data_api::Balance, wallet::TransparentAddressMetadata},
-    ::transparent::{address::TransparentAddress, keys::TransparentKeyScope},
+    super::{
+        TransactionsInvolvingAddress, TransparentBalances,
+        wallet::input_selection::ShieldingSelector,
+    },
+    crate::wallet::TransparentAddressMetadata,
+    ::transparent::address::TransparentAddress,
     zcash_keys::keys::transparent::gap_limits::GapLimits,
 };
 
@@ -2776,7 +2779,7 @@ impl WalletRead for MockWalletDb {
         _account: Self::AccountId,
         _target_height: TargetHeight,
         _confirmations_policy: ConfirmationsPolicy,
-    ) -> Result<HashMap<TransparentAddress, (TransparentKeyScope, Balance)>, Self::Error> {
+    ) -> Result<TransparentBalances, Self::Error> {
         Ok(HashMap::new())
     }
 
diff --git a/zcash_client_memory/src/wallet_read.rs b/zcash_client_memory/src/wallet_read.rs
index 9f96a045b3..7b1206bed4 100644
--- a/zcash_client_memory/src/wallet_read.rs
+++ b/zcash_client_memory/src/wallet_read.rs
@@ -6,6 +6,8 @@ use std::{
 use nonempty::NonEmpty;
 use secrecy::{ExposeSecret, SecretVec};
 use shardtree::store::ShardStore as _;
+#[cfg(feature = "transparent-inputs")]
+use zcash_client_backend::data_api::TransparentBalances;
 use zcash_client_backend::data_api::{
     AddressInfo, BlockMetadata, NullifierQuery, ReceivedTransactionOutput, WalletRead,
     WalletSummary, Zip32Derivation,
@@ -34,10 +36,7 @@ use zip32::fingerprint::SeedFingerprint;
 
 #[cfg(feature = "transparent-inputs")]
 use {
-    transparent::{
-        address::TransparentAddress,
-        keys::{NonHardenedChildIndex, TransparentKeyScope},
-    },
+    transparent::{address::TransparentAddress, keys::NonHardenedChildIndex},
     zcash_client_backend::wallet::{Exposure, TransparentAddressMetadata},
     zip32::Scope,
 };
@@ -692,7 +691,7 @@ impl<P: consensus::Parameters> WalletRead for MemoryWalletDb<P> {
         account_id: Self::AccountId,
         target_height: TargetHeight,
         confirmations_policy: ConfirmationsPolicy,
-    ) -> Result<HashMap<TransparentAddress, (TransparentKeyScope, Balance)>, Self::Error> {
+    ) -> Result<TransparentBalances, Self::Error> {
         tracing::debug!("get_transparent_balances");
 
         let mut balances = HashMap::new();
@@ -710,7 +709,7 @@ impl<P: consensus::Parameters> WalletRead for MemoryWalletDb<P> {
                 let address = txo.address;
                 let entry = balances
                     .entry(address)
-                    .or_insert((txo.key_scope, Balance::ZERO));
+                    .or_insert((Some(txo.key_scope), Balance::ZERO));
 
                 entry.1.add_spendable_value(txo.txout.value())?;
             }
diff --git a/zcash_client_sqlite/CHANGELOG.md b/zcash_client_sqlite/CHANGELOG.md
index ae563c07d7..5fdeabfccb 100644
--- a/zcash_client_sqlite/CHANGELOG.md
+++ b/zcash_client_sqlite/CHANGELOG.md
@@ -35,6 +35,9 @@ workspace.
 - `zcash_client_sqlite::UtxoId` contents are now private.
 
 ### Fixed
+- `get_transparent_balances` no longer fails for standalone transparent addresses
+  that have no `TransparentKeyScope`. Previously, it would error when encountering
+  a `KeyScope` that could not be converted to a `TransparentKeyScope`.
 - Notes are now consistently treated as having "uneconomic value" if their value is less
   than **or equal to** the marginal fee. Previously, some call sites only considered
   note uneconomic if their value was less than the marginal fee.
diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs
index 565ccad3a7..e3bddc2aba 100644
--- a/zcash_client_sqlite/src/lib.rs
+++ b/zcash_client_sqlite/src/lib.rs
@@ -115,7 +115,7 @@ use {
     std::{collections::HashSet, time::SystemTime},
     zcash_client_backend::{
         data_api::{
-            Balance, TransactionsInvolvingAddress, WalletUtxo,
+            TransactionsInvolvingAddress, TransparentBalances, WalletUtxo,
             ll::wallet::generate_transparent_gap_addresses,
         },
         wallet::TransparentAddressMetadata,
@@ -900,7 +900,7 @@ impl<C: Borrow<rusqlite::Connection>, P: consensus::Parameters, CL, R> WalletRea
         account: Self::AccountId,
         target_height: TargetHeight,
         confirmations_policy: ConfirmationsPolicy,
-    ) -> Result<HashMap<TransparentAddress, (TransparentKeyScope, Balance)>, Self::Error> {
+    ) -> Result<TransparentBalances, Self::Error> {
         wallet::transparent::get_transparent_balances(
             self.conn.borrow(),
             &self.params,
diff --git a/zcash_client_sqlite/src/testing/db.rs b/zcash_client_sqlite/src/testing/db.rs
index bd1cbf0c06..c43ddec16f 100644
--- a/zcash_client_sqlite/src/testing/db.rs
+++ b/zcash_client_sqlite/src/testing/db.rs
@@ -45,11 +45,7 @@ use crate::{
 #[cfg(feature = "transparent-inputs")]
 use {
     crate::TransparentAddressMetadata,
-    ::transparent::{
-        address::TransparentAddress,
-        bundle::OutPoint,
-        keys::{NonHardenedChildIndex, TransparentKeyScope},
-    },
+    ::transparent::{address::TransparentAddress, bundle::OutPoint, keys::NonHardenedChildIndex},
     core::ops::Range,
     zcash_keys::keys::transparent::gap_limits::GapLimits,
 };
diff --git a/zcash_client_sqlite/src/wallet/encoding.rs b/zcash_client_sqlite/src/wallet/encoding.rs
index f45e8502dc..5692a0321d 100644
--- a/zcash_client_sqlite/src/wallet/encoding.rs
+++ b/zcash_client_sqlite/src/wallet/encoding.rs
@@ -22,7 +22,7 @@ use crate::error::SqliteClientError;
 #[cfg(feature = "transparent-inputs")]
 use {
     super::transparent::SchedulingError, std::time::SystemTime,
-    transparent::keys::TransparentKeyScope,
+    transparent::keys::TransparentKeyScope, zcash_client_backend::data_api::TransparentKeyOrigin,
 };
 
 #[cfg(feature = "zcashd-compat")]
@@ -163,6 +163,19 @@ impl KeyScope {
             KeyScope::Foreign => None,
         }
     }
+
+    #[cfg(feature = "transparent-inputs")]
+    pub(crate) fn as_key_origin(&self) -> TransparentKeyOrigin {
+        match self {
+            KeyScope::Zip32(scope) => TransparentKeyOrigin::Derived {
+                scope: TransparentKeyScope::from(*scope),
+            },
+            KeyScope::Ephemeral => TransparentKeyOrigin::Derived {
+                scope: TransparentKeyScope::custom(2).expect("valid scope"),
+            },
+            KeyScope::Foreign => TransparentKeyOrigin::Imported,
+        }
+    }
 }
 
 impl From<zip32::Scope> for KeyScope {
diff --git a/zcash_client_sqlite/src/wallet/transparent.rs b/zcash_client_sqlite/src/wallet/transparent.rs
index 5604567a95..43fcb6d76a 100644
--- a/zcash_client_sqlite/src/wallet/transparent.rs
+++ b/zcash_client_sqlite/src/wallet/transparent.rs
@@ -23,7 +23,7 @@ use zcash_address::unified::{Ivk, Uivk};
 use zcash_client_backend::{
     data_api::{
         Account, AccountBalance, Balance, OutputStatusFilter, TransactionDataRequest,
-        TransactionStatusFilter, WalletUtxo,
+        TransactionStatusFilter, TransparentBalances, WalletUtxo,
         wallet::{ConfirmationsPolicy, TargetHeight},
     },
     wallet::{
@@ -1165,7 +1165,7 @@ pub(crate) fn get_transparent_balances<P: consensus::Parameters>(
     account_uuid: AccountUuid,
     target_height: TargetHeight,
     confirmations_policy: ConfirmationsPolicy,
-) -> Result<HashMap<TransparentAddress, (TransparentKeyScope, Balance)>, SqliteClientError> {
+) -> Result<TransparentBalances, SqliteClientError> {
     // We treat all transparent UTXOs as untrusted; however, if zero-conf shielding
     // is enabled, we set the minimum number of confirmations to zero.
     let min_confirmations = if confirmations_policy.allow_zero_conf_shielding() {
@@ -1203,16 +1203,9 @@ pub(crate) fn get_transparent_balances<P: consensus::Parameters>(
         let taddr = TransparentAddress::decode(params, &taddr_str)?;
         let value = Zatoshis::from_nonnegative_i64(row.get("value_zat")?)?;
         let key_scope_code: i64 = row.get("key_scope")?;
-        let key_scope = KeyScope::decode(key_scope_code)?
-            .as_transparent()
-            .ok_or_else(|| {
-                SqliteClientError::CorruptedData(format!(
-                    "Invalid key scope code for transparent received output: {}",
-                    key_scope_code
-                ))
-            })?;
+        let key_origin = KeyScope::decode(key_scope_code)?.as_key_origin();
 
-        let entry = result.entry(taddr).or_insert((key_scope, Balance::ZERO));
+        let entry = result.entry(taddr).or_insert((key_origin, Balance::ZERO));
         if value <= zip317::MARGINAL_FEE {
             entry.1.add_uneconomic_value(value)?;
         } else {
@@ -1262,16 +1255,9 @@ pub(crate) fn get_transparent_balances<P: consensus::Parameters>(
             let taddr = TransparentAddress::decode(params, &taddr_str)?;
             let value = Zatoshis::from_nonnegative_i64(row.get("value_zat")?)?;
             let key_scope_code: i64 = row.get("key_scope")?;
-            let key_scope = KeyScope::decode(key_scope_code)?
-                .as_transparent()
-                .ok_or_else(|| {
-                    SqliteClientError::CorruptedData(format!(
-                        "Invalid key scope code for transparent received output: {}",
-                        key_scope_code
-                    ))
-                })?;
+            let key_origin = KeyScope::decode(key_scope_code)?.as_key_origin();
 
-            let entry = result.entry(taddr).or_insert((key_scope, Balance::ZERO));
+            let entry = result.entry(taddr).or_insert((key_origin, Balance::ZERO));
             if value <= zip317::MARGINAL_FEE {
                 entry.1.add_uneconomic_value(value)?;
             } else {

From c0552bb2dbb9a7cfaaf75126678e40f582e56bd4 Mon Sep 17 00:00:00 2001
From: John Boyd <john@coldnoise.net>
Date: Mon, 2 Mar 2026 16:48:46 -0600
Subject: [PATCH 217/263] Add backend tests for standalone P2PKH addresses

First, this commit moves `test_import_standalone_pubkey()` to the transparent
transaction tests in the backend.

Then, this commit adds more integration tests to exercise standalone P2PKH
functionality.
---
 .../src/data_api/testing/transparent.rs       | 300 ++++++++++++++++++
 zcash_client_sqlite/src/wallet.rs             |  24 --
 zcash_client_sqlite/src/wallet/transparent.rs |  41 +++
 3 files changed, 341 insertions(+), 24 deletions(-)

diff --git a/zcash_client_backend/src/data_api/testing/transparent.rs b/zcash_client_backend/src/data_api/testing/transparent.rs
index 71d817148b..f293100b81 100644
--- a/zcash_client_backend/src/data_api/testing/transparent.rs
+++ b/zcash_client_backend/src/data_api/testing/transparent.rs
@@ -14,6 +14,9 @@ use zcash_keys::{
 use zcash_primitives::block::BlockHash;
 use zcash_protocol::{local_consensus::LocalNetwork, value::Zatoshis};
 
+#[cfg(feature = "transparent-key-import")]
+use crate::wallet::TransparentAddressSource;
+
 use super::TestAccount;
 use crate::{
     data_api::{
@@ -534,3 +537,300 @@ where
     let query_height = st.wallet().utxo_query_height(account_uuid).unwrap();
     assert_eq!(query_height, h0);
 }
+
+/// Tests that importing a standalone transparent public key succeeds.
+#[cfg(feature = "transparent-key-import")]
+pub fn import_standalone_transparent_pubkey<DSF>(dsf: DSF)
+where
+    DSF: DataStoreFactory,
+{
+    use secp256k1::{Secp256k1, SecretKey};
+
+    let mut st = TestBuilder::new()
+        .with_data_store_factory(dsf)
+        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .build();
+
+    let account_id = st.test_account().unwrap().id();
+
+    let secp = Secp256k1::new();
+    let secret_key = SecretKey::from_slice(&[1u8; 32]).expect("valid secret key");
+    let pubkey = secret_key.public_key(&secp);
+    assert_matches!(
+        st.wallet_mut()
+            .import_standalone_transparent_pubkey(account_id, pubkey),
+        Ok(_)
+    );
+}
+
+/// Tests that importing the same pubkey twice to the same account is idempotent.
+#[cfg(feature = "transparent-key-import")]
+pub fn import_standalone_transparent_pubkey_idempotent<DSF>(dsf: DSF)
+where
+    DSF: DataStoreFactory,
+{
+    use secp256k1::{Secp256k1, SecretKey};
+
+    let mut st = TestBuilder::new()
+        .with_data_store_factory(dsf)
+        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .build();
+
+    let account_id = st.test_account().unwrap().id();
+
+    let secp = Secp256k1::new();
+    let secret_key = SecretKey::from_slice(&[1u8; 32]).expect("valid secret key");
+    let pubkey = secret_key.public_key(&secp);
+
+    // First import
+    assert_matches!(
+        st.wallet_mut()
+            .import_standalone_transparent_pubkey(account_id, pubkey),
+        Ok(_)
+    );
+
+    // Snapshot state after first import
+    let receivers_before = st
+        .wallet()
+        .get_transparent_receivers(account_id, false, true)
+        .unwrap();
+
+    // Second import to same account should also succeed (idempotent)
+    assert_matches!(
+        st.wallet_mut()
+            .import_standalone_transparent_pubkey(account_id, pubkey),
+        Ok(_)
+    );
+
+    // Verify wallet state is unchanged
+    let receivers_after = st
+        .wallet()
+        .get_transparent_receivers(account_id, false, true)
+        .unwrap();
+
+    assert_eq!(receivers_before.len(), receivers_after.len());
+
+    let taddr = TransparentAddress::from_pubkey(&pubkey);
+    let metadata = receivers_after
+        .get(&taddr)
+        .expect("address should be present");
+    assert!(matches!(
+        metadata.source(),
+        TransparentAddressSource::Standalone(_)
+    ));
+}
+
+/// Tests that importing the same pubkey to a different account fails.
+#[cfg(feature = "transparent-key-import")]
+pub fn import_standalone_transparent_pubkey_conflict<DSF>(dsf: DSF)
+where
+    DSF: DataStoreFactory,
+{
+    use secp256k1::{Secp256k1, SecretKey};
+    use secrecy::Secret;
+
+    use crate::data_api::{AccountBirthday, chain::ChainState};
+    use zcash_protocol::consensus::{NetworkUpgrade, Parameters};
+
+    let mut st = TestBuilder::new()
+        .with_data_store_factory(dsf)
+        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .build();
+
+    let account1_id = st.test_account().unwrap().id();
+
+    let secp = Secp256k1::new();
+    let secret_key = SecretKey::from_slice(&[1u8; 32]).expect("valid secret key");
+    let pubkey = secret_key.public_key(&secp);
+
+    // Import to first account
+    assert_matches!(
+        st.wallet_mut()
+            .import_standalone_transparent_pubkey(account1_id, pubkey),
+        Ok(_)
+    );
+
+    // Create a second account
+    let birthday = AccountBirthday::from_parts(
+        ChainState::empty(
+            st.network()
+                .activation_height(NetworkUpgrade::Sapling)
+                .unwrap()
+                - 1,
+            BlockHash([0; 32]),
+        ),
+        None,
+    );
+    let seed2 = Secret::new(vec![42u8; 32]);
+    let (account2_id, _) = st
+        .wallet_mut()
+        .create_account("account2", &seed2, &birthday, None)
+        .unwrap();
+
+    // Import same pubkey to second account should fail
+    assert_matches!(
+        st.wallet_mut()
+            .import_standalone_transparent_pubkey(account2_id, pubkey),
+        Err(_)
+    );
+}
+
+/// Tests that a UTXO received at a standalone P2PKH address is reflected in the wallet balance.
+#[cfg(feature = "transparent-key-import")]
+pub fn import_standalone_transparent_pubkey_balance<DSF>(dsf: DSF)
+where
+    DSF: DataStoreFactory,
+    <<DSF as DataStoreFactory>::DataStore as WalletWrite>::UtxoRef: std::fmt::Debug,
+{
+    use crate::data_api::wallet::ConfirmationsPolicy;
+    use secp256k1::{Secp256k1, SecretKey};
+
+    let mut st = TestBuilder::new()
+        .with_data_store_factory(dsf)
+        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .build();
+
+    let account_id = st.test_account().unwrap().id();
+    let birthday = st.test_account().unwrap().birthday().height();
+
+    let secp = Secp256k1::new();
+    let secret_key = SecretKey::from_slice(&[1u8; 32]).expect("valid secret key");
+    let pubkey = secret_key.public_key(&secp);
+
+    // Import the public key.
+    st.wallet_mut()
+        .import_standalone_transparent_pubkey(account_id, pubkey)
+        .unwrap();
+
+    // Derive the P2PKH address.
+    let taddr = TransparentAddress::from_pubkey(&pubkey);
+
+    let height = birthday + 1000;
+    st.wallet_mut().update_chain_tip(height).unwrap();
+
+    // Create a fake UTXO at the P2PKH address.
+    let value = Zatoshis::const_from_u64(50_000);
+    let outpoint = OutPoint::fake();
+    let txout = TxOut::new(value, taddr.script().into());
+    let utxo = WalletTransparentOutput::from_parts(outpoint, txout, Some(height)).unwrap();
+    st.wallet_mut()
+        .put_received_transparent_utxo(&utxo)
+        .unwrap();
+
+    // Verify the balance is reflected via get_transparent_balances.
+    let target_height = TargetHeight::from(height + 1);
+    let balances = st
+        .wallet()
+        .get_transparent_balances(account_id, target_height, ConfirmationsPolicy::MIN)
+        .unwrap();
+    assert_eq!(
+        balances.get(&taddr).map(|(_, b)| b.spendable_value()),
+        Some(value),
+    );
+
+    // Verify the UTXO is returned by get_spendable_transparent_outputs.
+    let utxos = st
+        .wallet()
+        .get_spendable_transparent_outputs(&taddr, target_height, ConfirmationsPolicy::MIN)
+        .unwrap();
+    assert_eq!(utxos.len(), 1);
+    assert_eq!(utxos[0].value(), value);
+}
+
+/// Tests spending from a standalone P2PKH address by shielding its balance.
+#[cfg(feature = "transparent-key-import")]
+pub fn spend_from_standalone_pubkey<DSF>(dsf: DSF, cache: impl TestCache)
+where
+    DSF: DataStoreFactory,
+{
+    use crate::data_api::wallet::{self, SpendingKeys};
+    use secp256k1::{Secp256k1, SecretKey};
+    use std::collections::HashMap;
+
+    let mut st = TestBuilder::new()
+        .with_data_store_factory(dsf)
+        .with_block_cache(cache)
+        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .build();
+
+    let account = st.test_account().cloned().unwrap();
+    let account_id = account.id();
+
+    // Create a keypair and derive the P2PKH address.
+    let secp = Secp256k1::new();
+    let secret_key = SecretKey::from_slice(&[1u8; 32]).expect("valid secret key");
+    let pubkey = secret_key.public_key(&secp);
+
+    // Import the public key.
+    st.wallet_mut()
+        .import_standalone_transparent_pubkey(account_id, pubkey)
+        .unwrap();
+
+    // Derive the P2PKH address.
+    let taddr = TransparentAddress::from_pubkey(&pubkey);
+
+    // Initialize chain data with blocks (needed for shielding transaction creation).
+    let not_our_key = ExtendedSpendingKey::master(&[]).to_diversifiable_full_viewing_key();
+    let not_our_value = Zatoshis::const_from_u64(10000);
+    let (start_height, _, _) =
+        st.generate_next_block(&not_our_key, AddressType::DefaultExternal, not_our_value);
+    for _ in 1..10 {
+        st.generate_next_block(&not_our_key, AddressType::DefaultExternal, not_our_value);
+    }
+    st.scan_cached_blocks(start_height, 10);
+
+    // Create a fake UTXO at the P2PKH address.
+    let value = Zatoshis::from_u64(100000).unwrap();
+    let height = st.wallet().chain_height().unwrap().unwrap();
+    let txout = TxOut::new(value, taddr.script().into());
+    let utxo = WalletTransparentOutput::from_parts(OutPoint::fake(), txout, Some(height)).unwrap();
+    st.wallet_mut()
+        .put_received_transparent_utxo(&utxo)
+        .unwrap();
+
+    // Build SpendingKeys with the standalone key for the P2PKH address.
+    let mut standalone_keys = HashMap::new();
+    standalone_keys.insert(taddr, secret_key);
+    let spending_keys = SpendingKeys::new(
+        account.usk().clone(),
+        #[cfg(feature = "transparent-key-import")]
+        standalone_keys,
+    );
+
+    // Shield the P2PKH UTXO.
+    let input_selector = GreedyInputSelector::new();
+    let change_strategy = standard::SingleOutputChangeStrategy::new(
+        StandardFeeRule::Zip317,
+        None,
+        ShieldedProtocol::Sapling,
+        DustOutputPolicy::default(),
+    );
+
+    let prover = ::zcash_proofs::prover::LocalTxProver::bundled();
+    let network = *st.network();
+    let txids = wallet::shield_transparent_funds(
+        st.wallet_mut(),
+        &network,
+        &prover,
+        &prover,
+        &input_selector,
+        &change_strategy,
+        value,
+        &spending_keys,
+        &[taddr],
+        account_id,
+        ConfirmationsPolicy::MIN,
+    )
+    .unwrap();
+
+    assert!(!txids.is_empty());
+
+    // The wallet should have zero transparent balance after shielding.
+    check_balance::<DSF>(
+        &st,
+        &account,
+        &taddr,
+        ConfirmationsPolicy::MIN,
+        &Balance::ZERO,
+    );
+}
diff --git a/zcash_client_sqlite/src/wallet.rs b/zcash_client_sqlite/src/wallet.rs
index 41f97d1099..9acd4c1339 100644
--- a/zcash_client_sqlite/src/wallet.rs
+++ b/zcash_client_sqlite/src/wallet.rs
@@ -4658,28 +4658,4 @@ mod tests {
             Ok(birthday) if birthday == st.sapling_activation_height()
         )
     }
-
-    #[test]
-    #[cfg(feature = "transparent-key-import")]
-    fn test_import_standalone_transparent_pubkey() {
-        use rand::SeedableRng;
-        use rand_chacha::ChaChaRng;
-        use secp256k1::{Secp256k1, SecretKey};
-
-        let mut st = TestBuilder::new()
-            .with_data_store_factory(TestDbFactory::default())
-            .with_account_from_sapling_activation(BlockHash([0; 32]))
-            .build();
-
-        let account_id = st.test_account().unwrap().id();
-
-        let mut rng = ChaChaRng::from_seed([0u8; 32]);
-        let secp = Secp256k1::new();
-        let pubkey = SecretKey::new(&mut rng).public_key(&secp);
-        assert_matches!(
-            st.wallet_mut()
-                .import_standalone_transparent_pubkey(account_id, pubkey),
-            Ok(_)
-        );
-    }
 }
diff --git a/zcash_client_sqlite/src/wallet/transparent.rs b/zcash_client_sqlite/src/wallet/transparent.rs
index 43fcb6d76a..a5468ace0a 100644
--- a/zcash_client_sqlite/src/wallet/transparent.rs
+++ b/zcash_client_sqlite/src/wallet/transparent.rs
@@ -2186,6 +2186,47 @@ mod tests {
         );
     }
 
+    #[test]
+    #[cfg(feature = "transparent-key-import")]
+    fn test_import_standalone_transparent_pubkey() {
+        zcash_client_backend::data_api::testing::transparent::import_standalone_transparent_pubkey(
+            TestDbFactory::default(),
+        );
+    }
+
+    #[test]
+    #[cfg(feature = "transparent-key-import")]
+    fn test_import_standalone_transparent_pubkey_idempotent() {
+        zcash_client_backend::data_api::testing::transparent::import_standalone_transparent_pubkey_idempotent(
+            TestDbFactory::default(),
+        );
+    }
+
+    #[test]
+    #[cfg(feature = "transparent-key-import")]
+    fn test_import_standalone_transparent_pubkey_conflict() {
+        zcash_client_backend::data_api::testing::transparent::import_standalone_transparent_pubkey_conflict(
+            TestDbFactory::default(),
+        );
+    }
+
+    #[test]
+    #[cfg(feature = "transparent-key-import")]
+    fn test_import_standalone_transparent_pubkey_balance() {
+        zcash_client_backend::data_api::testing::transparent::import_standalone_transparent_pubkey_balance(
+            TestDbFactory::default(),
+        );
+    }
+
+    #[test]
+    #[cfg(feature = "transparent-key-import")]
+    fn test_spend_from_standalone_pubkey() {
+        zcash_client_backend::data_api::testing::transparent::spend_from_standalone_pubkey(
+            TestDbFactory::default(),
+            BlockCache::new(),
+        );
+    }
+
     #[test]
     fn ephemeral_address_management() {
         let mut st = TestBuilder::new()

From 8b5e42b281164397de7bdd1266e488226c0ffc79 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Wed, 18 Mar 2026 07:54:16 +0000
Subject: [PATCH 218/263] zcash_transparent: Expose and use
 `solver::ScriptKind` for a `TxOut`

---
 zcash_transparent/CHANGELOG.md   |  2 ++
 zcash_transparent/src/address.rs | 15 +++++++++++----
 zcash_transparent/src/bundle.rs  | 14 +++++++++++---
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/zcash_transparent/CHANGELOG.md b/zcash_transparent/CHANGELOG.md
index ee6664dc12..b610b88fad 100644
--- a/zcash_transparent/CHANGELOG.md
+++ b/zcash_transparent/CHANGELOG.md
@@ -11,6 +11,8 @@ workspace.
 ## [0.7.0] - PENDING
 
 ### Added
+- `zcash_transparent::address::TransparentAddress::from_script_kind`
+- `zcash_transparent::bundle::TxOut::script_kind`
 - `zcash_transparent::pczt`:
   - `Input::with_signable_input`
   - `Input::append_signature`
diff --git a/zcash_transparent/src/address.rs b/zcash_transparent/src/address.rs
index ae0c2b89d0..b2b0529baf 100644
--- a/zcash_transparent/src/address.rs
+++ b/zcash_transparent/src/address.rs
@@ -150,13 +150,20 @@ impl TransparentAddress {
 
     /// Returns the address that this Script contains, if any.
     pub fn from_script_pubkey(script_pubkey: &script::PubKey) -> Option<Self> {
-        solver::standard(script_pubkey).and_then(|script_kind| match script_kind {
+        solver::standard(script_pubkey)
+            .as_ref()
+            .and_then(Self::from_script_kind)
+    }
+
+    /// Returns the address that this `ScriptKind` contains, if any.
+    pub fn from_script_kind(script_kind: &solver::ScriptKind) -> Option<Self> {
+        match script_kind {
             solver::ScriptKind::PubKeyHash { hash } => {
-                Some(TransparentAddress::PublicKeyHash(hash))
+                Some(TransparentAddress::PublicKeyHash(*hash))
             }
-            solver::ScriptKind::ScriptHash { hash } => Some(TransparentAddress::ScriptHash(hash)),
+            solver::ScriptKind::ScriptHash { hash } => Some(TransparentAddress::ScriptHash(*hash)),
             _ => None,
-        })
+        }
     }
 
     /// Generate the `scriptPubKey` corresponding to this address.
diff --git a/zcash_transparent/src/bundle.rs b/zcash_transparent/src/bundle.rs
index 80901b7d53..afc6a63152 100644
--- a/zcash_transparent/src/bundle.rs
+++ b/zcash_transparent/src/bundle.rs
@@ -8,6 +8,7 @@ use zcash_script::{
     pattern::push_num,
     pv,
     script::{self, Evaluable as _},
+    solver,
 };
 
 use zcash_protocol::{
@@ -397,10 +398,9 @@ impl TxOut {
 
     /// Returns the address to which the TxOut was sent, if this is a valid P2SH or P2PKH output.
     pub fn recipient_address(&self) -> Option<TransparentAddress> {
-        script::PubKey::parse(&self.script_pubkey.0)
-            .ok()
+        self.script_kind()
             .as_ref()
-            .and_then(TransparentAddress::from_script_pubkey)
+            .and_then(TransparentAddress::from_script_kind)
     }
 
     pub fn value(&self) -> Zatoshis {
@@ -410,6 +410,14 @@ impl TxOut {
     pub fn script_pubkey(&self) -> &Script {
         &self.script_pubkey
     }
+
+    /// Returns the kind of script to which the TxOut was sent, if this is a valid output.
+    pub fn script_kind(&self) -> Option<solver::ScriptKind> {
+        script::PubKey::parse(&self.script_pubkey.0)
+            .ok()
+            .as_ref()
+            .and_then(solver::standard)
+    }
 }
 
 #[cfg(any(test, feature = "test-dependencies"))]

From 97be54bd2f2747dc32b997d934e9f669163308e2 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Wed, 18 Mar 2026 13:56:32 +0000
Subject: [PATCH 219/263] zcash_client_backend: Further regularize `ll` tx
 handling

---
 .../src/data_api/ll/wallet.rs                 | 313 +++++++++++-------
 1 file changed, 189 insertions(+), 124 deletions(-)

diff --git a/zcash_client_backend/src/data_api/ll/wallet.rs b/zcash_client_backend/src/data_api/ll/wallet.rs
index 27b770fab1..b28ccbc166 100644
--- a/zcash_client_backend/src/data_api/ll/wallet.rs
+++ b/zcash_client_backend/src/data_api/ll/wallet.rs
@@ -320,47 +320,74 @@ where
                 .map_err(PutBlocksError::Storage)?;
 
             // Mark notes as spent and remove them from the scanning cache
-            for spend in tx.sapling_spends() {
-                wallet_db
-                    .mark_sapling_note_spent(spend.nf(), tx_ref)
-                    .map_err(PutBlocksError::Storage)?;
-            }
-            #[cfg(feature = "orchard")]
-            for spend in tx.orchard_spends() {
-                wallet_db
-                    .mark_orchard_note_spent(spend.nf(), tx_ref)
-                    .map_err(PutBlocksError::Storage)?;
-            }
+            mark_notes_spent(
+                wallet_db,
+                tx_ref,
+                #[cfg(feature = "transparent-inputs")]
+                None.iter(),
+                tx.sapling_spends().iter().map(|spend| spend.nf()),
+                #[cfg(feature = "orchard")]
+                tx.orchard_spends().iter().map(|spend| spend.nf()),
+            )
+            .map_err(PutBlocksError::Storage)?;
+
+            // TODO: Pass in the actual network parameters even though we don't need them.
+            let params: Option<&consensus::Network> = None;
 
-            for output in tx.sapling_outputs() {
+            put_shielded_outputs(
+                wallet_db,
+                params,
+                tx_ref,
+                None,
+                tx.sapling_outputs(),
                 // Check whether this note was spent in a later block range that
                 // we previously scanned.
-                let spent_in = output
-                    .nf()
-                    .map(|nf| wallet_db.detect_sapling_spend(nf))
-                    .transpose()
-                    .map_err(PutBlocksError::Storage)?
-                    .flatten();
-
-                wallet_db
-                    .put_received_sapling_note(output, tx_ref, Some(block.height()), spent_in)
-                    .map_err(PutBlocksError::Storage)?;
-            }
+                |wallet_db, output| {
+                    Ok(output
+                        .nf()
+                        .map(|nf| wallet_db.detect_sapling_spend(nf))
+                        .transpose()?
+                        .flatten())
+                },
+                |wallet_db, output, tx_ref, spent_in| {
+                    wallet_db.put_received_sapling_note(
+                        output,
+                        tx_ref,
+                        Some(block.height()),
+                        spent_in,
+                    )
+                },
+                |_account_id| (),
+            )
+            .map_err(PutBlocksError::Storage)?;
+
             #[cfg(feature = "orchard")]
-            for output in tx.orchard_outputs() {
+            put_shielded_outputs(
+                wallet_db,
+                params,
+                tx_ref,
+                None,
+                tx.orchard_outputs(),
                 // Check whether this note was spent in a later block range that
                 // we previously scanned.
-                let spent_in = output
-                    .nf()
-                    .map(|nf| wallet_db.detect_orchard_spend(nf))
-                    .transpose()
-                    .map_err(PutBlocksError::Storage)?
-                    .flatten();
-
-                wallet_db
-                    .put_received_orchard_note(output, tx_ref, Some(block.height()), spent_in)
-                    .map_err(PutBlocksError::Storage)?;
-            }
+                |wallet_db, output| {
+                    Ok(output
+                        .nf()
+                        .map(|nf| wallet_db.detect_orchard_spend(nf))
+                        .transpose()?
+                        .flatten())
+                },
+                |wallet_db, output, tx_ref, spent_in| {
+                    wallet_db.put_received_orchard_note(
+                        output,
+                        tx_ref,
+                        Some(block.height()),
+                        spent_in,
+                    )
+                },
+                |_account_id| (),
+            )
+            .map_err(PutBlocksError::Storage)?;
         }
 
         // Insert the new nullifiers from this block into the nullifier map.
@@ -789,37 +816,27 @@ where
         wallet_db.set_transaction_status(d_tx.tx().txid(), TransactionStatus::Mined(height))?;
     }
 
-    // Mark Sapling notes as spent when we observe their nullifiers.
-    for spend in d_tx
-        .tx()
-        .sapling_bundle()
-        .iter()
-        .flat_map(|b| b.shielded_spends().iter())
-    {
-        wallet_db.mark_sapling_note_spent(spend.nullifier(), tx_ref)?;
-    }
-
-    // Mark Orchard notes as spent when we observe their nullifiers.
-    #[cfg(feature = "orchard")]
-    for action in d_tx
-        .tx()
-        .orchard_bundle()
-        .iter()
-        .flat_map(|b| b.actions().iter())
-    {
-        wallet_db.mark_orchard_note_spent(action.nullifier(), tx_ref)?;
-    }
-
-    // If any of the utxos spent in the transaction are ours, mark them as spent.
-    #[cfg(feature = "transparent-inputs")]
-    for txin in d_tx
-        .tx()
-        .transparent_bundle()
-        .iter()
-        .flat_map(|b| b.vin.iter())
-    {
-        wallet_db.mark_transparent_utxo_spent(txin.prevout(), tx_ref)?;
-    }
+    mark_notes_spent(
+        wallet_db,
+        tx_ref,
+        #[cfg(feature = "transparent-inputs")]
+        d_tx.tx()
+            .transparent_bundle()
+            .iter()
+            .flat_map(|b| b.vin.iter())
+            .map(|txin| txin.prevout()),
+        d_tx.tx()
+            .sapling_bundle()
+            .iter()
+            .flat_map(|b| b.shielded_spends().iter())
+            .map(|spend| spend.nullifier()),
+        #[cfg(feature = "orchard")]
+        d_tx.tx()
+            .orchard_bundle()
+            .iter()
+            .flat_map(|b| b.actions().iter())
+            .map(|action| action.nullifier()),
+    )?;
 
     // A flag used to determine whether it is necessary to query for transactions that
     // provided transparent inputs to this transaction, in order to be able to correctly
@@ -851,12 +868,13 @@ where
 
     put_shielded_outputs(
         wallet_db,
-        params,
+        Some(params),
         tx_ref,
         funding_account,
         d_tx.sapling_outputs(),
-        |wallet_db, output, tx_ref| {
-            wallet_db.put_received_sapling_note(output, tx_ref, d_tx.mined_height(), None)
+        |_, _| Ok(None),
+        |wallet_db, output, tx_ref, spent_in| {
+            wallet_db.put_received_sapling_note(output, tx_ref, d_tx.mined_height(), spent_in)
         },
         |_account_id| {
             #[cfg(feature = "transparent-inputs")]
@@ -867,12 +885,13 @@ where
     #[cfg(feature = "orchard")]
     put_shielded_outputs(
         wallet_db,
-        params,
+        Some(params),
         tx_ref,
         funding_account,
         d_tx.orchard_outputs(),
-        |wallet_db, output, tx_ref| {
-            wallet_db.put_received_orchard_note(output, tx_ref, d_tx.mined_height(), None)
+        |_, _| Ok(None),
+        |wallet_db, output, tx_ref, spent_in| {
+            wallet_db.put_received_orchard_note(output, tx_ref, d_tx.mined_height(), spent_in)
         },
         |_account_id| {
             #[cfg(feature = "transparent-inputs")]
@@ -1009,9 +1028,8 @@ where
                     let receiver = Receiver::Transparent(address);
 
                     #[cfg(feature = "transparent-inputs")]
-                    let recipient_address = wallet_db
-                        .select_receiving_address(account_uuid, &receiver)?
-                        .unwrap_or_else(|| receiver.to_zcash_address(params.network_type()));
+                    let recipient_address =
+                        external_address(wallet_db, params, account_uuid, receiver)?;
 
                     #[cfg(not(feature = "transparent-inputs"))]
                     let recipient_address = receiver.to_zcash_address(params.network_type());
@@ -1043,17 +1061,57 @@ where
     }
 }
 
+fn mark_notes_spent<'a, DbT>(
+    wallet_db: &mut DbT,
+    tx_ref: <DbT as LowLevelWalletRead>::TxRef,
+    #[cfg(feature = "transparent-inputs")] transparent_prevouts: impl Iterator<
+        Item = &'a transparent::bundle::OutPoint,
+    >,
+    sapling_nfs: impl Iterator<Item = &'a sapling::Nullifier>,
+    #[cfg(feature = "orchard")] orchard_nfs: impl Iterator<Item = &'a orchard::note::Nullifier>,
+) -> Result<(), <DbT as LowLevelWalletRead>::Error>
+where
+    DbT: LowLevelWalletWrite,
+{
+    // If any of the utxos spent in the transaction are ours, mark them as spent.
+    #[cfg(feature = "transparent-inputs")]
+    for outpoint in transparent_prevouts {
+        wallet_db.mark_transparent_utxo_spent(outpoint, tx_ref)?;
+    }
+
+    // Mark Sapling notes as spent when we observe their nullifiers.
+    for nf in sapling_nfs {
+        wallet_db.mark_sapling_note_spent(nf, tx_ref)?;
+    }
+
+    // Mark Orchard notes as spent when we observe their nullifiers.
+    #[cfg(feature = "orchard")]
+    for nf in orchard_nfs {
+        wallet_db.mark_orchard_note_spent(nf, tx_ref)?;
+    }
+
+    Ok(())
+}
+
 #[allow(clippy::too_many_arguments)]
 fn put_shielded_outputs<DbT, P, Output>(
     wallet_db: &mut DbT,
-    params: &P,
+    params: Option<&P>,
     tx_ref: <DbT as LowLevelWalletRead>::TxRef,
     funding_account: Option<DbT::AccountId>,
     outputs: &[Output],
+    detect_note_spent_in: impl Fn(
+        &mut DbT,
+        &Output,
+    ) -> Result<
+        Option<<DbT as LowLevelWalletRead>::TxRef>,
+        <DbT as LowLevelWalletRead>::Error,
+    >,
     put_received_note: impl Fn(
         &mut DbT,
         &Output,
         <DbT as LowLevelWalletRead>::TxRef,
+        Option<<DbT as LowLevelWalletRead>::TxRef>,
     ) -> Result<(), <DbT as LowLevelWalletRead>::Error>,
     mut on_external_account: impl FnMut(<DbT as LowLevelWalletRead>::AccountId),
 ) -> Result<(), <DbT as LowLevelWalletRead>::Error>
@@ -1064,34 +1122,25 @@ where
     Output::Note: Clone,
 {
     for output in outputs {
-        match output.transfer_type() {
+        let sent_output = match output.transfer_type() {
             TransferType::Outgoing => {
                 let note = output.note().clone().into();
-                let receiver = note.receiver();
-                let value = note.value();
-
-                let recipient = {
-                    let recipient_address = wallet_db
-                        .select_receiving_address(output.account_id(), &receiver)?
-                        .unwrap_or_else(|| receiver.to_zcash_address(params.network_type()));
 
-                    Recipient::External {
-                        recipient_address,
-                        output_pool: Output::POOL_TYPE,
-                    }
+                let recipient = Recipient::External {
+                    recipient_address: external_address(
+                        wallet_db,
+                        params.expect("present when outgoing is possible (store_decrypted_tx)"),
+                        output.account_id(),
+                        note.receiver(),
+                    )?,
+                    output_pool: Output::POOL_TYPE,
                 };
 
-                wallet_db.put_sent_output(
-                    output.account_id(),
-                    tx_ref,
-                    output.index(),
-                    &recipient,
-                    value,
-                    output.memo(),
-                )?;
+                Some((output.account_id(), recipient, note.value()))
             }
             TransferType::WalletInternal => {
-                put_received_note(wallet_db, output, tx_ref)?;
+                let spent_in = detect_note_spent_in(wallet_db, output)?;
+                put_received_note(wallet_db, output, tx_ref, spent_in)?;
 
                 let note = output.note().clone().into();
                 let value = note.value();
@@ -1102,49 +1151,47 @@ where
                     note: Box::new(note),
                 };
 
-                wallet_db.put_sent_output(
-                    output.account_id(),
-                    tx_ref,
-                    output.index(),
-                    &recipient,
-                    value,
-                    output.memo(),
-                )?;
+                Some((output.account_id(), recipient, value))
             }
             TransferType::Incoming => {
-                put_received_note(wallet_db, output, tx_ref)?;
+                let spent_in = detect_note_spent_in(wallet_db, output)?;
+                put_received_note(wallet_db, output, tx_ref, spent_in)?;
                 on_external_account(output.account_id());
 
                 if let Some(account_id) = funding_account {
                     let note = output.note().clone().into();
-                    let receiver = note.receiver();
                     let value = note.value();
 
                     // Even if the recipient address is external, record the send as internal.
                     let recipient = Recipient::InternalAccount {
                         receiving_account: output.account_id(),
-                        external_address: {
-                            Some(
-                                wallet_db
-                                    .select_receiving_address(output.account_id(), &receiver)?
-                                    .unwrap_or_else(|| {
-                                        receiver.to_zcash_address(params.network_type())
-                                    }),
-                            )
-                        },
+                        external_address: Some(external_address(
+                            wallet_db,
+                            params.expect(
+                                "present when funding_account is known (store_decrypted_tx)",
+                            ),
+                            output.account_id(),
+                            note.receiver(),
+                        )?),
                         note: Box::new(note),
                     };
 
-                    wallet_db.put_sent_output(
-                        account_id,
-                        tx_ref,
-                        output.index(),
-                        &recipient,
-                        value,
-                        output.memo(),
-                    )?;
+                    Some((account_id, recipient, value))
+                } else {
+                    None
                 }
             }
+        };
+
+        if let Some((from_account_uuid, recipient, value)) = sent_output {
+            wallet_db.put_sent_output(
+                from_account_uuid,
+                tx_ref,
+                output.index(),
+                &recipient,
+                value,
+                output.memo(),
+            )?;
         }
     }
 
@@ -1206,3 +1253,21 @@ where
 
     Ok(())
 }
+
+/// Returns the most likely account address that corresponds to the given [`Receiver`].
+fn external_address<DbT, P>(
+    wallet_db: &DbT,
+    params: &P,
+    account_id: DbT::AccountId,
+    receiver: Receiver,
+) -> Result<zcash_address::ZcashAddress, <DbT as LowLevelWalletRead>::Error>
+where
+    DbT: LowLevelWalletRead,
+    P: consensus::Parameters,
+{
+    let recipient_address = wallet_db
+        .select_receiving_address(account_id, &receiver)?
+        .unwrap_or_else(|| receiver.to_zcash_address(params.network_type()));
+
+    Ok(recipient_address)
+}

From b268d15cb3f046e20160a1d72fe81dd3397447b3 Mon Sep 17 00:00:00 2001
From: John Boyd <john@coldnoise.net>
Date: Sat, 28 Feb 2026 00:21:24 -0600
Subject: [PATCH 220/263] zcash_client_backend: Add support for P2SH address
 import

This commit adds the ability to import and track funds received to any
arbitrary standalone transparent P2SH address. This commit does not
implement spend capability for these addresses, and furthermore allows
importing scripts which we may never implement spend support for.

Future work will implement spend capabilities for supported script
types.
---
 zcash_client_backend/CHANGELOG.md             |  15 +-
 zcash_client_backend/src/data_api.rs          |  47 +++-
 zcash_client_backend/src/data_api/testing.rs  |  11 +
 .../src/data_api/testing/transparent.rs       | 232 +++++++++++++++++-
 zcash_client_backend/src/data_api/wallet.rs   |  15 +-
 zcash_client_backend/src/wallet.rs            |  62 ++++-
 zcash_client_memory/src/wallet_read.rs        |   9 +-
 zcash_client_memory/src/wallet_write.rs       |   9 +
 zcash_client_sqlite/src/wallet/transparent.rs |   4 +-
 9 files changed, 378 insertions(+), 26 deletions(-)

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index e5011d3cb2..2d1764abc7 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -12,6 +12,7 @@ workspace.
 
 ### Added
 - `zcash_client_backend::data_api`:
+  - `TransparentKeyOrigin` enum (behind the `transparent-inputs` feature flag).
   - `TransparentBalances` type alias (behind the `transparent-inputs` feature flag).
   - `ll` module
   - `wallet::ConfirmationsPolicy::confirmations_until_spendable`
@@ -32,6 +33,12 @@ workspace.
   - `Note::receiver`
   - `impl From<sapling_crypto::Note> for Note`
   - `impl From<orchard::Note> for Note`
+- Import standalone transparent P2SH addresses
+  - `zcash_client_backend::data_api::WalletWrite::import_standalone_transparent_script()`
+  - `zcash_client_backend::wallet::TransparentAddressSource::StandaloneScript`
+  - `zcash_client_backend::wallet::TransparentAddressSource::redeem_script()`
+  - `zcash_client_backend::wallet::TransparentAddressMetadata::standalone_script()`
+  - `zcash_client_backend::wallet::TransparentAddressMetadata::redeem_script()`
 
 ### Changed
 - `zcash_client_backend::data_api::wallet::create_proposed_transactions` now takes
@@ -71,8 +78,8 @@ workspace.
     that would otherwise only be recoverable using the wallet's internal
     IVK.
 - `zcash_client_backend::data_api::WalletRead::get_transparent_balances` now returns
-  `TransparentBalances` (using `Option<TransparentKeyScope>`) to support standalone
-  transparent addresses that have no key scope.
+  `TransparentBalances` (using `TransparentKeyOrigin`) to distinguish standalone
+  transparent addresses from HD-derived ones.
 - `zcash_client_backend::data_api::WalletRead` has added method `get_received_outputs`.
 - `zcash_client_backend::proposal::ProposalError` has added variants `PaymentAmountMissing`
   and `IncompatibleTxVersion`
@@ -99,6 +106,10 @@ workspace.
   than or equal to the provided minimum value. This fixes an inconsistency
   in the various tests related to notes having no economic value in
   `zcash_client_sqlite`.
+- Renamed `zcash_client_backend::wallet::TransparentAddressSource::Standalone`
+  to `zcash_client_backend::wallet::TransparentAddressSource::StandalonePubkey`
+- Renamed `zcash_client_backend::wallet::TransparentAddressMetadata::standalone()`
+  to `zcash_client_backend::wallet::TransparentAddressMetadata::standalone_p2pkh()`
 
 ### Removed
 - `zcash_client_backend::data_api::testing::transparent::GapLimits` use
diff --git a/zcash_client_backend/src/data_api.rs b/zcash_client_backend/src/data_api.rs
index e7f5867a1f..70c42d5938 100644
--- a/zcash_client_backend/src/data_api.rs
+++ b/zcash_client_backend/src/data_api.rs
@@ -132,9 +132,19 @@ pub mod wallet;
 #[cfg(any(test, feature = "test-dependencies"))]
 pub mod testing;
 
-/// A mapping from transparent addresses to their key scope and balance.
+/// The origin of a transparent address within a wallet.
 #[cfg(feature = "transparent-inputs")]
-pub type TransparentBalances = HashMap<TransparentAddress, (Option<TransparentKeyScope>, Balance)>;
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum TransparentKeyOrigin {
+    /// The address was imported standalone (no HD derivation scope).
+    Imported,
+    /// The address was derived from the account's HD key tree.
+    Derived { scope: TransparentKeyScope },
+}
+
+/// A mapping from transparent addresses to their key origin and balance.
+#[cfg(feature = "transparent-inputs")]
+pub type TransparentBalances = HashMap<TransparentAddress, (TransparentKeyOrigin, Balance)>;
 
 /// The height of subtree roots in the Sapling note commitment tree.
 ///
@@ -2778,11 +2788,12 @@ impl AccountBirthday {
 ///
 /// An account is treated as having a single root of spending authority that spans the shielded and
 /// transparent rules for the purpose of balance, transaction listing, and so forth. However,
-/// transparent keys imported via [`WalletWrite::import_standalone_transparent_pubkey`] break this
-/// abstraction slightly, so wallets using this API need to be cautious to enforce the invariant
-/// that the wallet either maintains access to the keys required to spend **ALL** outputs received
-/// by the account, or that it **DOES NOT** offer any spending capability for the account, i.e. the
-/// account is treated as view-only for all user-facing operations.
+/// transparent keys imported via [`WalletWrite::import_standalone_transparent_pubkey`] or
+/// [`WalletWrite::import_standalone_transparent_script`] break this abstraction slightly, so
+/// wallets using this API need to be cautious to enforce the invariant that the wallet either
+/// maintains access to the keys required to spend **ALL** outputs received by the account, or that
+/// it **DOES NOT** offer any spending capability for the account, i.e. the account is treated as
+/// view-only for all user-facing operations.
 ///
 /// A future change to this trait might introduce a method to "upgrade" an imported
 /// account with derivation information. See [zcash/librustzcash#1284] for details.
@@ -2995,6 +3006,28 @@ pub trait WalletWrite: WalletRead {
         )
     }
 
+    /// Imports the given redeem script into the account without key derivation information, and
+    /// adds the associated transparent p2sh address.
+    ///
+    /// The imported address will contribute to the balance of the account (for UFVK-based
+    /// accounts), but spending funds held by this address requires the associated spending keys to
+    /// be provided explicitly when calling [`create_proposed_transactions`]. By extension, calls
+    /// to [`propose_shielding`] must only include addresses for which the spending application
+    /// holds or can obtain the spending keys.
+    ///
+    /// [`create_proposed_transactions`]: crate::data_api::wallet::create_proposed_transactions
+    /// [`propose_shielding`]: crate::data_api::wallet::propose_shielding
+    #[cfg(feature = "transparent-key-import")]
+    fn import_standalone_transparent_script(
+        &mut self,
+        _account: Self::AccountId,
+        _script: zcash_script::script::Redeem,
+    ) -> Result<(), Self::Error> {
+        unimplemented!(
+            "WalletWrite::import_standalone_transparent_script must be overridden for wallets to use the `transparent-key-import` feature"
+        )
+    }
+
     /// Generates, persists, and marks as exposed the next available diversified address for the
     /// specified account, given the current addresses known to the wallet.
     ///
diff --git a/zcash_client_backend/src/data_api/testing.rs b/zcash_client_backend/src/data_api/testing.rs
index 3e8a734887..f4cc42d240 100644
--- a/zcash_client_backend/src/data_api/testing.rs
+++ b/zcash_client_backend/src/data_api/testing.rs
@@ -41,6 +41,8 @@ use zcash_protocol::{
     memo::{Memo, MemoBytes},
     value::{ZatBalance, Zatoshis},
 };
+#[cfg(feature = "transparent-key-import")]
+use zcash_script::script;
 use zip32::DiversifierIndex;
 use zip321::Payment;
 
@@ -2862,6 +2864,15 @@ impl WalletWrite for MockWalletDb {
         todo!()
     }
 
+    #[cfg(feature = "transparent-key-import")]
+    fn import_standalone_transparent_script(
+        &mut self,
+        _account: Self::AccountId,
+        _script: script::Redeem,
+    ) -> Result<(), Self::Error> {
+        todo!()
+    }
+
     fn get_next_available_address(
         &mut self,
         _account: Self::AccountId,
diff --git a/zcash_client_backend/src/data_api/testing/transparent.rs b/zcash_client_backend/src/data_api/testing/transparent.rs
index f293100b81..a72aa0e426 100644
--- a/zcash_client_backend/src/data_api/testing/transparent.rs
+++ b/zcash_client_backend/src/data_api/testing/transparent.rs
@@ -15,7 +15,10 @@ use zcash_primitives::block::BlockHash;
 use zcash_protocol::{local_consensus::LocalNetwork, value::Zatoshis};
 
 #[cfg(feature = "transparent-key-import")]
-use crate::wallet::TransparentAddressSource;
+use {
+    crate::wallet::TransparentAddressSource,
+    zcash_script::{descriptor::sh, script},
+};
 
 use super::TestAccount;
 use crate::{
@@ -538,6 +541,24 @@ where
     assert_eq!(query_height, h0);
 }
 
+/// Builds a test 1-of-1 multisig redeem script from a single keypair.
+#[cfg(feature = "transparent-key-import")]
+fn build_test_redeem_script() -> (script::Redeem, secp256k1::SecretKey) {
+    use secp256k1::{Secp256k1, SecretKey};
+    use zcash_script::pattern::check_multisig;
+
+    let secp = Secp256k1::new();
+    let secret_key = SecretKey::from_slice(&[1u8; 32]).expect("valid secret key");
+    let pubkey = secret_key.public_key(&secp);
+    let redeem_script = script::Component(
+        check_multisig(1, &[&pubkey.serialize()], false)
+            .unwrap()
+            .into_iter()
+            .collect(),
+    );
+    (redeem_script, secret_key)
+}
+
 /// Tests that importing a standalone transparent public key succeeds.
 #[cfg(feature = "transparent-key-import")]
 pub fn import_standalone_transparent_pubkey<DSF>(dsf: DSF)
@@ -616,7 +637,7 @@ where
         .expect("address should be present");
     assert!(matches!(
         metadata.source(),
-        TransparentAddressSource::Standalone(_)
+        TransparentAddressSource::StandalonePubkey(_)
     ));
 }
 
@@ -834,3 +855,210 @@ where
         &Balance::ZERO,
     );
 }
+
+/// Tests that importing a standalone P2SH address succeeds and the address appears
+/// in `get_transparent_receivers` with the correct `TransparentAddressSource`.
+#[cfg(feature = "transparent-key-import")]
+pub fn import_standalone_transparent_p2sh<DSF>(dsf: DSF)
+where
+    DSF: DataStoreFactory,
+{
+    let mut st = TestBuilder::new()
+        .with_data_store_factory(dsf)
+        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .build();
+
+    let account_id = st.test_account().unwrap().id();
+    let (redeem_script, _) = build_test_redeem_script();
+
+    // Import should succeed
+    assert_matches!(
+        st.wallet_mut()
+            .import_standalone_transparent_script(account_id, redeem_script.clone()),
+        Ok(_)
+    );
+
+    // Verify the address appears in get_transparent_receivers
+    let receivers = st
+        .wallet()
+        .get_transparent_receivers(account_id, false, true)
+        .unwrap();
+
+    // The P2SH address derived from the redeem script should be present
+    let script_pubkey = sh(&redeem_script);
+    let expected_addr =
+        TransparentAddress::from_script_pubkey(&script_pubkey).expect("valid P2SH address");
+
+    let metadata = receivers
+        .get(&expected_addr)
+        .expect("address should be present");
+    assert!(matches!(
+        metadata.source(),
+        TransparentAddressSource::StandaloneScript(_)
+    ));
+}
+
+/// Tests that importing the same P2SH address twice to the same account is idempotent.
+#[cfg(feature = "transparent-key-import")]
+pub fn import_standalone_transparent_p2sh_idempotent<DSF>(dsf: DSF)
+where
+    DSF: DataStoreFactory,
+{
+    let mut st = TestBuilder::new()
+        .with_data_store_factory(dsf)
+        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .build();
+
+    let account_id = st.test_account().unwrap().id();
+    let (redeem_script, _) = build_test_redeem_script();
+
+    // First import
+    assert_matches!(
+        st.wallet_mut()
+            .import_standalone_transparent_script(account_id, redeem_script.clone()),
+        Ok(_)
+    );
+
+    // Snapshot state after first import
+    let receivers_before = st
+        .wallet()
+        .get_transparent_receivers(account_id, false, true)
+        .unwrap();
+
+    // Second import to same account should also succeed (idempotent)
+    assert_matches!(
+        st.wallet_mut()
+            .import_standalone_transparent_script(account_id, redeem_script.clone()),
+        Ok(_)
+    );
+
+    // Verify wallet state is unchanged
+    let receivers_after = st
+        .wallet()
+        .get_transparent_receivers(account_id, false, true)
+        .unwrap();
+
+    assert_eq!(receivers_before.len(), receivers_after.len());
+
+    let script_pubkey = sh(&redeem_script);
+    let expected_addr =
+        TransparentAddress::from_script_pubkey(&script_pubkey).expect("valid P2SH address");
+    let metadata = receivers_after
+        .get(&expected_addr)
+        .expect("address should be present");
+    assert!(matches!(
+        metadata.source(),
+        TransparentAddressSource::StandaloneScript(_)
+    ));
+}
+
+/// Tests that importing the same P2SH address to a different account fails.
+#[cfg(feature = "transparent-key-import")]
+pub fn import_standalone_transparent_p2sh_conflict<DSF>(dsf: DSF)
+where
+    DSF: DataStoreFactory,
+{
+    use secrecy::Secret;
+
+    use crate::data_api::{AccountBirthday, chain::ChainState};
+    use zcash_protocol::consensus::{NetworkUpgrade, Parameters};
+
+    let mut st = TestBuilder::new()
+        .with_data_store_factory(dsf)
+        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .build();
+
+    let account1_id = st.test_account().unwrap().id();
+    let (redeem_script, _) = build_test_redeem_script();
+
+    // Import to first account
+    assert_matches!(
+        st.wallet_mut()
+            .import_standalone_transparent_script(account1_id, redeem_script.clone()),
+        Ok(_)
+    );
+
+    // Create a second account
+    let birthday = AccountBirthday::from_parts(
+        ChainState::empty(
+            st.network()
+                .activation_height(NetworkUpgrade::Sapling)
+                .unwrap()
+                - 1,
+            BlockHash([0; 32]),
+        ),
+        None,
+    );
+    let seed2 = Secret::new(vec![42u8; 32]);
+    let (account2_id, _) = st
+        .wallet_mut()
+        .create_account("account2", &seed2, &birthday, None)
+        .unwrap();
+
+    // Import same redeem script to second account should fail
+    assert_matches!(
+        st.wallet_mut()
+            .import_standalone_transparent_script(account2_id, redeem_script),
+        Err(_)
+    );
+}
+
+/// Tests that a UTXO received at a standalone P2SH address is reflected in the wallet balance.
+#[cfg(feature = "transparent-key-import")]
+pub fn import_standalone_transparent_p2sh_balance<DSF>(dsf: DSF)
+where
+    DSF: DataStoreFactory,
+    <<DSF as DataStoreFactory>::DataStore as WalletWrite>::UtxoRef: std::fmt::Debug,
+{
+    use crate::data_api::wallet::ConfirmationsPolicy;
+
+    let mut st = TestBuilder::new()
+        .with_data_store_factory(dsf)
+        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .build();
+
+    let account_id = st.test_account().unwrap().id();
+    let birthday = st.test_account().unwrap().birthday().height();
+
+    let (redeem_script, _) = build_test_redeem_script();
+
+    // Import the P2SH address.
+    st.wallet_mut()
+        .import_standalone_transparent_script(account_id, redeem_script.clone())
+        .unwrap();
+
+    // Derive the expected transparent address from the redeem script.
+    let script_pubkey = sh(&redeem_script);
+    let taddr = TransparentAddress::from_script_pubkey(&script_pubkey).expect("valid P2SH address");
+
+    let height = birthday + 1000;
+    st.wallet_mut().update_chain_tip(height).unwrap();
+
+    // Create a fake UTXO at the P2SH address.
+    let value = Zatoshis::const_from_u64(50_000);
+    let outpoint = OutPoint::fake();
+    let txout = TxOut::new(value, taddr.script().into());
+    let utxo = WalletTransparentOutput::from_parts(outpoint, txout, Some(height)).unwrap();
+    st.wallet_mut()
+        .put_received_transparent_utxo(&utxo)
+        .unwrap();
+
+    // Verify the balance is reflected via get_transparent_balances.
+    let target_height = TargetHeight::from(height + 1);
+    let balances = st
+        .wallet()
+        .get_transparent_balances(account_id, target_height, ConfirmationsPolicy::MIN)
+        .unwrap();
+    assert_eq!(
+        balances.get(&taddr).map(|(_, b)| b.spendable_value()),
+        Some(value),
+    );
+
+    // Verify the UTXO is returned by get_spendable_transparent_outputs.
+    let utxos = st
+        .wallet()
+        .get_spendable_transparent_outputs(&taddr, target_height, ConfirmationsPolicy::MIN)
+        .unwrap();
+    assert_eq!(utxos.len(), 1);
+    assert_eq!(utxos[0].value(), value);
+}
diff --git a/zcash_client_backend/src/data_api/wallet.rs b/zcash_client_backend/src/data_api/wallet.rs
index 1517825aec..e159fac906 100644
--- a/zcash_client_backend/src/data_api/wallet.rs
+++ b/zcash_client_backend/src/data_api/wallet.rs
@@ -1337,7 +1337,11 @@ where
                         .derive_address_pubkey(*scope, *address_index)
                         .expect("spending key derivation should not fail"),
                     #[cfg(feature = "transparent-key-import")]
-                    TransparentAddressSource::Standalone(pubkey) => *pubkey,
+                    TransparentAddressSource::StandalonePubkey(pubkey) => *pubkey,
+                    #[cfg(feature = "transparent-key-import")]
+                    TransparentAddressSource::StandaloneScript(_) => {
+                        return Err(Error::ProposalNotSupported);
+                    }
                 };
 
                 utxos_spent.push(outpoint.clone());
@@ -1702,10 +1706,14 @@ where
                 .derive_secret_key(*scope, *address_index)
                 .expect("spending key derivation should not fail"),
             #[cfg(feature = "transparent-key-import")]
-            TransparentAddressSource::Standalone(_) => *spending_keys
+            TransparentAddressSource::StandalonePubkey(_) => *spending_keys
                 .standalone_transparent_keys
                 .get(&_address)
                 .ok_or(Error::AddressNotRecognized(_address))?,
+            #[cfg(feature = "transparent-key-import")]
+            TransparentAddressSource::StandaloneScript(_) => {
+                return Err(Error::ProposalNotSupported);
+            }
         });
     }
     let sapling_extsks = &[
@@ -2077,7 +2085,8 @@ where
                                     address_index,
                                 } => Some((index, *scope, *address_index)),
                                 #[cfg(feature = "transparent-key-import")]
-                                TransparentAddressSource::Standalone(_) => None,
+                                TransparentAddressSource::StandalonePubkey(_)
+                                | TransparentAddressSource::StandaloneScript(_) => None,
                             })
                     })
                     .collect::<Vec<_>>();
diff --git a/zcash_client_backend/src/wallet.rs b/zcash_client_backend/src/wallet.rs
index 2390c725b1..525dbf2431 100644
--- a/zcash_client_backend/src/wallet.rs
+++ b/zcash_client_backend/src/wallet.rs
@@ -17,6 +17,8 @@ use zcash_protocol::{
     consensus::{BlockHeight, TxIndex},
     value::{BalanceError, Zatoshis},
 };
+#[cfg(feature = "transparent-key-import")]
+use zcash_script::script;
 use zip32::Scope;
 
 use crate::fees::sapling as sapling_fees;
@@ -763,16 +765,31 @@ impl TransparentAddressMetadata {
         }
     }
 
-    /// Returns a [`TransparentAddressMetadata`] with [`TransparentAddressSource::Standalone`] source
-    /// information and the specified exposure height.
+    /// Returns a [`TransparentAddressMetadata`] with [`TransparentAddressSource::StandalonePubkey`]
+    /// source information for a P2PKH address and the specified exposure height.
     #[cfg(feature = "transparent-key-import")]
-    pub fn standalone(
+    pub fn standalone_p2pkh(
         pubkey: secp256k1::PublicKey,
         exposure: Exposure,
         next_check_time: Option<SystemTime>,
     ) -> Self {
         Self {
-            source: TransparentAddressSource::Standalone(pubkey),
+            source: TransparentAddressSource::StandalonePubkey(pubkey),
+            exposure,
+            next_check_time,
+        }
+    }
+
+    /// Returns a [`TransparentAddressMetadata`] with [`TransparentAddressSource::StandaloneScript`]
+    /// source information for a P2SH address and the specified exposure height.
+    #[cfg(feature = "transparent-key-import")]
+    pub fn standalone_script(
+        redeem_script: script::Redeem,
+        exposure: Exposure,
+        next_check_time: Option<SystemTime>,
+    ) -> Self {
+        Self {
+            source: TransparentAddressSource::StandaloneScript(redeem_script),
             exposure,
             next_check_time,
         }
@@ -825,6 +842,13 @@ impl TransparentAddressMetadata {
     pub fn address_index(&self) -> Option<NonHardenedChildIndex> {
         self.source.address_index()
     }
+
+    /// Returns the redeem script for the address, if this is a P2SH address.
+    /// Returns `None` for non-P2SH addresses.
+    #[cfg(feature = "transparent-key-import")]
+    pub fn redeem_script(&self) -> Option<&script::Redeem> {
+        self.source.redeem_script()
+    }
 }
 
 /// Source information for a transparent address.
@@ -837,11 +861,18 @@ pub enum TransparentAddressSource {
         scope: TransparentKeyScope,
         address_index: NonHardenedChildIndex,
     },
+
     /// The address was derived from a secp256k1 public key for which derivation information is
     /// unknown or for which the associated spending key was produced from system randomness.
     /// This variant provides the public key directly.
     #[cfg(feature = "transparent-key-import")]
-    Standalone(secp256k1::PublicKey),
+    StandalonePubkey(secp256k1::PublicKey),
+
+    /// The address was derived from a P2SH redeem_script for which derivation information is
+    /// unknown.
+    /// This variant provides the redeem script directly.
+    #[cfg(feature = "transparent-key-import")]
+    StandaloneScript(script::Redeem),
 }
 
 #[cfg(feature = "transparent-inputs")]
@@ -852,7 +883,9 @@ impl TransparentAddressSource {
         match self {
             TransparentAddressSource::Derived { scope, .. } => Some(*scope),
             #[cfg(feature = "transparent-key-import")]
-            TransparentAddressSource::Standalone(_) => None,
+            TransparentAddressSource::StandalonePubkey(_) => None,
+            #[cfg(feature = "transparent-key-import")]
+            TransparentAddressSource::StandaloneScript(_) => None,
         }
     }
 
@@ -862,7 +895,22 @@ impl TransparentAddressSource {
         match self {
             TransparentAddressSource::Derived { address_index, .. } => Some(*address_index),
             #[cfg(feature = "transparent-key-import")]
-            TransparentAddressSource::Standalone(_) => None,
+            TransparentAddressSource::StandalonePubkey(_) => None,
+            #[cfg(feature = "transparent-key-import")]
+            TransparentAddressSource::StandaloneScript(_) => None,
+        }
+    }
+
+    /// Returns the redeem script for the address, if this is a P2SH address.
+    /// Returns `None` for non-P2SH addresses.
+    #[cfg(feature = "transparent-key-import")]
+    pub fn redeem_script(&self) -> Option<&script::Redeem> {
+        match self {
+            TransparentAddressSource::Derived { .. } => None,
+            #[cfg(feature = "transparent-key-import")]
+            TransparentAddressSource::StandalonePubkey(_) => None,
+            #[cfg(feature = "transparent-key-import")]
+            TransparentAddressSource::StandaloneScript(redeem_script) => Some(redeem_script),
         }
     }
 }
diff --git a/zcash_client_memory/src/wallet_read.rs b/zcash_client_memory/src/wallet_read.rs
index 7b1206bed4..a48f5e3b79 100644
--- a/zcash_client_memory/src/wallet_read.rs
+++ b/zcash_client_memory/src/wallet_read.rs
@@ -6,14 +6,14 @@ use std::{
 use nonempty::NonEmpty;
 use secrecy::{ExposeSecret, SecretVec};
 use shardtree::store::ShardStore as _;
-#[cfg(feature = "transparent-inputs")]
-use zcash_client_backend::data_api::TransparentBalances;
 use zcash_client_backend::data_api::{
     AddressInfo, BlockMetadata, NullifierQuery, ReceivedTransactionOutput, WalletRead,
     WalletSummary, Zip32Derivation,
     scanning::ScanRange,
     wallet::{ConfirmationsPolicy, TargetHeight},
 };
+#[cfg(feature = "transparent-inputs")]
+use zcash_client_backend::data_api::{TransparentBalances, TransparentKeyOrigin};
 use zcash_client_backend::{
     data_api::{
         Account as _, AccountBalance, AccountSource, Balance, Progress, Ratio, SeedRelevance,
@@ -707,9 +707,12 @@ impl<P: consensus::Parameters> WalletRead for MemoryWalletDb<P> {
         }) {
             if self.utxo_is_spendable(outpoint, target_height, confirmations_policy)? {
                 let address = txo.address;
+                let key_origin = TransparentKeyOrigin::Derived {
+                    scope: txo.key_scope,
+                };
                 let entry = balances
                     .entry(address)
-                    .or_insert((Some(txo.key_scope), Balance::ZERO));
+                    .or_insert((key_origin, Balance::ZERO));
 
                 entry.1.add_spendable_value(txo.txout.value())?;
             }
diff --git a/zcash_client_memory/src/wallet_write.rs b/zcash_client_memory/src/wallet_write.rs
index e8a5e3edcc..5801193aba 100644
--- a/zcash_client_memory/src/wallet_write.rs
+++ b/zcash_client_memory/src/wallet_write.rs
@@ -1264,6 +1264,15 @@ Instead derive the ufvk in the calling code and import it using `import_account_
     ) -> Result<(), Self::Error> {
         todo!()
     }
+
+    #[cfg(feature = "transparent-key-import")]
+    fn import_standalone_transparent_script(
+        &mut self,
+        _account: Self::AccountId,
+        _script: zcash_script::script::Redeem,
+    ) -> Result<(), Self::Error> {
+        todo!()
+    }
 }
 
 #[cfg(feature = "transparent-inputs")]
diff --git a/zcash_client_sqlite/src/wallet/transparent.rs b/zcash_client_sqlite/src/wallet/transparent.rs
index a5468ace0a..4bcde38697 100644
--- a/zcash_client_sqlite/src/wallet/transparent.rs
+++ b/zcash_client_sqlite/src/wallet/transparent.rs
@@ -266,7 +266,7 @@ pub(crate) fn get_transparent_receivers<P: consensus::Parameters>(
                     let pubkey = PublicKey::from_bytes(pubkey_bytes).map_err(|e| {
                         SqliteClientError::CorruptedData(format!("Invalid public key: {}", e))
                     })?;
-                    TransparentAddressMetadata::standalone(pubkey, exposure, next_check_time)
+                    TransparentAddressMetadata::standalone_p2pkh(pubkey, exposure, next_check_time)
                 }
                 derived => {
                     let (scope, address_index) = derived
@@ -1819,7 +1819,7 @@ pub(crate) fn get_transparent_address_metadata<P: consensus::Parameters>(
                                     })?;
                                     let pubkey = secp256k1::PublicKey::from_bytes(pubkey_bytes)?;
 
-                                    let addr_meta = TransparentAddressMetadata::standalone(
+                                    let addr_meta = TransparentAddressMetadata::standalone_p2pkh(
                                         pubkey,
                                         exposed_at_height.map_or(
                                             Exposure::Unknown,

From c91e7c30c87d09b8609c87f903acdfdb873305bf Mon Sep 17 00:00:00 2001
From: John Boyd <john@coldnoise.net>
Date: Sat, 28 Feb 2026 00:21:48 -0600
Subject: [PATCH 221/263] zcash_client_sqlite: Impl standalone P2SH import

This commit adds support for standalone P2SH address import in the
zcash_client_sqlite implementation.
---
 zcash_client_sqlite/CHANGELOG.md              |   4 +
 zcash_client_sqlite/src/error.rs              |   8 +-
 zcash_client_sqlite/src/lib.rs                |  11 +
 zcash_client_sqlite/src/wallet.rs             |  91 +++++-
 zcash_client_sqlite/src/wallet/db.rs          |  29 +-
 zcash_client_sqlite/src/wallet/init.rs        |   4 +-
 .../src/wallet/init/migrations.rs             |  11 +-
 .../wallet/init/migrations/standalone_p2sh.rs | 303 ++++++++++++++++++
 zcash_client_sqlite/src/wallet/transparent.rs | 249 ++++++++++----
 9 files changed, 627 insertions(+), 83 deletions(-)
 create mode 100644 zcash_client_sqlite/src/wallet/init/migrations/standalone_p2sh.rs

diff --git a/zcash_client_sqlite/CHANGELOG.md b/zcash_client_sqlite/CHANGELOG.md
index 5fdeabfccb..af33fe4133 100644
--- a/zcash_client_sqlite/CHANGELOG.md
+++ b/zcash_client_sqlite/CHANGELOG.md
@@ -25,10 +25,14 @@ workspace.
 - `impl zcash_keys::keys::transparent::gap_limits::AddressStore for WalletDb`
   (behind the `transparent-inputs` feature flag)
 - `zcash_client_sqlite::AccountRef` is now public.
+- Implement standalone P2SH address import support
+  - `impl zcash_client_backend::data_api::WalletWrite::import_standalone_transparent_script()`
 
 ### Changed
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`.
 - `zcash_client_sqlite::error::SqliteClientError` has added variant `GapAddresses`.
+- Renamed `zcash_client_sqlite::error::PubkeyImportConflict` to
+  `zcash_client_sqlite::error::StandaloneImportConflict`
 
 ### Removed
 - `zcash_client_sqlite::GapLimits` use `zcash_keys::keys::transparent::GapLimits` instead.
diff --git a/zcash_client_sqlite/src/error.rs b/zcash_client_sqlite/src/error.rs
index 9868fe9a9f..e5f03f86bc 100644
--- a/zcash_client_sqlite/src/error.rs
+++ b/zcash_client_sqlite/src/error.rs
@@ -171,10 +171,10 @@ pub enum SqliteClientError {
     #[cfg(feature = "transparent-inputs")]
     GapAddresses,
 
-    /// An attempt to import a transparent pubkey failed because that pubkey had already been
+    /// An attempt to import a standalone transparent address failed because it had already been
     /// imported to a different account.
     #[cfg(feature = "transparent-key-import")]
-    PubkeyImportConflict(Uuid),
+    StandaloneImportConflict(Uuid),
 }
 
 impl error::Error for SqliteClientError {
@@ -334,10 +334,10 @@ impl fmt::Display for SqliteClientError {
                 )
             }
             #[cfg(feature = "transparent-key-import")]
-            SqliteClientError::PubkeyImportConflict(uuid) => {
+            SqliteClientError::StandaloneImportConflict(uuid) => {
                 write!(
                     f,
-                    "The given transparent pubkey is already managed by account {uuid}"
+                    "The given standalone transparent address is already managed by account {uuid}"
                 )
             }
         }
diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs
index e3bddc2aba..798c359bd1 100644
--- a/zcash_client_sqlite/src/lib.rs
+++ b/zcash_client_sqlite/src/lib.rs
@@ -1314,6 +1314,17 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
         })
     }
 
+    #[cfg(feature = "transparent-key-import")]
+    fn import_standalone_transparent_script(
+        &mut self,
+        account: Self::AccountId,
+        script: zcash_script::script::Redeem,
+    ) -> Result<(), Self::Error> {
+        self.transactionally(|wdb| {
+            wallet::import_standalone_transparent_script(wdb.conn.0, wdb.params, account, script)
+        })
+    }
+
     fn get_next_available_address(
         &mut self,
         account_uuid: Self::AccountId,
diff --git a/zcash_client_sqlite/src/wallet.rs b/zcash_client_sqlite/src/wallet.rs
index 9acd4c1339..683b31c84e 100644
--- a/zcash_client_sqlite/src/wallet.rs
+++ b/zcash_client_sqlite/src/wallet.rs
@@ -801,12 +801,12 @@ pub(crate) fn import_standalone_transparent_pubkey<P: consensus::Parameters>(
             // The key has already been imported; nothing to do.
             return Ok(());
         } else {
-            return Err(SqliteClientError::PubkeyImportConflict(current));
+            return Err(SqliteClientError::StandaloneImportConflict(current));
         }
     }
 
     let addr_str = Address::Transparent(TransparentAddress::from_pubkey(&pubkey)).encode(params);
-    conn.execute(
+    let rows_affected = conn.execute(
         r#"
         INSERT INTO addresses (
           account_id, key_scope, address, cached_transparent_receiver_address,
@@ -817,7 +817,6 @@ pub(crate) fn import_standalone_transparent_pubkey<P: consensus::Parameters>(
           :receiver_flags, :imported_transparent_receiver_pubkey
           FROM accounts
           WHERE accounts.uuid = :account_uuid
-        ON CONFLICT (imported_transparent_receiver_pubkey) DO NOTHING
         "#,
         named_params![
             ":account_uuid": account_uuid.0,
@@ -828,6 +827,92 @@ pub(crate) fn import_standalone_transparent_pubkey<P: consensus::Parameters>(
         ],
     )?;
 
+    if rows_affected == 0 {
+        return Err(SqliteClientError::AccountUnknown);
+    }
+
+    Ok(())
+}
+
+#[cfg(feature = "transparent-key-import")]
+pub(crate) fn import_standalone_transparent_script<P: consensus::Parameters>(
+    conn: &rusqlite::Transaction,
+    params: &P,
+    account_uuid: AccountUuid,
+    redeem_script: zcash_script::script::Redeem,
+) -> Result<(), SqliteClientError> {
+    use ::transparent::address::TransparentAddress;
+    use zcash_script::descriptor::sh;
+    use zcash_script::script::Evaluable;
+
+    // This mirrors `zcash_script::opcode::push_value::LargeValue::MAX_SIZE`, which is
+    // currently `pub(crate)`. Replace with a direct reference if it becomes public.
+    const MAX_P2SH_REDEEM_SCRIPT_SIZE: usize = 520;
+    let rs_bytes = redeem_script.to_bytes();
+    if rs_bytes.len() > MAX_P2SH_REDEEM_SCRIPT_SIZE {
+        return Err(SqliteClientError::BadAccountData(format!(
+            "Redeem script exceeds maximum P2SH size of {MAX_P2SH_REDEEM_SCRIPT_SIZE} bytes (got {} bytes)",
+            rs_bytes.len()
+        )));
+    }
+
+    let script_pubkey = sh(&redeem_script);
+    // `sh()` always produces a valid P2SH scriptPubKey, so `from_script_pubkey`
+    // should always succeed here. This is a defensive check.
+    let addr = TransparentAddress::from_script_pubkey(&script_pubkey).ok_or_else(|| {
+        SqliteClientError::CorruptedData(
+            "Could not derive P2SH address from redeem script".to_owned(),
+        )
+    })?;
+
+    let existing_import_account = conn
+        .query_row(
+            "SELECT accounts.uuid AS account_uuid
+             FROM addresses
+             JOIN accounts ON accounts.id = addresses.account_id
+             WHERE imported_transparent_receiver_script = :imported_transparent_receiver_script",
+            named_params![
+                ":imported_transparent_receiver_script": &rs_bytes[..]
+            ],
+            |row| row.get::<_, Uuid>("account_uuid"),
+        )
+        .optional()?;
+
+    if let Some(current) = existing_import_account {
+        if current == account_uuid.expose_uuid() {
+            // The key has already been imported; nothing to do.
+            return Ok(());
+        } else {
+            return Err(SqliteClientError::StandaloneImportConflict(current));
+        }
+    }
+
+    let addr_str = Address::Transparent(addr).encode(params);
+    let rows_affected = conn.execute(
+        r#"
+        INSERT INTO addresses (
+          account_id, key_scope, address, cached_transparent_receiver_address,
+          receiver_flags, imported_transparent_receiver_script
+        )
+        SELECT
+          id, :key_scope, :address, :address,
+          :receiver_flags, :imported_transparent_receiver_script
+          FROM accounts
+          WHERE accounts.uuid = :account_uuid
+        "#,
+        named_params![
+            ":account_uuid": account_uuid.0,
+            ":key_scope": KeyScope::Foreign.encode(),
+            ":address": addr_str,
+            ":receiver_flags": ReceiverFlags::P2SH.bits(),
+            ":imported_transparent_receiver_script": &rs_bytes[..]
+        ],
+    )?;
+
+    if rows_affected == 0 {
+        return Err(SqliteClientError::AccountUnknown);
+    }
+
     Ok(())
 }
 
diff --git a/zcash_client_sqlite/src/wallet/db.rs b/zcash_client_sqlite/src/wallet/db.rs
index 1972db129e..7da8e557a4 100644
--- a/zcash_client_sqlite/src/wallet/db.rs
+++ b/zcash_client_sqlite/src/wallet/db.rs
@@ -125,7 +125,7 @@ pub(super) const INDEX_HD_ACCOUNT: &str = r#"CREATE UNIQUE INDEX hd_account ON a
 /// - `diversifier_index_be`: the diversifier index at which this address was derived.
 ///   This may be null for imported standalone addresses.
 /// - `key_scope`: the BIP 44 change-level index at which this address was derived, or `-1`
-///   for imported transparent pubkeys.
+///   for imported standalone transparent addresses (P2PKH or P2SH).
 /// - `address`: The Unified, Sapling, or transparent address. For Unified and Sapling addresses,
 ///   only external-key scoped addresses should be stored in this table; for purely transparent
 ///   addresses, this may be an internal-scope (change) address, so that we can provide
@@ -162,11 +162,16 @@ pub(super) const INDEX_HD_ACCOUNT: &str = r#"CREATE UNIQUE INDEX hd_account ON a
 /// - `transparent_receiver_next_check_time`: The Unix epoch time at which a client should next
 ///   check to determine whether any new UTXOs have been received by the cached transparent receiver
 ///   address. At present, this will ordinarily be populated only for ZIP 320 ephemeral addresses.
-//  - `imported_transparent_receiver_pubkey`: The 33-byte pubkey corresponding to the
-//    `cached_transparent_receiver_address` value, for imported transparent addresses that were not
-//    obtained via derivation from an HD seed associated with the account. In cases that
-//    `cached_transparent_receiver_address` is non-null, either this column or
-//    `transparent_child_index` must also be non-null.
+/// - `imported_transparent_receiver_pubkey`: The 33-byte pubkey corresponding to the
+///   `cached_transparent_receiver_address` value, for imported transparent P2PKH addresses that
+///   were not obtained via derivation from an HD seed associated with the account. In cases that
+///   `cached_transparent_receiver_address` is non-null, either this column, or
+///   `imported_transparent_receiver_script` (for imported P2SH addresses), or
+///   `transparent_child_index` must also be non-null. This is only set for imported addresses
+///   (key_scope = -1).
+/// - `imported_transparent_receiver_script`: The serialized redeem script for an imported
+///   standalone P2SH address. When present, `cached_transparent_receiver_address` holds the P2SH
+///   address derived from this script. This is only set for imported addresses (key_scope = -1).
 ///
 /// [`ReceiverFlags`]: crate::wallet::encoding::ReceiverFlags
 pub(super) const TABLE_ADDRESSES: &str = r#"
@@ -183,8 +188,10 @@ CREATE TABLE "addresses" (
     receiver_flags INTEGER NOT NULL,
     transparent_receiver_next_check_time INTEGER,
     imported_transparent_receiver_pubkey BLOB,
+    imported_transparent_receiver_script BLOB,
     UNIQUE (account_id, key_scope, diversifier_index_be),
     UNIQUE (imported_transparent_receiver_pubkey),
+    UNIQUE (imported_transparent_receiver_script),
     CONSTRAINT ck_addr_transparent_index_consistency CHECK (
         (transparent_child_index IS NULL OR diversifier_index_be < x'0000000F00000000000000')
         AND (
@@ -192,10 +199,18 @@ CREATE TABLE "addresses" (
                 cached_transparent_receiver_address IS NULL
                 AND transparent_child_index IS NULL
                 AND imported_transparent_receiver_pubkey IS NULL
+                AND imported_transparent_receiver_script IS NULL
             )
             OR (
                 cached_transparent_receiver_address IS NOT NULL
-                AND (transparent_child_index IS NULL) == (imported_transparent_receiver_pubkey IS NOT NULL)
+                AND (
+                    (transparent_child_index IS NULL) == (
+                        key_scope = -1 AND (
+                            (imported_transparent_receiver_pubkey IS NULL) !=
+                              (imported_transparent_receiver_script IS NULL)
+                        )
+                    )
+                )
             )
         )
     ),
diff --git a/zcash_client_sqlite/src/wallet/init.rs b/zcash_client_sqlite/src/wallet/init.rs
index eaff14d8f0..7ea7f3c096 100644
--- a/zcash_client_sqlite/src/wallet/init.rs
+++ b/zcash_client_sqlite/src/wallet/init.rs
@@ -250,8 +250,8 @@ fn sqlite_client_error_to_wallet_migration_error(e: SqliteClientError) -> Wallet
             unreachable!("we don't service transaction data requests in migrations")
         }
         #[cfg(feature = "transparent-key-import")]
-        SqliteClientError::PubkeyImportConflict(_) => {
-            unreachable!("we do not import pubkeys in migrations")
+        SqliteClientError::StandaloneImportConflict(_) => {
+            unreachable!("we do not import standalone transparent addresses in migrations")
         }
     }
 }
diff --git a/zcash_client_sqlite/src/wallet/init/migrations.rs b/zcash_client_sqlite/src/wallet/init/migrations.rs
index 3a119070d2..88d28c3745 100644
--- a/zcash_client_sqlite/src/wallet/init/migrations.rs
+++ b/zcash_client_sqlite/src/wallet/init/migrations.rs
@@ -32,6 +32,7 @@ mod sapling_memo_consistency;
 mod sent_notes_to_internal;
 mod shardtree_support;
 mod spend_key_available;
+mod standalone_p2sh;
 mod support_legacy_sqlite;
 mod support_zcashd_wallet_import;
 mod transparent_gap_limit_handling;
@@ -131,8 +132,8 @@ pub(super) fn all_migrations<
     //                     \                       \         v_received_output_spends_account      /        /
     //                      \                       \               /                             /        /
     //                       `------------------- account_delete_cascade ---------------------------------'
-    //                                                      |
-    //                                           v_tx_outputs_key_scopes
+    //                                              /               \
+    //                               v_tx_outputs_key_scopes    standalone_p2sh
     //
     let rng = Rc::new(Mutex::new(rng));
     vec![
@@ -219,6 +220,7 @@ pub(super) fn all_migrations<
         Box::new(add_transaction_trust_marker::Migration),
         Box::new(account_delete_cascade::Migration),
         Box::new(v_tx_outputs_key_scopes::Migration),
+        Box::new(standalone_p2sh::Migration),
     ]
 }
 
@@ -359,7 +361,10 @@ pub const V_0_18_5: &[Uuid] = &[
 pub const V_0_19_0: &[Uuid] = &[account_delete_cascade::MIGRATION_ID];
 
 /// Leaf migrations as of the current repository state.
-pub const CURRENT_LEAF_MIGRATIONS: &[Uuid] = &[v_tx_outputs_key_scopes::MIGRATION_ID];
+pub const CURRENT_LEAF_MIGRATIONS: &[Uuid] = &[
+    v_tx_outputs_key_scopes::MIGRATION_ID,
+    standalone_p2sh::MIGRATION_ID,
+];
 
 pub(super) fn verify_network_compatibility<P: consensus::Parameters>(
     conn: &rusqlite::Connection,
diff --git a/zcash_client_sqlite/src/wallet/init/migrations/standalone_p2sh.rs b/zcash_client_sqlite/src/wallet/init/migrations/standalone_p2sh.rs
new file mode 100644
index 0000000000..d5ce4db2f3
--- /dev/null
+++ b/zcash_client_sqlite/src/wallet/init/migrations/standalone_p2sh.rs
@@ -0,0 +1,303 @@
+//! This migration relaxes the addresses table constraint to allow standalone P2SH addresses
+//! that have an imported transparent receiver script but no imported public key and no
+//! transparent child index.
+
+use std::collections::HashSet;
+
+use schemerz_rusqlite::RusqliteMigration;
+use uuid::Uuid;
+
+use crate::wallet::init::WalletMigrationError;
+
+use super::account_delete_cascade;
+
+pub(super) const MIGRATION_ID: Uuid = Uuid::from_u128(0x944f8a1e_bdfa_4d52_90ca_663dee8efc62);
+
+const DEPENDENCIES: &[Uuid] = &[account_delete_cascade::MIGRATION_ID];
+
+pub(super) struct Migration;
+
+impl schemerz::Migration<Uuid> for Migration {
+    fn id(&self) -> Uuid {
+        MIGRATION_ID
+    }
+
+    fn dependencies(&self) -> HashSet<Uuid> {
+        DEPENDENCIES.iter().copied().collect()
+    }
+
+    fn description(&self) -> &'static str {
+        "Relaxes the addresses table constraint to allow standalone P2SH addresses."
+    }
+}
+
+impl RusqliteMigration for Migration {
+    type Error = WalletMigrationError;
+
+    fn up(&self, transaction: &rusqlite::Transaction) -> Result<(), Self::Error> {
+        // Recreate the addresses table with the relaxed constraint.
+        // The new constraint allows rows where:
+        // - transparent_child_index IS NULL AND imported_transparent_receiver_pubkey IS NULL
+        //   as long as key_scope = -1 (Foreign) AND imported_transparent_receiver_script IS NOT NULL
+        //   (this is the standalone P2SH case)
+        transaction.execute_batch(
+            r#"
+            CREATE TABLE addresses_new (
+                id INTEGER NOT NULL PRIMARY KEY,
+                account_id INTEGER NOT NULL
+                    REFERENCES accounts(id) ON DELETE CASCADE,
+                key_scope INTEGER NOT NULL,
+                diversifier_index_be BLOB,
+                address TEXT NOT NULL,
+                transparent_child_index INTEGER,
+                cached_transparent_receiver_address TEXT,
+                exposed_at_height INTEGER,
+                receiver_flags INTEGER NOT NULL,
+                transparent_receiver_next_check_time INTEGER,
+                imported_transparent_receiver_pubkey BLOB,
+                imported_transparent_receiver_script BLOB,
+                UNIQUE (account_id, key_scope, diversifier_index_be),
+                UNIQUE (imported_transparent_receiver_pubkey),
+                UNIQUE (imported_transparent_receiver_script),
+                CONSTRAINT ck_addr_transparent_index_consistency CHECK (
+                    (transparent_child_index IS NULL OR diversifier_index_be < x'0000000F00000000000000')
+                    AND (
+                        (
+                            cached_transparent_receiver_address IS NULL
+                            AND transparent_child_index IS NULL
+                            AND imported_transparent_receiver_pubkey IS NULL
+                            AND imported_transparent_receiver_script IS NULL
+                        )
+                        OR (
+                            cached_transparent_receiver_address IS NOT NULL
+                            AND (
+                                (transparent_child_index IS NULL) == (
+                                    key_scope = -1 AND (
+                                        (imported_transparent_receiver_pubkey IS NULL) !=
+                                          (imported_transparent_receiver_script IS NULL)
+                                    )
+                                )
+                            )
+                        )
+                    )
+                ),
+                CONSTRAINT ck_addr_foreign_or_diversified CHECK (
+                    (diversifier_index_be IS NULL) == (key_scope = -1)
+                )
+            );
+
+            INSERT INTO addresses_new (
+                id, account_id, key_scope, diversifier_index_be, address,
+                transparent_child_index, cached_transparent_receiver_address,
+                exposed_at_height, receiver_flags, transparent_receiver_next_check_time,
+                imported_transparent_receiver_pubkey
+            )
+            SELECT
+                id, account_id, key_scope, diversifier_index_be, address,
+                transparent_child_index, cached_transparent_receiver_address,
+                exposed_at_height, receiver_flags, transparent_receiver_next_check_time,
+                imported_transparent_receiver_pubkey
+            FROM addresses;
+
+            PRAGMA legacy_alter_table = ON;
+
+            DROP TABLE addresses;
+            ALTER TABLE addresses_new RENAME TO addresses;
+
+            PRAGMA legacy_alter_table = OFF;
+
+            -- Recreate the existing indices
+            CREATE INDEX idx_addresses_accounts ON addresses (
+                account_id ASC
+            );
+            CREATE INDEX idx_addresses_indices ON addresses (
+                diversifier_index_be ASC
+            );
+            CREATE INDEX idx_addresses_pubkeys ON addresses (
+                imported_transparent_receiver_pubkey ASC
+            );
+            CREATE INDEX idx_addresses_t_indices ON addresses (
+                transparent_child_index ASC
+            );
+            "#,
+        )?;
+
+        Ok(())
+    }
+
+    fn down(&self, _transaction: &rusqlite::Transaction) -> Result<(), Self::Error> {
+        Err(WalletMigrationError::CannotRevert(MIGRATION_ID))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use rusqlite::named_params;
+    use secrecy::Secret;
+    use tempfile::NamedTempFile;
+    use zcash_keys::keys::UnifiedSpendingKey;
+    use zcash_protocol::consensus::Network;
+
+    use crate::{
+        WalletDb,
+        testing::db::{test_clock, test_rng},
+        wallet::init::{WalletMigrator, migrations::tests::test_migrate},
+    };
+
+    use super::{DEPENDENCIES, MIGRATION_ID};
+
+    #[test]
+    fn migrate() {
+        test_migrate(&[MIGRATION_ID]);
+    }
+
+    #[test]
+    fn migrate_preserves_data() {
+        let network = Network::TestNetwork;
+        let data_file = NamedTempFile::new().unwrap();
+        let mut db_data =
+            WalletDb::for_path(data_file.path(), network, test_clock(), test_rng()).unwrap();
+
+        let seed_bytes = vec![0xab; 32];
+
+        // Migrate to database state just prior to this migration.
+        WalletMigrator::new()
+            .with_seed(Secret::new(seed_bytes.clone()))
+            .ignore_seed_relevance()
+            .init_or_migrate_to(&mut db_data, DEPENDENCIES)
+            .unwrap();
+
+        // Insert a test account with a valid UFVK so post-migration checks pass.
+        let usk = UnifiedSpendingKey::from_seed(&network, &seed_bytes[..], zip32::AccountId::ZERO)
+            .unwrap();
+        let ufvk = usk.to_unified_full_viewing_key();
+        let ufvk_str = ufvk.encode(&network);
+        let uivk_str = ufvk.to_unified_incoming_viewing_key().encode(&network);
+
+        db_data
+            .conn
+            .execute(
+                "INSERT INTO accounts (uuid, account_kind, hd_seed_fingerprint,
+                 hd_account_index, ufvk, uivk, has_spend_key, birthday_height)
+                 VALUES (X'0000000000000000000000000000AAAA', 0, X'00000000000000000000000000000000000000000000000000000000000000AB',
+                 0, :ufvk, :uivk, 1, 1)",
+                named_params![":ufvk": ufvk_str, ":uivk": uivk_str],
+            )
+            .unwrap();
+
+        let account_id: i64 = db_data
+            .conn
+            .query_row(
+                "SELECT id FROM accounts WHERE uuid = X'0000000000000000000000000000AAAA'",
+                [],
+                |row| row.get(0),
+            )
+            .unwrap();
+
+        // Insert three address types that exist in production databases.
+
+        // 1. Derived transparent address (most common row type)
+        db_data
+            .conn
+            .execute(
+                "INSERT INTO addresses (account_id, key_scope, diversifier_index_be, address,
+                 transparent_child_index, cached_transparent_receiver_address, receiver_flags)
+                 VALUES (?1, 0, X'00000000000000000000000000', 'addr_derived', 0, 't_derived', 5)",
+                [account_id],
+            )
+            .unwrap();
+
+        // 2. Shielded-only address (no transparent receiver — all transparent fields NULL)
+        db_data
+            .conn
+            .execute(
+                "INSERT INTO addresses (account_id, key_scope, diversifier_index_be, address,
+                 receiver_flags)
+                 VALUES (?1, 0, X'00000000000000000100000000', 'addr_shielded', 4)",
+                [account_id],
+            )
+            .unwrap();
+
+        // 3. Standalone P2PKH address
+        db_data
+            .conn
+            .execute(
+                "INSERT INTO addresses (account_id, key_scope, address,
+                 cached_transparent_receiver_address, receiver_flags,
+                 imported_transparent_receiver_pubkey)
+                 VALUES (?1, -1, 'ttest_addr', 'ttest_addr', 1, X'0000000000000000000000000000000000000000000000000000000000000001')",
+                [account_id],
+            )
+            .unwrap();
+
+        // Run the standalone_p2sh migration.
+        WalletMigrator::new()
+            .with_seed(Secret::new(seed_bytes))
+            .ignore_seed_relevance()
+            .init_or_migrate_to(&mut db_data, &[MIGRATION_ID])
+            .unwrap();
+
+        // 1. Verify all 3 rows survived the migration.
+        let count: i64 = db_data
+            .conn
+            .query_row(
+                "SELECT COUNT(*) FROM addresses WHERE account_id = ?1",
+                [account_id],
+                |row| row.get(0),
+            )
+            .unwrap();
+        assert_eq!(count, 3);
+
+        // Verify each row has imported_transparent_receiver_script IS NULL.
+        let rows: Vec<(String, Option<Vec<u8>>)> = {
+            let mut stmt = db_data
+                .conn
+                .prepare(
+                    "SELECT address, imported_transparent_receiver_script FROM addresses
+                     WHERE account_id = ?1 ORDER BY address",
+                )
+                .unwrap();
+            stmt.query_map([account_id], |row| Ok((row.get(0)?, row.get(1)?)))
+                .unwrap()
+                .collect::<Result<Vec<_>, _>>()
+                .unwrap()
+        };
+        assert_eq!(rows.len(), 3);
+        assert_eq!(rows[0].0, "addr_derived");
+        assert!(rows[0].1.is_none());
+        assert_eq!(rows[1].0, "addr_shielded");
+        assert!(rows[1].1.is_none());
+        assert_eq!(rows[2].0, "ttest_addr");
+        assert!(rows[2].1.is_none());
+
+        // 2. Verify P2SH insert succeeds with the new constraint.
+        db_data
+            .conn
+            .execute(
+                "INSERT INTO addresses (account_id, key_scope, address,
+                 cached_transparent_receiver_address, receiver_flags, imported_transparent_receiver_script)
+                 VALUES (?1, -1, 't_p2sh', 't_p2sh', 2, X'0102030405')",
+                [account_id],
+            )
+            .unwrap();
+
+        // 3. Verify invalid P2SH is rejected (imported_transparent_receiver_script NOT NULL but
+        //    cached_transparent_receiver_address IS NULL).
+        let result = db_data.conn.execute(
+            "INSERT INTO addresses (account_id, key_scope, address,
+             receiver_flags, imported_transparent_receiver_script)
+             VALUES (?1, -1, 't_p2sh_bad', 2, X'AABBCCDD')",
+            [account_id],
+        );
+        assert!(result.is_err());
+
+        // 4. Verify non-foreign address with imported_transparent_receiver_script is rejected.
+        let result = db_data.conn.execute(
+            "INSERT INTO addresses (account_id, key_scope, diversifier_index_be, address,
+             cached_transparent_receiver_address, receiver_flags, imported_transparent_receiver_script)
+             VALUES (?1, 0, X'00000000000000000200000000', 'bad_non_foreign_p2sh', 'bad_non_foreign_p2sh', 2, X'AABBCCDD')",
+            [account_id],
+        );
+        assert!(result.is_err());
+    }
+}
diff --git a/zcash_client_sqlite/src/wallet/transparent.rs b/zcash_client_sqlite/src/wallet/transparent.rs
index 4bcde38697..78bc9f0c7d 100644
--- a/zcash_client_sqlite/src/wallet/transparent.rs
+++ b/zcash_client_sqlite/src/wallet/transparent.rs
@@ -12,7 +12,7 @@ use rand_distr::Distribution;
 use rusqlite::OptionalExtension;
 use rusqlite::types::Value;
 use rusqlite::{Connection, Row, named_params};
-use tracing::debug;
+use tracing::{debug, warn};
 
 use transparent::{
     address::{Script, TransparentAddress},
@@ -161,7 +161,8 @@ pub(crate) fn get_transparent_receivers<P: consensus::Parameters>(
             transparent_child_index,
             imported_transparent_receiver_pubkey,
             exposed_at_height,
-            transparent_receiver_next_check_time
+            transparent_receiver_next_check_time,
+            imported_transparent_receiver_script
          FROM addresses
          WHERE account_id = :account_id
          AND cached_transparent_receiver_address IS NOT NULL
@@ -243,51 +244,111 @@ pub(crate) fn get_transparent_receivers<P: consensus::Parameters>(
             .map(decode_epoch_seconds)
             .transpose()?;
 
+        #[cfg(feature = "transparent-key-import")]
+        let imported_transparent_receiver_script_bytes: Option<Vec<u8>> =
+            row.get("imported_transparent_receiver_script")?;
+
         if let Some(taddr) = taddr {
-            let metadata = match key_scope {
-                #[cfg(feature = "transparent-key-import")]
-                KeyScope::Foreign => {
-                    let pubkey_bytes = row
-                        .get::<_, Option<Vec<u8>>>(3)?
-                        .ok_or_else(|| {
-                            SqliteClientError::CorruptedData(
-                            "Pubkey bytes must be present for all imported transparent addresses."
-                                .to_owned(),
-                        )
-                        })
-                        .and_then(|b| {
-                            <[u8; 33]>::try_from(&b[..]).map_err(|_| {
+            let non_script_metadata =
+                || -> Result<TransparentAddressMetadata, SqliteClientError> {
+                    match key_scope {
+                        #[cfg(feature = "transparent-key-import")]
+                        KeyScope::Foreign => {
+                            let pubkey_bytes = row
+                                .get::<_, Option<Vec<u8>>>(3)?
+                                .ok_or_else(|| {
+                                    SqliteClientError::CorruptedData(
+                                    "Pubkey bytes must be present for all imported transparent P2PKH addresses."
+                                        .to_owned(),
+                                )
+                                })
+                                .and_then(|b| {
+                                    <[u8; 33]>::try_from(&b[..]).map_err(|_| {
+                                        SqliteClientError::CorruptedData(format!(
+                                            "Invalid public key byte length; must be 33 bytes, got {}.",
+                                            b.len()
+                                        ))
+                                    })
+                                })?;
+                            let pubkey = PublicKey::from_bytes(pubkey_bytes).map_err(|e| {
                                 SqliteClientError::CorruptedData(format!(
-                                    "Invalid public key byte length; must be 33 bytes, got {}.",
-                                    b.len()
+                                    "Invalid public key: {}",
+                                    e
                                 ))
-                            })
-                        })?;
-                    let pubkey = PublicKey::from_bytes(pubkey_bytes).map_err(|e| {
-                        SqliteClientError::CorruptedData(format!("Invalid public key: {}", e))
+                            })?;
+                            Ok(TransparentAddressMetadata::standalone_p2pkh(
+                                pubkey,
+                                exposure,
+                                next_check_time,
+                            ))
+                        }
+                        derived => {
+                            let (scope, address_index) = derived
+                                .as_transparent()
+                                .zip(address_index_opt)
+                                .ok_or_else(|| {
+                                    SqliteClientError::CorruptedData(
+                                        "Derived addresses must have derivation metadata present."
+                                            .to_owned(),
+                                    )
+                                })?;
+
+                            Ok(TransparentAddressMetadata::derived(
+                                scope,
+                                address_index,
+                                exposure,
+                                next_check_time,
+                            ))
+                        }
+                    }
+                };
+
+            #[cfg(feature = "transparent-key-import")]
+            let metadata = if let Some(ref rs_bytes) = imported_transparent_receiver_script_bytes {
+                use zcash_script::script::{self, Code};
+
+                let imported_transparent_receiver_script =
+                    script::Redeem::parse(&Code(rs_bytes.clone())).map_err(|e| {
+                        SqliteClientError::CorruptedData(format!("Invalid redeem script: {:?}", e))
                     })?;
-                    TransparentAddressMetadata::standalone_p2pkh(pubkey, exposure, next_check_time)
-                }
-                derived => {
-                    let (scope, address_index) = derived
-                        .as_transparent()
-                        .zip(address_index_opt)
-                        .ok_or_else(|| {
-                            SqliteClientError::CorruptedData(
-                                "Derived addresses must have derivation metadata present."
-                                    .to_owned(),
-                            )
-                        })?;
-
-                    TransparentAddressMetadata::derived(
-                        scope,
-                        address_index,
+
+                if matches!(key_scope, KeyScope::Foreign) {
+                    // Standalone P2SH import
+                    TransparentAddressMetadata::standalone_script(
+                        imported_transparent_receiver_script,
                         exposure,
                         next_check_time,
                     )
+                } else {
+                    return Err(SqliteClientError::CorruptedData(
+                        "Redeem script found for non-foreign-scoped address, which is not supported."
+                            .to_owned(),
+                    ));
                 }
+            } else {
+                non_script_metadata()?
             };
 
+            #[cfg(not(feature = "transparent-key-import"))]
+            let metadata = p2pkh_metadata()?;
+
+            #[cfg(not(feature = "transparent-key-import"))]
+            {
+                if matches!(key_scope, KeyScope::Foreign) {
+                    // Foreign-scoped addresses (standalone imports) require
+                    // transparent-key-import. Skip gracefully for DB compatibility.
+                    warn!(
+                        "Skipping foreign-scoped address {}: \
+                         transparent-key-import feature is not enabled",
+                        taddr.encode(params),
+                    );
+                    continue;
+                }
+            }
+
+            #[cfg(not(feature = "transparent-key-import"))]
+            let metadata = non_script_metadata()?;
+
             ret.insert(taddr, metadata);
         }
     }
@@ -1745,7 +1806,8 @@ pub(crate) fn get_transparent_address_metadata<P: consensus::Parameters>(
                 key_scope,
                 imported_transparent_receiver_pubkey,
                 exposed_at_height,
-                transparent_receiver_next_check_time
+                transparent_receiver_next_check_time,
+                imported_transparent_receiver_script
              FROM addresses
              JOIN accounts ON addresses.account_id = accounts.id
              WHERE accounts.uuid = :account_uuid
@@ -1804,39 +1866,66 @@ pub(crate) fn get_transparent_address_metadata<P: consensus::Parameters>(
                             ))
                         }
                         None => {
-                            if let Some(_pubkey_bytes) = row.get::<_, Option<Vec<u8>>>("imported_transparent_receiver_pubkey")? {
-                                #[cfg(not(feature = "transparent-key-import"))]
-                                let addr_meta = Err(SqliteClientError::CorruptedData(
-                                    "standalone imported transparent addresses are not supported by this build of `zcash_client_sqlite`".to_string()
-                                ));
-
-                                #[cfg(feature = "transparent-key-import")]
-                                let addr_meta = {
-                                    let pubkey_bytes = PublicKeyBytes::try_from(_pubkey_bytes).map_err(|_| {
+                            let _imported_transparent_receiver_script_bytes: Option<Vec<u8>> = row.get("imported_transparent_receiver_script")?;
+                            let _pubkey_bytes = row.get::<_, Option<Vec<u8>>>("imported_transparent_receiver_pubkey")?;
+
+                            let _standalone_exposure = exposed_at_height.map_or(
+                                Exposure::Unknown,
+                                |at_height| Exposure::Exposed {
+                                    at_height,
+                                    gap_metadata: GapMetadata::DerivationUnknown
+                                }
+                            );
+
+                            #[cfg(feature = "transparent-key-import")]
+                            {
+                                if let Some(ref rs_bytes) = _imported_transparent_receiver_script_bytes {
+                                    use zcash_script::script::{self, Code};
+
+                                    let imported_transparent_receiver_script =
+                                        script::Redeem::parse(&Code(rs_bytes.clone())).map_err(|e| {
+                                            SqliteClientError::CorruptedData(format!(
+                                                "Invalid redeem script: {:?}",
+                                                e
+                                            ))
+                                        })?;
+
+                                    Ok(TransparentAddressMetadata::standalone_script(
+                                        imported_transparent_receiver_script,
+                                        _standalone_exposure,
+                                        next_check_time,
+                                    ))
+                                } else if let Some(ref pubkey_bytes_vec) = _pubkey_bytes {
+                                    let pubkey_bytes = PublicKeyBytes::try_from(pubkey_bytes_vec.clone()).map_err(|_| {
                                         SqliteClientError::CorruptedData(
                                             "imported_transparent_receiver_pubkey must be 33 bytes in length".to_string()
                                         )
                                     })?;
                                     let pubkey = secp256k1::PublicKey::from_bytes(pubkey_bytes)?;
 
-                                    let addr_meta = TransparentAddressMetadata::standalone_p2pkh(
+                                    Ok(TransparentAddressMetadata::standalone_p2pkh(
                                         pubkey,
-                                        exposed_at_height.map_or(
-                                            Exposure::Unknown,
-                                            |at_height| Exposure::Exposed {
-                                                at_height,
-                                                gap_metadata: GapMetadata::DerivationUnknown
-                                            }
-                                        ),
-                                        next_check_time
-                                    );
-
-                                    Ok(addr_meta)
-                                };
-
-                                addr_meta
-                            } else {
-                                Err(SqliteClientError::CorruptedData("imported_transparent_receiver_pubkey must be set for \"standalone\" transparent addresses".to_string()))
+                                        _standalone_exposure,
+                                        next_check_time,
+                                    ))
+                                } else {
+                                    Err(SqliteClientError::CorruptedData(
+                                        "imported_transparent_receiver_pubkey or imported_transparent_receiver_script must be set for \"standalone\" transparent addresses".to_string()
+                                    ))
+                                }
+                            }
+
+                            #[cfg(not(feature = "transparent-key-import"))]
+                            {
+                                if _pubkey_bytes.is_some() || _imported_transparent_receiver_script_bytes.is_some() {
+                                    Err(SqliteClientError::CorruptedData(
+                                        "standalone imported transparent addresses are not supported by this build of `zcash_client_sqlite`".to_string()
+                                    ))
+                                } else {
+                                    Err(SqliteClientError::CorruptedData(
+                                        "imported_transparent_receiver_pubkey or imported_transparent_receiver_script must be set for \"standalone\" transparent addresses".to_string()
+                                    ))
+                                }
                             }
                         }
                     }
@@ -2227,6 +2316,38 @@ mod tests {
         );
     }
 
+    #[test]
+    #[cfg(feature = "transparent-key-import")]
+    fn test_import_standalone_transparent_p2sh() {
+        zcash_client_backend::data_api::testing::transparent::import_standalone_transparent_p2sh(
+            TestDbFactory::default(),
+        );
+    }
+
+    #[test]
+    #[cfg(feature = "transparent-key-import")]
+    fn test_import_standalone_transparent_p2sh_idempotent() {
+        zcash_client_backend::data_api::testing::transparent::import_standalone_transparent_p2sh_idempotent(
+            TestDbFactory::default(),
+        );
+    }
+
+    #[test]
+    #[cfg(feature = "transparent-key-import")]
+    fn test_import_standalone_transparent_p2sh_conflict() {
+        zcash_client_backend::data_api::testing::transparent::import_standalone_transparent_p2sh_conflict(
+            TestDbFactory::default(),
+        );
+    }
+
+    #[test]
+    #[cfg(feature = "transparent-key-import")]
+    fn test_import_standalone_transparent_p2sh_balance() {
+        zcash_client_backend::data_api::testing::transparent::import_standalone_transparent_p2sh_balance(
+            TestDbFactory::default(),
+        );
+    }
+
     #[test]
     fn ephemeral_address_management() {
         let mut st = TestBuilder::new()

From 57380a0f3ef2eae19d84b67a27c11399464da0d8 Mon Sep 17 00:00:00 2001
From: John Boyd <john@coldnoise.net>
Date: Wed, 4 Mar 2026 09:45:14 -0600
Subject: [PATCH 222/263] Implement standalone P2SH spend capability

This commit modifies `SpendingKeys` and `build_proposed_transaction()`
in `zcash_client_backend::data_api::wallet` to accept a vector of keys
and to support spending from P2SH addresses.

Additionally, this commit restricts standalone P2SH address import to
only allow script types for which spend capabilities have been
implemented.
---
 zcash_client_backend/CHANGELOG.md             |   7 +
 zcash_client_backend/src/data_api.rs          |   5 +
 .../src/data_api/testing/transparent.rs       | 137 ++++++++-
 zcash_client_backend/src/data_api/wallet.rs   |  82 +++--
 zcash_client_backend/src/wallet.rs            |  31 ++
 zcash_client_sqlite/CHANGELOG.md              |   2 +
 zcash_client_sqlite/src/wallet.rs             |  10 +
 zcash_client_sqlite/src/wallet/transparent.rs | 142 +++++----
 zcash_primitives/CHANGELOG.md                 |   4 +
 zcash_primitives/src/transaction/builder.rs   |   3 -
 zcash_transparent/CHANGELOG.md                |   6 +
 zcash_transparent/src/builder.rs              | 290 ++++++++++++++----
 12 files changed, 558 insertions(+), 161 deletions(-)

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index 2d1764abc7..b6f0a6fb2b 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -39,6 +39,7 @@ workspace.
   - `zcash_client_backend::wallet::TransparentAddressSource::redeem_script()`
   - `zcash_client_backend::wallet::TransparentAddressMetadata::standalone_script()`
   - `zcash_client_backend::wallet::TransparentAddressMetadata::redeem_script()`
+- `zcash_client_backend::wallet::WalletTransparentOutput::with_known_input_size`
 
 ### Changed
 - `zcash_client_backend::data_api::wallet::create_proposed_transactions` now takes
@@ -110,6 +111,12 @@ workspace.
   to `zcash_client_backend::wallet::TransparentAddressSource::StandalonePubkey`
 - Renamed `zcash_client_backend::wallet::TransparentAddressMetadata::standalone()`
   to `zcash_client_backend::wallet::TransparentAddressMetadata::standalone_p2pkh()`
+- `zcash_client_backend::data_api::wallet::SpendingKeys::new` now takes
+  `HashMap<TransparentAddress, Vec<secp256k1::SecretKey>>` instead of
+  `HashMap<TransparentAddress, secp256k1::SecretKey>` for standalone transparent
+  keys, to support multi-key P2SH addresses.
+- `zcash_client_backend::data_api::wallet::create_proposed_transactions` now
+  supports spending from standalone P2SH (multisig) transparent addresses.
 
 ### Removed
 - `zcash_client_backend::data_api::testing::transparent::GapLimits` use
diff --git a/zcash_client_backend/src/data_api.rs b/zcash_client_backend/src/data_api.rs
index 70c42d5938..3c959916af 100644
--- a/zcash_client_backend/src/data_api.rs
+++ b/zcash_client_backend/src/data_api.rs
@@ -3017,6 +3017,11 @@ pub trait WalletWrite: WalletRead {
     ///
     /// [`create_proposed_transactions`]: crate::data_api::wallet::create_proposed_transactions
     /// [`propose_shielding`]: crate::data_api::wallet::propose_shielding
+    ///
+    /// # Spending limitations
+    ///
+    /// P2PKH-in-P2SH scripts are unsupported by PCZT at this time, so the only way to spend
+    /// from such an address is to use the [`create_proposed_transactions`] signing path.
     #[cfg(feature = "transparent-key-import")]
     fn import_standalone_transparent_script(
         &mut self,
diff --git a/zcash_client_backend/src/data_api/testing/transparent.rs b/zcash_client_backend/src/data_api/testing/transparent.rs
index a72aa0e426..50a807bb29 100644
--- a/zcash_client_backend/src/data_api/testing/transparent.rs
+++ b/zcash_client_backend/src/data_api/testing/transparent.rs
@@ -811,7 +811,7 @@ where
 
     // Build SpendingKeys with the standalone key for the P2PKH address.
     let mut standalone_keys = HashMap::new();
-    standalone_keys.insert(taddr, secret_key);
+    standalone_keys.insert(taddr, vec![secret_key]);
     let spending_keys = SpendingKeys::new(
         account.usk().clone(),
         #[cfg(feature = "transparent-key-import")]
@@ -854,6 +854,26 @@ where
         ConfirmationsPolicy::MIN,
         &Balance::ZERO,
     );
+
+    // The shielded balance should now include the value minus the fee.
+    let fee = st
+        .get_tx_from_history(*txids.first())
+        .unwrap()
+        .unwrap()
+        .fee_paid()
+        .expect("fee should be known for wallet-created transactions");
+    let summary = st
+        .wallet()
+        .get_wallet_summary(ConfirmationsPolicy::MIN)
+        .unwrap()
+        .unwrap();
+    let account_balance = summary.account_balances().get(&account_id).unwrap();
+    assert_eq!(
+        account_balance
+            .sapling_balance()
+            .change_pending_confirmation(),
+        (value - fee).unwrap(),
+    );
 }
 
 /// Tests that importing a standalone P2SH address succeeds and the address appears
@@ -1062,3 +1082,118 @@ where
     assert_eq!(utxos.len(), 1);
     assert_eq!(utxos[0].value(), value);
 }
+
+/// Tests spending from a standalone P2SH (multisig) address by shielding its balance.
+#[cfg(feature = "transparent-key-import")]
+pub fn spend_from_standalone_p2sh<DSF>(dsf: DSF, cache: impl TestCache)
+where
+    DSF: DataStoreFactory,
+{
+    use crate::data_api::wallet::{self, SpendingKeys};
+    use std::collections::HashMap;
+
+    let mut st = TestBuilder::new()
+        .with_data_store_factory(dsf)
+        .with_block_cache(cache)
+        .with_account_from_sapling_activation(BlockHash([0; 32]))
+        .build();
+
+    let account = st.test_account().cloned().unwrap();
+    let account_id = account.id();
+    // Build the redeem script and get the signing key.
+    let (redeem_script, secret_key) = build_test_redeem_script();
+
+    // Import the P2SH address.
+    st.wallet_mut()
+        .import_standalone_transparent_script(account_id, redeem_script.clone())
+        .unwrap();
+
+    // Derive the P2SH address.
+    let script_pubkey = sh(&redeem_script);
+    let taddr = TransparentAddress::from_script_pubkey(&script_pubkey).expect("valid P2SH address");
+
+    // Initialize chain data with blocks (needed for shielding transaction creation).
+    let not_our_key = ExtendedSpendingKey::master(&[]).to_diversifiable_full_viewing_key();
+    let not_our_value = Zatoshis::const_from_u64(10000);
+    let (start_height, _, _) =
+        st.generate_next_block(&not_our_key, AddressType::DefaultExternal, not_our_value);
+    for _ in 1..10 {
+        st.generate_next_block(&not_our_key, AddressType::DefaultExternal, not_our_value);
+    }
+    st.scan_cached_blocks(start_height, 10);
+
+    // Create a fake UTXO at the P2SH address.
+    let value = Zatoshis::from_u64(100000).unwrap();
+    let height = st.wallet().chain_height().unwrap().unwrap();
+    let txout = TxOut::new(value, taddr.script().into());
+    let utxo = WalletTransparentOutput::from_parts(OutPoint::fake(), txout, Some(height)).unwrap();
+    st.wallet_mut()
+        .put_received_transparent_utxo(&utxo)
+        .unwrap();
+
+    // Build SpendingKeys with the standalone key for the P2SH address.
+    let mut standalone_keys = HashMap::new();
+    standalone_keys.insert(taddr, vec![secret_key]);
+    let spending_keys = SpendingKeys::new(
+        account.usk().clone(),
+        #[cfg(feature = "transparent-key-import")]
+        standalone_keys,
+    );
+
+    // Shield the P2SH UTXO.
+    let input_selector = GreedyInputSelector::new();
+    let change_strategy = standard::SingleOutputChangeStrategy::new(
+        StandardFeeRule::Zip317,
+        None,
+        ShieldedProtocol::Sapling,
+        DustOutputPolicy::default(),
+    );
+
+    let prover = ::zcash_proofs::prover::LocalTxProver::bundled();
+    let network = *st.network();
+    let txids = wallet::shield_transparent_funds(
+        st.wallet_mut(),
+        &network,
+        &prover,
+        &prover,
+        &input_selector,
+        &change_strategy,
+        value,
+        &spending_keys,
+        &[taddr],
+        account_id,
+        ConfirmationsPolicy::MIN,
+    )
+    .unwrap();
+
+    assert!(!txids.is_empty());
+
+    // The wallet should have zero transparent balance after shielding.
+    check_balance::<DSF>(
+        &st,
+        &account,
+        &taddr,
+        ConfirmationsPolicy::MIN,
+        &Balance::ZERO,
+    );
+
+    // The shielded balance should now include the value minus the fee.
+    let fee = st
+        .get_tx_from_history(*txids.first())
+        .unwrap()
+        .unwrap()
+        .fee_paid()
+        .expect("fee should be known for wallet-created transactions");
+    let summary = st
+        .wallet()
+        .get_wallet_summary(ConfirmationsPolicy::MIN)
+        .unwrap()
+        .unwrap();
+    let account_balance = summary.account_balances().get(&account_id).unwrap();
+    assert_eq!(
+        account_balance
+            .sapling_balance()
+            .change_pending_confirmation(),
+        (value - fee).unwrap(),
+    );
+}
diff --git a/zcash_client_backend/src/data_api/wallet.rs b/zcash_client_backend/src/data_api/wallet.rs
index e159fac906..e34f20dac6 100644
--- a/zcash_client_backend/src/data_api/wallet.rs
+++ b/zcash_client_backend/src/data_api/wallet.rs
@@ -96,6 +96,9 @@ use {
     std::collections::HashMap,
 };
 
+#[cfg(feature = "transparent-key-import")]
+use zcash_script::script::{self as zs_script, Evaluable};
+
 #[cfg(feature = "pczt")]
 use {
     crate::data_api::error::PcztError,
@@ -853,7 +856,7 @@ struct StepResult<AccountId> {
 pub struct SpendingKeys {
     usk: UnifiedSpendingKey,
     #[cfg(feature = "transparent-key-import")]
-    standalone_transparent_keys: HashMap<TransparentAddress, secp256k1::SecretKey>,
+    standalone_transparent_keys: HashMap<TransparentAddress, Vec<secp256k1::SecretKey>>,
 }
 
 impl SpendingKeys {
@@ -862,7 +865,7 @@ impl SpendingKeys {
         usk: UnifiedSpendingKey,
         #[cfg(feature = "transparent-key-import")] standalone_transparent_keys: HashMap<
             TransparentAddress,
-            secp256k1::SecretKey,
+            Vec<secp256k1::SecretKey>,
         >,
     ) -> Self {
         Self {
@@ -1320,38 +1323,47 @@ where
     #[cfg(feature = "transparent-inputs")]
     let utxos_spent = {
         let mut utxos_spent: Vec<OutPoint> = vec![];
-        let mut add_transparent_p2pkh_input =
+        let mut add_transparent_input =
             |builder: &mut Builder<_, _>,
              utxos_spent: &mut Vec<_>,
              recipient_address: &TransparentAddress,
              outpoint: OutPoint,
              txout: TxOut|
              -> Result<(), CreateErrT<DbT, InputsErrT, FeeRuleT, ChangeErrT, N>> {
-                let pubkey = match metadata_from_address(recipient_address)?.source() {
+                let metadata = metadata_from_address(recipient_address)?;
+                match metadata.source() {
                     TransparentAddressSource::Derived {
                         scope,
                         address_index,
-                    } => ufvk
-                        .transparent()
-                        .ok_or(Error::KeyNotAvailable(PoolType::Transparent))?
-                        .derive_address_pubkey(*scope, *address_index)
-                        .expect("spending key derivation should not fail"),
+                    } => {
+                        let pubkey = ufvk
+                            .transparent()
+                            .ok_or(Error::KeyNotAvailable(PoolType::Transparent))?
+                            .derive_address_pubkey(*scope, *address_index)
+                            .expect("spending key derivation should not fail");
+                        utxos_spent.push(outpoint.clone());
+                        builder.add_transparent_p2pkh_input(pubkey, outpoint, txout)?;
+                    }
                     #[cfg(feature = "transparent-key-import")]
-                    TransparentAddressSource::StandalonePubkey(pubkey) => *pubkey,
+                    TransparentAddressSource::StandalonePubkey(pubkey) => {
+                        utxos_spent.push(outpoint.clone());
+                        builder.add_transparent_p2pkh_input(*pubkey, outpoint, txout)?;
+                    }
                     #[cfg(feature = "transparent-key-import")]
-                    TransparentAddressSource::StandaloneScript(_) => {
-                        return Err(Error::ProposalNotSupported);
+                    TransparentAddressSource::StandaloneScript(redeem_script) => {
+                        let from_chain =
+                            zs_script::FromChain::parse(&zs_script::Code(redeem_script.to_bytes()))
+                                .map_err(|_| ::transparent::builder::Error::UnsupportedScript)?;
+                        utxos_spent.push(outpoint.clone());
+                        builder.add_transparent_p2sh_input(from_chain, outpoint, txout)?;
                     }
-                };
-
-                utxos_spent.push(outpoint.clone());
-                builder.add_transparent_p2pkh_input(pubkey, outpoint, txout)?;
+                }
 
                 Ok(())
             };
 
         for utxo in proposal_step.transparent_inputs() {
-            add_transparent_p2pkh_input(
+            add_transparent_input(
                 &mut builder,
                 &mut utxos_spent,
                 utxo.recipient_address(),
@@ -1374,7 +1386,7 @@ where
                 .ok_or(ProposalError::ReferenceError(*input_ref))?
                 .vout[outpoint.n() as usize];
 
-            add_transparent_p2pkh_input(
+            add_transparent_input(
                 &mut builder,
                 &mut utxos_spent,
                 &address,
@@ -1696,25 +1708,31 @@ where
     let mut transparent_signing_set = TransparentSigningSet::new();
     #[cfg(feature = "transparent-inputs")]
     for (_address, address_metadata) in build_state.transparent_input_addresses {
-        transparent_signing_set.add_key(match address_metadata.source() {
+        match address_metadata.source() {
             TransparentAddressSource::Derived {
                 scope,
                 address_index,
-            } => spending_keys
-                .usk
-                .transparent()
-                .derive_secret_key(*scope, *address_index)
-                .expect("spending key derivation should not fail"),
-            #[cfg(feature = "transparent-key-import")]
-            TransparentAddressSource::StandalonePubkey(_) => *spending_keys
-                .standalone_transparent_keys
-                .get(&_address)
-                .ok_or(Error::AddressNotRecognized(_address))?,
+            } => {
+                transparent_signing_set.add_key(
+                    spending_keys
+                        .usk
+                        .transparent()
+                        .derive_secret_key(*scope, *address_index)
+                        .expect("spending key derivation should not fail"),
+                );
+            }
             #[cfg(feature = "transparent-key-import")]
-            TransparentAddressSource::StandaloneScript(_) => {
-                return Err(Error::ProposalNotSupported);
+            TransparentAddressSource::StandalonePubkey(_)
+            | TransparentAddressSource::StandaloneScript(_) => {
+                let keys = spending_keys
+                    .standalone_transparent_keys
+                    .get(&_address)
+                    .ok_or(Error::AddressNotRecognized(_address))?;
+                for key in keys {
+                    transparent_signing_set.add_key(*key);
+                }
             }
-        });
+        }
     }
     let sapling_extsks = &[
         spending_keys.usk.sapling().clone(),
diff --git a/zcash_client_backend/src/wallet.rs b/zcash_client_backend/src/wallet.rs
index 525dbf2431..88afb16c26 100644
--- a/zcash_client_backend/src/wallet.rs
+++ b/zcash_client_backend/src/wallet.rs
@@ -178,6 +178,9 @@ pub struct WalletTransparentOutput {
     txout: TxOut,
     mined_height: Option<BlockHeight>,
     recipient_address: TransparentAddress,
+    /// The known serialized input size for this output, if available.
+    /// This is set for P2SH outputs where the redeem script is known.
+    known_input_size: Option<usize>,
 }
 
 impl WalletTransparentOutput {
@@ -197,9 +200,19 @@ impl WalletTransparentOutput {
                 txout,
                 mined_height,
                 recipient_address,
+                known_input_size: None,
             })
     }
 
+    /// Sets the known serialized input size for this output.
+    ///
+    /// This should be used for P2SH outputs where the wallet knows the redeem script
+    /// and can compute the expected input size for fee calculation.
+    pub fn with_known_input_size(mut self, size: usize) -> Self {
+        self.known_input_size = Some(size);
+        self
+    }
+
     /// Returns the [`OutPoint`] corresponding to the output.
     pub fn outpoint(&self) -> &OutPoint {
         &self.outpoint
@@ -233,6 +246,24 @@ impl transparent_fees::InputView for WalletTransparentOutput {
     fn coin(&self) -> &TxOut {
         &self.txout
     }
+    fn serialized_size(&self) -> transparent_fees::InputSize {
+        match self.known_input_size {
+            Some(size) => transparent_fees::InputSize::Known(size),
+            None => {
+                // Fall back to default: only P2PKH is recognized.
+                match zcash_script::script::PubKey::parse(&self.txout.script_pubkey().0)
+                    .ok()
+                    .as_ref()
+                    .and_then(zcash_script::solver::standard)
+                {
+                    Some(zcash_script::solver::ScriptKind::PubKeyHash { .. }) => {
+                        transparent_fees::InputSize::STANDARD_P2PKH
+                    }
+                    _ => transparent_fees::InputSize::Unknown(self.outpoint.clone()),
+                }
+            }
+        }
+    }
 }
 
 /// A reference to a spent note belonging to the wallet within a transaction.
diff --git a/zcash_client_sqlite/CHANGELOG.md b/zcash_client_sqlite/CHANGELOG.md
index af33fe4133..07b7731dd1 100644
--- a/zcash_client_sqlite/CHANGELOG.md
+++ b/zcash_client_sqlite/CHANGELOG.md
@@ -33,6 +33,8 @@ workspace.
 - `zcash_client_sqlite::error::SqliteClientError` has added variant `GapAddresses`.
 - Renamed `zcash_client_sqlite::error::PubkeyImportConflict` to
   `zcash_client_sqlite::error::StandaloneImportConflict`
+- P2SH UTXOs returned by `get_spendable_transparent_outputs` now include a
+  precomputed input size for accurate ZIP 317 fee estimation.
 
 ### Removed
 - `zcash_client_sqlite::GapLimits` use `zcash_keys::keys::transparent::GapLimits` instead.
diff --git a/zcash_client_sqlite/src/wallet.rs b/zcash_client_sqlite/src/wallet.rs
index 683b31c84e..88f3ecce24 100644
--- a/zcash_client_sqlite/src/wallet.rs
+++ b/zcash_client_sqlite/src/wallet.rs
@@ -856,6 +856,16 @@ pub(crate) fn import_standalone_transparent_script<P: consensus::Parameters>(
         )));
     }
 
+    // Do not import script types which do not have a supported spend flow.
+    match zcash_script::solver::standard(&redeem_script) {
+        Some(zcash_script::solver::ScriptKind::MultiSig { .. }) => (),
+        _ => {
+            return Err(SqliteClientError::BadAccountData(
+                "Redeem script is not a supported P2SH script kind".to_owned(),
+            ));
+        }
+    }
+
     let script_pubkey = sh(&redeem_script);
     // `sh()` always produces a valid P2SH scriptPubKey, so `from_script_pubkey`
     // should always succeed here. This is a defensive check.
diff --git a/zcash_client_sqlite/src/wallet/transparent.rs b/zcash_client_sqlite/src/wallet/transparent.rs
index 78bc9f0c7d..1a80eef4bb 100644
--- a/zcash_client_sqlite/src/wallet/transparent.rs
+++ b/zcash_client_sqlite/src/wallet/transparent.rs
@@ -249,12 +249,11 @@ pub(crate) fn get_transparent_receivers<P: consensus::Parameters>(
             row.get("imported_transparent_receiver_script")?;
 
         if let Some(taddr) = taddr {
-            let non_script_metadata =
-                || -> Result<TransparentAddressMetadata, SqliteClientError> {
-                    match key_scope {
-                        #[cfg(feature = "transparent-key-import")]
-                        KeyScope::Foreign => {
-                            let pubkey_bytes = row
+            let p2pkh_metadata = || -> Result<TransparentAddressMetadata, SqliteClientError> {
+                match key_scope {
+                    #[cfg(feature = "transparent-key-import")]
+                    KeyScope::Foreign => {
+                        let pubkey_bytes = row
                                 .get::<_, Option<Vec<u8>>>(3)?
                                 .ok_or_else(|| {
                                     SqliteClientError::CorruptedData(
@@ -270,63 +269,68 @@ pub(crate) fn get_transparent_receivers<P: consensus::Parameters>(
                                         ))
                                     })
                                 })?;
-                            let pubkey = PublicKey::from_bytes(pubkey_bytes).map_err(|e| {
-                                SqliteClientError::CorruptedData(format!(
-                                    "Invalid public key: {}",
-                                    e
-                                ))
+                        let pubkey = PublicKey::from_bytes(pubkey_bytes).map_err(|e| {
+                            SqliteClientError::CorruptedData(format!("Invalid public key: {}", e))
+                        })?;
+                        Ok(TransparentAddressMetadata::standalone_p2pkh(
+                            pubkey,
+                            exposure,
+                            next_check_time,
+                        ))
+                    }
+                    derived => {
+                        let (scope, address_index) = derived
+                            .as_transparent()
+                            .zip(address_index_opt)
+                            .ok_or_else(|| {
+                                SqliteClientError::CorruptedData(
+                                    "Derived addresses must have derivation metadata present."
+                                        .to_owned(),
+                                )
                             })?;
-                            Ok(TransparentAddressMetadata::standalone_p2pkh(
-                                pubkey,
-                                exposure,
-                                next_check_time,
-                            ))
-                        }
-                        derived => {
-                            let (scope, address_index) = derived
-                                .as_transparent()
-                                .zip(address_index_opt)
-                                .ok_or_else(|| {
-                                    SqliteClientError::CorruptedData(
-                                        "Derived addresses must have derivation metadata present."
-                                            .to_owned(),
-                                    )
-                                })?;
 
-                            Ok(TransparentAddressMetadata::derived(
-                                scope,
-                                address_index,
-                                exposure,
-                                next_check_time,
+                        Ok(TransparentAddressMetadata::derived(
+                            scope,
+                            address_index,
+                            exposure,
+                            next_check_time,
+                        ))
+                    }
+                }
+            };
+
+            #[cfg(feature = "transparent-key-import")]
+            let p2sh_metadata =
+                |rs_bytes: &Vec<u8>| -> Result<TransparentAddressMetadata, SqliteClientError> {
+                    use zcash_script::script::{self, Code};
+
+                    let imported_transparent_receiver_script =
+                        script::Redeem::parse(&Code(rs_bytes.clone())).map_err(|e| {
+                            SqliteClientError::CorruptedData(format!(
+                                "Invalid redeem script: {:?}",
+                                e
                             ))
-                        }
+                        })?;
+
+                    if matches!(key_scope, KeyScope::Foreign) {
+                        // Standalone P2SH import
+                        Ok(TransparentAddressMetadata::standalone_script(
+                            imported_transparent_receiver_script,
+                            exposure,
+                            next_check_time,
+                        ))
+                    } else {
+                        Err(SqliteClientError::CorruptedData(
+                            "non-foreign-scoped address is not supported.".to_owned(),
+                        ))
                     }
                 };
 
             #[cfg(feature = "transparent-key-import")]
             let metadata = if let Some(ref rs_bytes) = imported_transparent_receiver_script_bytes {
-                use zcash_script::script::{self, Code};
-
-                let imported_transparent_receiver_script =
-                    script::Redeem::parse(&Code(rs_bytes.clone())).map_err(|e| {
-                        SqliteClientError::CorruptedData(format!("Invalid redeem script: {:?}", e))
-                    })?;
-
-                if matches!(key_scope, KeyScope::Foreign) {
-                    // Standalone P2SH import
-                    TransparentAddressMetadata::standalone_script(
-                        imported_transparent_receiver_script,
-                        exposure,
-                        next_check_time,
-                    )
-                } else {
-                    return Err(SqliteClientError::CorruptedData(
-                        "Redeem script found for non-foreign-scoped address, which is not supported."
-                            .to_owned(),
-                    ));
-                }
+                p2sh_metadata(rs_bytes)?
             } else {
-                non_script_metadata()?
+                p2pkh_metadata()?
             };
 
             #[cfg(not(feature = "transparent-key-import"))]
@@ -346,9 +350,6 @@ pub(crate) fn get_transparent_receivers<P: consensus::Parameters>(
                 }
             }
 
-            #[cfg(not(feature = "transparent-key-import"))]
-            let metadata = non_script_metadata()?;
-
             ret.insert(taddr, metadata);
         }
     }
@@ -1170,6 +1171,7 @@ pub(crate) fn get_spendable_transparent_outputs<P: consensus::Parameters>(
     let mut stmt_utxos = conn.prepare(&format!(
         "SELECT t.txid, u.output_index, u.script,
                 u.value_zat, addresses.key_scope,
+                addresses.imported_transparent_receiver_script,
                 t.mined_height AS received_height
          FROM transparent_received_outputs u
          JOIN transactions t ON t.id_tx = u.transaction_id
@@ -1206,8 +1208,23 @@ pub(crate) fn get_spendable_transparent_outputs<P: consensus::Parameters>(
 
     let mut utxos = Vec::<WalletUtxo>::new();
     while let Some(row) = rows.next()? {
-        let output = to_unspent_transparent_output(row)?;
+        let mut output = to_unspent_transparent_output(row)?;
         let key_scope = KeyScope::decode(row.get("key_scope")?)?.as_transparent();
+
+        // If the address has a redeem script, compute the known input size for fee
+        // estimation so that the ZIP 317 fee calculator can handle P2SH inputs.
+        let imported_transparent_receiver_script_bytes: Option<Vec<u8>> =
+            row.get("imported_transparent_receiver_script")?;
+        if let Some(rs_bytes) = imported_transparent_receiver_script_bytes {
+            if let Ok(from_chain) = script::FromChain::parse(&script::Code(rs_bytes)) {
+                if let Some(input_size) =
+                    transparent::builder::p2sh_input_serialized_len(&from_chain)
+                {
+                    output = output.with_known_input_size(input_size);
+                }
+            }
+        }
+
         utxos.push(WalletUtxo::new(output, key_scope));
     }
 
@@ -2348,6 +2365,15 @@ mod tests {
         );
     }
 
+    #[test]
+    #[cfg(feature = "transparent-key-import")]
+    fn test_spend_from_standalone_p2sh() {
+        zcash_client_backend::data_api::testing::transparent::spend_from_standalone_p2sh(
+            TestDbFactory::default(),
+            BlockCache::new(),
+        );
+    }
+
     #[test]
     fn ephemeral_address_management() {
         let mut st = TestBuilder::new()
diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md
index f7fbf5c041..2207af7f43 100644
--- a/zcash_primitives/CHANGELOG.md
+++ b/zcash_primitives/CHANGELOG.md
@@ -18,6 +18,10 @@ workspace.
 - `zcash_primitives::transaction::TxVersion::valid_in_branch`
 
 ### Changed
+- `zcash_primitives::transaction::builder::Builder::add_transparent_p2sh_input`
+  is no longer restricted to the PCZT workflow; it can now be used with
+  `Builder::build`.
+
 - MSRV is now 1.85.1.
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`.
 - `zcash_primitives::transaction::builder`:
diff --git a/zcash_primitives/src/transaction/builder.rs b/zcash_primitives/src/transaction/builder.rs
index 894982c74c..50d66d2518 100644
--- a/zcash_primitives/src/transaction/builder.rs
+++ b/zcash_primitives/src/transaction/builder.rs
@@ -647,9 +647,6 @@ impl<P: consensus::Parameters, U> Builder<'_, P, U> {
     }
 
     /// Adds a transparent P2SH coin to be spent in this transaction.
-    ///
-    /// This is only for use with [`Self::build_for_pczt`]. It is unsupported with
-    /// [`Self::build`], which will return an error.
     #[cfg(feature = "transparent-inputs")]
     pub fn add_transparent_p2sh_input(
         &mut self,
diff --git a/zcash_transparent/CHANGELOG.md b/zcash_transparent/CHANGELOG.md
index ee6664dc12..cc38cff8bd 100644
--- a/zcash_transparent/CHANGELOG.md
+++ b/zcash_transparent/CHANGELOG.md
@@ -21,9 +21,15 @@ workspace.
 - `zcash_transparent::builder::TransparentInputInfo::{from_parts, spend_info}`
 - `zcash_transparent::builder::Builder::add_p2pkh_input`
 - `impl Hash for zcash_transparent::keys::TransparentKeyScope`
+- `zcash_transparent::builder::p2sh_input_serialized_len`
 
 ### Changed
 - MSRV is now 1.85.1.
+- `zcash_transparent::builder::TransparentBuilder::add_p2sh_input` is no longer
+  restricted to the PCZT workflow; `Bundle::apply_signatures`,
+  `Bundle::prepare_transparent_signatures`, and
+  `TransparentSignatureContext::finalize_signatures` now support P2SH (multisig)
+  inputs.
 - `zcash_transparent::pczt`:
   - `SignerError` has added variants:
     - `InvalidExternalSignature`
diff --git a/zcash_transparent/src/builder.rs b/zcash_transparent/src/builder.rs
index 4123a9e70e..7d9e756bef 100644
--- a/zcash_transparent/src/builder.rs
+++ b/zcash_transparent/src/builder.rs
@@ -29,11 +29,22 @@ use {
         sighash::{SIGHASH_ALL, SighashType},
     },
     core::iter,
-    sha2::Digest,
     zcash_encoding::CompactSize,
     zcash_script::{pattern::push_script, pv, solver},
 };
 
+/// Maximum size of a DER-encoded ECDSA signature (72 bytes) plus one SIGHASH type byte.
+#[cfg(feature = "transparent-inputs")]
+const MAX_SIG_SIZE: usize = 72 + 1;
+
+/// Size of a serialized outpoint: transaction hash (32 bytes) + output index (4 bytes).
+#[cfg(feature = "transparent-inputs")]
+const PREVOUT_SIZE: usize = 32 + 4;
+
+/// Size of a serialized sequence number (u32).
+#[cfg(feature = "transparent-inputs")]
+const SEQUENCE_SIZE: usize = 4;
+
 #[cfg(not(feature = "transparent-inputs"))]
 use zcash_script::Opcode;
 
@@ -43,7 +54,8 @@ pub enum Error {
     UnsupportedScript,
     InvalidAddress,
     InvalidAmount,
-    /// A bundle could not be built because a required signing keys was missing.
+    /// A bundle could not be built because a required signing key was missing, or
+    /// insufficient keys were provided to meet a multisig threshold.
     MissingSigningKey,
     /// Provided null data is longer than the maximum supported length.
     NullDataTooLong {
@@ -190,7 +202,7 @@ impl TransparentInputInfo {
                 match TransparentAddress::from_script_pubkey(&script_pubkey) {
                     Some(TransparentAddress::PublicKeyHash(hash)) => {
                         use ripemd::Ripemd160;
-                        use sha2::Sha256;
+                        use sha2::{Digest, Sha256};
 
                         if hash[..] != Ripemd160::digest(Sha256::digest(pubkey.serialize()))[..] {
                             return Err(Error::InvalidAddress);
@@ -210,9 +222,7 @@ impl TransparentInputInfo {
                 {
                     Some(TransparentAddress::ScriptHash(hash)) => {
                         use ripemd::Ripemd160;
-                        use sha2::Sha256;
-                        use zcash_script::script::Evaluable;
-
+                        use sha2::{Digest, Sha256};
                         if hash[..]
                             != Ripemd160::digest(Sha256::digest(redeem_script.to_bytes()))[..]
                         {
@@ -252,56 +262,51 @@ impl TransparentInputInfo {
     ///
     /// [ZIP 317]: https://zips.z.cash/zip-0317#rationale-for-the-chosen-parameters
     pub fn serialized_len(&self) -> Option<usize> {
-        // PushData(secp256k1::ecdsa::serialized_signature::MAX_LEN + 1)
-        let fake_sig = pv::push_value(&[0; 72 + 1]).expect("short enough");
-
-        let script_len = match &self.spend_info {
+        match &self.spend_info {
             SpendInfo::P2pkh { .. } => {
-                // P2PKH `script_sig` format is:
-                // - PushData(signature || sigtype)
-                // - PushData(pubkey)
+                let fake_sig = pv::push_value(&[0; MAX_SIG_SIZE]).expect("short enough");
                 let fake_pubkey = pv::push_value(&[0; secp256k1::constants::PUBLIC_KEY_SIZE])
                     .expect("short enough");
-                Some(script::Component(vec![fake_sig, fake_pubkey]).byte_len())
-            }
-            SpendInfo::P2sh { redeem_script } => {
-                redeem_script
-                    .refine()
-                    .ok()
-                    .as_ref()
-                    .and_then(solver::standard)
-                    .and_then(|spend_info| match spend_info {
-                        solver::ScriptKind::MultiSig { required, .. } => {
-                            // P2MS-in-P2SH `script_sig` format is:
-                            // - Dummy OP_0 to bypass OP_CHECKMULTISIG bug.
-                            // - PushData(signature || sigtype) * required
-                            // - PushData(redeem_script)
-                            Some(
-                                script::Component(
-                                    iter::empty()
-                                        .chain(Some(pv::_0))
-                                        .chain(core::iter::repeat_n(
-                                            fake_sig,
-                                            usize::from(required),
-                                        ))
-                                        .chain(push_script(redeem_script))
-                                        .collect(),
-                                )
-                                .byte_len(),
-                            )
-                        }
-                        _ => None,
-                    })
+                let script_len = script::Component(vec![fake_sig, fake_pubkey]).byte_len();
+                let script_sig_len = CompactSize::serialized_size(script_len) + script_len;
+                Some(PREVOUT_SIZE + script_sig_len + SEQUENCE_SIZE)
             }
-        }?;
-
-        let prevout_len = 32 + 4;
-        let script_sig_len = CompactSize::serialized_size(script_len) + script_len;
-        let sequence_len = 4;
-        Some(prevout_len + script_sig_len + sequence_len)
+            SpendInfo::P2sh { redeem_script } => p2sh_input_serialized_len(redeem_script),
+        }
     }
 }
 
+/// Computes the serialized input size for a P2SH input given the redeem script.
+///
+/// Returns `None` if the redeem script is not a recognized P2SH script kind (currently
+/// only P2MS-in-P2SH is supported).
+#[cfg(feature = "transparent-inputs")]
+pub fn p2sh_input_serialized_len(redeem_script: &script::FromChain) -> Option<usize> {
+    let fake_sig = pv::push_value(&[0; MAX_SIG_SIZE]).expect("short enough");
+
+    let script_len = redeem_script
+        .refine()
+        .ok()
+        .as_ref()
+        .and_then(solver::standard)
+        .and_then(|spend_info| match spend_info {
+            solver::ScriptKind::MultiSig { required, .. } => Some(
+                script::Component(
+                    iter::empty()
+                        .chain(Some(pv::_0))
+                        .chain(core::iter::repeat_n(fake_sig, usize::from(required)))
+                        .chain(push_script(redeem_script))
+                        .collect(),
+                )
+                .byte_len(),
+            ),
+            _ => None,
+        })?;
+
+    let script_sig_len = CompactSize::serialized_size(script_len) + script_len;
+    Some(PREVOUT_SIZE + script_sig_len + SEQUENCE_SIZE)
+}
+
 pub struct TransparentBuilder {
     #[cfg(feature = "transparent-inputs")]
     inputs: Vec<TransparentInputInfo>,
@@ -408,10 +413,6 @@ impl TransparentBuilder {
 
     /// Adds a P2SH coin (the output of a previous transaction) to be spent in the
     /// transaction.
-    ///
-    /// This is only for use with [`Self::build_for_pczt`]. It is unsupported with
-    /// [`Self::build`]; the resulting bundle's [`Bundle::apply_signatures`] will return
-    /// an error.
     #[cfg(feature = "transparent-inputs")]
     pub fn add_p2sh_input(
         &mut self,
@@ -613,6 +614,10 @@ impl TransparentAuthorizingContext for Unauthorized {
 }
 
 impl Bundle<Unauthorized> {
+    /// Applies signatures to the bundle using the provided signing set.
+    ///
+    /// All signatures use [`SighashType::ALL`]. For other sighash types, use the PCZT
+    /// signing flow.
     #[cfg_attr(not(feature = "transparent-inputs"), allow(unused_variables))]
     pub fn apply_signatures<F>(
         self,
@@ -629,13 +634,13 @@ impl Bundle<Unauthorized> {
             .iter()
             .enumerate()
             .map(|(index, info)| {
-                match info.spend_info {
+                match &info.spend_info {
                     SpendInfo::P2pkh { pubkey } => {
                         // Find the matching signing key.
                         let (sk, _) = signing_set
                             .keys
                             .iter()
-                            .find(|(_, pk)| pk == &pubkey)
+                            .find(|(_, pk)| pk == pubkey)
                             .ok_or(Error::MissingSigningKey)?;
 
                         let sighash = calculate_sighash(SignableInput {
@@ -649,18 +654,66 @@ impl Bundle<Unauthorized> {
                         let msg = secp256k1::Message::from_digest(sighash);
                         let sig = signing_set.secp.sign_ecdsa(&msg, sk);
 
-                        // Signature has to have "SIGHASH_ALL" appended to it
-                        let mut sig_bytes: Vec<u8> = sig.serialize_der()[..].to_vec();
-                        sig_bytes.extend([SIGHASH_ALL]);
-
-                        // P2PKH scriptSig
-                        Ok(script::Component(vec![
-                            op::push_value(&sig_bytes).expect("length checked"),
-                            op::push_value(&pubkey.serialize()).expect("length checked"),
-                        ]))
+                        Ok(construct_script_sig(&sig, pubkey))
+                    }
+                    SpendInfo::P2sh { redeem_script } => {
+                        let refined = redeem_script
+                            .refine()
+                            .map_err(|_| Error::UnsupportedScript)?;
+                        let script_code = Script::from(redeem_script);
+                        match solver::standard(&refined) {
+                            Some(solver::ScriptKind::MultiSig { required, pubkeys }) => {
+                                let sighash = calculate_sighash(SignableInput {
+                                    hash_type: SighashType::ALL,
+                                    index,
+                                    script_code: &script_code,
+                                    script_pubkey: info.coin.script_pubkey(),
+                                    value: info.coin.value(),
+                                });
+
+                                let msg = secp256k1::Message::from_digest(sighash);
+
+                                // Collect signatures in pubkey order
+                                let mut script_sig = vec![pv::_0];
+                                let mut sigs_found: u8 = 0;
+
+                                for pubkey_data in pubkeys {
+                                    if sigs_found == required {
+                                        break;
+                                    }
+                                    let pubkey_bytes: [u8; 33] = pubkey_data
+                                        .as_slice()
+                                        .try_into()
+                                        .map_err(|_| Error::UnsupportedScript)?;
+
+                                    if let Some((sk, _)) = signing_set
+                                        .keys
+                                        .iter()
+                                        .find(|(_, pk)| pk.serialize() == pubkey_bytes)
+                                    {
+                                        let sig = signing_set.secp.sign_ecdsa(&msg, sk);
+                                        let mut sig_bytes: Vec<u8> = sig.serialize_der().to_vec();
+                                        sig_bytes.push(SIGHASH_ALL);
+                                        script_sig.push(
+                                            pv::push_value(&sig_bytes).expect("short enough"),
+                                        );
+                                        sigs_found += 1;
+                                    }
+                                }
+
+                                if sigs_found < required {
+                                    return Err(Error::MissingSigningKey);
+                                }
+
+                                script_sig.push(
+                                    push_script(redeem_script).ok_or(Error::UnsupportedScript)?,
+                                );
+
+                                Ok(script::Component(script_sig))
+                            }
+                            _ => Err(Error::UnsupportedScript),
+                        }
                     }
-                    // P2SH is unsupported here; use the PCZT workflow instead.
-                    SpendInfo::P2sh { .. } => Err(Error::InvalidAddress),
                 }
             });
 
@@ -844,6 +897,8 @@ impl TransparentSignatureContext<'_, secp256k1::VerifyOnly> {
 
 #[cfg(all(test, feature = "std"))]
 mod tests {
+    use std::vec::Vec;
+
     use super::{Error, OutPoint, SignableInput, TransparentBuilder, TxOut};
     use crate::address::TransparentAddress;
     use ripemd::Ripemd160;
@@ -884,7 +939,7 @@ mod tests {
 
         // Create two inputs with corresponding secret keys for signing
         let (sk1, pk1, coin1, utxo1) = new_p2pkh_spend_with_key([1; 32]);
-        let (sk2, pk2, coin2, utxo2) = new_p2pkh_spend_with_key([1; 32]);
+        let (sk2, pk2, coin2, utxo2) = new_p2pkh_spend_with_key([2; 32]);
 
         // Create a builder and add the inputs and a dummy output
         let mut builder = TransparentBuilder::empty();
@@ -1046,4 +1101,105 @@ mod tests {
             final_bundle_result
         );
     }
+
+    /// Helper to create a 2-of-2 P2SH multisig spend input.
+    fn new_p2sh_2of2_spend(
+        key_bytes_1: [u8; 32],
+        key_bytes_2: [u8; 32],
+    ) -> (
+        Vec<SecretKey>,
+        zcash_script::script::FromChain,
+        TxOut,
+        OutPoint,
+    ) {
+        use zcash_script::pattern::check_multisig;
+        use zcash_script::script::{Component, Evaluable, FromChain};
+
+        let secp = Secp256k1::new();
+        let sk1 = SecretKey::from_slice(&key_bytes_1).unwrap();
+        let sk2 = SecretKey::from_slice(&key_bytes_2).unwrap();
+        let pk1 = secp256k1::PublicKey::from_secret_key(&secp, &sk1);
+        let pk2 = secp256k1::PublicKey::from_secret_key(&secp, &sk2);
+
+        // Build a 2-of-2 multisig redeem script
+        let redeem_script: FromChain =
+            Component(check_multisig(2, &[&pk1.serialize(), &pk2.serialize()], false).unwrap())
+                .weaken();
+
+        // Create P2SH address from HASH160(redeem_script)
+        let hash = Ripemd160::digest(Sha256::digest(redeem_script.to_bytes()));
+        let hash_bytes: [u8; 20] = hash.into();
+        let taddr = TransparentAddress::ScriptHash(hash_bytes);
+
+        let txout = TxOut::new(Zatoshis::from_u64(10000).unwrap(), taddr.script().into());
+        let outpoint = OutPoint::new([0u8; 32], 0);
+
+        (vec![sk1, sk2], redeem_script, txout, outpoint)
+    }
+
+    #[test]
+    fn apply_signatures_p2sh() {
+        use super::TransparentSigningSet;
+
+        let addr_str = "tmNUFAr71YAW3eXetm8fhx7k8zpUJYQiKZP";
+        let taddr: TransparentAddress =
+            addr_str.parse::<ZcashAddress>().unwrap().convert().unwrap();
+
+        let (sks, redeem_script, coin, utxo) = new_p2sh_2of2_spend([1; 32], [2; 32]);
+
+        let mut builder = TransparentBuilder::empty();
+        builder.add_p2sh_input(redeem_script, utxo, coin).unwrap();
+        builder
+            .add_output(&taddr, Zatoshis::from_u64(5000).unwrap())
+            .unwrap();
+
+        let bundle = builder.build().unwrap();
+
+        // Add both signing keys to the signing set
+        let mut signing_set = TransparentSigningSet::new();
+        for sk in &sks {
+            signing_set.add_key(*sk);
+        }
+
+        let calculate_sighash = |input: SignableInput| {
+            let mut sighash = [0u8; 32];
+            sighash[0] = input.index as u8;
+            sighash
+        };
+
+        let result = bundle.apply_signatures(calculate_sighash, &signing_set);
+        assert!(result.is_ok(), "P2SH apply_signatures failed: {:?}", result);
+    }
+
+    #[test]
+    fn apply_signatures_p2sh_missing_key() {
+        use super::TransparentSigningSet;
+
+        let addr_str = "tmNUFAr71YAW3eXetm8fhx7k8zpUJYQiKZP";
+        let taddr: TransparentAddress =
+            addr_str.parse::<ZcashAddress>().unwrap().convert().unwrap();
+
+        let (sks, redeem_script, coin, utxo) = new_p2sh_2of2_spend([1; 32], [2; 32]);
+
+        let mut builder = TransparentBuilder::empty();
+        builder.add_p2sh_input(redeem_script, utxo, coin).unwrap();
+        builder
+            .add_output(&taddr, Zatoshis::from_u64(5000).unwrap())
+            .unwrap();
+
+        let bundle = builder.build().unwrap();
+
+        // Only add one signing key (need 2-of-2)
+        let mut signing_set = TransparentSigningSet::new();
+        signing_set.add_key(sks[0]);
+
+        let calculate_sighash = |input: SignableInput| {
+            let mut sighash = [0u8; 32];
+            sighash[0] = input.index as u8;
+            sighash
+        };
+
+        let result = bundle.apply_signatures(calculate_sighash, &signing_set);
+        assert!(matches!(result, Err(Error::MissingSigningKey)));
+    }
 }

From 1cb4f14256861e7c474992eefd51e213e9ebb20c Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Wed, 18 Mar 2026 07:54:48 +0000
Subject: [PATCH 223/263] zcash_client_backend: Improve `store_decrypted_tx`
 unsupported `TxOut` warning

---
 Cargo.lock                                     |  4 ++--
 Cargo.toml                                     |  2 +-
 supply-chain/audits.toml                       |  5 +++++
 zcash_client_backend/src/data_api/ll/wallet.rs | 14 +++++++++++++-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ae3faf84ad..e517d33bc3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7382,9 +7382,9 @@ dependencies = [
 
 [[package]]
 name = "zcash_script"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bed6cf5b2b4361105d4ea06b2752f0c8af4641756c7fbc9858a80af186c234f"
+checksum = "c6ef9d04e0434a80b62ad06c5a610557be358ef60a98afa5dbc8ecaf19ad72e7"
 dependencies = [
  "bip32",
  "bitflags 2.9.0",
diff --git a/Cargo.toml b/Cargo.toml
index f54bc754ea..1429b231e3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -78,7 +78,7 @@ crypto-common = { version = "=0.2.0-rc.1" } # later RCs require edition2024
 ripemd = { version = "0.1", default-features = false }
 secp256k1 = { version = "0.29", default-features = false, features = ["alloc"] }
 transparent = { package = "zcash_transparent", version = "0.6.2", path = "zcash_transparent", default-features = false }
-zcash_script = { version = "0.4.2", default-features = false }
+zcash_script = { version = "0.4.3", default-features = false }
 zeroize = { version = "1.7", default-features = false }
 
 # Boilerplate & missing stdlib
diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
index 3af1fdc8df..e2d34dfdca 100644
--- a/supply-chain/audits.toml
+++ b/supply-chain/audits.toml
@@ -1870,6 +1870,11 @@ criteria = "safe-to-deploy"
 delta = "0.15.0 -> 0.16.0"
 notes = "This release involves only updates of previously-vetted dependencies."
 
+[[audits.zcash_script]]
+who = "Jack Grigg <thestr4d@gmail.com>"
+criteria = "safe-to-deploy"
+delta = "0.4.2 -> 0.4.3"
+
 [[audits.zerocopy]]
 who = "Daira-Emma Hopwood <daira@jacaranda.org>"
 criteria = "safe-to-deploy"
diff --git a/zcash_client_backend/src/data_api/ll/wallet.rs b/zcash_client_backend/src/data_api/ll/wallet.rs
index 27b770fab1..918b9158d2 100644
--- a/zcash_client_backend/src/data_api/ll/wallet.rs
+++ b/zcash_client_backend/src/data_api/ll/wallet.rs
@@ -8,6 +8,7 @@ use tracing::{debug, info, trace, warn};
 
 use incrementalmerkletree::{Marking, Position, Retention};
 use shardtree::error::ShardTreeError;
+use transparent::address::TransparentAddress;
 use zcash_keys::{address::Receiver, encoding::AddressCodec as _};
 use zcash_primitives::transaction::Transaction;
 use zcash_protocol::{
@@ -964,7 +965,11 @@ where
             .flat_map(|b| b.vout.iter())
             .enumerate()
         {
-            if let Some(address) = txout.recipient_address() {
+            let script_kind = txout.script_kind();
+            if let Some(address) = script_kind
+                .as_ref()
+                .and_then(TransparentAddress::from_script_kind)
+            {
                 debug!(
                     "{:?} output {} has recipient {}",
                     d_tx.tx().txid(),
@@ -1028,6 +1033,13 @@ where
                         value: txout.value(),
                     });
                 }
+            } else if let Some(script_kind) = script_kind {
+                warn!(
+                    "Ignoring unsupported script kind '{}' for tx {} output {}",
+                    script_kind.as_str(),
+                    d_tx.tx().txid(),
+                    output_index
+                );
             } else {
                 warn!(
                     "Unable to determine recipient address for tx {} output {}",

From 9f95dd22103dcef14ece8cef08e5bfe16b4a2a15 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Wed, 18 Mar 2026 21:10:29 +0000
Subject: [PATCH 224/263] `cargo vet prune`

---
 supply-chain/config.toml  |  4 ----
 supply-chain/imports.lock | 30 ++++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/supply-chain/config.toml b/supply-chain/config.toml
index 1004f948ec..6d635dba75 100644
--- a/supply-chain/config.toml
+++ b/supply-chain/config.toml
@@ -579,10 +579,6 @@ criteria = "safe-to-deploy"
 version = "0.2.11"
 criteria = "safe-to-deploy"
 
-[[exemptions.getrandom]]
-version = "0.3.4"
-criteria = "safe-to-deploy"
-
 [[exemptions.getset]]
 version = "0.1.6"
 criteria = "safe-to-deploy"
diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index a46be99a22..249fc2fa65 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -2228,6 +2228,11 @@ who = "David Cook <dcook@divviup.org>"
 criteria = "safe-to-deploy"
 delta = "0.2.14 -> 0.2.15"
 
+[[audits.isrg.audits.getrandom]]
+who = "David Cook <dcook@divviup.org>"
+criteria = "safe-to-deploy"
+delta = "0.3.3 -> 0.3.4"
+
 [[audits.isrg.audits.hmac]]
 who = "David Cook <dcook@divviup.org>"
 criteria = "safe-to-deploy"
@@ -2751,6 +2756,31 @@ criteria = "safe-to-deploy"
 delta = "0.3.27 -> 0.3.28"
 aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
 
+[[audits.mozilla.audits.getrandom]]
+who = "Chris Martin <cmartin@mozilla.com>"
+criteria = "safe-to-deploy"
+delta = "0.2.15 -> 0.3.1"
+notes = """
+I've looked over all unsafe code, and it appears to be safe, fully initializing the rng buffers.
+In addition, I've checked Linux, Windows, Mac, and Android more thoroughly against API
+documentation.
+"""
+aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
+
+[[audits.mozilla.audits.getrandom]]
+who = "Emilio Cobos Álvarez <emilio@crisal.io>"
+criteria = "safe-to-deploy"
+delta = "0.3.1 -> 0.3.3"
+notes = """
+Biggest non-trivial change is a new UEFI back-end, which looks reasonable to
+the best of my ability: There's some trickiness on initialization but doesn't
+look unsafe, at worse it leaks, and it might not if the relevant pointers are
+static/non-owning. Other changes also look reasonable too: some tweaks to
+inlining and a syscall-based linux back-end, whose relevant unsafe code looks
+reasonable.
+"""
+aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
+
 [[audits.mozilla.audits.hashbrown]]
 who = "Mike Hommey <mh+mozilla@glandium.org>"
 criteria = "safe-to-deploy"

From 7b8f665a3de30cdda3bdce1a4fb4aae330c53e27 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Thu, 19 Mar 2026 14:59:26 +0000
Subject: [PATCH 225/263] zcash_client_backend: Regularize `ll` tree handling

---
 .../src/data_api/ll/wallet.rs                 | 395 +++++++++---------
 1 file changed, 200 insertions(+), 195 deletions(-)

diff --git a/zcash_client_backend/src/data_api/ll/wallet.rs b/zcash_client_backend/src/data_api/ll/wallet.rs
index b4d46f15d3..f7f5016b3b 100644
--- a/zcash_client_backend/src/data_api/ll/wallet.rs
+++ b/zcash_client_backend/src/data_api/ll/wallet.rs
@@ -1,4 +1,6 @@
-use std::{hash::Hash, ops::Range};
+use std::collections::BTreeMap;
+use std::hash::Hash;
+use std::ops::Range;
 
 use rayon::{
     iter::{IndexedParallelIterator as _, ParallelIterator},
@@ -6,8 +8,8 @@ use rayon::{
 };
 use tracing::{debug, info, trace, warn};
 
-use incrementalmerkletree::{Marking, Position, Retention};
-use shardtree::error::ShardTreeError;
+use incrementalmerkletree::{Hashable, Marking, Position, Retention, frontier::Frontier};
+use shardtree::{LocatedPrunableTree, ShardTree, error::ShardTreeError, store::ShardStore};
 use transparent::address::TransparentAddress;
 use zcash_keys::{address::Receiver, encoding::AddressCodec as _};
 use zcash_primitives::transaction::Transaction;
@@ -42,12 +44,7 @@ use {
 };
 
 #[cfg(feature = "orchard")]
-use {
-    crate::data_api::ORCHARD_SHARD_HEIGHT,
-    incrementalmerkletree::frontier::Frontier,
-    shardtree::store::{Checkpoint, ShardStore as _},
-    std::collections::BTreeMap,
-};
+use {crate::data_api::ORCHARD_SHARD_HEIGHT, shardtree::store::Checkpoint};
 
 /// The maximum number of blocks the wallet is allowed to rewind. This is
 /// consistent with the bound in zcashd, and allows block data deeper than
@@ -474,156 +471,54 @@ where
     if let Some(last_scanned_height) = last_scanned_height {
         // Create subtrees from the note commitments in parallel.
         const CHUNK_SIZE: usize = 1024;
-        let sapling_subtrees = sapling_commitments
-            .par_chunks_mut(CHUNK_SIZE)
-            .enumerate()
-            .filter_map(|(i, chunk)| {
-                let start = start_positions.sapling_start_position + (i * CHUNK_SIZE) as u64;
-                let end = start + chunk.len() as u64;
-
-                shardtree::LocatedTree::from_iter(
-                    start..end,
-                    SAPLING_SHARD_HEIGHT.into(),
-                    chunk.iter_mut().map(|n| n.take().expect("always Some")),
-                )
-            })
-            .map(|res| (res.subtree, res.checkpoints))
-            .collect::<Vec<_>>();
-
-        #[cfg(feature = "orchard")]
-        let orchard_subtrees = orchard_commitments
-            .par_chunks_mut(CHUNK_SIZE)
-            .enumerate()
-            .filter_map(|(i, chunk)| {
-                let start = start_positions.orchard_start_position + (i * CHUNK_SIZE) as u64;
-                let end = start + chunk.len() as u64;
-
-                shardtree::LocatedTree::from_iter(
-                    start..end,
-                    ORCHARD_SHARD_HEIGHT.into(),
-                    chunk.iter_mut().map(|n| n.take().expect("always Some")),
-                )
-            })
-            .map(|res| (res.subtree, res.checkpoints))
-            .collect::<Vec<_>>();
-
-        // Collect the complete set of Sapling checkpoints
-        #[cfg(feature = "orchard")]
-        let sapling_checkpoint_positions: BTreeMap<BlockHeight, Position> = sapling_subtrees
-            .iter()
-            .flat_map(|(_, checkpoints)| checkpoints.iter())
-            .map(|(k, v)| (*k, *v))
-            .collect();
-
-        #[cfg(feature = "orchard")]
-        let orchard_checkpoint_positions: BTreeMap<BlockHeight, Position> = orchard_subtrees
-            .iter()
-            .flat_map(|(_, checkpoints)| checkpoints.iter())
-            .map(|(k, v)| (*k, *v))
-            .collect();
+        let sapling_subtrees = build_subtrees::<_, SAPLING_SHARD_HEIGHT>(
+            start_positions.sapling_start_position,
+            &mut sapling_commitments,
+            CHUNK_SIZE,
+        );
 
         #[cfg(feature = "orchard")]
-        fn ensure_checkpoints<'a, H, I: Iterator<Item = &'a BlockHeight>, const DEPTH: u8>(
-            // An iterator of checkpoints heights for which we wish to ensure that
-            // checkpoints exists.
-            ensure_heights: I,
-            // The map of checkpoint positions from which we will draw note commitment tree
-            // position information for the newly created checkpoints.
-            existing_checkpoint_positions: &BTreeMap<BlockHeight, Position>,
-            // The frontier whose position will be used for an inserted checkpoint when
-            // there is no preceding checkpoint in existing_checkpoint_positions.
-            state_final_tree: &Frontier<H, DEPTH>,
-        ) -> Vec<(BlockHeight, Checkpoint)> {
-            ensure_heights
-                .flat_map(|ensure_height| {
-                    existing_checkpoint_positions
-                        .range::<BlockHeight, _>(..=*ensure_height)
-                        .last()
-                        .map_or_else(
-                            || {
-                                Some((
-                                    *ensure_height,
-                                    state_final_tree
-                                        .value()
-                                        .map_or_else(Checkpoint::tree_empty, |t| {
-                                            Checkpoint::at_position(t.position())
-                                        }),
-                                ))
-                            },
-                            |(existing_checkpoint_height, position)| {
-                                if *existing_checkpoint_height < *ensure_height {
-                                    Some((*ensure_height, Checkpoint::at_position(*position)))
-                                } else {
-                                    // The checkpoint already exists, so we don't need to
-                                    // do anything.
-                                    None
-                                }
-                            },
-                        )
-                        .into_iter()
-                })
-                .collect::<Vec<_>>()
-        }
+        let orchard_subtrees = build_subtrees::<_, ORCHARD_SHARD_HEIGHT>(
+            start_positions.orchard_start_position,
+            &mut orchard_commitments,
+            CHUNK_SIZE,
+        );
 
+        // Ensure that we have the same set of checkpoints across all trees.
         #[cfg(feature = "orchard")]
-        let (missing_sapling_checkpoints, missing_orchard_checkpoints) = (
-            ensure_checkpoints(
-                orchard_checkpoint_positions.keys(),
-                &sapling_checkpoint_positions,
-                from_state.final_sapling_tree(),
-            ),
-            ensure_checkpoints(
-                sapling_checkpoint_positions.keys(),
-                &orchard_checkpoint_positions,
-                from_state.final_orchard_tree(),
-            ),
-        );
+        let (missing_sapling_checkpoints, missing_orchard_checkpoints) = {
+            let sapling_checkpoint_positions = checkpoint_positions(&sapling_subtrees);
+            let orchard_checkpoint_positions = checkpoint_positions(&orchard_subtrees);
+            (
+                ensure_checkpoints(
+                    orchard_checkpoint_positions.keys(),
+                    &sapling_checkpoint_positions,
+                    from_state.final_sapling_tree(),
+                ),
+                ensure_checkpoints(
+                    sapling_checkpoint_positions.keys(),
+                    &orchard_checkpoint_positions,
+                    from_state.final_orchard_tree(),
+                ),
+            )
+        };
 
         // Update the Sapling note commitment tree with all newly read note commitments
         {
-            let mut sapling_subtrees_iter = sapling_subtrees.into_iter();
-            wallet_db.with_sapling_tree_mut::<_, _, PutBlocksError<SE, TE>>(|sapling_tree| {
-                debug!(
-                    "Sapling initial tree size at {:?}: {:?}",
+            let mut sapling_subtrees = sapling_subtrees.into_iter();
+            #[cfg(feature = "orchard")]
+            let mut missing_checkpoints = missing_sapling_checkpoints.into_iter();
+            wallet_db.with_sapling_tree_mut(|sapling_tree| {
+                update_tree(
+                    "Sapling",
+                    from_state.final_sapling_tree(),
                     from_state.block_height(),
-                    from_state.final_sapling_tree().tree_size()
-                );
-                // We insert the frontier with `Checkpoint` retention because we need to be
-                // able to truncate the tree back to this point.
-                sapling_tree.insert_frontier(
-                    from_state.final_sapling_tree().clone(),
-                    Retention::Checkpoint {
-                        id: from_state.block_height(),
-                        marking: Marking::Reference,
-                    },
-                )?;
-
-                for (tree, checkpoints) in &mut sapling_subtrees_iter {
-                    sapling_tree.insert_tree(tree, checkpoints)?;
-                }
-
-                // Ensure we have a Sapling checkpoint for each checkpointed Orchard block height.
-                // We skip all checkpoints below the minimum retained checkpoint in the
-                // Sapling tree, because branches below this height may be pruned.
-                #[cfg(feature = "orchard")]
-                {
-                    let min_checkpoint_height = sapling_tree
-                        .store()
-                        .min_checkpoint_id()
-                        .map_err(ShardTreeError::Storage)?
-                        .expect("At least one checkpoint was inserted (by insert_frontier)");
-
-                    for (height, checkpoint) in &missing_sapling_checkpoints {
-                        if *height > min_checkpoint_height {
-                            sapling_tree
-                                .store_mut()
-                                .add_checkpoint(*height, checkpoint.clone())
-                                .map_err(ShardTreeError::Storage)?;
-                        }
-                    }
-                }
-
-                Ok(())
+                    sapling_tree,
+                    &mut sapling_subtrees,
+                    #[cfg(feature = "orchard")]
+                    &mut missing_checkpoints,
+                )
+                .map_err(PutBlocksError::ShardTree)
             })?;
         }
 
@@ -631,51 +526,17 @@ where
         #[cfg(feature = "orchard")]
         {
             let mut orchard_subtrees = orchard_subtrees.into_iter();
-            wallet_db.with_orchard_tree_mut::<_, _, PutBlocksError<SE, TE>>(|orchard_tree| {
-                debug!(
-                    "Orchard initial tree size at {:?}: {:?}",
+            let mut missing_checkpoints = missing_orchard_checkpoints.into_iter();
+            wallet_db.with_orchard_tree_mut(|orchard_tree| {
+                update_tree(
+                    "Orchard",
+                    from_state.final_orchard_tree(),
                     from_state.block_height(),
-                    from_state.final_orchard_tree().tree_size()
-                );
-                // We insert the frontier with `Checkpoint` retention because we need to be
-                // able to truncate the tree back to this point.
-                orchard_tree.insert_frontier(
-                    from_state.final_orchard_tree().clone(),
-                    Retention::Checkpoint {
-                        id: from_state.block_height(),
-                        marking: Marking::Reference,
-                    },
-                )?;
-
-                for (tree, checkpoints) in &mut orchard_subtrees {
-                    orchard_tree.insert_tree(tree, checkpoints)?;
-                }
-
-                // Ensure we have an Orchard checkpoint for each checkpointed Sapling block height.
-                // We skip all checkpoints below the minimum retained checkpoint in the
-                // Orchard tree, because branches below this height may be pruned.
-                {
-                    let min_checkpoint_height = orchard_tree
-                        .store()
-                        .min_checkpoint_id()
-                        .map_err(ShardTreeError::Storage)?
-                        .expect("At least one checkpoint was inserted (by insert_frontier)");
-
-                    for (height, checkpoint) in &missing_orchard_checkpoints {
-                        if *height > min_checkpoint_height {
-                            debug!(
-                                "Adding missing Orchard checkpoint for height: {:?}: {:?}",
-                                height,
-                                checkpoint.position()
-                            );
-                            orchard_tree
-                                .store_mut()
-                                .add_checkpoint(*height, checkpoint.clone())
-                                .map_err(ShardTreeError::Storage)?;
-                        }
-                    }
-                }
-                Ok(())
+                    orchard_tree,
+                    &mut orchard_subtrees,
+                    &mut missing_checkpoints,
+                )
+                .map_err(PutBlocksError::ShardTree)
             })?;
         }
 
@@ -1283,3 +1144,147 @@ where
 
     Ok(recipient_address)
 }
+
+/// Creates subtrees from note commitments in parallel.
+///
+/// `commitments` is an `&mut [Option<_>]` to emulate move semantics inside a `rayon`
+/// parallel iterator.
+fn build_subtrees<H, const SHARD_HEIGHT: u8>(
+    start_position: Position,
+    commitments: &mut [Option<(H, Retention<BlockHeight>)>],
+    chunk_size: usize,
+) -> Vec<(LocatedPrunableTree<H>, BTreeMap<BlockHeight, Position>)>
+where
+    H: Clone + PartialEq + Hashable + Send + Sync,
+{
+    commitments
+        .par_chunks_mut(chunk_size)
+        .enumerate()
+        .filter_map(|(i, chunk)| {
+            let start = start_position + (i * chunk_size) as u64;
+            let end = start + chunk.len() as u64;
+
+            shardtree::LocatedTree::from_iter(
+                start..end,
+                SHARD_HEIGHT.into(),
+                chunk.iter_mut().map(|n| n.take().expect("always Some")),
+            )
+        })
+        .map(|res| (res.subtree, res.checkpoints))
+        .collect()
+}
+
+/// Produces an overall set of checkpoints from a list of subtrees.
+#[cfg(feature = "orchard")]
+fn checkpoint_positions<H>(
+    subtrees: &[(LocatedPrunableTree<H>, BTreeMap<BlockHeight, Position>)],
+) -> BTreeMap<BlockHeight, Position> {
+    subtrees
+        .iter()
+        .flat_map(|(_, checkpoints)| checkpoints.iter())
+        .map(|(k, v)| (*k, *v))
+        .collect()
+}
+
+#[cfg(feature = "orchard")]
+fn ensure_checkpoints<'a, H, I: Iterator<Item = &'a BlockHeight>, const DEPTH: u8>(
+    // An iterator of checkpoints heights for which we wish to ensure that
+    // checkpoints exists.
+    ensure_heights: I,
+    // The map of checkpoint positions from which we will draw note commitment tree
+    // position information for the newly created checkpoints.
+    existing_checkpoint_positions: &BTreeMap<BlockHeight, Position>,
+    // The frontier whose position will be used for an inserted checkpoint when
+    // there is no preceding checkpoint in existing_checkpoint_positions.
+    state_final_tree: &Frontier<H, DEPTH>,
+) -> Vec<(BlockHeight, Checkpoint)> {
+    ensure_heights
+        .flat_map(|ensure_height| {
+            existing_checkpoint_positions
+                .range::<BlockHeight, _>(..=*ensure_height)
+                .last()
+                .map_or_else(
+                    || {
+                        Some((
+                            *ensure_height,
+                            state_final_tree
+                                .value()
+                                .map_or_else(Checkpoint::tree_empty, |t| {
+                                    Checkpoint::at_position(t.position())
+                                }),
+                        ))
+                    },
+                    |(existing_checkpoint_height, position)| {
+                        if *existing_checkpoint_height < *ensure_height {
+                            Some((*ensure_height, Checkpoint::at_position(*position)))
+                        } else {
+                            // The checkpoint already exists, so we don't need to
+                            // do anything.
+                            None
+                        }
+                    },
+                )
+                .into_iter()
+        })
+        .collect::<Vec<_>>()
+}
+
+/// Updates the given note commitment tree with all newly read note commitments starting
+/// at the block `frontier_height + 1`.
+fn update_tree<S, const DEPTH: u8, const SHARD_HEIGHT: u8>(
+    protocol: &'static str,
+    frontier: &Frontier<S::H, DEPTH>,
+    frontier_height: BlockHeight,
+    tree: &mut ShardTree<S, DEPTH, SHARD_HEIGHT>,
+    subtrees: impl Iterator<Item = (LocatedPrunableTree<S::H>, BTreeMap<BlockHeight, Position>)>,
+    #[cfg(feature = "orchard")] missing_checkpoints: impl Iterator<Item = (BlockHeight, Checkpoint)>,
+) -> Result<(), ShardTreeError<S::Error>>
+where
+    S: ShardStore<CheckpointId = BlockHeight>,
+    S::H: Clone + PartialEq + Hashable,
+{
+    debug!(
+        "{protocol} initial tree size at {frontier_height:?}: {:?}",
+        frontier.tree_size()
+    );
+    // We insert the frontier with `Checkpoint` retention because we need to be
+    // able to truncate the tree back to this point.
+    tree.insert_frontier(
+        frontier.clone(),
+        Retention::Checkpoint {
+            id: frontier_height,
+            marking: Marking::Reference,
+        },
+    )?;
+
+    for (subtree, checkpoints) in subtrees {
+        tree.insert_tree(subtree, checkpoints)?;
+    }
+
+    // Ensure we have a tree checkpoint for each checkpointed block height.
+    // We skip all checkpoints below the minimum retained checkpoint in the
+    // tree, because branches below this height may be pruned.
+    #[cfg(feature = "orchard")]
+    {
+        let min_checkpoint_height = tree
+            .store()
+            .min_checkpoint_id()
+            .map_err(ShardTreeError::Storage)?
+            .expect("At least one checkpoint was inserted (by insert_frontier)");
+
+        for (height, checkpoint) in missing_checkpoints {
+            if height > min_checkpoint_height {
+                debug!(
+                    "Adding missing {protocol} checkpoint for height: {:?}: {:?}",
+                    height,
+                    checkpoint.position()
+                );
+                tree.store_mut()
+                    .add_checkpoint(height, checkpoint.clone())
+                    .map_err(ShardTreeError::Storage)?;
+            }
+        }
+    }
+
+    Ok(())
+}

From 01e7561e4d82ce08cca72460883f0bc6031466dc Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Thu, 19 Mar 2026 15:33:14 +0000
Subject: [PATCH 226/263] zcash_client_backend: Return error from `put_blocks`
 on non-sequential `from_state`

This also removes the superfluous `BlockPositions` type, as the
requisite values are trivially obtained via `from_state`.
---
 .../src/data_api/ll/wallet.rs                 | 48 +++++++++----------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/zcash_client_backend/src/data_api/ll/wallet.rs b/zcash_client_backend/src/data_api/ll/wallet.rs
index f7f5016b3b..fb29ec6f55 100644
--- a/zcash_client_backend/src/data_api/ll/wallet.rs
+++ b/zcash_client_backend/src/data_api/ll/wallet.rs
@@ -229,7 +229,8 @@ impl<
 /// # Parameters
 /// - `wallet_db`: A handle to the underlying data store.
 /// - `from_state`: The note commitment tree state as of the end of the last block prior to the
-///   first block in the provided block vector.
+///   first block in the provided block vector; [`PutBlocksError::NonSequentialBlocks`] will be
+///   returned if this invariant is violated.
 /// - `blocks`: The scanned block data to be added to the data store. This vector must contain
 ///   data for blocks in sequentially increasing height order;
 ///   [`PutBlocksError::NonSequentialBlocks`] will be returned if this invariant is violated.
@@ -243,32 +244,29 @@ where
     DbT: PutBlocksDbT<SE, TE, <DbT as LowLevelWalletRead>::AccountRef>,
     DbT::TxRef: Eq + Hash,
 {
-    struct BlockPositions {
-        height: BlockHeight,
-        sapling_start_position: Position,
-        #[cfg(feature = "orchard")]
-        orchard_start_position: Position,
-    }
-
     if blocks.is_empty() {
         return Ok(());
     }
 
     let initial_block = blocks.first().expect("blocks is known to be nonempty");
-    assert!(from_state.block_height() + 1 == initial_block.height());
-
-    let start_positions = BlockPositions {
-        height: initial_block.height(),
-        sapling_start_position: Position::from(
-            u64::from(initial_block.sapling().final_tree_size())
-                - u64::try_from(initial_block.sapling().commitments().len()).unwrap(),
-        ),
-        #[cfg(feature = "orchard")]
-        orchard_start_position: Position::from(
-            u64::from(initial_block.orchard().final_tree_size())
-                - u64::try_from(initial_block.orchard().commitments().len()).unwrap(),
-        ),
-    };
+    let mut initial_block_sequential = from_state.block_height() + 1 == initial_block.height();
+    {
+        initial_block_sequential &= from_state.final_sapling_tree().tree_size()
+            + u64::try_from(initial_block.sapling().commitments().len()).unwrap()
+            == u64::from(initial_block.sapling().final_tree_size());
+    }
+    #[cfg(feature = "orchard")]
+    {
+        initial_block_sequential &= from_state.final_orchard_tree().tree_size()
+            + u64::try_from(initial_block.orchard().commitments().len()).unwrap()
+            == u64::from(initial_block.orchard().final_tree_size());
+    }
+    if !initial_block_sequential {
+        return Err(PutBlocksError::NonSequentialBlocks {
+            prev_height: from_state.block_height(),
+            block_height: initial_block.height(),
+        });
+    }
 
     let mut sapling_commitments = vec![];
     #[cfg(feature = "orchard")]
@@ -472,14 +470,14 @@ where
         // Create subtrees from the note commitments in parallel.
         const CHUNK_SIZE: usize = 1024;
         let sapling_subtrees = build_subtrees::<_, SAPLING_SHARD_HEIGHT>(
-            start_positions.sapling_start_position,
+            Position::from(from_state.final_sapling_tree().tree_size()),
             &mut sapling_commitments,
             CHUNK_SIZE,
         );
 
         #[cfg(feature = "orchard")]
         let orchard_subtrees = build_subtrees::<_, ORCHARD_SHARD_HEIGHT>(
-            start_positions.orchard_start_position,
+            Position::from(from_state.final_orchard_tree().tree_size()),
             &mut orchard_commitments,
             CHUNK_SIZE,
         );
@@ -543,7 +541,7 @@ where
         wallet_db
             .notify_scan_complete(
                 Range {
-                    start: start_positions.height,
+                    start: from_state.block_height() + 1,
                     end: last_scanned_height + 1,
                 },
                 &note_positions,

From a8af0b53d4d0c8f32d21112c8bdc591b17bbf387 Mon Sep 17 00:00:00 2001
From: LorenzoRD2003 <lorenzoruizdiaz2003@gmail.com>
Date: Thu, 19 Mar 2026 14:55:11 -0300
Subject: [PATCH 227/263] Redact sensitive material in `Debug` implementations

Replace derived `Debug` implementations with redacted manual implementations for types containing sensitive key material. This prevents accidental disclosure of secrets via logs, panics, or error formatting.
---
 .../zcash_address/src/kind/unified/fvk.rs     |  61 ++++++-
 .../zcash_address/src/kind/unified/ivk.rs     |  61 ++++++-
 zcash_keys/src/keys.rs                        | 164 +++++++++++++++++-
 zcash_keys/src/keys/transparent.rs            |  24 +++
 zcash_transparent/src/keys.rs                 |  78 ++++++++-
 zcash_transparent/src/zip48.rs                |  11 +-
 6 files changed, 386 insertions(+), 13 deletions(-)

diff --git a/components/zcash_address/src/kind/unified/fvk.rs b/components/zcash_address/src/kind/unified/fvk.rs
index 534d6c7834..cb93f8ed9e 100644
--- a/components/zcash_address/src/kind/unified/fvk.rs
+++ b/components/zcash_address/src/kind/unified/fvk.rs
@@ -1,5 +1,8 @@
 use alloc::vec::Vec;
-use core::convert::{TryFrom, TryInto};
+use core::{
+    convert::{TryFrom, TryInto},
+    fmt,
+};
 use zcash_protocol::constants;
 
 use super::{
@@ -8,7 +11,7 @@ use super::{
 };
 
 /// The set of known FVKs for Unified FVKs.
-#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+#[derive(Clone, PartialEq, Eq, Hash)]
 pub enum Fvk {
     /// The raw encoding of an Orchard Full Viewing Key.
     ///
@@ -41,6 +44,21 @@ pub enum Fvk {
     },
 }
 
+impl fmt::Debug for Fvk {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Fvk::Orchard(_) => f.debug_tuple("Fvk::Orchard").field(&"...").finish(),
+            Fvk::Sapling(_) => f.debug_tuple("Fvk::Sapling").field(&"...").finish(),
+            Fvk::P2pkh(_) => f.debug_tuple("Fvk::P2pkh").field(&"...").finish(),
+            Fvk::Unknown { typecode, .. } => f
+                .debug_struct("Fvk::Unknown")
+                .field("typecode", typecode)
+                .field("data", &"...")
+                .finish(),
+        }
+    }
+}
+
 impl TryFrom<(u32, &[u8])> for Fvk {
     type Error = ParseError;
 
@@ -381,4 +399,43 @@ mod tests {
             ]
         )
     }
+
+    #[test]
+    fn fvk_debug_redaction() {
+        assert_eq!(
+            format!("{:?}", Fvk::Orchard([0; 96])),
+            "Fvk::Orchard(\"...\")"
+        );
+        assert_eq!(
+            format!("{:?}", Fvk::Sapling([0; 128])),
+            "Fvk::Sapling(\"...\")"
+        );
+        assert_eq!(format!("{:?}", Fvk::P2pkh([0; 65])), "Fvk::P2pkh(\"...\")");
+        assert_eq!(
+            format!(
+                "{:?}",
+                Fvk::Unknown {
+                    typecode: 4242,
+                    data: vec![1, 2, 3],
+                }
+            ),
+            "Fvk::Unknown { typecode: 4242, data: \"...\" }"
+        );
+    }
+
+    #[test]
+    fn ufvk_debug_redaction() {
+        let ufvk = Ufvk(vec![
+            Fvk::P2pkh([0; 65]),
+            Fvk::Unknown {
+                typecode: 7,
+                data: vec![9, 9, 9],
+            },
+        ]);
+
+        assert_eq!(
+            format!("{:?}", ufvk),
+            "Ufvk([Fvk::P2pkh(\"...\"), Fvk::Unknown { typecode: 7, data: \"...\" }])"
+        );
+    }
 }
diff --git a/components/zcash_address/src/kind/unified/ivk.rs b/components/zcash_address/src/kind/unified/ivk.rs
index 7b776b0008..7377154633 100644
--- a/components/zcash_address/src/kind/unified/ivk.rs
+++ b/components/zcash_address/src/kind/unified/ivk.rs
@@ -1,5 +1,8 @@
 use alloc::vec::Vec;
-use core::convert::{TryFrom, TryInto};
+use core::{
+    convert::{TryFrom, TryInto},
+    fmt,
+};
 use zcash_protocol::constants;
 
 use super::{
@@ -8,7 +11,7 @@ use super::{
 };
 
 /// The set of known IVKs for Unified IVKs.
-#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+#[derive(Clone, PartialEq, Eq, Hash)]
 pub enum Ivk {
     /// The raw encoding of an Orchard Incoming Viewing Key.
     ///
@@ -46,6 +49,21 @@ pub enum Ivk {
     },
 }
 
+impl fmt::Debug for Ivk {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Ivk::Orchard(_) => f.debug_tuple("Ivk::Orchard").field(&"...").finish(),
+            Ivk::Sapling(_) => f.debug_tuple("Ivk::Sapling").field(&"...").finish(),
+            Ivk::P2pkh(_) => f.debug_tuple("Ivk::P2pkh").field(&"...").finish(),
+            Ivk::Unknown { typecode, .. } => f
+                .debug_struct("Ivk::Unknown")
+                .field("typecode", typecode)
+                .field("data", &"...")
+                .finish(),
+        }
+    }
+}
+
 impl TryFrom<(u32, &[u8])> for Ivk {
     type Error = ParseError;
 
@@ -359,4 +377,43 @@ mod tests {
             ]
         )
     }
+
+    #[test]
+    fn ivk_debug_redaction() {
+        assert_eq!(
+            format!("{:?}", Ivk::Orchard([0; 64])),
+            "Ivk::Orchard(\"...\")"
+        );
+        assert_eq!(
+            format!("{:?}", Ivk::Sapling([0; 64])),
+            "Ivk::Sapling(\"...\")"
+        );
+        assert_eq!(format!("{:?}", Ivk::P2pkh([0; 65])), "Ivk::P2pkh(\"...\")");
+        assert_eq!(
+            format!(
+                "{:?}",
+                Ivk::Unknown {
+                    typecode: 31337,
+                    data: vec![4, 5, 6],
+                }
+            ),
+            "Ivk::Unknown { typecode: 31337, data: \"...\" }"
+        );
+    }
+
+    #[test]
+    fn uivk_debug_redaction() {
+        let uivk = Uivk(vec![
+            Ivk::Sapling([0; 64]),
+            Ivk::Unknown {
+                typecode: 9,
+                data: vec![8, 8, 8],
+            },
+        ]);
+
+        assert_eq!(
+            format!("{:?}", uivk),
+            "Uivk([Ivk::Sapling(\"...\"), Ivk::Unknown { typecode: 9, data: \"...\" }])"
+        );
+    }
 }
diff --git a/zcash_keys/src/keys.rs b/zcash_keys/src/keys.rs
index cae6607dbd..f842a3592c 100644
--- a/zcash_keys/src/keys.rs
+++ b/zcash_keys/src/keys.rs
@@ -209,7 +209,7 @@ impl Era {
 }
 
 /// A set of spending keys that are all associated with a single ZIP-0032 account identifier.
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct UnifiedSpendingKey {
     #[cfg(feature = "transparent-inputs")]
     transparent: ::transparent::keys::AccountPrivKey,
@@ -219,6 +219,19 @@ pub struct UnifiedSpendingKey {
     orchard: orchard::keys::SpendingKey,
 }
 
+impl core::fmt::Debug for UnifiedSpendingKey {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        let mut d = f.debug_struct("UnifiedSpendingKey");
+        #[cfg(feature = "transparent-inputs")]
+        d.field("transparent", &"...");
+        #[cfg(feature = "sapling")]
+        d.field("sapling", &"...");
+        #[cfg(feature = "orchard")]
+        d.field("orchard", &"...");
+        d.finish()
+    }
+}
+
 impl UnifiedSpendingKey {
     pub fn from_seed<P: consensus::Parameters>(
         _params: &P,
@@ -761,9 +774,15 @@ impl From<bip32::Error> for DerivationError {
 
 /// A key that provides the capability to recover outgoing transaction information from
 /// the block chain.
-#[derive(Debug, Clone, Copy)]
+#[derive(Clone, Copy)]
 pub struct OutgoingViewingKey([u8; 32]);
 
+impl core::fmt::Debug for OutgoingViewingKey {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        f.debug_tuple("OutgoingViewingKey").field(&"...").finish()
+    }
+}
+
 impl From<[u8; 32]> for OutgoingViewingKey {
     fn from(ovk: [u8; 32]) -> Self {
         OutgoingViewingKey(ovk)
@@ -805,7 +824,7 @@ impl AsRef<[u8; 32]> for OutgoingViewingKey {
 }
 
 /// A [ZIP 316](https://zips.z.cash/zip-0316) unified full viewing key.
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct UnifiedFullViewingKey {
     #[cfg(feature = "transparent-inputs")]
     transparent: Option<::transparent::keys::AccountPubKey>,
@@ -816,6 +835,27 @@ pub struct UnifiedFullViewingKey {
     unknown: Vec<(u32, Vec<u8>)>,
 }
 
+impl core::fmt::Debug for UnifiedFullViewingKey {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        let mut d = f.debug_struct("UnifiedFullViewingKey");
+        #[cfg(feature = "transparent-inputs")]
+        d.field("transparent", &self.transparent);
+        #[cfg(feature = "sapling")]
+        d.field("sapling", &self.sapling.as_ref().map(|_| "..."));
+        #[cfg(feature = "orchard")]
+        d.field("orchard", &self.orchard.as_ref().map(|_| "..."));
+        d.field(
+            "unknown_typecodes",
+            &self
+                .unknown
+                .iter()
+                .map(|(typecode, _)| *typecode)
+                .collect::<Vec<_>>(),
+        )
+        .finish()
+    }
+}
+
 impl UnifiedFullViewingKey {
     /// Construct a new unified full viewing key.
     ///
@@ -1186,7 +1226,7 @@ impl UnifiedFullViewingKey {
 }
 
 /// A [ZIP 316](https://zips.z.cash/zip-0316) unified incoming viewing key.
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct UnifiedIncomingViewingKey {
     #[cfg(feature = "transparent-inputs")]
     transparent: Option<::transparent::keys::ExternalIvk>,
@@ -1198,6 +1238,27 @@ pub struct UnifiedIncomingViewingKey {
     unknown: Vec<(u32, Vec<u8>)>,
 }
 
+impl core::fmt::Debug for UnifiedIncomingViewingKey {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        let mut d = f.debug_struct("UnifiedIncomingViewingKey");
+        #[cfg(feature = "transparent-inputs")]
+        d.field("transparent", &self.transparent);
+        #[cfg(feature = "sapling")]
+        d.field("sapling", &self.sapling.as_ref().map(|_| "..."));
+        #[cfg(feature = "orchard")]
+        d.field("orchard", &self.orchard.as_ref().map(|_| "..."));
+        d.field(
+            "unknown_typecodes",
+            &self
+                .unknown
+                .iter()
+                .map(|(typecode, _)| *typecode)
+                .collect::<Vec<_>>(),
+        )
+        .finish()
+    }
+}
+
 impl UnifiedIncomingViewingKey {
     /// Construct a new unified incoming viewing key.
     ///
@@ -2140,4 +2201,99 @@ mod tests {
             assert_eq!(decoded.transparent().to_bytes(), usk.transparent().to_bytes());
         }
     }
+
+    #[cfg(feature = "unstable")]
+    #[test]
+    fn usk_debug_redaction() {
+        let seed = [0u8; 64];
+        let usk = UnifiedSpendingKey::from_seed(&MAIN_NETWORK, &seed, AccountId::ZERO).unwrap();
+        assert!(format!("{:?}", usk).contains("\"...\""));
+    }
+
+    #[test]
+    #[cfg(any(feature = "orchard", feature = "sapling"))]
+    fn ufvk_debug_redaction() {
+        #[cfg(feature = "orchard")]
+        let orchard = {
+            let sk =
+                orchard::keys::SpendingKey::from_zip32_seed(&[0; 32], 0, AccountId::ZERO).unwrap();
+            Some(orchard::keys::FullViewingKey::from(&sk))
+        };
+
+        #[cfg(feature = "sapling")]
+        let sapling = {
+            let extsk = sapling::spending_key(&[0; 32], 0, AccountId::ZERO);
+            Some(extsk.to_diversifiable_full_viewing_key())
+        };
+
+        #[cfg(feature = "transparent-inputs")]
+        let transparent = {
+            let privkey =
+                AccountPrivKey::from_seed(&MAIN_NETWORK, &[0; 32], AccountId::ZERO).unwrap();
+            Some(privkey.to_account_pubkey())
+        };
+
+        let ufvk = UnifiedFullViewingKey::new(
+            #[cfg(feature = "transparent-inputs")]
+            transparent,
+            #[cfg(feature = "sapling")]
+            sapling,
+            #[cfg(feature = "orchard")]
+            orchard,
+        )
+        .unwrap();
+
+        let debug_str = format!("{:?}", ufvk);
+        #[cfg(feature = "sapling")]
+        assert!(debug_str.contains("sapling: Some(\"...\")"));
+        #[cfg(feature = "orchard")]
+        assert!(debug_str.contains("orchard: Some(\"...\")"));
+    }
+
+    #[test]
+    #[cfg(any(feature = "orchard", feature = "sapling"))]
+    fn uivk_debug_redaction() {
+        #[cfg(feature = "orchard")]
+        let orchard = {
+            let sk =
+                orchard::keys::SpendingKey::from_zip32_seed(&[0; 32], 0, AccountId::ZERO).unwrap();
+            Some(orchard::keys::FullViewingKey::from(&sk).to_ivk(Scope::External))
+        };
+
+        #[cfg(feature = "sapling")]
+        let sapling = {
+            let extsk = sapling::spending_key(&[0; 32], 0, AccountId::ZERO);
+            Some(extsk.to_diversifiable_full_viewing_key().to_external_ivk())
+        };
+
+        #[cfg(feature = "transparent-inputs")]
+        let transparent = {
+            let privkey =
+                AccountPrivKey::from_seed(&MAIN_NETWORK, &[0; 32], AccountId::ZERO).unwrap();
+            Some(privkey.to_account_pubkey().derive_external_ivk().unwrap())
+        };
+
+        let uivk = UnifiedIncomingViewingKey::new(
+            #[cfg(feature = "transparent-inputs")]
+            transparent,
+            #[cfg(feature = "sapling")]
+            sapling,
+            #[cfg(feature = "orchard")]
+            orchard,
+        );
+
+        let debug_str = format!("{:?}", uivk);
+        #[cfg(feature = "sapling")]
+        assert!(debug_str.contains("sapling: Some(\"...\")"));
+        #[cfg(feature = "orchard")]
+        assert!(debug_str.contains("orchard: Some(\"...\")"));
+    }
+
+    #[test]
+    fn ovk_debug_redaction() {
+        assert_eq!(
+            format!("{:?}", super::OutgoingViewingKey::from([0u8; 32])),
+            "OutgoingViewingKey(\"...\")"
+        );
+    }
 }
diff --git a/zcash_keys/src/keys/transparent.rs b/zcash_keys/src/keys/transparent.rs
index 1bfde0aece..797d6befc4 100644
--- a/zcash_keys/src/keys/transparent.rs
+++ b/zcash_keys/src/keys/transparent.rs
@@ -28,6 +28,16 @@ pub enum ParseError {
     Bip32(bip32::Error),
 }
 
+#[cfg(feature = "transparent-key-encoding")]
+impl core::fmt::Debug for Key {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        f.debug_struct("Key")
+            .field("secret", &"...")
+            .field("compressed", &self.compressed)
+            .finish()
+    }
+}
+
 #[cfg(feature = "transparent-key-encoding")]
 impl From<bs58::decode::Error> for ParseError {
     fn from(value: bs58::decode::Error) -> Self {
@@ -433,4 +443,18 @@ mod tests {
             );
         }
     }
+
+    #[test]
+    #[cfg(feature = "transparent-key-encoding")]
+    fn key_debug_redaction() {
+        let mut rng = ChaChaRng::from_seed([0u8; 32]);
+        let secret = SecretKey::new(&mut rng);
+        let key = Key {
+            secret,
+            compressed: true,
+        };
+        let debug_str = format!("{:?}", key);
+        assert!(debug_str.contains("secret: \"...\""));
+        assert!(debug_str.contains("compressed: true"));
+    }
 }
diff --git a/zcash_transparent/src/keys.rs b/zcash_transparent/src/keys.rs
index 37a36316c2..3cb5ebb5fa 100644
--- a/zcash_transparent/src/keys.rs
+++ b/zcash_transparent/src/keys.rs
@@ -226,10 +226,17 @@ impl IntoIterator for NonHardenedChildRange {
 /// A [BIP44] private key at the account path level `m/44'/<coin_type>'/<account>'`.
 ///
 /// [BIP44]: https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 #[cfg(feature = "transparent-inputs")]
 pub struct AccountPrivKey(ExtendedPrivateKey<secp256k1::SecretKey>);
 
+#[cfg(feature = "transparent-inputs")]
+impl core::fmt::Debug for AccountPrivKey {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        f.debug_tuple("AccountPrivKey").field(&"...").finish()
+    }
+}
+
 #[cfg(feature = "transparent-inputs")]
 impl AccountPrivKey {
     /// Performs derivation of the extended private key for the BIP44 path:
@@ -541,9 +548,16 @@ pub trait IncomingViewingKey: private::SealedChangeLevelKey + core::marker::Size
 ///
 /// [BIP44]: https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki
 #[cfg(feature = "transparent-inputs")]
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct ExternalIvk(ExtendedPublicKey<PublicKey>);
 
+#[cfg(feature = "transparent-inputs")]
+impl core::fmt::Debug for ExternalIvk {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        f.debug_tuple("ExternalIvk").field(&"...").finish()
+    }
+}
+
 #[cfg(feature = "transparent-inputs")]
 impl private::SealedChangeLevelKey for ExternalIvk {
     const SCOPE: TransparentKeyScope = TransparentKeyScope(0);
@@ -568,9 +582,16 @@ impl IncomingViewingKey for ExternalIvk {}
 ///
 /// [BIP44]: https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki
 #[cfg(feature = "transparent-inputs")]
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct InternalIvk(ExtendedPublicKey<PublicKey>);
 
+#[cfg(feature = "transparent-inputs")]
+impl core::fmt::Debug for InternalIvk {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        f.debug_tuple("InternalIvk").field(&"...").finish()
+    }
+}
+
 #[cfg(feature = "transparent-inputs")]
 impl private::SealedChangeLevelKey for InternalIvk {
     const SCOPE: TransparentKeyScope = TransparentKeyScope(1);
@@ -592,9 +613,16 @@ impl IncomingViewingKey for InternalIvk {}
 ///
 /// This allows derivation of ephemeral addresses for use within the wallet.
 #[cfg(feature = "transparent-inputs")]
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct EphemeralIvk(ExtendedPublicKey<PublicKey>);
 
+#[cfg(feature = "transparent-inputs")]
+impl core::fmt::Debug for EphemeralIvk {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        f.debug_tuple("EphemeralIvk").field(&"...").finish()
+    }
+}
+
 #[cfg(feature = "transparent-inputs")]
 impl EphemeralIvk {
     /// Derives a transparent address at the provided child index.
@@ -611,6 +639,12 @@ impl EphemeralIvk {
 /// Internal outgoing viewing key used for autoshielding.
 pub struct InternalOvk([u8; 32]);
 
+impl core::fmt::Debug for InternalOvk {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        f.debug_tuple("InternalOvk").field(&"...").finish()
+    }
+}
+
 impl InternalOvk {
     pub fn as_bytes(&self) -> [u8; 32] {
         self.0
@@ -621,6 +655,12 @@ impl InternalOvk {
 /// external receivers.
 pub struct ExternalOvk([u8; 32]);
 
+impl core::fmt::Debug for ExternalOvk {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        f.debug_tuple("ExternalOvk").field(&"...").finish()
+    }
+}
+
 impl ExternalOvk {
     pub fn as_bytes(&self) -> [u8; 32] {
         self.0
@@ -813,4 +853,34 @@ mod tests {
 
         assert!(NonHardenedChildIndex::try_from(ChildNumber::new(0, true).unwrap()).is_err());
     }
+
+    #[test]
+    #[cfg(feature = "transparent-inputs")]
+    fn account_priv_key_debug_redaction() {
+        let sk =
+            AccountPrivKey::from_seed(&MAIN_NETWORK, &[0u8; 64], zip32::AccountId::ZERO).unwrap();
+        assert_eq!(format!("{:?}", sk), "AccountPrivKey(\"...\")");
+    }
+
+    #[test]
+    #[cfg(feature = "transparent-inputs")]
+    fn viewing_key_debug_redaction() {
+        let seed = [0u8; 32];
+        let account_sk =
+            AccountPrivKey::from_seed(&MAIN_NETWORK, &seed, zip32::AccountId::ZERO).unwrap();
+        let account_pubkey = account_sk.to_account_pubkey();
+
+        let external_ivk = account_pubkey.derive_external_ivk().unwrap();
+        assert_eq!(format!("{:?}", external_ivk), "ExternalIvk(\"...\")");
+
+        let internal_ivk = account_pubkey.derive_internal_ivk().unwrap();
+        assert_eq!(format!("{:?}", internal_ivk), "InternalIvk(\"...\")");
+
+        let ephemeral_ivk = account_pubkey.derive_ephemeral_ivk().unwrap();
+        assert_eq!(format!("{:?}", ephemeral_ivk), "EphemeralIvk(\"...\")");
+
+        let (internal_ovk, external_ovk) = account_pubkey.ovks_for_shielding();
+        assert_eq!(format!("{:?}", internal_ovk), "InternalOvk(\"...\")");
+        assert_eq!(format!("{:?}", external_ovk), "ExternalOvk(\"...\")");
+    }
 }
diff --git a/zcash_transparent/src/zip48.rs b/zcash_transparent/src/zip48.rs
index ba382e858f..6802f29d92 100644
--- a/zcash_transparent/src/zip48.rs
+++ b/zcash_transparent/src/zip48.rs
@@ -32,12 +32,21 @@ fn pub_prefix<P: consensus::Parameters>(params: &P) -> Prefix {
 /// A [ZIP 48] private key at the P2SH level `m/48'/<coin_type>'/<account>'/133000'`.
 ///
 /// [ZIP 48]: https://zips.z.cash/zip-0048
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct AccountPrivKey {
     origin: KeyOrigin,
     key: ExtendedPrivateKey<SecretKey>,
 }
 
+impl core::fmt::Debug for AccountPrivKey {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        f.debug_struct("AccountPrivKey")
+            .field("origin", &self.origin)
+            .field("key", &"...")
+            .finish()
+    }
+}
+
 impl AccountPrivKey {
     /// Performs derivation of the extended private key for the ZIP 48 path:
     /// `m/48'/<coin_type>'/<account>'/133000'`.

From 5888533fb68867328b2de765e555be8f8011a578 Mon Sep 17 00:00:00 2001
From: fdecroix <fdecroix@eryx.co>
Date: Thu, 19 Mar 2026 14:55:55 -0300
Subject: [PATCH 228/263] Update CHANGELOG.md with changes made in
 a8af0b53d4d0c8f32d21112c8bdc591b17bbf387

---
 components/zcash_address/CHANGELOG.md | 4 ++++
 zcash_keys/CHANGELOG.md               | 9 +++++++++
 zcash_transparent/CHANGELOG.md        | 7 +++++++
 3 files changed, 20 insertions(+)

diff --git a/components/zcash_address/CHANGELOG.md b/components/zcash_address/CHANGELOG.md
index bce46086bc..55f5648fd6 100644
--- a/components/zcash_address/CHANGELOG.md
+++ b/components/zcash_address/CHANGELOG.md
@@ -13,6 +13,10 @@ workspace.
 ### Added
 - `zcash_address::ZcashAddress::is_transparent_only`
 
+### Fixed
+- `Debug` output for `zcash_address::unified::{Fvk, Ivk}` now
+  redacts viewing key material instead of emitting raw key bytes.
+
 ### Removed
 
 - Removed deprecated `zcash_address::Network`, use `zcash_protocol::consensus::Network` instead.
diff --git a/zcash_keys/CHANGELOG.md b/zcash_keys/CHANGELOG.md
index c2d8e39a23..24f9c007c4 100644
--- a/zcash_keys/CHANGELOG.md
+++ b/zcash_keys/CHANGELOG.md
@@ -27,6 +27,15 @@ workspace.
 - The `std` feature flag now enables the equivalent flag on the dependencies
   `orchard`, `sapling-crypto`, `zcash_transparent`, and `zcash_address`.
 
+### Fixed
+- `Debug` output for `zcash_keys::keys::transparent::Key` now redacts its
+  secret key material.
+- `Debug` output for `zcash_keys::keys::{UnifiedSpendingKey,
+  OutgoingViewingKey, UnifiedFullViewingKey, UnifiedIncomingViewingKey}` now
+  redacts sensitive key material. `UnifiedFullViewingKey` and
+  `UnifiedIncomingViewingKey` no longer delegate shielded components to
+  external `Debug` implementations or emit raw unknown-item bytes.
+
 ## [0.12.0] - 2025-10-13
 
 ### Changed
diff --git a/zcash_transparent/CHANGELOG.md b/zcash_transparent/CHANGELOG.md
index ee6664dc12..bbbb5214bd 100644
--- a/zcash_transparent/CHANGELOG.md
+++ b/zcash_transparent/CHANGELOG.md
@@ -33,6 +33,13 @@ workspace.
   instead of its constituent parts. Use `Builder::add_p2pkh_input` if you need the
   previous API.
 
+### Fixed
+- `Debug` output for `zcash_transparent::keys::{AccountPrivKey,
+  ExternalIvk, InternalIvk, EphemeralIvk, InternalOvk,
+  ExternalOvk}` now redacts key material.
+- `Debug` output for `zcash_transparent::zip48::{AccountPrivKey}` 
+  now redacts the embedded extended key material.
+
 ## [0.6.3] - 2025-12-17
 
 ### Added

From 52fee3268a1d9a1a3cb77d99e2570c7e37730675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenzo=20Ruiz=20D=C3=ADaz?=
 <70449115+LorenzoRD2003@users.noreply.github.com>
Date: Thu, 19 Mar 2026 18:47:16 -0400
Subject: [PATCH 229/263] Update zcash_transparent/CHANGELOG.md

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 zcash_transparent/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zcash_transparent/CHANGELOG.md b/zcash_transparent/CHANGELOG.md
index bbbb5214bd..ac034bfcee 100644
--- a/zcash_transparent/CHANGELOG.md
+++ b/zcash_transparent/CHANGELOG.md
@@ -37,7 +37,7 @@ workspace.
 - `Debug` output for `zcash_transparent::keys::{AccountPrivKey,
   ExternalIvk, InternalIvk, EphemeralIvk, InternalOvk,
   ExternalOvk}` now redacts key material.
-- `Debug` output for `zcash_transparent::zip48::{AccountPrivKey}` 
+- `Debug` output for `zcash_transparent::zip48::{AccountPrivKey}`
   now redacts the embedded extended key material.
 
 ## [0.6.3] - 2025-12-17

From 58107d69a8861a59b4e0c94eebc88622f7297904 Mon Sep 17 00:00:00 2001
From: LorenzoRD2003 <lorenzoruizdiaz2003@gmail.com>
Date: Thu, 19 Mar 2026 20:32:24 -0300
Subject: [PATCH 230/263] fix(keys): enforce debug redaction for
 AccountPubKey/UFVK, extend tests, and update changelogs

---
 zcash_keys/CHANGELOG.md        |  6 +++---
 zcash_keys/src/keys.rs         |  4 +++-
 zcash_transparent/CHANGELOG.md |  2 +-
 zcash_transparent/src/keys.rs  | 10 +++++++++-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/zcash_keys/CHANGELOG.md b/zcash_keys/CHANGELOG.md
index 24f9c007c4..a3152ec39d 100644
--- a/zcash_keys/CHANGELOG.md
+++ b/zcash_keys/CHANGELOG.md
@@ -32,9 +32,9 @@ workspace.
   secret key material.
 - `Debug` output for `zcash_keys::keys::{UnifiedSpendingKey,
   OutgoingViewingKey, UnifiedFullViewingKey, UnifiedIncomingViewingKey}` now
-  redacts sensitive key material. `UnifiedFullViewingKey` and
-  `UnifiedIncomingViewingKey` no longer delegate shielded components to
-  external `Debug` implementations or emit raw unknown-item bytes.
+  redacts sensitive key material. `UnifiedFullViewingKey` and `UnifiedIncomingViewingKey`
+  no longer delegates shielded components to external `Debug` implementations
+  or emits raw unknown-item bytes.
 
 ## [0.12.0] - 2025-10-13
 
diff --git a/zcash_keys/src/keys.rs b/zcash_keys/src/keys.rs
index f842a3592c..10b2e13fcb 100644
--- a/zcash_keys/src/keys.rs
+++ b/zcash_keys/src/keys.rs
@@ -839,7 +839,7 @@ impl core::fmt::Debug for UnifiedFullViewingKey {
     fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
         let mut d = f.debug_struct("UnifiedFullViewingKey");
         #[cfg(feature = "transparent-inputs")]
-        d.field("transparent", &self.transparent);
+        d.field("transparent", &self.transparent.as_ref().map(|_| "..."));
         #[cfg(feature = "sapling")]
         d.field("sapling", &self.sapling.as_ref().map(|_| "..."));
         #[cfg(feature = "orchard")]
@@ -2244,6 +2244,8 @@ mod tests {
         .unwrap();
 
         let debug_str = format!("{:?}", ufvk);
+        #[cfg(feature = "transparent-inputs")]
+        assert!(debug_str.contains("transparent: Some(\"...\")"));
         #[cfg(feature = "sapling")]
         assert!(debug_str.contains("sapling: Some(\"...\")"));
         #[cfg(feature = "orchard")]
diff --git a/zcash_transparent/CHANGELOG.md b/zcash_transparent/CHANGELOG.md
index ac034bfcee..22fda4b557 100644
--- a/zcash_transparent/CHANGELOG.md
+++ b/zcash_transparent/CHANGELOG.md
@@ -35,7 +35,7 @@ workspace.
 
 ### Fixed
 - `Debug` output for `zcash_transparent::keys::{AccountPrivKey,
-  ExternalIvk, InternalIvk, EphemeralIvk, InternalOvk,
+  AccountPubKey, ExternalIvk, InternalIvk, EphemeralIvk, InternalOvk,
   ExternalOvk}` now redacts key material.
 - `Debug` output for `zcash_transparent::zip48::{AccountPrivKey}`
   now redacts the embedded extended key material.
diff --git a/zcash_transparent/src/keys.rs b/zcash_transparent/src/keys.rs
index 3cb5ebb5fa..3d72a31235 100644
--- a/zcash_transparent/src/keys.rs
+++ b/zcash_transparent/src/keys.rs
@@ -335,9 +335,16 @@ impl AccountPrivKey {
 ///
 /// [BIP44]: https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki
 #[cfg(feature = "transparent-inputs")]
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct AccountPubKey(ExtendedPublicKey<PublicKey>);
 
+#[cfg(feature = "transparent-inputs")]
+impl core::fmt::Debug for AccountPubKey {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        f.debug_tuple("AccountPubKey").field(&"...").finish()
+    }
+}
+
 #[cfg(feature = "transparent-inputs")]
 impl AccountPubKey {
     /// Derives the BIP44 public key at the external "change level" path
@@ -869,6 +876,7 @@ mod tests {
         let account_sk =
             AccountPrivKey::from_seed(&MAIN_NETWORK, &seed, zip32::AccountId::ZERO).unwrap();
         let account_pubkey = account_sk.to_account_pubkey();
+        assert_eq!(format!("{:?}", account_pubkey), "AccountPubKey(\"...\")");
 
         let external_ivk = account_pubkey.derive_external_ivk().unwrap();
         assert_eq!(format!("{:?}", external_ivk), "ExternalIvk(\"...\")");

From 2975a3381c61c59ba7b7acefc43daac9e4f04577 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Tue, 24 Mar 2026 20:04:32 -0600
Subject: [PATCH 231/263] test(zip321): add proptest regression seed for
 roundtrip failure

Add the failing seed from the CI proptest run to ensure the specific
input that triggered the roundtrip failure is always re-tested.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 components/zip321/proptest-regressions/lib.txt | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 components/zip321/proptest-regressions/lib.txt

diff --git a/components/zip321/proptest-regressions/lib.txt b/components/zip321/proptest-regressions/lib.txt
new file mode 100644
index 0000000000..16c86a3c90
--- /dev/null
+++ b/components/zip321/proptest-regressions/lib.txt
@@ -0,0 +1,6 @@
+# Seeds for failure cases propance has generated in the past. It is
+# temporary automatically reproduced before any new cases are generated.
+#
+# It is recommended to check this file in to source control so that
+# everyone who runs the test benefits from these saved cases.
+cc b040fce0ef8c3a97cea73b1d467f4a1b2bc3e3e017e41d96b091c125d2b2b57e # shrunk from prop_zip321_roundtrip_uri

From 645ed980c54302763900208f6203ce77fd026cd0 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Tue, 24 Mar 2026 19:52:24 -0600
Subject: [PATCH 232/263] fix(zip321): filter invalid param names from proptest
 strategy

The roundtrip proptest was generating parameter names that cannot
survive a parse-serialize cycle by ZIP 321 design: `req-` prefixed
names (which must be rejected if unrecognized) and reserved parameter
names (address, amount, memo, label, message) which get parsed as
known fields rather than other_params.

Closes zcash/librustzcash#1912

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 components/zip321/src/lib.rs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/components/zip321/src/lib.rs b/components/zip321/src/lib.rs
index a3b57ac5e6..570804fcad 100644
--- a/components/zip321/src/lib.rs
+++ b/components/zip321/src/lib.rs
@@ -881,6 +881,9 @@ pub mod testing {
         }
     }
 
+    /// Parameter names that are reserved by ZIP 321 and must not appear in `other_params`.
+    const RESERVED_PARAM_NAMES: &[&str] = &["address", "amount", "memo", "label", "message"];
+
     prop_compose! {
         pub fn arb_zip321_payment(network: NetworkType)(
             (recipient_address, amount) in arb_address(network).prop_flat_map(|addr| {
@@ -898,9 +901,12 @@ pub mod testing {
             other_params in btree_map(VALID_PARAMNAME, any::<String>(), 0..3),
         ) -> Payment {
             let memo = memo.filter(|_| recipient_address.can_receive_memo());
-            let other_params = other_params
+            let other_params: Vec<(String, String)> = other_params
                 .into_iter()
-                .filter(|(name, _)| !name.starts_with("req-"))
+                .filter(|(name, _)| {
+                    !name.starts_with("req-")
+                        && !RESERVED_PARAM_NAMES.contains(&name.as_str())
+                })
                 .collect();
             Payment {
                 recipient_address,

From 0696f94468eeab29e5939e68a46afcb7167cf506 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Wed, 25 Mar 2026 14:38:53 -0600
Subject: [PATCH 233/263] Squashed 'zcash_client_backend/lightwallet-protocol/'
 changes from 23f0768ea4..dd0ea2c3c5

dd0ea2c3c5 Merge pull request #23 from zcash/2026-03-doc-fixes
93b26b7db1 v0.4.1 release - minor doc fixups
d528fa82e3 Merge pull request #22 from zcash/2025-12-doc-git-subtree
b421ef0b34 Merge pull request #22 from zcash/2025-12-doc-git-subtree
4a26e54c36 Fix git subtree command syntax in README
34bb38b606 Merge pull request #20 from zcash/doc/get_block
a507182f92 Document GetBlock transparent data behavior and clarify nullifier RPCs
fc5cc9a4b1 Merge pull request #19 from zcash/deprecate_get_nullifiers
f0ebc72cad Mark `GetBlockNullifiers` and `GetBlockRangeNullifiers` as deprecated.
9a5f7a0eec Merge pull request #16 from zcash/2026-01-remove-fullHeader
f1095897d9 revert the previous PR that added BlockID.fullHeader
99d9bf9fff Merge pull request #15 from zcash/2025-12-compactblock-doc
bbdd689d73 either CompactBlock.{hash, prevHash}, or CompactBlock.header
aa42926ed3 Merge pull request #13 from pacu/add-README
da4d3d57d8 Add rationale suggested by @LarryRuane
4edd22465b fix type
e36df314b8 clean up whitespace and line width
215cb5a3f3 Add PR suggestions. Organize Clients section
3e78d5d872 Apply suggestions from code review
96b86544db Apply suggestion from @LarryRuane
6259b97df0 Apply suggestion from @nuttycom
f2fcef3e42 Apply suggestion from @nuttycom
8cc1e66b11 Apply suggestion from @LarryRuane
99132222dd Apply suggestion from @nuttycom
207cc5e6f9 create a README file with context and instructions
7392b9706f Merge pull request #12 from zcash/release/v0.4.0

git-subtree-dir: zcash_client_backend/lightwallet-protocol
git-subtree-split: dd0ea2c3c5827a433e62c2f936b89efa2dec5a9a
---
 CHANGELOG.md                    | 10 ++++++
 README.md                       | 60 +++++++++++++++++++++++++++++++++
 walletrpc/compact_formats.proto | 13 ++++---
 walletrpc/service.proto         | 49 ++++++++++++++++++++-------
 4 files changed, 115 insertions(+), 17 deletions(-)
 create mode 100644 README.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59a13060ff..7f5a08d4d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,16 @@ and this library adheres to Rust's notion of
 
 ## Unreleased
 
+## [v0.4.1] - 2026-02-20
+
+### Added
+- `README.md`
+
+### Changed
+- Designate `GetBlockNullifiers` and `GetBlockRangeNullifiers` as deprecated
+- Document `GetBlock` transparent data behavior
+- Clarify documentation of `GetBlockNullifiers` and `GetBlockRangeNullifiers`
+
 ## [v0.4.0] - 2025-12-03
 
 ### Added
diff --git a/README.md b/README.md
new file mode 100644
index 0000000000..56978ce7cc
--- /dev/null
+++ b/README.md
@@ -0,0 +1,60 @@
+# Light Wallet Protocol Canonical files
+
+This repository contains the canonical Protobuf definitions for the Zcash Light Wallet protocol.
+
+## Rationale
+Before the creation of this repository, copies of wallet RPC `.proto` files existed in several
+repositories across the Zcash ecosystem. This posed a challenge for protocol developers,
+wallet maintainers, and infrastructure providers who would have to look up the _Ad Hoc_
+canonical files for their own use and changes were hard to propagate and communicate. There was also
+a danger of projects deploying incompatible changes, such as using the same field or tag number for
+a new message field.
+
+This repository IS _not_ a specification of the Zcash Light Client protocol. The Zcash Light Client
+Protocol is described in [ZIP-307](https://zips.z.cash/zip-0307).
+
+These files define the GRPC API for the ZIP 307 light wallet service using [proto 3](https://protobuf.dev/programming-guides/proto3/).
+
+## How to use these files
+We recommend using `git subtree` to update downstream repositories to use the lastest tagged versions
+of this repository.
+
+```git subtree --prefix=$(TARGET_PATH) pull git@github.com:zcash/lightwallet-protocol.git $(LATEST_VERSION) --squash```
+
+### Example: YourProject
+We assume YourProject is a git repository. Begin with a clean working tree.
+(Pulling in lightwallet-protocol creates its own commit;
+any changes you're making to your project should be in separate commits.)
+
+You can install the `tree` command using your OS package manager of choice (although is not necessary).
+(Replace the version tag with the appropriate one, usually the latest.)
+```
+$ cd YourProject
+$ git subtree --prefix=lightwallet-protocol/ pull git@github.com:zcash/lightwallet-protocol.git v0.4.0 --squash
+$ tree .
+├── lightwallet-protocol
+│   ├── LICENSE
+│   └── walletrpc
+│       ├── compact_formats.proto
+│       └── service.proto
+... (other directories)
+```
+## Current implementations
+### Servers
+- [Lightwalletd (Go)](https://github.com/zcash/lightwalletd/)
+- [Zaino (Rust)](https://github.com/zingolabs/zaino)
+### Clients
+#### CLI and Dev Tooling
+- [Zingo Lib CLI (Rust)](https://github.com/zingolabs/zingolib/)
+- [Zcash dev-tool (Rust)](https://github.com/zcash/zcash-devtool)
+- [zcash_client_backend Rust crate](https://docs.rs/zcash_client_backend/latest/zcash_client_backend/)
+#### Light Wallets
+- Zashi [[iOS](https://github.com/Electric-Coin-Company/zcash-swift-wallet-sdk/) | [Android](https://github.com/Electric-Coin-Company/zcash-android-wallet-sdk/)]
+- [Ywallet (Dart/Flutter)](https://github.com/hhanh00/zwallet)
+
+## Discussing and developing the Zcash Light Client Protocol
+Light client protocol development is steered by the [Light Client Working Group](https://github.com/zcash/lcwg).
+
+This workgroup meets bi-weekly and is invite-only, but you can reach out through
+[this channel](https://discord.com/channels/809218587167293450/809250822579028008)
+of the Zcash R&D Discord server.
diff --git a/walletrpc/compact_formats.proto b/walletrpc/compact_formats.proto
index c62c7acbb1..c68ce39d16 100644
--- a/walletrpc/compact_formats.proto
+++ b/walletrpc/compact_formats.proto
@@ -23,13 +23,18 @@ message ChainMetadata {
 //   2. Detect a spend of your Shielded notes
 //   3. Update your witnesses to generate new spend proofs.
 //   4. Spend UTXOs associated to t-addresses of your wallet.
+//
+// Currently, the `header` field should always be unset (empty). In the future, 
+// the presence or absence of header data may be made dependent on request 
+// parameters, although it is likely that such flexibility will only be provided via 
+// newly-added service methods, not via existing APIs.
 message CompactBlock {
     uint32 protoVersion = 1;         // the version of this wire format, for storage
     uint64 height = 2;               // the height of this block
-    bytes hash = 3;                  // the ID (hash) of this block, same as in block explorers
-    bytes prevHash = 4;              // the ID (hash) of this block's predecessor
-    uint32 time = 5;                 // Unix epoch time when the block was mined
-    bytes header = 6;                // full header (as returned by the getblock RPC)
+    bytes hash = 3;                  // if present, the ID (hash) of this block
+    bytes prevHash = 4;              // if present, the ID (hash) of this block's predecessor
+    uint32 time = 5;                 // if non-zero, Unix epoch time when the block was mined
+    bytes header = 6;                // if present, full header (as returned by the getblock RPC)
     repeated CompactTx vtx = 7;      // zero or more compact transactions from this block
     ChainMetadata chainMetadata = 8; // information about the state of the chain as of this block
 }
diff --git a/walletrpc/service.proto b/walletrpc/service.proto
index d3dc8ba045..2f30f676fa 100644
--- a/walletrpc/service.proto
+++ b/walletrpc/service.proto
@@ -17,7 +17,9 @@ enum PoolType {
 }
 
 // A BlockID message contains identifiers to select a block: a height or a
-// hash. Specification by hash is not implemented, but may be in the future.
+// hash. Support for specification by hash is not mandatory. (If `hash` is
+// non-empty, the rpc may return an error.) This field is present to support
+// a possible future upgrade.
 message BlockID {
     uint64 height = 1;
     bytes hash = 2;
@@ -28,7 +30,7 @@ message BlockID {
 //
 // If no pool types are specified, the server should default to the legacy
 // behavior of returning only data relevant to the shielded (Sapling and
-// Orchard) pools; otherwise, the server should prune `CompactBlocks` returned
+// Orchard) pools; otherwise, the server should prune `CompactBlock`s returned
 // to include only data relevant to the requested pool types. Clients MUST 
 // verify that the version of the server they are connected to are capable
 // of returning pruned and/or transparent data before setting `poolTypes`
@@ -220,15 +222,30 @@ service CompactTxStreamer {
     // Return the BlockID of the block at the tip of the best chain
     rpc GetLatestBlock(ChainSpec) returns (BlockID) {}
 
-    // Return the compact block corresponding to the given block identifier
+    // Return the compact block corresponding to the given block identifier.
+    //
+    // The returned `CompactBlock` includes transaction data for all value
+    // pools, including transparent inputs (`vin`) and outputs (`vout`). This
+    // differs from `GetBlockRange`, which supports filtering by pool type and
+    // defaults to returning only shielded (Sapling and Orchard) data. Clients
+    // that require only data for specific pools should use `GetBlockRange`
+    // with the appropriate `poolTypes` set.
+    //
+    // Note: the single null-outpoint input for coinbase transactions is
+    // omitted from the `vin` field of the corresponding `CompactTx`. See the
+    // documentation of the `CompactTx` message for details.
     rpc GetBlock(BlockID) returns (CompactBlock) {}
 
-    // Same as GetBlock except the returned CompactBlock value contains only
-    // nullifiers.
+    // Return a compact block containing only nullifier information for the
+    // shielded pools (Sapling spend nullifiers and Orchard action nullifiers).
+    // Transparent transaction data, Sapling outputs, full Orchard action data,
+    // and commitment tree sizes are not included.
     //
-    // Note: this method is deprecated. Implementations should ignore any
-    // `PoolType::TRANSPARENT` member of the `poolTypes` argument.
-    rpc GetBlockNullifiers(BlockID) returns (CompactBlock) {}
+    // Note: this method is deprecated; use `GetBlockRange` with the
+    // appropriate `poolTypes` instead.
+    rpc GetBlockNullifiers(BlockID) returns (CompactBlock) {
+      option deprecated = true;
+    }
 
     // Return a list of consecutive compact blocks in the specified range,
     // which is inclusive of `range.end`.
@@ -237,12 +254,18 @@ service CompactTxStreamer {
     // otherwise blocks are returned in decreasing height order.
     rpc GetBlockRange(BlockRange) returns (stream CompactBlock) {}
 
-    // Same as GetBlockRange except the returned CompactBlock values contain
-    // only nullifiers.
+    // Return a stream of compact blocks for the specified range, where each
+    // block contains only nullifier information for the shielded pools
+    // (Sapling spend nullifiers and Orchard action nullifiers). Transparent
+    // transaction data, Sapling outputs, full Orchard action data, and
+    // commitment tree sizes are not included. Implementations MUST ignore any
+    // `PoolType::TRANSPARENT` member of the `poolTypes` field of the request.
     //
-    // Note: this method is deprecated. Implementations should ignore any
-    // `PoolType::TRANSPARENT` member of the `poolTypes` argument.
-    rpc GetBlockRangeNullifiers(BlockRange) returns (stream CompactBlock) {}
+    // Note: this method is deprecated; use `GetBlockRange` with the
+    // appropriate `poolTypes` instead.
+    rpc GetBlockRangeNullifiers(BlockRange) returns (stream CompactBlock) {
+      option deprecated = true;
+    }
 
     // Return the requested full (not compact) transaction (as from zcashd)
     rpc GetTransaction(TxFilter) returns (RawTransaction) {}

From 350123e1597356140a9176ba1ad5f80e45e98e0e Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Wed, 25 Mar 2026 14:42:30 -0600
Subject: [PATCH 234/263] Regenerate sources after lightwallet_protocol-v0.4.1
 update.

---
 zcash_client_backend/CHANGELOG.md             | 11 ++++-
 zcash_client_backend/build.rs                 |  4 ++
 .../src/proto/compact_formats.rs              | 13 ++++--
 zcash_client_backend/src/proto/service.rs     | 43 ++++++++++++++-----
 4 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index 8e974132d9..a4bacc3a8d 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -8,7 +8,7 @@ indicated by the `PLANNED` status in order to make it possible to correctly
 represent the transitive `semver` implications of changes within the enclosing
 workspace.
 
-## [Unreleased]
+## [0.22.0] - PLANNED
 
 ### Added
 - `zcash_client_backend::data_api`:
@@ -20,7 +20,7 @@ workspace.
   - `ReceivedTransactionOutput`
 - in `zcash_client_backend::proto::compact_formats`:
   - `CompactTx` has added fields `vin` and `vout`
-  - Added types `CompactTxIn`, `TxOut`
+  - Added types `CompactTxIn`, `OutPoint`, `TxOut`
 - in `zcash_client_backend::proto::service`:
   - Added enum `PoolType`
   - `BlockRange` has added field `pool_types`
@@ -42,6 +42,7 @@ workspace.
 - `zcash_client_backend::wallet::WalletTransparentOutput::with_known_input_size`
 
 ### Changed
+- Updated to `lightwallet_protocol v0.4.1`
 - `zcash_client_backend::data_api::error::Error::MemoForbidden` has been replaced
   by `Error::Payment(zip321::PaymentError)`, which can represent both memo-to-transparent
   and zero-valued-transparent-output errors.
@@ -121,6 +122,12 @@ workspace.
 - `zcash_client_backend::data_api::wallet::create_proposed_transactions` now
   supports spending from standalone P2SH (multisig) transparent addresses.
 
+### Deprecated
+- `zcash_client_backend::proto::service::compact_tx_streamer_client`
+  The following are deprecated as in `lightwallet-protocol v0.4.1`:
+  - `get_block_nullifiers`
+  - `get_block_range_nullifiers`
+
 ### Removed
 - `zcash_client_backend::data_api::testing::transparent::GapLimits` use
   `zcash_keys::keys::transparent::GapLimits` instead.
diff --git a/zcash_client_backend/build.rs b/zcash_client_backend/build.rs
index a35b8233ff..8f1e1d8b8d 100644
--- a/zcash_client_backend/build.rs
+++ b/zcash_client_backend/build.rs
@@ -85,6 +85,10 @@ fn build() -> io::Result<()> {
             ".cash.z.wallet.sdk.rpc.CompactOrchardAction",
             "crate::proto::compact_formats::CompactOrchardAction",
         )
+        .extern_path(
+            ".cash.z.wallet.sdk.rpc.OutPoint",
+            "crate::proto::compact_formats::OutPoint",
+        )
         .compile_protos(&[SERVICE_PROTO], &["proto/"])?;
 
     // Build the proposal types.
diff --git a/zcash_client_backend/src/proto/compact_formats.rs b/zcash_client_backend/src/proto/compact_formats.rs
index e0af5156e6..1ec7276c35 100644
--- a/zcash_client_backend/src/proto/compact_formats.rs
+++ b/zcash_client_backend/src/proto/compact_formats.rs
@@ -16,6 +16,11 @@ pub struct ChainMetadata {
 ///    2. Detect a spend of your Shielded notes
 ///    3. Update your witnesses to generate new spend proofs.
 ///    4. Spend UTXOs associated to t-addresses of your wallet.
+///
+/// Currently, the `header` field should always be unset (empty). In the future,
+/// the presence or absence of header data may be made dependent on request
+/// parameters, although it is likely that such flexibility will only be provided via
+/// newly-added service methods, not via existing APIs.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CompactBlock {
     /// the version of this wire format, for storage
@@ -24,16 +29,16 @@ pub struct CompactBlock {
     /// the height of this block
     #[prost(uint64, tag = "2")]
     pub height: u64,
-    /// the ID (hash) of this block, same as in block explorers
+    /// if present, the ID (hash) of this block
     #[prost(bytes = "vec", tag = "3")]
     pub hash: ::prost::alloc::vec::Vec<u8>,
-    /// the ID (hash) of this block's predecessor
+    /// if present, the ID (hash) of this block's predecessor
     #[prost(bytes = "vec", tag = "4")]
     pub prev_hash: ::prost::alloc::vec::Vec<u8>,
-    /// Unix epoch time when the block was mined
+    /// if non-zero, Unix epoch time when the block was mined
     #[prost(uint32, tag = "5")]
     pub time: u32,
-    /// full header (as returned by the getblock RPC)
+    /// if present, full header (as returned by the getblock RPC)
     #[prost(bytes = "vec", tag = "6")]
     pub header: ::prost::alloc::vec::Vec<u8>,
     /// zero or more compact transactions from this block
diff --git a/zcash_client_backend/src/proto/service.rs b/zcash_client_backend/src/proto/service.rs
index 05d6a5ed20..479e527234 100644
--- a/zcash_client_backend/src/proto/service.rs
+++ b/zcash_client_backend/src/proto/service.rs
@@ -1,6 +1,8 @@
 // This file is @generated by prost-build.
 /// A BlockID message contains identifiers to select a block: a height or a
-/// hash. Specification by hash is not implemented, but may be in the future.
+/// hash. Support for specification by hash is not mandatory. (If `hash` is
+/// non-empty, the rpc may return an error.) This field is present to support
+/// a possible future upgrade.
 #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct BlockId {
     #[prost(uint64, tag = "1")]
@@ -13,7 +15,7 @@ pub struct BlockId {
 ///
 /// If no pool types are specified, the server should default to the legacy
 /// behavior of returning only data relevant to the shielded (Sapling and
-/// Orchard) pools; otherwise, the server should prune `CompactBlocks` returned
+/// Orchard) pools; otherwise, the server should prune `CompactBlock`s returned
 /// to include only data relevant to the requested pool types. Clients MUST
 /// verify that the version of the server they are connected to are capable
 /// of returning pruned and/or transparent data before setting `poolTypes`
@@ -455,7 +457,18 @@ pub mod compact_tx_streamer_client {
                 );
             self.inner.unary(req, path, codec).await
         }
-        /// Return the compact block corresponding to the given block identifier
+        /// Return the compact block corresponding to the given block identifier.
+        ///
+        /// The returned `CompactBlock` includes transaction data for all value
+        /// pools, including transparent inputs (`vin`) and outputs (`vout`). This
+        /// differs from `GetBlockRange`, which supports filtering by pool type and
+        /// defaults to returning only shielded (Sapling and Orchard) data. Clients
+        /// that require only data for specific pools should use `GetBlockRange`
+        /// with the appropriate `poolTypes` set.
+        ///
+        /// Note: the single null-outpoint input for coinbase transactions is
+        /// omitted from the `vin` field of the corresponding `CompactTx`. See the
+        /// documentation of the `CompactTx` message for details.
         pub async fn get_block(
             &mut self,
             request: impl tonic::IntoRequest<super::BlockId>,
@@ -485,11 +498,14 @@ pub mod compact_tx_streamer_client {
                 );
             self.inner.unary(req, path, codec).await
         }
-        /// Same as GetBlock except the returned CompactBlock value contains only
-        /// nullifiers.
+        /// Return a compact block containing only nullifier information for the
+        /// shielded pools (Sapling spend nullifiers and Orchard action nullifiers).
+        /// Transparent transaction data, Sapling outputs, full Orchard action data,
+        /// and commitment tree sizes are not included.
         ///
-        /// Note: this method is deprecated. Implementations should ignore any
-        /// `PoolType::TRANSPARENT` member of the `poolTypes` argument.
+        /// Note: this method is deprecated; use `GetBlockRange` with the
+        /// appropriate `poolTypes` instead.
+        #[deprecated]
         pub async fn get_block_nullifiers(
             &mut self,
             request: impl tonic::IntoRequest<super::BlockId>,
@@ -555,11 +571,16 @@ pub mod compact_tx_streamer_client {
                 );
             self.inner.server_streaming(req, path, codec).await
         }
-        /// Same as GetBlockRange except the returned CompactBlock values contain
-        /// only nullifiers.
+        /// Return a stream of compact blocks for the specified range, where each
+        /// block contains only nullifier information for the shielded pools
+        /// (Sapling spend nullifiers and Orchard action nullifiers). Transparent
+        /// transaction data, Sapling outputs, full Orchard action data, and
+        /// commitment tree sizes are not included. Implementations MUST ignore any
+        /// `PoolType::TRANSPARENT` member of the `poolTypes` field of the request.
         ///
-        /// Note: this method is deprecated. Implementations should ignore any
-        /// `PoolType::TRANSPARENT` member of the `poolTypes` argument.
+        /// Note: this method is deprecated; use `GetBlockRange` with the
+        /// appropriate `poolTypes` instead.
+        #[deprecated]
         pub async fn get_block_range_nullifiers(
             &mut self,
             request: impl tonic::IntoRequest<super::BlockRange>,

From 372bf00d4702e019b9ef541db94f4cb6a4bbc964 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Wed, 25 Mar 2026 16:02:07 -0600
Subject: [PATCH 235/263] Apply suggestions from code review

Co-authored-by: Jack Grigg <thestr4d@gmail.com>
---
 zcash_client_backend/CHANGELOG.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index a4bacc3a8d..43513080da 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -42,7 +42,6 @@ workspace.
 - `zcash_client_backend::wallet::WalletTransparentOutput::with_known_input_size`
 
 ### Changed
-- Updated to `lightwallet_protocol v0.4.1`
 - `zcash_client_backend::data_api::error::Error::MemoForbidden` has been replaced
   by `Error::Payment(zip321::PaymentError)`, which can represent both memo-to-transparent
   and zero-valued-transparent-output errors.
@@ -58,7 +57,7 @@ workspace.
   `proposed_version: Option<TxVersion>` parameter under the `unstable` feature
   flag.
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`, `zip321 0.7`
-- Migrated to `lightwallet-protocol v0.4.0`. This results in the following API
+- Migrated to `lightwallet-protocol v0.4.1`. This results in the following API
   changes:
   - in `zcash_client_backend::proto::compact_formats`:
     - `CompactTx::hash` has been renamed to `CompactTx::txid`

From 6d399b43a4fed24dae0d74f21edc51fd2db15939 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 26 Mar 2026 05:28:28 +0000
Subject: [PATCH 236/263] build(deps): bump actions/deploy-pages from 4.0.5 to
 5.0.0

Bumps [actions/deploy-pages](https://github.com/actions/deploy-pages) from 4.0.5 to 5.0.0.
- [Release notes](https://github.com/actions/deploy-pages/releases)
- [Commits](https://github.com/actions/deploy-pages/compare/d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e...cd2ce8fcbc39b97be8ca5fce6e763baed58fa128)

---
updated-dependencies:
- dependency-name: actions/deploy-pages
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/book.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/book.yml b/.github/workflows/book.yml
index 852c88e70d..7ea0f73cf5 100644
--- a/.github/workflows/book.yml
+++ b/.github/workflows/book.yml
@@ -50,4 +50,4 @@ jobs:
 
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4.0.5
+        uses: actions/deploy-pages@cd2ce8fcbc39b97be8ca5fce6e763baed58fa128 # v5.0.0

From 1d14cfd8fdd1b23e4e8d595bfe2d7fe77a2aac20 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Thu, 26 Mar 2026 11:51:31 +0000
Subject: [PATCH 237/263] zcash_client_backend: Extract a tree position tracker
 from scanner

---
 zcash_client_backend/src/scanning.rs | 361 ++++++++++++++++-----------
 1 file changed, 216 insertions(+), 145 deletions(-)

diff --git a/zcash_client_backend/src/scanning.rs b/zcash_client_backend/src/scanning.rs
index e4c0295fe4..b772fefdaf 100644
--- a/zcash_client_backend/src/scanning.rs
+++ b/zcash_client_backend/src/scanning.rs
@@ -25,7 +25,7 @@ use zip32::Scope;
 
 use crate::{
     data_api::{BlockMetadata, ScannedBlock, ScannedBundles},
-    proto::compact_formats::CompactBlock,
+    proto::compact_formats::{ChainMetadata, CompactBlock, CompactTx},
     scan::{Batch, BatchRunner, CompactDecryptor, DecryptedOutput, Tasks},
     wallet::{WalletOutput, WalletSpend, WalletTx},
 };
@@ -729,113 +729,10 @@ where
     let cur_hash = block.hash();
     let zip212_enforcement = zip212_enforcement(params, cur_height);
 
-    let mut sapling_commitment_tree_size = prior_block_metadata
-        .and_then(|m| m.sapling_tree_size())
-        .map_or_else(
-            || {
-                block.chain_metadata.as_ref().map_or_else(
-                    || {
-                        // If we're below Sapling activation, or Sapling activation is not set, the tree size is zero
-                        params
-                            .activation_height(NetworkUpgrade::Sapling)
-                            .map_or_else(
-                                || Ok(0),
-                                |sapling_activation| {
-                                    if cur_height < sapling_activation {
-                                        Ok(0)
-                                    } else {
-                                        Err(ScanError::TreeSizeUnknown {
-                                            protocol: ShieldedProtocol::Sapling,
-                                            at_height: cur_height,
-                                        })
-                                    }
-                                },
-                            )
-                    },
-                    |m| {
-                        let sapling_output_count: u32 = block
-                            .vtx
-                            .iter()
-                            .map(|tx| tx.outputs.len())
-                            .sum::<usize>()
-                            .try_into()
-                            .expect("Sapling output count cannot exceed a u32");
-
-                        // The default for m.sapling_commitment_tree_size is zero, so we need to check
-                        // that the subtraction will not underflow; if it would do so, we were given
-                        // invalid chain metadata for a block with Sapling outputs.
-                        m.sapling_commitment_tree_size
-                            .checked_sub(sapling_output_count)
-                            .ok_or(ScanError::TreeSizeInvalid {
-                                protocol: ShieldedProtocol::Sapling,
-                                at_height: cur_height,
-                            })
-                    },
-                )
-            },
-            Ok,
-        )?;
-    let sapling_final_tree_size = sapling_commitment_tree_size
-        + block
-            .vtx
-            .iter()
-            .map(|tx| u32::try_from(tx.outputs.len()).unwrap())
-            .sum::<u32>();
-
-    #[cfg(feature = "orchard")]
-    let mut orchard_commitment_tree_size = prior_block_metadata
-        .and_then(|m| m.orchard_tree_size())
-        .map_or_else(
-            || {
-                block.chain_metadata.as_ref().map_or_else(
-                    || {
-                        // If we're below Orchard activation, or Orchard activation is not set, the tree size is zero
-                        params.activation_height(NetworkUpgrade::Nu5).map_or_else(
-                            || Ok(0),
-                            |orchard_activation| {
-                                if cur_height < orchard_activation {
-                                    Ok(0)
-                                } else {
-                                    Err(ScanError::TreeSizeUnknown {
-                                        protocol: ShieldedProtocol::Orchard,
-                                        at_height: cur_height,
-                                    })
-                                }
-                            },
-                        )
-                    },
-                    |m| {
-                        let orchard_action_count: u32 = block
-                            .vtx
-                            .iter()
-                            .map(|tx| tx.actions.len())
-                            .sum::<usize>()
-                            .try_into()
-                            .expect("Orchard action count cannot exceed a u32");
-
-                        // The default for m.orchard_commitment_tree_size is zero, so we need to check
-                        // that the subtraction will not underflow; if it would do so, we were given
-                        // invalid chain metadata for a block with Orchard actions.
-                        m.orchard_commitment_tree_size
-                            .checked_sub(orchard_action_count)
-                            .ok_or(ScanError::TreeSizeInvalid {
-                                protocol: ShieldedProtocol::Orchard,
-                                at_height: cur_height,
-                            })
-                    },
-                )
-            },
-            Ok,
-        )?;
-    #[cfg(feature = "orchard")]
-    let orchard_final_tree_size = orchard_commitment_tree_size
-        + block
-            .vtx
-            .iter()
-            .map(|tx| u32::try_from(tx.actions.len()).unwrap())
-            .sum::<u32>();
+    let mut pos_tracker = PositionTracker::for_block(params, &block, prior_block_metadata)?;
 
     let mut wtxs: Vec<WalletTx<AccountId>> = vec![];
+
     let mut sapling_nullifier_map = Vec::with_capacity(block.vtx.len());
     let mut sapling_note_commitments: Vec<(sapling::Node, Retention<BlockHeight>)> = vec![];
 
@@ -887,10 +784,9 @@ where
 
         let (sapling_outputs, mut sapling_nc) = find_received(
             cur_height,
-            sapling_final_tree_size
-                == sapling_commitment_tree_size + u32::try_from(tx.outputs.len()).unwrap(),
+            pos_tracker.contains_last_sapling_outputs_in_block(&tx),
             txid,
-            sapling_commitment_tree_size,
+            |output_idx| pos_tracker.sapling_note_position(output_idx),
             &scanning_keys.sapling,
             &spent_from_accounts,
             &tx.outputs
@@ -921,10 +817,9 @@ where
         #[cfg(feature = "orchard")]
         let (orchard_outputs, mut orchard_nc) = find_received(
             cur_height,
-            orchard_final_tree_size
-                == orchard_commitment_tree_size + u32::try_from(tx.actions.len()).unwrap(),
+            pos_tracker.contains_last_orchard_actions_in_block(&tx),
             txid,
-            orchard_commitment_tree_size,
+            |output_idx| pos_tracker.orchard_note_position(output_idx),
             &scanning_keys.orchard,
             &spent_from_accounts,
             &tx.actions
@@ -968,35 +863,10 @@ where
             ));
         }
 
-        sapling_commitment_tree_size +=
-            u32::try_from(tx.outputs.len()).expect("Sapling output count cannot exceed a u32");
-        #[cfg(feature = "orchard")]
-        {
-            orchard_commitment_tree_size +=
-                u32::try_from(tx.actions.len()).expect("Orchard action count cannot exceed a u32");
-        }
+        pos_tracker.increment_over_tx(&tx);
     }
 
-    if let Some(chain_meta) = block.chain_metadata {
-        if chain_meta.sapling_commitment_tree_size != sapling_commitment_tree_size {
-            return Err(ScanError::TreeSizeMismatch {
-                protocol: ShieldedProtocol::Sapling,
-                at_height: cur_height,
-                given: chain_meta.sapling_commitment_tree_size,
-                computed: sapling_commitment_tree_size,
-            });
-        }
-
-        #[cfg(feature = "orchard")]
-        if chain_meta.orchard_commitment_tree_size != orchard_commitment_tree_size {
-            return Err(ScanError::TreeSizeMismatch {
-                protocol: ShieldedProtocol::Orchard,
-                at_height: cur_height,
-                given: chain_meta.orchard_commitment_tree_size,
-                computed: orchard_commitment_tree_size,
-            });
-        }
-    }
+    pos_tracker.check_end_of_block_consistency(cur_height, block.chain_metadata)?;
 
     Ok(ScannedBlock::from_parts(
         cur_height,
@@ -1004,19 +874,222 @@ where
         block.time,
         wtxs,
         ScannedBundles::new(
-            sapling_commitment_tree_size,
+            pos_tracker.sapling_final_tree_size,
             sapling_note_commitments,
             sapling_nullifier_map,
         ),
         #[cfg(feature = "orchard")]
         ScannedBundles::new(
-            orchard_commitment_tree_size,
+            pos_tracker.orchard_final_tree_size,
             orchard_note_commitments,
             orchard_nullifier_map,
         ),
     ))
 }
 
+/// Tracks the scanner's position within the note commitment trees, in order to calculate
+/// received note positions.
+struct PositionTracker {
+    sapling_tree_position: u32,
+    sapling_final_tree_size: u32,
+    #[cfg(feature = "orchard")]
+    orchard_tree_position: u32,
+    #[cfg(feature = "orchard")]
+    orchard_final_tree_size: u32,
+}
+
+impl PositionTracker {
+    fn for_block<P>(
+        params: &P,
+        block: &CompactBlock,
+        prior_block_metadata: Option<&BlockMetadata>,
+    ) -> Result<Self, ScanError>
+    where
+        P: consensus::Parameters,
+    {
+        /// Returns the size of the given shielded protocol's note commitment tree before and
+        /// after the application of the given block.
+        #[allow(clippy::too_many_arguments)]
+        fn tree_sizes_around<P>(
+            params: &P,
+            block: &CompactBlock,
+            prior_block_metadata: Option<&BlockMetadata>,
+            protocol: ShieldedProtocol,
+            activation_nu: NetworkUpgrade,
+            prior_tree_size: impl Fn(&BlockMetadata) -> Option<u32>,
+            tx_output_count: impl Fn(&CompactTx) -> usize,
+            final_tree_size: impl Fn(&ChainMetadata) -> u32,
+        ) -> Result<(u32, u32), ScanError>
+        where
+            P: consensus::Parameters,
+        {
+            let at_height = block.height();
+
+            let start_tree_size = prior_block_metadata.and_then(prior_tree_size).map_or_else(
+                || {
+                    block.chain_metadata.as_ref().map_or_else(
+                        || {
+                            // If we're below the protocol's activation height, or it is
+                            // not set, the tree size is zero.
+                            params.activation_height(activation_nu).map_or_else(
+                                || Ok(0),
+                                |activation_height| {
+                                    if at_height < activation_height {
+                                        Ok(0)
+                                    } else {
+                                        Err(ScanError::TreeSizeUnknown {
+                                            protocol,
+                                            at_height,
+                                        })
+                                    }
+                                },
+                            )
+                        },
+                        |m| {
+                            let output_count: u32 = block
+                                .vtx
+                                .iter()
+                                .map(&tx_output_count)
+                                .sum::<usize>()
+                                .try_into()
+                                .expect("Shielded output count cannot exceed a u32");
+
+                            // The default for `final_tree_size(m)` is zero, so we need to
+                            // check that the subtraction will not underflow; if it would
+                            // do so, we were given invalid chain metadata for a block
+                            // with outputs in this shielded protocol.
+                            final_tree_size(m).checked_sub(output_count).ok_or(
+                                ScanError::TreeSizeInvalid {
+                                    protocol,
+                                    at_height,
+                                },
+                            )
+                        },
+                    )
+                },
+                Ok,
+            )?;
+
+            // We pre-compute the end tree size here so we can determine when we reach the
+            // last transaction in the block that adds notes to the tree. This enables us
+            // to correctly set the tree checkpoint in `find_received`.
+            let end_tree_size = start_tree_size
+                + block
+                    .vtx
+                    .iter()
+                    .map(tx_output_count)
+                    .map(|tx_outputs| u32::try_from(tx_outputs).unwrap())
+                    .sum::<u32>();
+
+            Ok((start_tree_size, end_tree_size))
+        }
+
+        let (sapling_prior_tree_size, sapling_final_tree_size) = tree_sizes_around(
+            params,
+            block,
+            prior_block_metadata,
+            ShieldedProtocol::Sapling,
+            NetworkUpgrade::Sapling,
+            |m| m.sapling_tree_size(),
+            |tx| tx.outputs.len(),
+            |m| m.sapling_commitment_tree_size,
+        )?;
+
+        #[cfg(feature = "orchard")]
+        let (orchard_prior_tree_size, orchard_final_tree_size) = tree_sizes_around(
+            params,
+            block,
+            prior_block_metadata,
+            ShieldedProtocol::Orchard,
+            NetworkUpgrade::Nu5,
+            |m| m.orchard_tree_size(),
+            |tx| tx.actions.len(),
+            |m| m.orchard_commitment_tree_size,
+        )?;
+
+        Ok(Self {
+            sapling_tree_position: sapling_prior_tree_size,
+            sapling_final_tree_size,
+            #[cfg(feature = "orchard")]
+            orchard_tree_position: orchard_prior_tree_size,
+            #[cfg(feature = "orchard")]
+            orchard_final_tree_size,
+        })
+    }
+
+    fn contains_last_sapling_outputs_in_block(&self, tx: &CompactTx) -> bool {
+        self.sapling_tree_position
+            + u32::try_from(tx.outputs.len()).expect("Sapling output count cannot exceed a u32")
+            == self.sapling_final_tree_size
+    }
+
+    #[cfg(feature = "orchard")]
+    fn contains_last_orchard_actions_in_block(&self, tx: &CompactTx) -> bool {
+        self.orchard_tree_position
+            + u32::try_from(tx.actions.len()).expect("Orchard action count cannot exceed a u32")
+            == self.orchard_final_tree_size
+    }
+
+    fn sapling_note_position(&self, output_idx: usize) -> Position {
+        Position::from(u64::from(
+            self.sapling_tree_position + u32::try_from(output_idx).unwrap(),
+        ))
+    }
+
+    #[cfg(feature = "orchard")]
+    fn orchard_note_position(&self, output_idx: usize) -> Position {
+        Position::from(u64::from(
+            self.orchard_tree_position + u32::try_from(output_idx).unwrap(),
+        ))
+    }
+
+    fn increment_over_tx(&mut self, tx: &CompactTx) {
+        self.sapling_tree_position +=
+            u32::try_from(tx.outputs.len()).expect("Sapling output count cannot exceed a u32");
+        #[cfg(feature = "orchard")]
+        {
+            self.orchard_tree_position +=
+                u32::try_from(tx.actions.len()).expect("Orchard action count cannot exceed a u32");
+        }
+    }
+
+    fn check_end_of_block_consistency(
+        &self,
+        at_height: BlockHeight,
+        chain_metadata: Option<ChainMetadata>,
+    ) -> Result<(), ScanError> {
+        // It is a programming error to construct `PositionTracker` from a `CompactBlock`
+        // and then not call `PositionTracker::increment_over_tx` on every transaction
+        // within the block.
+        assert_eq!(self.sapling_tree_position, self.sapling_final_tree_size);
+        #[cfg(feature = "orchard")]
+        assert_eq!(self.orchard_tree_position, self.orchard_final_tree_size);
+
+        if let Some(chain_meta) = chain_metadata {
+            if chain_meta.sapling_commitment_tree_size != self.sapling_tree_position {
+                return Err(ScanError::TreeSizeMismatch {
+                    protocol: ShieldedProtocol::Sapling,
+                    at_height,
+                    given: chain_meta.sapling_commitment_tree_size,
+                    computed: self.sapling_tree_position,
+                });
+            }
+
+            #[cfg(feature = "orchard")]
+            if chain_meta.orchard_commitment_tree_size != self.orchard_tree_position {
+                return Err(ScanError::TreeSizeMismatch {
+                    protocol: ShieldedProtocol::Orchard,
+                    at_height,
+                    given: chain_meta.orchard_commitment_tree_size,
+                    computed: self.orchard_tree_position,
+                });
+            }
+        }
+
+        Ok(())
+    }
+}
+
 /// Check for spent notes. The comparison against known-unspent nullifiers is done
 /// in constant time.
 fn find_spent<
@@ -1074,7 +1147,7 @@ fn find_received<
     block_height: BlockHeight,
     last_commitments_in_block: bool,
     txid: TxId,
-    commitment_tree_size: u32,
+    note_position: impl Fn(usize) -> Position,
     keys: &HashMap<IvkTag, SK>,
     spent_from_accounts: &HashSet<AccountId>,
     decoded: &[(D, Output)],
@@ -1157,9 +1230,7 @@ fn find_received<
             // - Notes created by consolidation transactions.
             // - Notes sent from one account to itself.
             let is_change = spent_from_accounts.contains(key.account_id());
-            let note_commitment_tree_position = Position::from(u64::from(
-                commitment_tree_size + u32::try_from(output_idx).unwrap(),
-            ));
+            let note_commitment_tree_position = note_position(output_idx);
             let nf = key.nf(&note, note_commitment_tree_position);
 
             shielded_outputs.push(WalletOutput::from_parts(

From a461b4398dd431cdda1ada35fe34e74234d96184 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Thu, 15 Jan 2026 13:32:53 -0800
Subject: [PATCH 238/263] zcash_client_backend: Move compact block scanning
 into sub-module

---
 zcash_client_backend/src/data_api/chain.rs   |   5 +-
 zcash_client_backend/src/scanning.rs         | 618 +-----------------
 zcash_client_backend/src/scanning/compact.rs | 623 +++++++++++++++++++
 3 files changed, 635 insertions(+), 611 deletions(-)
 create mode 100644 zcash_client_backend/src/scanning/compact.rs

diff --git a/zcash_client_backend/src/data_api/chain.rs b/zcash_client_backend/src/data_api/chain.rs
index 887bffeedb..3535693282 100644
--- a/zcash_client_backend/src/data_api/chain.rs
+++ b/zcash_client_backend/src/data_api/chain.rs
@@ -161,7 +161,10 @@ use zcash_protocol::consensus::{self, BlockHeight};
 use crate::{
     data_api::{NullifierQuery, WalletWrite},
     proto::compact_formats::CompactBlock,
-    scanning::{BatchRunners, Nullifiers, ScanningKeys, scan_block_with_runners},
+    scanning::{
+        Nullifiers, ScanningKeys,
+        compact::{BatchRunners, scan_block_with_runners},
+    },
 };
 
 #[cfg(feature = "sync")]
diff --git a/zcash_client_backend/src/scanning.rs b/zcash_client_backend/src/scanning.rs
index b772fefdaf..3c8ef7a3fe 100644
--- a/zcash_client_backend/src/scanning.rs
+++ b/zcash_client_backend/src/scanning.rs
@@ -6,17 +6,12 @@ use std::fmt::{self, Debug};
 use std::hash::Hash;
 
 use incrementalmerkletree::{Marking, Position, Retention};
-use sapling::{
-    SaplingIvk,
-    note_encryption::{CompactOutputDescription, SaplingDomain},
-};
+use sapling::{SaplingIvk, note_encryption::SaplingDomain};
 use subtle::{ConditionallySelectable, ConstantTimeEq, CtOption};
 
-use tracing::{debug, trace};
 use zcash_keys::keys::UnifiedFullViewingKey;
 use zcash_note_encryption::{BatchDomain, COMPACT_NOTE_SIZE, Domain, ShieldedOutput, batch};
-use zcash_primitives::transaction::{TxId, components::sapling::zip212_enforcement};
-use zcash_protocol::consensus::TxIndex;
+use zcash_primitives::transaction::TxId;
 use zcash_protocol::{
     ShieldedProtocol,
     consensus::{self, BlockHeight, NetworkUpgrade},
@@ -24,20 +19,16 @@ use zcash_protocol::{
 use zip32::Scope;
 
 use crate::{
-    data_api::{BlockMetadata, ScannedBlock, ScannedBundles},
+    data_api::{BlockMetadata, ScannedBlock},
     proto::compact_formats::{ChainMetadata, CompactBlock, CompactTx},
-    scan::{Batch, BatchRunner, CompactDecryptor, DecryptedOutput, Tasks},
-    wallet::{WalletOutput, WalletSpend, WalletTx},
+    scan::DecryptedOutput,
+    wallet::WalletOutput,
 };
 
 #[cfg(feature = "orchard")]
-use orchard::{
-    note_encryption::{CompactAction, OrchardDomain},
-    tree::MerkleHashOrchard,
-};
+use orchard::note_encryption::OrchardDomain;
 
-#[cfg(not(feature = "orchard"))]
-use std::marker::PhantomData;
+pub(crate) mod compact;
 
 /// A key that can be used to perform trial decryption and nullifier
 /// computation for a [`CompactSaplingOutput`] or [`CompactOrchardAction`].
@@ -524,7 +515,7 @@ where
     AccountId: Default + Eq + Hash + ConditionallySelectable + Send + 'static,
     IvkTag: Copy + std::hash::Hash + Eq + Send + 'static,
 {
-    scan_block_with_runners::<_, _, _, (), ()>(
+    compact::scan_block_with_runners::<_, _, _, (), ()>(
         params,
         block,
         scanning_keys,
@@ -534,359 +525,6 @@ where
     )
 }
 
-type TaggedSaplingBatch<IvkTag> = Batch<
-    IvkTag,
-    SaplingDomain,
-    sapling::note_encryption::CompactOutputDescription,
-    CompactDecryptor,
->;
-type TaggedSaplingBatchRunner<IvkTag, Tasks> = BatchRunner<
-    IvkTag,
-    SaplingDomain,
-    sapling::note_encryption::CompactOutputDescription,
-    CompactDecryptor,
-    Tasks,
->;
-
-#[cfg(feature = "orchard")]
-type TaggedOrchardBatch<IvkTag> =
-    Batch<IvkTag, OrchardDomain, orchard::note_encryption::CompactAction, CompactDecryptor>;
-#[cfg(feature = "orchard")]
-type TaggedOrchardBatchRunner<IvkTag, Tasks> = BatchRunner<
-    IvkTag,
-    OrchardDomain,
-    orchard::note_encryption::CompactAction,
-    CompactDecryptor,
-    Tasks,
->;
-
-pub(crate) trait SaplingTasks<IvkTag>: Tasks<TaggedSaplingBatch<IvkTag>> {}
-impl<IvkTag, T: Tasks<TaggedSaplingBatch<IvkTag>>> SaplingTasks<IvkTag> for T {}
-
-#[cfg(not(feature = "orchard"))]
-pub(crate) trait OrchardTasks<IvkTag> {}
-#[cfg(not(feature = "orchard"))]
-impl<IvkTag, T> OrchardTasks<IvkTag> for T {}
-
-#[cfg(feature = "orchard")]
-pub(crate) trait OrchardTasks<IvkTag>: Tasks<TaggedOrchardBatch<IvkTag>> {}
-#[cfg(feature = "orchard")]
-impl<IvkTag, T: Tasks<TaggedOrchardBatch<IvkTag>>> OrchardTasks<IvkTag> for T {}
-
-pub(crate) struct BatchRunners<IvkTag, TS: SaplingTasks<IvkTag>, TO: OrchardTasks<IvkTag>> {
-    sapling: TaggedSaplingBatchRunner<IvkTag, TS>,
-    #[cfg(feature = "orchard")]
-    orchard: TaggedOrchardBatchRunner<IvkTag, TO>,
-    #[cfg(not(feature = "orchard"))]
-    orchard: PhantomData<TO>,
-}
-
-impl<IvkTag, TS, TO> BatchRunners<IvkTag, TS, TO>
-where
-    IvkTag: Clone + Send + 'static,
-    TS: SaplingTasks<IvkTag>,
-    TO: OrchardTasks<IvkTag>,
-{
-    pub(crate) fn for_keys<AccountId>(
-        batch_size_threshold: usize,
-        scanning_keys: &ScanningKeys<AccountId, IvkTag>,
-    ) -> Self {
-        BatchRunners {
-            sapling: BatchRunner::new(
-                batch_size_threshold,
-                scanning_keys
-                    .sapling()
-                    .iter()
-                    .map(|(id, key)| (id.clone(), key.prepare())),
-            ),
-            #[cfg(feature = "orchard")]
-            orchard: BatchRunner::new(
-                batch_size_threshold,
-                scanning_keys
-                    .orchard()
-                    .iter()
-                    .map(|(id, key)| (id.clone(), key.prepare())),
-            ),
-            #[cfg(not(feature = "orchard"))]
-            orchard: PhantomData,
-        }
-    }
-
-    pub(crate) fn flush(&mut self) {
-        self.sapling.flush();
-        #[cfg(feature = "orchard")]
-        self.orchard.flush();
-    }
-
-    #[tracing::instrument(skip_all, fields(height = block.height))]
-    pub(crate) fn add_block<P>(&mut self, params: &P, block: CompactBlock) -> Result<(), ScanError>
-    where
-        P: consensus::Parameters + Send + 'static,
-        IvkTag: Copy + Send + 'static,
-    {
-        let block_hash = block.hash();
-        let block_height = block.height();
-        let zip212_enforcement = zip212_enforcement(params, block_height);
-
-        for tx in block.vtx.into_iter() {
-            let txid = tx.txid();
-
-            self.sapling.add_outputs(
-                block_hash,
-                txid,
-                |_| SaplingDomain::new(zip212_enforcement),
-                &tx.outputs
-                    .iter()
-                    .enumerate()
-                    .map(|(i, output)| {
-                        CompactOutputDescription::try_from(output).map_err(|_| {
-                            ScanError::EncodingInvalid {
-                                at_height: block_height,
-                                txid,
-                                pool_type: ShieldedProtocol::Sapling,
-                                index: i,
-                            }
-                        })
-                    })
-                    .collect::<Result<Vec<_>, _>>()?,
-            );
-
-            #[cfg(feature = "orchard")]
-            self.orchard.add_outputs(
-                block_hash,
-                txid,
-                OrchardDomain::for_compact_action,
-                &tx.actions
-                    .iter()
-                    .enumerate()
-                    .map(|(i, action)| {
-                        CompactAction::try_from(action).map_err(|_| ScanError::EncodingInvalid {
-                            at_height: block_height,
-                            txid,
-                            pool_type: ShieldedProtocol::Orchard,
-                            index: i,
-                        })
-                    })
-                    .collect::<Result<Vec<_>, _>>()?,
-            );
-        }
-
-        Ok(())
-    }
-}
-
-#[tracing::instrument(skip_all, fields(height = block.height))]
-pub(crate) fn scan_block_with_runners<P, AccountId, IvkTag, TS, TO>(
-    params: &P,
-    block: CompactBlock,
-    scanning_keys: &ScanningKeys<AccountId, IvkTag>,
-    nullifiers: &Nullifiers<AccountId>,
-    prior_block_metadata: Option<&BlockMetadata>,
-    mut batch_runners: Option<&mut BatchRunners<IvkTag, TS, TO>>,
-) -> Result<ScannedBlock<AccountId>, ScanError>
-where
-    P: consensus::Parameters + Send + 'static,
-    AccountId: Default + Eq + Hash + ConditionallySelectable + Send + 'static,
-    IvkTag: Copy + std::hash::Hash + Eq + Send + 'static,
-    TS: SaplingTasks<IvkTag> + Sync,
-    TO: OrchardTasks<IvkTag> + Sync,
-{
-    fn check_hash_continuity(
-        block: &CompactBlock,
-        prior_block_metadata: Option<&BlockMetadata>,
-    ) -> Option<ScanError> {
-        if let Some(prev) = prior_block_metadata {
-            if block.height() != prev.block_height() + 1 {
-                debug!(
-                    "Block height discontinuity at {:?}, previous was {:?} ",
-                    block.height(),
-                    prev.block_height()
-                );
-                return Some(ScanError::BlockHeightDiscontinuity {
-                    prev_height: prev.block_height(),
-                    new_height: block.height(),
-                });
-            }
-
-            if block.prev_hash() != prev.block_hash() {
-                debug!("Block hash discontinuity at {:?}", block.height());
-                return Some(ScanError::PrevHashMismatch {
-                    at_height: block.height(),
-                });
-            }
-        }
-
-        None
-    }
-
-    if let Some(scan_error) = check_hash_continuity(&block, prior_block_metadata) {
-        return Err(scan_error);
-    }
-
-    trace!("Block continuity okay at {:?}", block.height());
-
-    let cur_height = block.height();
-    let cur_hash = block.hash();
-    let zip212_enforcement = zip212_enforcement(params, cur_height);
-
-    let mut pos_tracker = PositionTracker::for_block(params, &block, prior_block_metadata)?;
-
-    let mut wtxs: Vec<WalletTx<AccountId>> = vec![];
-
-    let mut sapling_nullifier_map = Vec::with_capacity(block.vtx.len());
-    let mut sapling_note_commitments: Vec<(sapling::Node, Retention<BlockHeight>)> = vec![];
-
-    #[cfg(feature = "orchard")]
-    let mut orchard_nullifier_map = Vec::with_capacity(block.vtx.len());
-    #[cfg(feature = "orchard")]
-    let mut orchard_note_commitments: Vec<(MerkleHashOrchard, Retention<BlockHeight>)> = vec![];
-
-    for tx in block.vtx.into_iter() {
-        let txid = tx.txid();
-        let tx_index =
-            TxIndex::try_from(tx.index).expect("Cannot fit more than 2^16 transactions in a block");
-
-        let (sapling_spends, sapling_unlinked_nullifiers) = find_spent(
-            &tx.spends,
-            &nullifiers.sapling,
-            |spend| {
-                spend.nf().expect(
-                    "Could not deserialize nullifier for spend from protobuf representation.",
-                )
-            },
-            WalletSpend::from_parts,
-        );
-
-        sapling_nullifier_map.push((tx_index, txid, sapling_unlinked_nullifiers));
-
-        #[cfg(feature = "orchard")]
-        let orchard_spends = {
-            let (orchard_spends, orchard_unlinked_nullifiers) = find_spent(
-                &tx.actions,
-                &nullifiers.orchard,
-                |spend| {
-                    spend.nf().expect(
-                        "Could not deserialize nullifier for spend from protobuf representation.",
-                    )
-                },
-                WalletSpend::from_parts,
-            );
-            orchard_nullifier_map.push((tx_index, txid, orchard_unlinked_nullifiers));
-            orchard_spends
-        };
-
-        // Collect the set of accounts that were spent from in this transaction
-        let spent_from_accounts = sapling_spends.iter().map(|spend| spend.account_id());
-        #[cfg(feature = "orchard")]
-        let spent_from_accounts =
-            spent_from_accounts.chain(orchard_spends.iter().map(|spend| spend.account_id()));
-        let spent_from_accounts = spent_from_accounts.copied().collect::<HashSet<_>>();
-
-        let (sapling_outputs, mut sapling_nc) = find_received(
-            cur_height,
-            pos_tracker.contains_last_sapling_outputs_in_block(&tx),
-            txid,
-            |output_idx| pos_tracker.sapling_note_position(output_idx),
-            &scanning_keys.sapling,
-            &spent_from_accounts,
-            &tx.outputs
-                .iter()
-                .enumerate()
-                .map(|(i, output)| {
-                    Ok((
-                        SaplingDomain::new(zip212_enforcement),
-                        CompactOutputDescription::try_from(output).map_err(|_| {
-                            ScanError::EncodingInvalid {
-                                at_height: cur_height,
-                                txid,
-                                pool_type: ShieldedProtocol::Sapling,
-                                index: i,
-                            }
-                        })?,
-                    ))
-                })
-                .collect::<Result<Vec<_>, _>>()?,
-            batch_runners
-                .as_mut()
-                .map(|runners| |txid| runners.sapling.collect_results(cur_hash, txid)),
-            |output| sapling::Node::from_cmu(&output.cmu),
-        );
-        sapling_note_commitments.append(&mut sapling_nc);
-        let has_sapling = !(sapling_spends.is_empty() && sapling_outputs.is_empty());
-
-        #[cfg(feature = "orchard")]
-        let (orchard_outputs, mut orchard_nc) = find_received(
-            cur_height,
-            pos_tracker.contains_last_orchard_actions_in_block(&tx),
-            txid,
-            |output_idx| pos_tracker.orchard_note_position(output_idx),
-            &scanning_keys.orchard,
-            &spent_from_accounts,
-            &tx.actions
-                .iter()
-                .enumerate()
-                .map(|(i, action)| {
-                    let action = CompactAction::try_from(action).map_err(|_| {
-                        ScanError::EncodingInvalid {
-                            at_height: cur_height,
-                            txid,
-                            pool_type: ShieldedProtocol::Orchard,
-                            index: i,
-                        }
-                    })?;
-                    Ok((OrchardDomain::for_compact_action(&action), action))
-                })
-                .collect::<Result<Vec<_>, _>>()?,
-            batch_runners
-                .as_mut()
-                .map(|runners| |txid| runners.orchard.collect_results(cur_hash, txid)),
-            |output| MerkleHashOrchard::from_cmx(&output.cmx()),
-        );
-        #[cfg(feature = "orchard")]
-        orchard_note_commitments.append(&mut orchard_nc);
-
-        #[cfg(feature = "orchard")]
-        let has_orchard = !(orchard_spends.is_empty() && orchard_outputs.is_empty());
-        #[cfg(not(feature = "orchard"))]
-        let has_orchard = false;
-
-        if has_sapling || has_orchard {
-            wtxs.push(WalletTx::new(
-                txid,
-                tx_index,
-                sapling_spends,
-                sapling_outputs,
-                #[cfg(feature = "orchard")]
-                orchard_spends,
-                #[cfg(feature = "orchard")]
-                orchard_outputs,
-            ));
-        }
-
-        pos_tracker.increment_over_tx(&tx);
-    }
-
-    pos_tracker.check_end_of_block_consistency(cur_height, block.chain_metadata)?;
-
-    Ok(ScannedBlock::from_parts(
-        cur_height,
-        cur_hash,
-        block.time,
-        wtxs,
-        ScannedBundles::new(
-            pos_tracker.sapling_final_tree_size,
-            sapling_note_commitments,
-            sapling_nullifier_map,
-        ),
-        #[cfg(feature = "orchard")]
-        ScannedBundles::new(
-            pos_tracker.orchard_final_tree_size,
-            orchard_note_commitments,
-            orchard_nullifier_map,
-        ),
-    ))
-}
-
 /// Tracks the scanner's position within the note commitment trees, in order to calculate
 /// received note positions.
 struct PositionTracker {
@@ -1398,243 +1036,3 @@ pub mod testing {
         cb
     }
 }
-
-#[cfg(test)]
-mod tests {
-
-    use std::convert::Infallible;
-
-    use incrementalmerkletree::{Marking, Position, Retention};
-    use sapling::Nullifier;
-    use zcash_keys::keys::UnifiedSpendingKey;
-    use zcash_primitives::block::BlockHash;
-    use zcash_protocol::{
-        consensus::{BlockHeight, Network},
-        value::Zatoshis,
-    };
-    use zip32::AccountId;
-
-    use crate::{
-        data_api::BlockMetadata,
-        scanning::{BatchRunners, ScanningKeys},
-    };
-
-    use super::{Nullifiers, scan_block, scan_block_with_runners, testing::fake_compact_block};
-
-    #[test]
-    fn scan_block_with_my_tx() {
-        fn go(scan_multithreaded: bool) {
-            let network = Network::TestNetwork;
-            let account = AccountId::ZERO;
-            let usk =
-                UnifiedSpendingKey::from_seed(&network, &[0u8; 32], account).expect("Valid USK");
-            let ufvk = usk.to_unified_full_viewing_key();
-            let sapling_dfvk = ufvk.sapling().expect("Sapling key is present").clone();
-            let scanning_keys = ScanningKeys::from_account_ufvks([(account, ufvk)]);
-
-            let cb = fake_compact_block(
-                1u32.into(),
-                BlockHash([0; 32]),
-                Nullifier([0; 32]),
-                &sapling_dfvk,
-                Zatoshis::const_from_u64(5),
-                false,
-                None,
-            );
-            assert_eq!(cb.vtx.len(), 2);
-
-            let mut batch_runners = if scan_multithreaded {
-                let mut runners = BatchRunners::<_, (), ()>::for_keys(10, &scanning_keys);
-                runners
-                    .add_block(&Network::TestNetwork, cb.clone())
-                    .unwrap();
-                runners.flush();
-
-                Some(runners)
-            } else {
-                None
-            };
-
-            let scanned_block = scan_block_with_runners(
-                &network,
-                cb,
-                &scanning_keys,
-                &Nullifiers::empty(),
-                Some(&BlockMetadata::from_parts(
-                    BlockHeight::from(0),
-                    BlockHash([0u8; 32]),
-                    Some(0),
-                    #[cfg(feature = "orchard")]
-                    Some(0),
-                )),
-                batch_runners.as_mut(),
-            )
-            .unwrap();
-            let txs = scanned_block.transactions();
-            assert_eq!(txs.len(), 1);
-
-            let tx = &txs[0];
-            assert_eq!(tx.block_index(), 1.into());
-            assert_eq!(tx.sapling_spends().len(), 0);
-            assert_eq!(tx.sapling_outputs().len(), 1);
-            assert_eq!(tx.sapling_outputs()[0].index(), 0);
-            assert_eq!(tx.sapling_outputs()[0].account_id(), &account);
-            assert_eq!(tx.sapling_outputs()[0].note().value().inner(), 5);
-            assert_eq!(
-                tx.sapling_outputs()[0].note_commitment_tree_position(),
-                Position::from(1)
-            );
-
-            assert_eq!(scanned_block.sapling().final_tree_size(), 2);
-            assert_eq!(
-                scanned_block
-                    .sapling()
-                    .commitments()
-                    .iter()
-                    .map(|(_, retention)| *retention)
-                    .collect::<Vec<_>>(),
-                vec![
-                    Retention::Ephemeral,
-                    Retention::Checkpoint {
-                        id: scanned_block.height(),
-                        marking: Marking::Marked
-                    }
-                ]
-            );
-        }
-
-        go(false);
-        go(true);
-    }
-
-    #[test]
-    fn scan_block_with_txs_after_my_tx() {
-        fn go(scan_multithreaded: bool) {
-            let network = Network::TestNetwork;
-            let account = AccountId::ZERO;
-            let usk =
-                UnifiedSpendingKey::from_seed(&network, &[0u8; 32], account).expect("Valid USK");
-            let ufvk = usk.to_unified_full_viewing_key();
-            let sapling_dfvk = ufvk.sapling().expect("Sapling key is present").clone();
-            let scanning_keys = ScanningKeys::from_account_ufvks([(account, ufvk)]);
-
-            let cb = fake_compact_block(
-                1u32.into(),
-                BlockHash([0; 32]),
-                Nullifier([0; 32]),
-                &sapling_dfvk,
-                Zatoshis::const_from_u64(5),
-                true,
-                Some((0, 0)),
-            );
-            assert_eq!(cb.vtx.len(), 3);
-
-            let mut batch_runners = if scan_multithreaded {
-                let mut runners = BatchRunners::<_, (), ()>::for_keys(10, &scanning_keys);
-                runners
-                    .add_block(&Network::TestNetwork, cb.clone())
-                    .unwrap();
-                runners.flush();
-
-                Some(runners)
-            } else {
-                None
-            };
-
-            let scanned_block = scan_block_with_runners(
-                &network,
-                cb,
-                &scanning_keys,
-                &Nullifiers::empty(),
-                None,
-                batch_runners.as_mut(),
-            )
-            .unwrap();
-            let txs = scanned_block.transactions();
-            assert_eq!(txs.len(), 1);
-
-            let tx = &txs[0];
-            assert_eq!(tx.block_index(), 1.into());
-            assert_eq!(tx.sapling_spends().len(), 0);
-            assert_eq!(tx.sapling_outputs().len(), 1);
-            assert_eq!(tx.sapling_outputs()[0].index(), 0);
-            assert_eq!(tx.sapling_outputs()[0].account_id(), &AccountId::ZERO);
-            assert_eq!(tx.sapling_outputs()[0].note().value().inner(), 5);
-
-            assert_eq!(
-                scanned_block
-                    .sapling()
-                    .commitments()
-                    .iter()
-                    .map(|(_, retention)| *retention)
-                    .collect::<Vec<_>>(),
-                vec![
-                    Retention::Ephemeral,
-                    Retention::Marked,
-                    Retention::Checkpoint {
-                        id: scanned_block.height(),
-                        marking: Marking::None
-                    }
-                ]
-            );
-        }
-
-        go(false);
-        go(true);
-    }
-
-    #[test]
-    fn scan_block_with_my_spend() {
-        let network = Network::TestNetwork;
-        let account = AccountId::try_from(12).unwrap();
-        let usk = UnifiedSpendingKey::from_seed(&network, &[0u8; 32], account).expect("Valid USK");
-        let ufvk = usk.to_unified_full_viewing_key();
-        let scanning_keys = ScanningKeys::<AccountId, Infallible>::empty();
-
-        let nf = Nullifier([7; 32]);
-        let nullifiers = Nullifiers::new(
-            vec![(account, nf)],
-            #[cfg(feature = "orchard")]
-            vec![],
-        );
-
-        let cb = fake_compact_block(
-            1u32.into(),
-            BlockHash([0; 32]),
-            nf,
-            ufvk.sapling().unwrap(),
-            Zatoshis::const_from_u64(5),
-            false,
-            Some((0, 0)),
-        );
-        assert_eq!(cb.vtx.len(), 2);
-
-        let scanned_block = scan_block(&network, cb, &scanning_keys, &nullifiers, None).unwrap();
-        let txs = scanned_block.transactions();
-        assert_eq!(txs.len(), 1);
-
-        let tx = &txs[0];
-        assert_eq!(tx.block_index(), 1.into());
-        assert_eq!(tx.sapling_spends().len(), 1);
-        assert_eq!(tx.sapling_outputs().len(), 0);
-        assert_eq!(tx.sapling_spends()[0].index(), 0);
-        assert_eq!(tx.sapling_spends()[0].nf(), &nf);
-        assert_eq!(tx.sapling_spends()[0].account_id(), &account);
-
-        assert_eq!(
-            scanned_block
-                .sapling()
-                .commitments()
-                .iter()
-                .map(|(_, retention)| *retention)
-                .collect::<Vec<_>>(),
-            vec![
-                Retention::Ephemeral,
-                Retention::Checkpoint {
-                    id: scanned_block.height(),
-                    marking: Marking::None
-                }
-            ]
-        );
-    }
-}
diff --git a/zcash_client_backend/src/scanning/compact.rs b/zcash_client_backend/src/scanning/compact.rs
new file mode 100644
index 0000000000..910cf8f94e
--- /dev/null
+++ b/zcash_client_backend/src/scanning/compact.rs
@@ -0,0 +1,623 @@
+use std::collections::HashSet;
+use std::convert::TryFrom;
+use std::hash::Hash;
+
+use incrementalmerkletree::Retention;
+use sapling::note_encryption::{CompactOutputDescription, SaplingDomain};
+use subtle::ConditionallySelectable;
+
+use tracing::{debug, trace};
+use zcash_primitives::transaction::components::sapling::zip212_enforcement;
+use zcash_protocol::{
+    ShieldedProtocol,
+    consensus::{self, BlockHeight, TxIndex},
+};
+
+use super::{Nullifiers, PositionTracker, ScanError, ScanningKeys, find_received, find_spent};
+use crate::{
+    data_api::{BlockMetadata, ScannedBlock, ScannedBundles},
+    proto::compact_formats::CompactBlock,
+    scan::{Batch, BatchRunner, CompactDecryptor, Tasks},
+    wallet::{WalletSpend, WalletTx},
+};
+
+#[cfg(feature = "orchard")]
+use orchard::{
+    note_encryption::{CompactAction, OrchardDomain},
+    tree::MerkleHashOrchard,
+};
+
+#[cfg(not(feature = "orchard"))]
+use std::marker::PhantomData;
+
+type TaggedSaplingBatch<IvkTag> = Batch<
+    IvkTag,
+    SaplingDomain,
+    sapling::note_encryption::CompactOutputDescription,
+    CompactDecryptor,
+>;
+type TaggedSaplingBatchRunner<IvkTag, Tasks> = BatchRunner<
+    IvkTag,
+    SaplingDomain,
+    sapling::note_encryption::CompactOutputDescription,
+    CompactDecryptor,
+    Tasks,
+>;
+
+#[cfg(feature = "orchard")]
+type TaggedOrchardBatch<IvkTag> =
+    Batch<IvkTag, OrchardDomain, orchard::note_encryption::CompactAction, CompactDecryptor>;
+#[cfg(feature = "orchard")]
+type TaggedOrchardBatchRunner<IvkTag, Tasks> = BatchRunner<
+    IvkTag,
+    OrchardDomain,
+    orchard::note_encryption::CompactAction,
+    CompactDecryptor,
+    Tasks,
+>;
+
+pub(crate) trait SaplingTasks<IvkTag>: Tasks<TaggedSaplingBatch<IvkTag>> {}
+impl<IvkTag, T: Tasks<TaggedSaplingBatch<IvkTag>>> SaplingTasks<IvkTag> for T {}
+
+#[cfg(not(feature = "orchard"))]
+pub(crate) trait OrchardTasks<IvkTag> {}
+#[cfg(not(feature = "orchard"))]
+impl<IvkTag, T> OrchardTasks<IvkTag> for T {}
+
+#[cfg(feature = "orchard")]
+pub(crate) trait OrchardTasks<IvkTag>: Tasks<TaggedOrchardBatch<IvkTag>> {}
+#[cfg(feature = "orchard")]
+impl<IvkTag, T: Tasks<TaggedOrchardBatch<IvkTag>>> OrchardTasks<IvkTag> for T {}
+
+pub(crate) struct BatchRunners<IvkTag, TS: SaplingTasks<IvkTag>, TO: OrchardTasks<IvkTag>> {
+    sapling: TaggedSaplingBatchRunner<IvkTag, TS>,
+    #[cfg(feature = "orchard")]
+    orchard: TaggedOrchardBatchRunner<IvkTag, TO>,
+    #[cfg(not(feature = "orchard"))]
+    orchard: PhantomData<TO>,
+}
+
+impl<IvkTag, TS, TO> BatchRunners<IvkTag, TS, TO>
+where
+    IvkTag: Clone + Send + 'static,
+    TS: SaplingTasks<IvkTag>,
+    TO: OrchardTasks<IvkTag>,
+{
+    pub(crate) fn for_keys<AccountId>(
+        batch_size_threshold: usize,
+        scanning_keys: &ScanningKeys<AccountId, IvkTag>,
+    ) -> Self {
+        BatchRunners {
+            sapling: BatchRunner::new(
+                batch_size_threshold,
+                scanning_keys
+                    .sapling()
+                    .iter()
+                    .map(|(id, key)| (id.clone(), key.prepare())),
+            ),
+            #[cfg(feature = "orchard")]
+            orchard: BatchRunner::new(
+                batch_size_threshold,
+                scanning_keys
+                    .orchard()
+                    .iter()
+                    .map(|(id, key)| (id.clone(), key.prepare())),
+            ),
+            #[cfg(not(feature = "orchard"))]
+            orchard: PhantomData,
+        }
+    }
+
+    pub(crate) fn flush(&mut self) {
+        self.sapling.flush();
+        #[cfg(feature = "orchard")]
+        self.orchard.flush();
+    }
+
+    #[tracing::instrument(skip_all, fields(height = block.height))]
+    pub(crate) fn add_block<P>(&mut self, params: &P, block: CompactBlock) -> Result<(), ScanError>
+    where
+        P: consensus::Parameters + Send + 'static,
+        IvkTag: Copy + Send + 'static,
+    {
+        let block_hash = block.hash();
+        let block_height = block.height();
+        let zip212_enforcement = zip212_enforcement(params, block_height);
+
+        for tx in block.vtx.into_iter() {
+            let txid = tx.txid();
+
+            self.sapling.add_outputs(
+                block_hash,
+                txid,
+                |_| SaplingDomain::new(zip212_enforcement),
+                &tx.outputs
+                    .iter()
+                    .enumerate()
+                    .map(|(i, output)| {
+                        CompactOutputDescription::try_from(output).map_err(|_| {
+                            ScanError::EncodingInvalid {
+                                at_height: block_height,
+                                txid,
+                                pool_type: ShieldedProtocol::Sapling,
+                                index: i,
+                            }
+                        })
+                    })
+                    .collect::<Result<Vec<_>, _>>()?,
+            );
+
+            #[cfg(feature = "orchard")]
+            self.orchard.add_outputs(
+                block_hash,
+                txid,
+                OrchardDomain::for_compact_action,
+                &tx.actions
+                    .iter()
+                    .enumerate()
+                    .map(|(i, action)| {
+                        CompactAction::try_from(action).map_err(|_| ScanError::EncodingInvalid {
+                            at_height: block_height,
+                            txid,
+                            pool_type: ShieldedProtocol::Orchard,
+                            index: i,
+                        })
+                    })
+                    .collect::<Result<Vec<_>, _>>()?,
+            );
+        }
+
+        Ok(())
+    }
+}
+
+#[tracing::instrument(skip_all, fields(height = block.height))]
+pub(crate) fn scan_block_with_runners<P, AccountId, IvkTag, TS, TO>(
+    params: &P,
+    block: CompactBlock,
+    scanning_keys: &ScanningKeys<AccountId, IvkTag>,
+    nullifiers: &Nullifiers<AccountId>,
+    prior_block_metadata: Option<&BlockMetadata>,
+    mut batch_runners: Option<&mut BatchRunners<IvkTag, TS, TO>>,
+) -> Result<ScannedBlock<AccountId>, ScanError>
+where
+    P: consensus::Parameters + Send + 'static,
+    AccountId: Default + Eq + Hash + ConditionallySelectable + Send + 'static,
+    IvkTag: Copy + std::hash::Hash + Eq + Send + 'static,
+    TS: SaplingTasks<IvkTag> + Sync,
+    TO: OrchardTasks<IvkTag> + Sync,
+{
+    fn check_hash_continuity(
+        block: &CompactBlock,
+        prior_block_metadata: Option<&BlockMetadata>,
+    ) -> Option<ScanError> {
+        if let Some(prev) = prior_block_metadata {
+            if block.height() != prev.block_height() + 1 {
+                debug!(
+                    "Block height discontinuity at {:?}, previous was {:?} ",
+                    block.height(),
+                    prev.block_height()
+                );
+                return Some(ScanError::BlockHeightDiscontinuity {
+                    prev_height: prev.block_height(),
+                    new_height: block.height(),
+                });
+            }
+
+            if block.prev_hash() != prev.block_hash() {
+                debug!("Block hash discontinuity at {:?}", block.height());
+                return Some(ScanError::PrevHashMismatch {
+                    at_height: block.height(),
+                });
+            }
+        }
+
+        None
+    }
+
+    if let Some(scan_error) = check_hash_continuity(&block, prior_block_metadata) {
+        return Err(scan_error);
+    }
+
+    trace!("Block continuity okay at {:?}", block.height());
+
+    let cur_height = block.height();
+    let cur_hash = block.hash();
+    let zip212_enforcement = zip212_enforcement(params, cur_height);
+
+    let mut pos_tracker = PositionTracker::for_block(params, &block, prior_block_metadata)?;
+
+    let mut wtxs: Vec<WalletTx<AccountId>> = vec![];
+
+    let mut sapling_nullifier_map = Vec::with_capacity(block.vtx.len());
+    let mut sapling_note_commitments: Vec<(sapling::Node, Retention<BlockHeight>)> = vec![];
+
+    #[cfg(feature = "orchard")]
+    let mut orchard_nullifier_map = Vec::with_capacity(block.vtx.len());
+    #[cfg(feature = "orchard")]
+    let mut orchard_note_commitments: Vec<(MerkleHashOrchard, Retention<BlockHeight>)> = vec![];
+
+    for tx in block.vtx.into_iter() {
+        let txid = tx.txid();
+        let tx_index =
+            TxIndex::try_from(tx.index).expect("Cannot fit more than 2^16 transactions in a block");
+
+        let (sapling_spends, sapling_unlinked_nullifiers) = find_spent(
+            &tx.spends,
+            &nullifiers.sapling,
+            |spend| {
+                spend.nf().expect(
+                    "Could not deserialize nullifier for spend from protobuf representation.",
+                )
+            },
+            WalletSpend::from_parts,
+        );
+
+        sapling_nullifier_map.push((tx_index, txid, sapling_unlinked_nullifiers));
+
+        #[cfg(feature = "orchard")]
+        let orchard_spends = {
+            let (orchard_spends, orchard_unlinked_nullifiers) = find_spent(
+                &tx.actions,
+                &nullifiers.orchard,
+                |spend| {
+                    spend.nf().expect(
+                        "Could not deserialize nullifier for spend from protobuf representation.",
+                    )
+                },
+                WalletSpend::from_parts,
+            );
+            orchard_nullifier_map.push((tx_index, txid, orchard_unlinked_nullifiers));
+            orchard_spends
+        };
+
+        // Collect the set of accounts that were spent from in this transaction
+        let spent_from_accounts = sapling_spends.iter().map(|spend| spend.account_id());
+        #[cfg(feature = "orchard")]
+        let spent_from_accounts =
+            spent_from_accounts.chain(orchard_spends.iter().map(|spend| spend.account_id()));
+        let spent_from_accounts = spent_from_accounts.copied().collect::<HashSet<_>>();
+
+        let (sapling_outputs, mut sapling_nc) = find_received(
+            cur_height,
+            pos_tracker.contains_last_sapling_outputs_in_block(&tx),
+            txid,
+            |output_idx| pos_tracker.sapling_note_position(output_idx),
+            &scanning_keys.sapling,
+            &spent_from_accounts,
+            &tx.outputs
+                .iter()
+                .enumerate()
+                .map(|(i, output)| {
+                    Ok((
+                        SaplingDomain::new(zip212_enforcement),
+                        CompactOutputDescription::try_from(output).map_err(|_| {
+                            ScanError::EncodingInvalid {
+                                at_height: cur_height,
+                                txid,
+                                pool_type: ShieldedProtocol::Sapling,
+                                index: i,
+                            }
+                        })?,
+                    ))
+                })
+                .collect::<Result<Vec<_>, _>>()?,
+            batch_runners
+                .as_mut()
+                .map(|runners| |txid| runners.sapling.collect_results(cur_hash, txid)),
+            |output| sapling::Node::from_cmu(&output.cmu),
+        );
+        sapling_note_commitments.append(&mut sapling_nc);
+        let has_sapling = !(sapling_spends.is_empty() && sapling_outputs.is_empty());
+
+        #[cfg(feature = "orchard")]
+        let (orchard_outputs, mut orchard_nc) = find_received(
+            cur_height,
+            pos_tracker.contains_last_orchard_actions_in_block(&tx),
+            txid,
+            |output_idx| pos_tracker.orchard_note_position(output_idx),
+            &scanning_keys.orchard,
+            &spent_from_accounts,
+            &tx.actions
+                .iter()
+                .enumerate()
+                .map(|(i, action)| {
+                    let action = CompactAction::try_from(action).map_err(|_| {
+                        ScanError::EncodingInvalid {
+                            at_height: cur_height,
+                            txid,
+                            pool_type: ShieldedProtocol::Orchard,
+                            index: i,
+                        }
+                    })?;
+                    Ok((OrchardDomain::for_compact_action(&action), action))
+                })
+                .collect::<Result<Vec<_>, _>>()?,
+            batch_runners
+                .as_mut()
+                .map(|runners| |txid| runners.orchard.collect_results(cur_hash, txid)),
+            |output| MerkleHashOrchard::from_cmx(&output.cmx()),
+        );
+        #[cfg(feature = "orchard")]
+        orchard_note_commitments.append(&mut orchard_nc);
+
+        #[cfg(feature = "orchard")]
+        let has_orchard = !(orchard_spends.is_empty() && orchard_outputs.is_empty());
+        #[cfg(not(feature = "orchard"))]
+        let has_orchard = false;
+
+        if has_sapling || has_orchard {
+            wtxs.push(WalletTx::new(
+                txid,
+                tx_index,
+                sapling_spends,
+                sapling_outputs,
+                #[cfg(feature = "orchard")]
+                orchard_spends,
+                #[cfg(feature = "orchard")]
+                orchard_outputs,
+            ));
+        }
+
+        pos_tracker.increment_over_tx(&tx);
+    }
+
+    pos_tracker.check_end_of_block_consistency(cur_height, block.chain_metadata)?;
+
+    Ok(ScannedBlock::from_parts(
+        cur_height,
+        cur_hash,
+        block.time,
+        wtxs,
+        ScannedBundles::new(
+            pos_tracker.sapling_final_tree_size,
+            sapling_note_commitments,
+            sapling_nullifier_map,
+        ),
+        #[cfg(feature = "orchard")]
+        ScannedBundles::new(
+            pos_tracker.orchard_final_tree_size,
+            orchard_note_commitments,
+            orchard_nullifier_map,
+        ),
+    ))
+}
+
+#[cfg(test)]
+mod tests {
+
+    use std::convert::Infallible;
+
+    use incrementalmerkletree::{Marking, Position, Retention};
+    use sapling::Nullifier;
+    use zcash_keys::keys::UnifiedSpendingKey;
+    use zcash_primitives::block::BlockHash;
+    use zcash_protocol::{
+        consensus::{BlockHeight, Network},
+        value::Zatoshis,
+    };
+    use zip32::AccountId;
+
+    use super::{BatchRunners, scan_block_with_runners};
+    use crate::{
+        data_api::BlockMetadata,
+        scanning::{Nullifiers, ScanningKeys, scan_block, testing::fake_compact_block},
+    };
+
+    #[test]
+    fn scan_block_with_my_tx() {
+        fn go(scan_multithreaded: bool) {
+            let network = Network::TestNetwork;
+            let account = AccountId::ZERO;
+            let usk =
+                UnifiedSpendingKey::from_seed(&network, &[0u8; 32], account).expect("Valid USK");
+            let ufvk = usk.to_unified_full_viewing_key();
+            let sapling_dfvk = ufvk.sapling().expect("Sapling key is present").clone();
+            let scanning_keys = ScanningKeys::from_account_ufvks([(account, ufvk)]);
+
+            let cb = fake_compact_block(
+                1u32.into(),
+                BlockHash([0; 32]),
+                Nullifier([0; 32]),
+                &sapling_dfvk,
+                Zatoshis::const_from_u64(5),
+                false,
+                None,
+            );
+            assert_eq!(cb.vtx.len(), 2);
+
+            let mut batch_runners = if scan_multithreaded {
+                let mut runners = BatchRunners::<_, (), ()>::for_keys(10, &scanning_keys);
+                runners
+                    .add_block(&Network::TestNetwork, cb.clone())
+                    .unwrap();
+                runners.flush();
+
+                Some(runners)
+            } else {
+                None
+            };
+
+            let scanned_block = scan_block_with_runners(
+                &network,
+                cb,
+                &scanning_keys,
+                &Nullifiers::empty(),
+                Some(&BlockMetadata::from_parts(
+                    BlockHeight::from(0),
+                    BlockHash([0u8; 32]),
+                    Some(0),
+                    #[cfg(feature = "orchard")]
+                    Some(0),
+                )),
+                batch_runners.as_mut(),
+            )
+            .unwrap();
+            let txs = scanned_block.transactions();
+            assert_eq!(txs.len(), 1);
+
+            let tx = &txs[0];
+            assert_eq!(tx.block_index(), 1.into());
+            assert_eq!(tx.sapling_spends().len(), 0);
+            assert_eq!(tx.sapling_outputs().len(), 1);
+            assert_eq!(tx.sapling_outputs()[0].index(), 0);
+            assert_eq!(tx.sapling_outputs()[0].account_id(), &account);
+            assert_eq!(tx.sapling_outputs()[0].note().value().inner(), 5);
+            assert_eq!(
+                tx.sapling_outputs()[0].note_commitment_tree_position(),
+                Position::from(1)
+            );
+
+            assert_eq!(scanned_block.sapling().final_tree_size(), 2);
+            assert_eq!(
+                scanned_block
+                    .sapling()
+                    .commitments()
+                    .iter()
+                    .map(|(_, retention)| *retention)
+                    .collect::<Vec<_>>(),
+                vec![
+                    Retention::Ephemeral,
+                    Retention::Checkpoint {
+                        id: scanned_block.height(),
+                        marking: Marking::Marked
+                    }
+                ]
+            );
+        }
+
+        go(false);
+        go(true);
+    }
+
+    #[test]
+    fn scan_block_with_txs_after_my_tx() {
+        fn go(scan_multithreaded: bool) {
+            let network = Network::TestNetwork;
+            let account = AccountId::ZERO;
+            let usk =
+                UnifiedSpendingKey::from_seed(&network, &[0u8; 32], account).expect("Valid USK");
+            let ufvk = usk.to_unified_full_viewing_key();
+            let sapling_dfvk = ufvk.sapling().expect("Sapling key is present").clone();
+            let scanning_keys = ScanningKeys::from_account_ufvks([(account, ufvk)]);
+
+            let cb = fake_compact_block(
+                1u32.into(),
+                BlockHash([0; 32]),
+                Nullifier([0; 32]),
+                &sapling_dfvk,
+                Zatoshis::const_from_u64(5),
+                true,
+                Some((0, 0)),
+            );
+            assert_eq!(cb.vtx.len(), 3);
+
+            let mut batch_runners = if scan_multithreaded {
+                let mut runners = BatchRunners::<_, (), ()>::for_keys(10, &scanning_keys);
+                runners
+                    .add_block(&Network::TestNetwork, cb.clone())
+                    .unwrap();
+                runners.flush();
+
+                Some(runners)
+            } else {
+                None
+            };
+
+            let scanned_block = scan_block_with_runners(
+                &network,
+                cb,
+                &scanning_keys,
+                &Nullifiers::empty(),
+                None,
+                batch_runners.as_mut(),
+            )
+            .unwrap();
+            let txs = scanned_block.transactions();
+            assert_eq!(txs.len(), 1);
+
+            let tx = &txs[0];
+            assert_eq!(tx.block_index(), 1.into());
+            assert_eq!(tx.sapling_spends().len(), 0);
+            assert_eq!(tx.sapling_outputs().len(), 1);
+            assert_eq!(tx.sapling_outputs()[0].index(), 0);
+            assert_eq!(tx.sapling_outputs()[0].account_id(), &AccountId::ZERO);
+            assert_eq!(tx.sapling_outputs()[0].note().value().inner(), 5);
+
+            assert_eq!(
+                scanned_block
+                    .sapling()
+                    .commitments()
+                    .iter()
+                    .map(|(_, retention)| *retention)
+                    .collect::<Vec<_>>(),
+                vec![
+                    Retention::Ephemeral,
+                    Retention::Marked,
+                    Retention::Checkpoint {
+                        id: scanned_block.height(),
+                        marking: Marking::None
+                    }
+                ]
+            );
+        }
+
+        go(false);
+        go(true);
+    }
+
+    #[test]
+    fn scan_block_with_my_spend() {
+        let network = Network::TestNetwork;
+        let account = AccountId::try_from(12).unwrap();
+        let usk = UnifiedSpendingKey::from_seed(&network, &[0u8; 32], account).expect("Valid USK");
+        let ufvk = usk.to_unified_full_viewing_key();
+        let scanning_keys = ScanningKeys::<AccountId, Infallible>::empty();
+
+        let nf = Nullifier([7; 32]);
+        let nullifiers = Nullifiers::new(
+            vec![(account, nf)],
+            #[cfg(feature = "orchard")]
+            vec![],
+        );
+
+        let cb = fake_compact_block(
+            1u32.into(),
+            BlockHash([0; 32]),
+            nf,
+            ufvk.sapling().unwrap(),
+            Zatoshis::const_from_u64(5),
+            false,
+            Some((0, 0)),
+        );
+        assert_eq!(cb.vtx.len(), 2);
+
+        let scanned_block = scan_block(&network, cb, &scanning_keys, &nullifiers, None).unwrap();
+        let txs = scanned_block.transactions();
+        assert_eq!(txs.len(), 1);
+
+        let tx = &txs[0];
+        assert_eq!(tx.block_index(), 1.into());
+        assert_eq!(tx.sapling_spends().len(), 1);
+        assert_eq!(tx.sapling_outputs().len(), 0);
+        assert_eq!(tx.sapling_spends()[0].index(), 0);
+        assert_eq!(tx.sapling_spends()[0].nf(), &nf);
+        assert_eq!(tx.sapling_spends()[0].account_id(), &account);
+
+        assert_eq!(
+            scanned_block
+                .sapling()
+                .commitments()
+                .iter()
+                .map(|(_, retention)| *retention)
+                .collect::<Vec<_>>(),
+            vec![
+                Retention::Ephemeral,
+                Retention::Checkpoint {
+                    id: scanned_block.height(),
+                    marking: Marking::None
+                }
+            ]
+        );
+    }
+}

From 5c2b1f42f81a7d4dc3ad3fd21c2ba41f2ffc6362 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 27 Feb 2026 05:26:00 +0000
Subject: [PATCH 239/263] build(deps): bump actions/upload-artifact from 6.0.0
 to 7.0.0

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 6.0.0 to 7.0.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/b7c566a772e6b6bfb58ed0dc250532a479d7789f...bbbca2ddaa5d8feaa63e36b76fdaad77386f024f)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: 7.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/mutants.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/mutants.yml b/.github/workflows/mutants.yml
index ac490fb9bb..23c6cba607 100644
--- a/.github/workflows/mutants.yml
+++ b/.github/workflows/mutants.yml
@@ -100,7 +100,7 @@ jobs:
         with:
           tool: cargo-mutants
       - run: cargo mutants --package "${{ matrix.package }}" --all-features -vV --in-place
-      - uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+      - uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         if: always()
         with:
           name: mutants-${{ matrix.package }}

From c7ae7979764c08e79efc9ad988d2b31e967a6016 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Thu, 26 Mar 2026 14:19:25 +0000
Subject: [PATCH 240/263] zcash_client_backend: Move rest of compact logic out
 of `scanning` module

---
 zcash_client_backend/src/scanning.rs         | 195 ++----------------
 zcash_client_backend/src/scanning/compact.rs | 206 ++++++++++++++++++-
 2 files changed, 211 insertions(+), 190 deletions(-)

diff --git a/zcash_client_backend/src/scanning.rs b/zcash_client_backend/src/scanning.rs
index 3c8ef7a3fe..8ea81761b9 100644
--- a/zcash_client_backend/src/scanning.rs
+++ b/zcash_client_backend/src/scanning.rs
@@ -10,17 +10,17 @@ use sapling::{SaplingIvk, note_encryption::SaplingDomain};
 use subtle::{ConditionallySelectable, ConstantTimeEq, CtOption};
 
 use zcash_keys::keys::UnifiedFullViewingKey;
-use zcash_note_encryption::{BatchDomain, COMPACT_NOTE_SIZE, Domain, ShieldedOutput, batch};
+use zcash_note_encryption::{BatchDomain, Domain, ShieldedOutput};
 use zcash_primitives::transaction::TxId;
 use zcash_protocol::{
     ShieldedProtocol,
-    consensus::{self, BlockHeight, NetworkUpgrade},
+    consensus::{self, BlockHeight},
 };
 use zip32::Scope;
 
 use crate::{
     data_api::{BlockMetadata, ScannedBlock},
-    proto::compact_formats::{ChainMetadata, CompactBlock, CompactTx},
+    proto::compact_formats::CompactBlock,
     scan::DecryptedOutput,
     wallet::WalletOutput,
 };
@@ -537,137 +537,6 @@ struct PositionTracker {
 }
 
 impl PositionTracker {
-    fn for_block<P>(
-        params: &P,
-        block: &CompactBlock,
-        prior_block_metadata: Option<&BlockMetadata>,
-    ) -> Result<Self, ScanError>
-    where
-        P: consensus::Parameters,
-    {
-        /// Returns the size of the given shielded protocol's note commitment tree before and
-        /// after the application of the given block.
-        #[allow(clippy::too_many_arguments)]
-        fn tree_sizes_around<P>(
-            params: &P,
-            block: &CompactBlock,
-            prior_block_metadata: Option<&BlockMetadata>,
-            protocol: ShieldedProtocol,
-            activation_nu: NetworkUpgrade,
-            prior_tree_size: impl Fn(&BlockMetadata) -> Option<u32>,
-            tx_output_count: impl Fn(&CompactTx) -> usize,
-            final_tree_size: impl Fn(&ChainMetadata) -> u32,
-        ) -> Result<(u32, u32), ScanError>
-        where
-            P: consensus::Parameters,
-        {
-            let at_height = block.height();
-
-            let start_tree_size = prior_block_metadata.and_then(prior_tree_size).map_or_else(
-                || {
-                    block.chain_metadata.as_ref().map_or_else(
-                        || {
-                            // If we're below the protocol's activation height, or it is
-                            // not set, the tree size is zero.
-                            params.activation_height(activation_nu).map_or_else(
-                                || Ok(0),
-                                |activation_height| {
-                                    if at_height < activation_height {
-                                        Ok(0)
-                                    } else {
-                                        Err(ScanError::TreeSizeUnknown {
-                                            protocol,
-                                            at_height,
-                                        })
-                                    }
-                                },
-                            )
-                        },
-                        |m| {
-                            let output_count: u32 = block
-                                .vtx
-                                .iter()
-                                .map(&tx_output_count)
-                                .sum::<usize>()
-                                .try_into()
-                                .expect("Shielded output count cannot exceed a u32");
-
-                            // The default for `final_tree_size(m)` is zero, so we need to
-                            // check that the subtraction will not underflow; if it would
-                            // do so, we were given invalid chain metadata for a block
-                            // with outputs in this shielded protocol.
-                            final_tree_size(m).checked_sub(output_count).ok_or(
-                                ScanError::TreeSizeInvalid {
-                                    protocol,
-                                    at_height,
-                                },
-                            )
-                        },
-                    )
-                },
-                Ok,
-            )?;
-
-            // We pre-compute the end tree size here so we can determine when we reach the
-            // last transaction in the block that adds notes to the tree. This enables us
-            // to correctly set the tree checkpoint in `find_received`.
-            let end_tree_size = start_tree_size
-                + block
-                    .vtx
-                    .iter()
-                    .map(tx_output_count)
-                    .map(|tx_outputs| u32::try_from(tx_outputs).unwrap())
-                    .sum::<u32>();
-
-            Ok((start_tree_size, end_tree_size))
-        }
-
-        let (sapling_prior_tree_size, sapling_final_tree_size) = tree_sizes_around(
-            params,
-            block,
-            prior_block_metadata,
-            ShieldedProtocol::Sapling,
-            NetworkUpgrade::Sapling,
-            |m| m.sapling_tree_size(),
-            |tx| tx.outputs.len(),
-            |m| m.sapling_commitment_tree_size,
-        )?;
-
-        #[cfg(feature = "orchard")]
-        let (orchard_prior_tree_size, orchard_final_tree_size) = tree_sizes_around(
-            params,
-            block,
-            prior_block_metadata,
-            ShieldedProtocol::Orchard,
-            NetworkUpgrade::Nu5,
-            |m| m.orchard_tree_size(),
-            |tx| tx.actions.len(),
-            |m| m.orchard_commitment_tree_size,
-        )?;
-
-        Ok(Self {
-            sapling_tree_position: sapling_prior_tree_size,
-            sapling_final_tree_size,
-            #[cfg(feature = "orchard")]
-            orchard_tree_position: orchard_prior_tree_size,
-            #[cfg(feature = "orchard")]
-            orchard_final_tree_size,
-        })
-    }
-
-    fn contains_last_sapling_outputs_in_block(&self, tx: &CompactTx) -> bool {
-        self.sapling_tree_position
-            + u32::try_from(tx.outputs.len()).expect("Sapling output count cannot exceed a u32")
-            == self.sapling_final_tree_size
-    }
-
-    #[cfg(feature = "orchard")]
-    fn contains_last_orchard_actions_in_block(&self, tx: &CompactTx) -> bool {
-        self.orchard_tree_position
-            + u32::try_from(tx.actions.len()).expect("Orchard action count cannot exceed a u32")
-            == self.orchard_final_tree_size
-    }
-
     fn sapling_note_position(&self, output_idx: usize) -> Position {
         Position::from(u64::from(
             self.sapling_tree_position + u32::try_from(output_idx).unwrap(),
@@ -680,52 +549,6 @@ impl PositionTracker {
             self.orchard_tree_position + u32::try_from(output_idx).unwrap(),
         ))
     }
-
-    fn increment_over_tx(&mut self, tx: &CompactTx) {
-        self.sapling_tree_position +=
-            u32::try_from(tx.outputs.len()).expect("Sapling output count cannot exceed a u32");
-        #[cfg(feature = "orchard")]
-        {
-            self.orchard_tree_position +=
-                u32::try_from(tx.actions.len()).expect("Orchard action count cannot exceed a u32");
-        }
-    }
-
-    fn check_end_of_block_consistency(
-        &self,
-        at_height: BlockHeight,
-        chain_metadata: Option<ChainMetadata>,
-    ) -> Result<(), ScanError> {
-        // It is a programming error to construct `PositionTracker` from a `CompactBlock`
-        // and then not call `PositionTracker::increment_over_tx` on every transaction
-        // within the block.
-        assert_eq!(self.sapling_tree_position, self.sapling_final_tree_size);
-        #[cfg(feature = "orchard")]
-        assert_eq!(self.orchard_tree_position, self.orchard_final_tree_size);
-
-        if let Some(chain_meta) = chain_metadata {
-            if chain_meta.sapling_commitment_tree_size != self.sapling_tree_position {
-                return Err(ScanError::TreeSizeMismatch {
-                    protocol: ShieldedProtocol::Sapling,
-                    at_height,
-                    given: chain_meta.sapling_commitment_tree_size,
-                    computed: self.sapling_tree_position,
-                });
-            }
-
-            #[cfg(feature = "orchard")]
-            if chain_meta.orchard_commitment_tree_size != self.orchard_tree_position {
-                return Err(ScanError::TreeSizeMismatch {
-                    protocol: ShieldedProtocol::Orchard,
-                    at_height,
-                    given: chain_meta.orchard_commitment_tree_size,
-                    computed: self.orchard_tree_position,
-                });
-            }
-        }
-
-        Ok(())
-    }
 }
 
 /// Check for spent notes. The comparison against known-unspent nullifiers is done
@@ -776,11 +599,13 @@ fn find_spent<
 fn find_received<
     AccountId: Copy + Eq + Hash,
     D: BatchDomain,
+    M,
     Nf,
     IvkTag: Copy + std::hash::Hash + Eq + Send + 'static,
     SK: ScanningKeyOps<D, AccountId, Nf>,
-    Output: ShieldedOutput<D, COMPACT_NOTE_SIZE>,
+    Output: ShieldedOutput<D, CIPHERTEXT_SIZE>,
     NoteCommitment,
+    const CIPHERTEXT_SIZE: usize,
 >(
     block_height: BlockHeight,
     last_commitments_in_block: bool,
@@ -792,6 +617,10 @@ fn find_received<
     batch_results: Option<
         impl FnOnce(TxId) -> HashMap<(TxId, usize), DecryptedOutput<IvkTag, D, ()>>,
     >,
+    decrypt_inline: impl FnOnce(
+        &[D::IncomingViewingKey],
+        &[(D, Output)],
+    ) -> Vec<Option<((D::Note, D::Recipient, M), usize)>>,
     extract_note_commitment: impl Fn(&Output) -> NoteCommitment,
 ) -> (
     Vec<WalletOutput<D::Note, Nf, AccountId>>,
@@ -821,10 +650,10 @@ fn find_received<
 
         let mut decrypted_len = 0;
         (
-            batch::try_compact_note_decryption(&ivks, decoded)
+            decrypt_inline(&ivks, decoded)
                 .into_iter()
                 .map(|v| {
-                    v.map(|((note, _), ivk_idx)| {
+                    v.map(|((note, _, _), ivk_idx)| {
                         decrypted_len += 1;
                         (*ivk_lookup[ivk_idx], note)
                     })
diff --git a/zcash_client_backend/src/scanning/compact.rs b/zcash_client_backend/src/scanning/compact.rs
index 910cf8f94e..ba1cb3dd71 100644
--- a/zcash_client_backend/src/scanning/compact.rs
+++ b/zcash_client_backend/src/scanning/compact.rs
@@ -7,16 +7,17 @@ use sapling::note_encryption::{CompactOutputDescription, SaplingDomain};
 use subtle::ConditionallySelectable;
 
 use tracing::{debug, trace};
+use zcash_note_encryption::batch;
 use zcash_primitives::transaction::components::sapling::zip212_enforcement;
 use zcash_protocol::{
     ShieldedProtocol,
-    consensus::{self, BlockHeight, TxIndex},
+    consensus::{self, BlockHeight, NetworkUpgrade, TxIndex},
 };
 
 use super::{Nullifiers, PositionTracker, ScanError, ScanningKeys, find_received, find_spent};
 use crate::{
     data_api::{BlockMetadata, ScannedBlock, ScannedBundles},
-    proto::compact_formats::CompactBlock,
+    proto::compact_formats::{ChainMetadata, CompactBlock, CompactTx},
     scan::{Batch, BatchRunner, CompactDecryptor, Tasks},
     wallet::{WalletSpend, WalletTx},
 };
@@ -225,7 +226,7 @@ where
     let cur_hash = block.hash();
     let zip212_enforcement = zip212_enforcement(params, cur_height);
 
-    let mut pos_tracker = PositionTracker::for_block(params, &block, prior_block_metadata)?;
+    let mut pos_tracker = PositionTracker::for_compact_block(params, &block, prior_block_metadata)?;
 
     let mut wtxs: Vec<WalletTx<AccountId>> = vec![];
 
@@ -280,7 +281,7 @@ where
 
         let (sapling_outputs, mut sapling_nc) = find_received(
             cur_height,
-            pos_tracker.contains_last_sapling_outputs_in_block(&tx),
+            pos_tracker.compact_tx_contains_last_sapling_outputs_in_block(&tx),
             txid,
             |output_idx| pos_tracker.sapling_note_position(output_idx),
             &scanning_keys.sapling,
@@ -305,6 +306,12 @@ where
             batch_runners
                 .as_mut()
                 .map(|runners| |txid| runners.sapling.collect_results(cur_hash, txid)),
+            |ivks, outputs| {
+                batch::try_compact_note_decryption(ivks, outputs)
+                    .into_iter()
+                    .map(|opt| opt.map(|((note, recipient), i)| ((note, recipient, ()), i)))
+                    .collect()
+            },
             |output| sapling::Node::from_cmu(&output.cmu),
         );
         sapling_note_commitments.append(&mut sapling_nc);
@@ -313,7 +320,7 @@ where
         #[cfg(feature = "orchard")]
         let (orchard_outputs, mut orchard_nc) = find_received(
             cur_height,
-            pos_tracker.contains_last_orchard_actions_in_block(&tx),
+            pos_tracker.compact_tx_contains_last_orchard_actions_in_block(&tx),
             txid,
             |output_idx| pos_tracker.orchard_note_position(output_idx),
             &scanning_keys.orchard,
@@ -336,6 +343,12 @@ where
             batch_runners
                 .as_mut()
                 .map(|runners| |txid| runners.orchard.collect_results(cur_hash, txid)),
+            |ivks, outputs| {
+                batch::try_compact_note_decryption(ivks, outputs)
+                    .into_iter()
+                    .map(|opt| opt.map(|((note, recipient), i)| ((note, recipient, ()), i)))
+                    .collect()
+            },
             |output| MerkleHashOrchard::from_cmx(&output.cmx()),
         );
         #[cfg(feature = "orchard")]
@@ -359,10 +372,10 @@ where
             ));
         }
 
-        pos_tracker.increment_over_tx(&tx);
+        pos_tracker.increment_over_compact_tx(&tx);
     }
 
-    pos_tracker.check_end_of_block_consistency(cur_height, block.chain_metadata)?;
+    pos_tracker.check_end_of_compact_block_consistency(cur_height, block.chain_metadata)?;
 
     Ok(ScannedBlock::from_parts(
         cur_height,
@@ -383,6 +396,185 @@ where
     ))
 }
 
+impl PositionTracker {
+    fn for_compact_block<P>(
+        params: &P,
+        block: &CompactBlock,
+        prior_block_metadata: Option<&BlockMetadata>,
+    ) -> Result<Self, ScanError>
+    where
+        P: consensus::Parameters,
+    {
+        /// Returns the size of the given shielded protocol's note commitment tree before and
+        /// after the application of the given block.
+        #[allow(clippy::too_many_arguments)]
+        fn tree_sizes_around<P>(
+            params: &P,
+            block: &CompactBlock,
+            prior_block_metadata: Option<&BlockMetadata>,
+            protocol: ShieldedProtocol,
+            activation_nu: NetworkUpgrade,
+            prior_tree_size: impl Fn(&BlockMetadata) -> Option<u32>,
+            tx_output_count: impl Fn(&CompactTx) -> usize,
+            final_tree_size: impl Fn(&ChainMetadata) -> u32,
+        ) -> Result<(u32, u32), ScanError>
+        where
+            P: consensus::Parameters,
+        {
+            let at_height = block.height();
+
+            let start_tree_size = prior_block_metadata.and_then(prior_tree_size).map_or_else(
+                || {
+                    block.chain_metadata.as_ref().map_or_else(
+                        || {
+                            // If we're below the protocol's activation height, or it is
+                            // not set, the tree size is zero.
+                            params.activation_height(activation_nu).map_or_else(
+                                || Ok(0),
+                                |activation_height| {
+                                    if at_height < activation_height {
+                                        Ok(0)
+                                    } else {
+                                        Err(ScanError::TreeSizeUnknown {
+                                            protocol,
+                                            at_height,
+                                        })
+                                    }
+                                },
+                            )
+                        },
+                        |m| {
+                            let output_count: u32 = block
+                                .vtx
+                                .iter()
+                                .map(&tx_output_count)
+                                .sum::<usize>()
+                                .try_into()
+                                .expect("Shielded output count cannot exceed a u32");
+
+                            // The default for `final_tree_size(m)` is zero, so we need to
+                            // check that the subtraction will not underflow; if it would
+                            // do so, we were given invalid chain metadata for a block
+                            // with outputs in this shielded protocol.
+                            final_tree_size(m).checked_sub(output_count).ok_or(
+                                ScanError::TreeSizeInvalid {
+                                    protocol,
+                                    at_height,
+                                },
+                            )
+                        },
+                    )
+                },
+                Ok,
+            )?;
+
+            // We pre-compute the end tree size here so we can determine when we reach the
+            // last transaction in the block that adds notes to the tree. This enables us
+            // to correctly set the tree checkpoint in `find_received`.
+            let end_tree_size = start_tree_size
+                + block
+                    .vtx
+                    .iter()
+                    .map(tx_output_count)
+                    .map(|tx_outputs| u32::try_from(tx_outputs).unwrap())
+                    .sum::<u32>();
+
+            Ok((start_tree_size, end_tree_size))
+        }
+
+        let (sapling_prior_tree_size, sapling_final_tree_size) = tree_sizes_around(
+            params,
+            block,
+            prior_block_metadata,
+            ShieldedProtocol::Sapling,
+            NetworkUpgrade::Sapling,
+            |m| m.sapling_tree_size(),
+            |tx| tx.outputs.len(),
+            |m| m.sapling_commitment_tree_size,
+        )?;
+
+        #[cfg(feature = "orchard")]
+        let (orchard_prior_tree_size, orchard_final_tree_size) = tree_sizes_around(
+            params,
+            block,
+            prior_block_metadata,
+            ShieldedProtocol::Orchard,
+            NetworkUpgrade::Nu5,
+            |m| m.orchard_tree_size(),
+            |tx| tx.actions.len(),
+            |m| m.orchard_commitment_tree_size,
+        )?;
+
+        Ok(Self {
+            sapling_tree_position: sapling_prior_tree_size,
+            sapling_final_tree_size,
+            #[cfg(feature = "orchard")]
+            orchard_tree_position: orchard_prior_tree_size,
+            #[cfg(feature = "orchard")]
+            orchard_final_tree_size,
+        })
+    }
+
+    fn compact_tx_contains_last_sapling_outputs_in_block(&self, tx: &CompactTx) -> bool {
+        self.sapling_tree_position
+            + u32::try_from(tx.outputs.len()).expect("Sapling output count cannot exceed a u32")
+            == self.sapling_final_tree_size
+    }
+
+    #[cfg(feature = "orchard")]
+    fn compact_tx_contains_last_orchard_actions_in_block(&self, tx: &CompactTx) -> bool {
+        self.orchard_tree_position
+            + u32::try_from(tx.actions.len()).expect("Orchard action count cannot exceed a u32")
+            == self.orchard_final_tree_size
+    }
+
+    fn increment_over_compact_tx(&mut self, tx: &CompactTx) {
+        self.sapling_tree_position +=
+            u32::try_from(tx.outputs.len()).expect("Sapling output count cannot exceed a u32");
+        #[cfg(feature = "orchard")]
+        {
+            self.orchard_tree_position +=
+                u32::try_from(tx.actions.len()).expect("Orchard action count cannot exceed a u32");
+        }
+    }
+
+    fn check_end_of_compact_block_consistency(
+        &self,
+        at_height: BlockHeight,
+        chain_metadata: Option<ChainMetadata>,
+    ) -> Result<(), ScanError> {
+        // It is a programming error to construct `PositionTracker` from a `CompactBlock`
+        // and then not call `PositionTracker::increment_over_tx` on every transaction
+        // within the block.
+        assert_eq!(self.sapling_tree_position, self.sapling_final_tree_size);
+        #[cfg(feature = "orchard")]
+        assert_eq!(self.orchard_tree_position, self.orchard_final_tree_size);
+
+        if let Some(chain_meta) = chain_metadata {
+            if chain_meta.sapling_commitment_tree_size != self.sapling_tree_position {
+                return Err(ScanError::TreeSizeMismatch {
+                    protocol: ShieldedProtocol::Sapling,
+                    at_height,
+                    given: chain_meta.sapling_commitment_tree_size,
+                    computed: self.sapling_tree_position,
+                });
+            }
+
+            #[cfg(feature = "orchard")]
+            if chain_meta.orchard_commitment_tree_size != self.orchard_tree_position {
+                return Err(ScanError::TreeSizeMismatch {
+                    protocol: ShieldedProtocol::Orchard,
+                    at_height,
+                    given: chain_meta.orchard_commitment_tree_size,
+                    computed: self.orchard_tree_position,
+                });
+            }
+        }
+
+        Ok(())
+    }
+}
+
 #[cfg(test)]
 mod tests {
 

From 53d1ea996ad295b9ad771ecf3fe9eaf5ae4fbe3f Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Fri, 27 Mar 2026 09:40:01 +0000
Subject: [PATCH 241/263] zcash_client_backend: Add helper methods to
 `scanning::Nullifiers`

---
 zcash_client_backend/src/data_api/chain.rs | 41 ++--------------
 zcash_client_backend/src/scanning.rs       | 56 +++++++++++++++++++++-
 2 files changed, 58 insertions(+), 39 deletions(-)

diff --git a/zcash_client_backend/src/data_api/chain.rs b/zcash_client_backend/src/data_api/chain.rs
index 3535693282..6548cc5046 100644
--- a/zcash_client_backend/src/data_api/chain.rs
+++ b/zcash_client_backend/src/data_api/chain.rs
@@ -159,7 +159,7 @@ use zcash_primitives::block::BlockHash;
 use zcash_protocol::consensus::{self, BlockHeight};
 
 use crate::{
-    data_api::{NullifierQuery, WalletWrite},
+    data_api::WalletWrite,
     proto::compact_formats::CompactBlock,
     scanning::{
         Nullifiers, ScanningKeys,
@@ -620,15 +620,7 @@ where
     };
 
     // Get the nullifiers for the unspent notes we are tracking
-    let mut nullifiers = Nullifiers::new(
-        data_db
-            .get_sapling_nullifiers(NullifierQuery::Unspent)
-            .map_err(Error::Wallet)?,
-        #[cfg(feature = "orchard")]
-        data_db
-            .get_orchard_nullifiers(NullifierQuery::Unspent)
-            .map_err(Error::Wallet)?,
-    );
+    let mut nullifiers = Nullifiers::unspent(data_db).map_err(Error::Wallet)?;
 
     let mut scanned_blocks = vec![];
     let mut scan_summary = ScanSummary::for_range(from_height..from_height);
@@ -657,34 +649,7 @@ where
                 }
             }
 
-            let sapling_spent_nf: Vec<&sapling::Nullifier> = scanned_block
-                .transactions
-                .iter()
-                .flat_map(|tx| tx.sapling_spends().iter().map(|spend| spend.nf()))
-                .collect();
-            nullifiers.retain_sapling(|(_, nf)| !sapling_spent_nf.contains(&nf));
-            nullifiers.extend_sapling(scanned_block.transactions.iter().flat_map(|tx| {
-                tx.sapling_outputs()
-                    .iter()
-                    .flat_map(|out| out.nf().into_iter().map(|nf| (*out.account_id(), *nf)))
-            }));
-
-            #[cfg(feature = "orchard")]
-            {
-                let orchard_spent_nf: Vec<&orchard::note::Nullifier> = scanned_block
-                    .transactions
-                    .iter()
-                    .flat_map(|tx| tx.orchard_spends().iter().map(|spend| spend.nf()))
-                    .collect();
-
-                nullifiers.retain_orchard(|(_, nf)| !orchard_spent_nf.contains(&nf));
-                nullifiers.extend_orchard(scanned_block.transactions.iter().flat_map(|tx| {
-                    tx.orchard_outputs()
-                        .iter()
-                        .flat_map(|out| out.nf().into_iter().map(|nf| (*out.account_id(), *nf)))
-                }));
-            }
-
+            nullifiers.update_with(&scanned_block);
             prior_block_metadata = Some(scanned_block.to_block_metadata());
             scanned_blocks.push(scanned_block);
 
diff --git a/zcash_client_backend/src/scanning.rs b/zcash_client_backend/src/scanning.rs
index 8ea81761b9..48589bc16a 100644
--- a/zcash_client_backend/src/scanning.rs
+++ b/zcash_client_backend/src/scanning.rs
@@ -19,7 +19,7 @@ use zcash_protocol::{
 use zip32::Scope;
 
 use crate::{
-    data_api::{BlockMetadata, ScannedBlock},
+    data_api::{BlockMetadata, NullifierQuery, ScannedBlock, WalletRead},
     proto::compact_formats::CompactBlock,
     scan::DecryptedOutput,
     wallet::WalletOutput,
@@ -307,6 +307,17 @@ impl<AccountId> Nullifiers<AccountId> {
         }
     }
 
+    /// Fetches the nullifiers for the unspent notes being tracked by the given wallet.
+    pub(crate) fn unspent<DbT: WalletRead<AccountId = AccountId>>(
+        db_data: &DbT,
+    ) -> Result<Self, DbT::Error> {
+        Ok(Self::new(
+            db_data.get_sapling_nullifiers(NullifierQuery::Unspent)?,
+            #[cfg(feature = "orchard")]
+            db_data.get_orchard_nullifiers(NullifierQuery::Unspent)?,
+        ))
+    }
+
     /// Construct a nullifier set from its constituent parts.
     pub(crate) fn new(
         sapling: Vec<(AccountId, sapling::Nullifier)>,
@@ -361,6 +372,49 @@ impl<AccountId> Nullifiers<AccountId> {
     }
 }
 
+impl<AccountId: Copy> Nullifiers<AccountId> {
+    /// Updates this set of unspent nullifiers based on the results of scanning a block.
+    ///
+    /// This is intended for use when scanning multiple sequential blocks in memory, prior
+    /// to updating the wallet's state (after which [`Self::unspent`] would produce the
+    /// same set).
+    ///
+    /// - Notes spent by the wallet in this block will have their nullifiers removed from
+    ///   the set, so we don't bother .
+    /// - Notes received by the wallet in this block will have their nullifiers added to
+    ///   the set, enabling spend detection in subsequent blocks.
+    pub(crate) fn update_with(&mut self, scanned_block: &ScannedBlock<AccountId>) {
+        let sapling_spent_nf: Vec<&sapling::Nullifier> = scanned_block
+            .transactions()
+            .iter()
+            .flat_map(|tx| tx.sapling_spends().iter().map(|spend| spend.nf()))
+            .collect();
+
+        self.retain_sapling(|(_, nf)| !sapling_spent_nf.contains(&nf));
+        self.extend_sapling(scanned_block.transactions().iter().flat_map(|tx| {
+            tx.sapling_outputs()
+                .iter()
+                .flat_map(|out| out.nf().into_iter().map(|nf| (*out.account_id(), *nf)))
+        }));
+
+        #[cfg(feature = "orchard")]
+        {
+            let orchard_spent_nf: Vec<&orchard::note::Nullifier> = scanned_block
+                .transactions()
+                .iter()
+                .flat_map(|tx| tx.orchard_spends().iter().map(|spend| spend.nf()))
+                .collect();
+
+            self.retain_orchard(|(_, nf)| !orchard_spent_nf.contains(&nf));
+            self.extend_orchard(scanned_block.transactions().iter().flat_map(|tx| {
+                tx.orchard_outputs()
+                    .iter()
+                    .flat_map(|out| out.nf().into_iter().map(|nf| (*out.account_id(), *nf)))
+            }));
+        }
+    }
+}
+
 /// Errors that may occur in chain scanning
 #[derive(Clone, Debug)]
 pub enum ScanError {

From b77dd52d20c173e15ce4b28cbae9fe1e05fbc9f9 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Fri, 27 Mar 2026 09:45:40 +0000
Subject: [PATCH 242/263] zcash_client_backend: Remove unnecessary `TxId` from
 batch results map

The map only contains outputs for a single transaction, and the caller
provides the `TxId` when fetching the results, so we don't need to spend
memory returning it to them in duplicate.
---
 zcash_client_backend/src/scan.rs     | 4 ++--
 zcash_client_backend/src/scanning.rs | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/zcash_client_backend/src/scan.rs b/zcash_client_backend/src/scan.rs
index 41463ea6ba..0d92d6719c 100644
--- a/zcash_client_backend/src/scan.rs
+++ b/zcash_client_backend/src/scan.rs
@@ -566,7 +566,7 @@ where
         &mut self,
         block_tag: BlockHash,
         txid: TxId,
-    ) -> HashMap<(TxId, usize), DecryptedOutput<IvkTag, D, Dec::Memo>> {
+    ) -> HashMap<usize, DecryptedOutput<IvkTag, D, Dec::Memo>> {
         self.pending_results
             .remove(&ResultKey(block_tag, txid))
             // We won't have a pending result if the transaction didn't have outputs of
@@ -583,7 +583,7 @@ where
                         |OutputIndex {
                              output_index,
                              value,
-                         }| { ((txid, output_index), value) },
+                         }| { (output_index, value) },
                     )
                     .collect()
             })
diff --git a/zcash_client_backend/src/scanning.rs b/zcash_client_backend/src/scanning.rs
index 48589bc16a..ed3573e499 100644
--- a/zcash_client_backend/src/scanning.rs
+++ b/zcash_client_backend/src/scanning.rs
@@ -668,9 +668,7 @@ fn find_received<
     keys: &HashMap<IvkTag, SK>,
     spent_from_accounts: &HashSet<AccountId>,
     decoded: &[(D, Output)],
-    batch_results: Option<
-        impl FnOnce(TxId) -> HashMap<(TxId, usize), DecryptedOutput<IvkTag, D, ()>>,
-    >,
+    batch_results: Option<impl FnOnce(TxId) -> HashMap<usize, DecryptedOutput<IvkTag, D, M>>>,
     decrypt_inline: impl FnOnce(
         &[D::IncomingViewingKey],
         &[(D, Output)],
@@ -688,7 +686,7 @@ fn find_received<
             (0..decoded.len())
                 .map(|i| {
                     decrypted
-                        .remove(&(txid, i))
+                        .remove(&i)
                         .map(|d_out| (d_out.ivk_tag, d_out.note))
                 })
                 .collect::<Vec<_>>(),

From b7710e9d965f76f7f83ad9890a265ee7dead5bcb Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Fri, 27 Mar 2026 10:44:39 +0000
Subject: [PATCH 243/263] zcash_client_backend: Clean up pending changelog and
 fix bug

Method additions to a trait like `WalletWrite` are breaking changes
(unless they have a functional default implementation), and must be
listed under "Changes", not "Additions".
---
 zcash_client_backend/CHANGELOG.md | 169 +++++++++++++++---------------
 1 file changed, 84 insertions(+), 85 deletions(-)

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index 43513080da..172886faba 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -18,108 +18,107 @@ workspace.
   - `wallet::ConfirmationsPolicy::confirmations_until_spendable`
   - `DecryptableTransaction`
   - `ReceivedTransactionOutput`
-- in `zcash_client_backend::proto::compact_formats`:
+  - `impl From<zcash_client_backend::proposal::ProposalError> for wallet::input_selection::InputSelectorError<...>`
+- `zcash_client_backend::proto::compact_formats`:
   - `CompactTx` has added fields `vin` and `vout`
   - Added types `CompactTxIn`, `OutPoint`, `TxOut`
-- in `zcash_client_backend::proto::service`:
+- `zcash_client_backend::proto::service`:
   - Added enum `PoolType`
   - `BlockRange` has added field `pool_types`
   - `LightdInfo` has added fields `upgrade_name`, `upgrade_height`, and `lighwallet_protocol_version`
   - `GetMempoolTxRequest` (previously named `Exclude`) has added field `pool_types`
-- `impl From<zcash_client_backend::proposal::ProposalError> for zcash_client_backend::data_api::wallet::input_selection::InputSelectorError<...>`
 - `zcash_client_backend::fees::MetaSource`
 - `zcash_client_backend::wallet`:
   - `transparent` module, behind the `transparent-inputs` feature flag.
   - `Note::receiver`
+  - `TransparentAddressSource::StandaloneScript`
+  - `TransparentAddressSource::redeem_script`
+  - `TransparentAddressMetadata::standalone_script`
+  - `TransparentAddressMetadata::redeem_script`
+  - `WalletTransparentOutput::with_known_input_size`
   - `impl From<sapling_crypto::Note> for Note`
   - `impl From<orchard::Note> for Note`
-- Import standalone transparent P2SH addresses
-  - `zcash_client_backend::data_api::WalletWrite::import_standalone_transparent_script()`
-  - `zcash_client_backend::wallet::TransparentAddressSource::StandaloneScript`
-  - `zcash_client_backend::wallet::TransparentAddressSource::redeem_script()`
-  - `zcash_client_backend::wallet::TransparentAddressMetadata::standalone_script()`
-  - `zcash_client_backend::wallet::TransparentAddressMetadata::redeem_script()`
-- `zcash_client_backend::wallet::WalletTransparentOutput::with_known_input_size`
 
 ### Changed
-- `zcash_client_backend::data_api::error::Error::MemoForbidden` has been replaced
-  by `Error::Payment(zip321::PaymentError)`, which can represent both memo-to-transparent
-  and zero-valued-transparent-output errors.
-- `zcash_client_backend::data_api::wallet::create_proposed_transactions` now takes
-  an additional `proposed_version: Option<TxVersion>` parameter under the `unstable`
-  feature flag, allowing callers to request a specific transaction version.
-- `zcash_client_backend::data_api::wallet::propose_transfer` and
-  `propose_standard_transfer_to_address` now take an additional
-  `proposed_version: Option<TxVersion>` parameter under the `unstable` feature
-  flag. When set, input selection avoids pools incompatible with the requested
-  transaction version.
-- `InputSelector::propose_transaction` trait method takes an additional
-  `proposed_version: Option<TxVersion>` parameter under the `unstable` feature
-  flag.
-- Migrated to `orchard 0.12`, `sapling-crypto 0.6`, `zip321 0.7`
+- Migrated to `orchard 0.12`, `sapling-crypto 0.6`, `zip321 0.7`.
+- `zcash_client_backend::data_api`:
+  - Changes to the `WalletRead` trait:
+    - `WalletRead::get_transparent_balances` now returns `TransparentBalances`
+      (using `TransparentKeyOrigin`) to distinguish standalone transparent
+      addresses from HD-derived ones.
+    - Added `WalletRead::get_received_outputs` method.
+  - Changes to the `WalletWrite` trait:
+    - Added `WalletWrite::import_standalone_transparent_script` method.
+    - Added `WalletWrite::truncate_to_chain_state` method.
+  - Type parameters to `DecryptedTransaction` have been modified. It now
+    abstracts over the transaction type, to permit use with partial or compact
+    transaction data instead of full transactions.
+  - The semantics of `NoteFilter::ExceedsMinValue` have changed; this filter now
+    selects notes having value strictly greater than the provided minimum value,
+    instead of notes having value greater than or equal to the provided minimum
+    value. This fixes an inconsistency in the various tests related to notes
+    having no economic value in `zcash_client_sqlite`.
+  - `error::Error::MemoForbidden` has been replaced by
+    `Error::Payment(zip321::PaymentError)`, which can represent both
+    memo-to-transparent and zero-valued-transparent-output errors.
+  - `wallet::create_proposed_transactions` now supports spending from standalone
+    P2SH (multisig) transparent addresses.
+  - `wallet::SpendingKeys::new` now takes
+    `HashMap<TransparentAddress, Vec<secp256k1::SecretKey>>` instead of
+    `HashMap<TransparentAddress, secp256k1::SecretKey>` for standalone transparent
+    keys, to support multi-key P2SH addresses.
+  - The following methods in the `wallet` module now takes an additional
+    `proposed_version: Option<TxVersion>` parameter under the `unstable` feature
+    flag:
+    - `create_proposed_transactions`, allowing callers to request a specific
+      transaction version.
+    - `{propose_transfer, propose_standard_transfer_to_address}`. When set,
+      input selection avoids pools incompatible with the requested transaction
+      version.
+    - `input_selection::InputSelector::propose_transaction` trait method.
+- `zcash_client_backend::fees`:
+  - The associated type `ChangeStrategy::MetaSource` is now bounded on the newly
+    added `MetaSource` type instead of `zcash_client_backend::data_api::InputSource`.
+- `zcash_client_backend::proposal`:
+  - `ProposalError` has added variants `PaymentAmountMissing` and
+    `IncompatibleTxVersion`.
 - Migrated to `lightwallet-protocol v0.4.1`. This results in the following API
-  changes:
-  - in `zcash_client_backend::proto::compact_formats`:
-    - `CompactTx::hash` has been renamed to `CompactTx::txid`
-  - in `zcash_client_backend::proto::service`:
-    - `Exclude` has been renamed to `GetMempoolTxRequest`
-    - `Exclude::txid` has been renamed to `GetMempoolTxRequest::exclude_txid_suffixes`
-- `zcash_client_backend::wallet::OvkPolicy` has been substantially modified
-  to reflect the view that a single outgoing viewing key should be uniformly
-  applied to encrypt all external transaction outputs, irrespective of which
-  pool those outputs are produced into, and that by default wallet-internal
-  outputs should not be decryptable using an OVK (and will therefore only
-  be recoverable using the wallet's internal IVK).
-  - The semantics of `OvkPolicy::Sender` have changed. In addition to using
-    a single OVK for all shielded outputs irrespective of pools, it now
-    specifies that wallet-internal change outputs should be treated as though
-    the policy for those outputs were `OvkPolicy::None`, rendering them only
-    recoverable using the wallet's internal IVK.
-  - The `OvkPolicy::Custom` variant has changed. Instead of pool-specific
-    OVKs, this now encapsulates a pair of OVKs, one to be used for all
-    shielded external outputs of the transaction, and a second (optional)
-    key that will be used to encrypt any wallet-internal change outputs
-    that would otherwise only be recoverable using the wallet's internal
-    IVK.
-- `zcash_client_backend::data_api::WalletRead::get_transparent_balances` now returns
-  `TransparentBalances` (using `TransparentKeyOrigin`) to distinguish standalone
-  transparent addresses from HD-derived ones.
-- `zcash_client_backend::data_api::WalletRead` has added method `get_received_outputs`.
-- `zcash_client_backend::proposal::ProposalError` has added variants `PaymentAmountMissing`
-  and `IncompatibleTxVersion`
-- `zcash_client_backend::data_api::WalletWrite` has added method `truncate_to_chain_state`.
-- The associated type `zcash_client_backend::fees::ChangeStrategy::MetaSource` is now
-  bounded on the newly added `MetaSource` type instead of
-  `zcash_client_backend::data_api::InputSource`.
-- `zcash_client_backend::wallet::GapMetadata` has been moved behind the
-  `transparent-inputs` feature flag, as it is only useful in the context
-  of the wallet receiving transparent funds.
+  changes in `zcash_client_backend::proto`:
+  - `compact_formats::CompactTx::hash` has been renamed to `CompactTx::txid`
+  - `service::Exclude` has been renamed to `GetMempoolTxRequest`
+  - `service::Exclude::txid` has been renamed to
+    `GetMempoolTxRequest::exclude_txid_suffixes`
+- `zcash_client_backend::wallet`:
+  - `OvkPolicy` has been substantially modified to reflect the view that a
+    single outgoing viewing key should be uniformly applied to encrypt all
+    external transaction outputs, irrespective of which pool those outputs are
+    produced into, and that by default wallet-internal outputs should not be
+    decryptable using an OVK (and will therefore only be recoverable using the
+    wallet's internal IVK).
+    - The semantics of `OvkPolicy::Sender` have changed. In addition to using
+      a single OVK for all shielded outputs irrespective of pools, it now
+      specifies that wallet-internal change outputs should be treated as though
+      the policy for those outputs were `OvkPolicy::None`, rendering them only
+      recoverable using the wallet's internal IVK.
+    - The `OvkPolicy::Custom` variant has changed. Instead of pool-specific
+      OVKs, this now encapsulates a pair of OVKs, one to be used for all
+      shielded external outputs of the transaction, and a second (optional)
+      key that will be used to encrypt any wallet-internal change outputs
+      that would otherwise only be recoverable using the wallet's internal
+      IVK.
+  - `GapMetadata` has been moved behind the `transparent-inputs` feature flag,
+    as it is only useful in the context of the wallet receiving transparent
+    funds.
+  - `WalletTx::block_index` now has type `zcash_protocol::consensus::TxIndex`
+    and the `WalletTx::new` function has been modified accordingly.
+  - Renamed `TransparentAddressSource::Standalone` to
+    `TransparentAddressSource::StandalonePubkey`
+  - Renamed `TransparentAddressMetadata::standalone()` to
+    `TransparentAddressMetadata::standalone_p2pkh()`
 - The return type of `zcash_client_backend::ScannedBundles::nullifier_map`
   has been altered to use the `zcash_protocol::consensus::TxIndex` type
   instead of `u16`. Also, the order of elements in the record has been
   changed.
-- `zcash_client_backend::wallet::WalletTx::block_index` now has type
-  `zcash_protocol::consensus::TxIndex` and the `new` function has
-  been modified accordingly.
-- Type parameters to `zcash_client_backend::data_api::DecryptedTransaction`
-  have been modified. It now abstracts over the transaction type, to permit
-  use with partial or compact transaction data instead of full transactions.
-- The semantics of `zcash_client_backend::data_api::NoteFilter::ExceedsMinValue`
-  have changed; this filter now selects notes having value strictly greater
-  than the provided minimum value, instead of notes having value greater
-  than or equal to the provided minimum value. This fixes an inconsistency
-  in the various tests related to notes having no economic value in
-  `zcash_client_sqlite`.
-- Renamed `zcash_client_backend::wallet::TransparentAddressSource::Standalone`
-  to `zcash_client_backend::wallet::TransparentAddressSource::StandalonePubkey`
-- Renamed `zcash_client_backend::wallet::TransparentAddressMetadata::standalone()`
-  to `zcash_client_backend::wallet::TransparentAddressMetadata::standalone_p2pkh()`
-- `zcash_client_backend::data_api::wallet::SpendingKeys::new` now takes
-  `HashMap<TransparentAddress, Vec<secp256k1::SecretKey>>` instead of
-  `HashMap<TransparentAddress, secp256k1::SecretKey>` for standalone transparent
-  keys, to support multi-key P2SH addresses.
-- `zcash_client_backend::data_api::wallet::create_proposed_transactions` now
-  supports spending from standalone P2SH (multisig) transparent addresses.
 
 ### Deprecated
 - `zcash_client_backend::proto::service::compact_tx_streamer_client`
@@ -128,8 +127,8 @@ workspace.
   - `get_block_range_nullifiers`
 
 ### Removed
-- `zcash_client_backend::data_api::testing::transparent::GapLimits` use
-  `zcash_keys::keys::transparent::GapLimits` instead.
+- `zcash_client_backend::data_api::testing::transparent::GapLimits` (use
+  `zcash_keys::keys::transparent::GapLimits` instead).
 
 ## [0.21.2] - 2026-03-10
 - The following APIs no longer crash in certain regtest mode configurations with

From 06e3a10f0c0857c8e1670f51f9d0510864f83517 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Fri, 27 Mar 2026 10:50:27 +0000
Subject: [PATCH 244/263] zcash_client_backend: Require `DbT::AccountId: Sync`
 in various places

---
 zcash_client_backend/CHANGELOG.md            |  5 +++++
 zcash_client_backend/src/data_api/chain.rs   |  2 +-
 zcash_client_backend/src/data_api/testing.rs | 11 +++++++++--
 zcash_client_backend/src/sync.rs             |  6 +++---
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index 172886faba..70dab9f808 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -58,6 +58,8 @@ workspace.
     instead of notes having value greater than or equal to the provided minimum
     value. This fixes an inconsistency in the various tests related to notes
     having no economic value in `zcash_client_sqlite`.
+  - `chain::scan_cached_blocks` now requires `DbT::AccountId: Sync` (in addition
+    to its existing `Send + 'static` bounds).
   - `error::Error::MemoForbidden` has been replaced by
     `Error::Payment(zip321::PaymentError)`, which can represent both
     memo-to-transparent and zero-valued-transparent-output errors.
@@ -88,6 +90,9 @@ workspace.
   - `service::Exclude` has been renamed to `GetMempoolTxRequest`
   - `service::Exclude::txid` has been renamed to
     `GetMempoolTxRequest::exclude_txid_suffixes`
+- `zcash_client_backend::sync`:
+  - `run` now requires `DbT::AccountId: Sync` (in addition to its existing
+    `Send + 'static` bounds).
 - `zcash_client_backend::wallet`:
   - `OvkPolicy` has been substantially modified to reflect the view that a
     single outgoing viewing key should be uniformly applied to encrypt all
diff --git a/zcash_client_backend/src/data_api/chain.rs b/zcash_client_backend/src/data_api/chain.rs
index 6548cc5046..9744c7117d 100644
--- a/zcash_client_backend/src/data_api/chain.rs
+++ b/zcash_client_backend/src/data_api/chain.rs
@@ -595,7 +595,7 @@ where
     ParamsT: consensus::Parameters + Send + 'static,
     BlockSourceT: BlockSource,
     DbT: WalletWrite,
-    <DbT as WalletRead>::AccountId: ConditionallySelectable + Default + Send + 'static,
+    <DbT as WalletRead>::AccountId: ConditionallySelectable + Default + Send + Sync + 'static,
 {
     assert_eq!(from_height, from_state.block_height + 1);
 
diff --git a/zcash_client_backend/src/data_api/testing.rs b/zcash_client_backend/src/data_api/testing.rs
index f4cc42d240..5c643c1ee6 100644
--- a/zcash_client_backend/src/data_api/testing.rs
+++ b/zcash_client_backend/src/data_api/testing.rs
@@ -826,7 +826,7 @@ where
     ParamsT: consensus::Parameters + Send + 'static,
     DbT: InputSource + WalletTest + WalletWrite + WalletCommitmentTrees,
     <DbT as WalletRead>::AccountId:
-        std::fmt::Debug + ConditionallySelectable + Default + Send + 'static,
+        std::fmt::Debug + ConditionallySelectable + Default + Send + Sync + 'static,
 {
     /// Invokes [`scan_cached_blocks`] with the given arguments, expecting success.
     pub fn scan_cached_blocks(&mut self, from_height: BlockHeight, limit: usize) -> ScanSummary {
@@ -1414,7 +1414,14 @@ pub struct InitialChainState {
 /// Trait representing the ability to construct a new data store for use in a test.
 pub trait DataStoreFactory {
     type Error: core::fmt::Debug;
-    type AccountId: std::fmt::Debug + ConditionallySelectable + Default + Hash + Eq + Send + 'static;
+    type AccountId: std::fmt::Debug
+        + ConditionallySelectable
+        + Default
+        + Hash
+        + Eq
+        + Send
+        + Sync
+        + 'static;
     type Account: Account<AccountId = Self::AccountId> + Clone;
     type DsError: core::fmt::Debug;
     type DataStore: InputSource<AccountId = Self::AccountId, Error = Self::DsError>
diff --git a/zcash_client_backend/src/sync.rs b/zcash_client_backend/src/sync.rs
index 20a0260db9..9954bb818c 100644
--- a/zcash_client_backend/src/sync.rs
+++ b/zcash_client_backend/src/sync.rs
@@ -69,7 +69,7 @@ where
     CaT: BlockCache,
     CaT::Error: std::error::Error + Send + Sync + 'static,
     DbT: WalletWrite + WalletCommitmentTrees,
-    DbT::AccountId: ConditionallySelectable + Default + Send + 'static,
+    DbT::AccountId: ConditionallySelectable + Default + Send + Sync + 'static,
     <DbT as WalletRead>::Error: std::error::Error + Send + Sync + 'static,
     <DbT as WalletCommitmentTrees>::Error: std::error::Error + Send + Sync + 'static,
 {
@@ -98,7 +98,7 @@ where
     CaT: BlockCache,
     CaT::Error: std::error::Error + Send + Sync + 'static,
     DbT: WalletWrite,
-    DbT::AccountId: ConditionallySelectable + Default + Send + 'static,
+    DbT::AccountId: ConditionallySelectable + Default + Send + Sync + 'static,
     DbT::Error: std::error::Error + Send + Sync + 'static,
 {
     // 3) Download chain tip metadata from lightwalletd
@@ -387,7 +387,7 @@ where
     CaT: BlockCache,
     CaT::Error: std::error::Error + Send + Sync + 'static,
     DbT: WalletWrite,
-    DbT::AccountId: ConditionallySelectable + Default + Send + 'static,
+    DbT::AccountId: ConditionallySelectable + Default + Send + Sync + 'static,
     DbT::Error: std::error::Error + Send + Sync + 'static,
 {
     info!("Scanning {}", scan_range);

From 50ab627e7513eefc4bbdf6c2fa3c8662661146cc Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Fri, 27 Mar 2026 11:24:27 +0000
Subject: [PATCH 245/263] zcash_client_backend: Enable cross-thread usage of
 `ScanningKeys`.

---
 zcash_client_backend/CHANGELOG.md            |  9 +++
 zcash_client_backend/src/scanning.rs         | 77 +++++++++++++++++---
 zcash_client_backend/src/scanning/compact.rs |  2 +-
 3 files changed, 75 insertions(+), 13 deletions(-)

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index 70dab9f808..3890166d4a 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -90,6 +90,15 @@ workspace.
   - `service::Exclude` has been renamed to `GetMempoolTxRequest`
   - `service::Exclude::txid` has been renamed to
     `GetMempoolTxRequest::exclude_txid_suffixes`
+- `zcash_client_backend::scanning`:
+  - `ScanningKeys` now stores `Box<dyn ScanningKeyOps<_, _, _> + Send + Sync>`
+    in its maps instead of `Box<dyn ScanningKeyOps<_, _, _>>`, enabling their
+    usage across threads, such as in `Arc<ScanningKeys<_, _>>`. Its constructors
+    and getters have been changed accordingly; for example,
+    `ScanningKeys::from_account_ufvks` now has the additional bound
+    `AccountId: Send + Sync`.
+  - `scan_block` now requires `DbT::AccountId: Sync` (in addition to its
+    existing `Send + 'static` bounds).
 - `zcash_client_backend::sync`:
   - `run` now requires `DbT::AccountId: Sync` (in addition to its existing
     `Send + 'static` bounds).
diff --git a/zcash_client_backend/src/scanning.rs b/zcash_client_backend/src/scanning.rs
index ed3573e499..bc2d6a6131 100644
--- a/zcash_client_backend/src/scanning.rs
+++ b/zcash_client_backend/src/scanning.rs
@@ -104,6 +104,26 @@ impl<D: Domain, AccountId, Nf> ScanningKeyOps<D, AccountId, Nf>
     }
 }
 
+impl<D: Domain, AccountId: Send + Sync, Nf> ScanningKeyOps<D, AccountId, Nf>
+    for Box<dyn ScanningKeyOps<D, AccountId, Nf> + Send + Sync>
+{
+    fn prepare(&self) -> D::IncomingViewingKey {
+        self.as_ref().prepare()
+    }
+
+    fn account_id(&self) -> &AccountId {
+        self.as_ref().account_id()
+    }
+
+    fn key_scope(&self) -> Option<Scope> {
+        self.as_ref().key_scope()
+    }
+
+    fn nf(&self, note: &D::Note, note_position: Position) -> Option<Nf> {
+        self.as_ref().nf(note, note_position)
+    }
+}
+
 /// An incoming viewing key, paired with an optional nullifier key and key source metadata.
 pub struct ScanningKey<Ivk, Nk, AccountId> {
     ivk: Ivk,
@@ -179,11 +199,14 @@ impl<AccountId> ScanningKeyOps<OrchardDomain, AccountId, orchard::note::Nullifie
 
 /// A set of keys to be used in scanning for decryptable transaction outputs.
 pub struct ScanningKeys<AccountId, IvkTag> {
-    sapling: HashMap<IvkTag, Box<dyn ScanningKeyOps<SaplingDomain, AccountId, sapling::Nullifier>>>,
+    sapling: HashMap<
+        IvkTag,
+        Box<dyn ScanningKeyOps<SaplingDomain, AccountId, sapling::Nullifier> + Send + Sync>,
+    >,
     #[cfg(feature = "orchard")]
     orchard: HashMap<
         IvkTag,
-        Box<dyn ScanningKeyOps<OrchardDomain, AccountId, orchard::note::Nullifier>>,
+        Box<dyn ScanningKeyOps<OrchardDomain, AccountId, orchard::note::Nullifier> + Send + Sync>,
     >,
 }
 
@@ -192,11 +215,15 @@ impl<AccountId, IvkTag> ScanningKeys<AccountId, IvkTag> {
     pub fn new(
         sapling: HashMap<
             IvkTag,
-            Box<dyn ScanningKeyOps<SaplingDomain, AccountId, sapling::Nullifier>>,
+            Box<dyn ScanningKeyOps<SaplingDomain, AccountId, sapling::Nullifier> + Send + Sync>,
         >,
         #[cfg(feature = "orchard")] orchard: HashMap<
             IvkTag,
-            Box<dyn ScanningKeyOps<OrchardDomain, AccountId, orchard::note::Nullifier>>,
+            Box<
+                dyn ScanningKeyOps<OrchardDomain, AccountId, orchard::note::Nullifier>
+                    + Send
+                    + Sync,
+            >,
         >,
     ) -> Self {
         Self {
@@ -218,8 +245,10 @@ impl<AccountId, IvkTag> ScanningKeys<AccountId, IvkTag> {
     /// Returns the Sapling keys to be used for incoming note detection.
     pub fn sapling(
         &self,
-    ) -> &HashMap<IvkTag, Box<dyn ScanningKeyOps<SaplingDomain, AccountId, sapling::Nullifier>>>
-    {
+    ) -> &HashMap<
+        IvkTag,
+        Box<dyn ScanningKeyOps<SaplingDomain, AccountId, sapling::Nullifier> + Send + Sync>,
+    > {
         &self.sapling
     }
 
@@ -227,13 +256,17 @@ impl<AccountId, IvkTag> ScanningKeys<AccountId, IvkTag> {
     #[cfg(feature = "orchard")]
     pub fn orchard(
         &self,
-    ) -> &HashMap<IvkTag, Box<dyn ScanningKeyOps<OrchardDomain, AccountId, orchard::note::Nullifier>>>
-    {
+    ) -> &HashMap<
+        IvkTag,
+        Box<dyn ScanningKeyOps<OrchardDomain, AccountId, orchard::note::Nullifier> + Send + Sync>,
+    > {
         &self.orchard
     }
 }
 
-impl<AccountId: Copy + Eq + Hash + 'static> ScanningKeys<AccountId, (AccountId, Scope)> {
+impl<AccountId: Copy + Eq + Hash + Send + Sync + 'static>
+    ScanningKeys<AccountId, (AccountId, Scope)>
+{
     /// Constructs a [`ScanningKeys`] from an iterator of [`UnifiedFullViewingKey`]s,
     /// along with the account identifiers corresponding to those UFVKs.
     pub fn from_account_ufvks(
@@ -243,12 +276,16 @@ impl<AccountId: Copy + Eq + Hash + 'static> ScanningKeys<AccountId, (AccountId,
 
         let mut sapling: HashMap<
             (AccountId, Scope),
-            Box<dyn ScanningKeyOps<SaplingDomain, AccountId, sapling::Nullifier>>,
+            Box<dyn ScanningKeyOps<SaplingDomain, AccountId, sapling::Nullifier> + Send + Sync>,
         > = HashMap::new();
         #[cfg(feature = "orchard")]
         let mut orchard: HashMap<
             (AccountId, Scope),
-            Box<dyn ScanningKeyOps<OrchardDomain, AccountId, orchard::note::Nullifier>>,
+            Box<
+                dyn ScanningKeyOps<OrchardDomain, AccountId, orchard::note::Nullifier>
+                    + Send
+                    + Sync,
+            >,
         > = HashMap::new();
 
         for (account_id, ufvk) in ufvks {
@@ -566,7 +603,7 @@ pub fn scan_block<P, AccountId, IvkTag>(
 ) -> Result<ScannedBlock<AccountId>, ScanError>
 where
     P: consensus::Parameters + Send + 'static,
-    AccountId: Default + Eq + Hash + ConditionallySelectable + Send + 'static,
+    AccountId: Default + Eq + Hash + ConditionallySelectable + Send + Sync + 'static,
     IvkTag: Copy + std::hash::Hash + Eq + Send + 'static,
 {
     compact::scan_block_with_runners::<_, _, _, (), ()>(
@@ -917,3 +954,19 @@ pub mod testing {
         cb
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use std::sync::Arc;
+    use std::thread::spawn;
+
+    use super::ScanningKeys;
+
+    #[test]
+    fn arc_scanning_keys() {
+        let keys = Arc::new(ScanningKeys::<(), ()>::empty());
+        spawn(move || {
+            let _ = keys.sapling().get(&());
+        });
+    }
+}
diff --git a/zcash_client_backend/src/scanning/compact.rs b/zcash_client_backend/src/scanning/compact.rs
index ba1cb3dd71..d206b41f13 100644
--- a/zcash_client_backend/src/scanning/compact.rs
+++ b/zcash_client_backend/src/scanning/compact.rs
@@ -183,7 +183,7 @@ pub(crate) fn scan_block_with_runners<P, AccountId, IvkTag, TS, TO>(
 ) -> Result<ScannedBlock<AccountId>, ScanError>
 where
     P: consensus::Parameters + Send + 'static,
-    AccountId: Default + Eq + Hash + ConditionallySelectable + Send + 'static,
+    AccountId: Default + Eq + Hash + ConditionallySelectable + Send + Sync + 'static,
     IvkTag: Copy + std::hash::Hash + Eq + Send + 'static,
     TS: SaplingTasks<IvkTag> + Sync,
     TO: OrchardTasks<IvkTag> + Sync,

From b1daa04fabb60486ebd1551d4019cddce92da75b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Mar 2026 05:31:22 +0000
Subject: [PATCH 246/263] build(deps): bump taiki-e/install-action from 2.68.9
 to 2.70.2

Bumps [taiki-e/install-action](https://github.com/taiki-e/install-action) from 2.68.9 to 2.70.2.
- [Release notes](https://github.com/taiki-e/install-action/releases)
- [Changelog](https://github.com/taiki-e/install-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/taiki-e/install-action/compare/7f491e26f71f4ec2e6902c7c95c73043f209ab79...e9e8e031bcd90cdbe8ac6bb1d376f8596e587fbf)

---
updated-dependencies:
- dependency-name: taiki-e/install-action
  dependency-version: 2.70.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/mutants.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/mutants.yml b/.github/workflows/mutants.yml
index 23c6cba607..4c2753a7e8 100644
--- a/.github/workflows/mutants.yml
+++ b/.github/workflows/mutants.yml
@@ -96,7 +96,7 @@ jobs:
         shell: sh
         env:
           TOOLCHAIN: ${{steps.toolchain.outputs.name}}
-      - uses: taiki-e/install-action@7f491e26f71f4ec2e6902c7c95c73043f209ab79 # v2.68.9
+      - uses: taiki-e/install-action@e9e8e031bcd90cdbe8ac6bb1d376f8596e587fbf # v2.70.2
         with:
           tool: cargo-mutants
       - run: cargo mutants --package "${{ matrix.package }}" --all-features -vV --in-place

From 7b57d55c288d23b752e5d3540e12d80e896b5ab7 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Fri, 27 Mar 2026 13:35:27 -0600
Subject: [PATCH 247/263] zcash_client_sqlite: Add regression test for
 truncate_to_chain_state below wallet birthday

Tests that truncate_to_chain_state succeeds when the target height is
below the wallet birthday (i.e., there is no entry in the blocks table
at that height). This exercises the case where a wallet needs to rewind
to a height it has never scanned.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../src/data_api/testing/pool.rs              | 103 ++++++++++++++++++
 zcash_client_sqlite/src/chain.rs              |  11 ++
 zcash_client_sqlite/src/testing/pool.rs       |   7 ++
 3 files changed, 121 insertions(+)

diff --git a/zcash_client_backend/src/data_api/testing/pool.rs b/zcash_client_backend/src/data_api/testing/pool.rs
index 5c604cf553..5fc840a769 100644
--- a/zcash_client_backend/src/data_api/testing/pool.rs
+++ b/zcash_client_backend/src/data_api/testing/pool.rs
@@ -4370,6 +4370,109 @@ where
     );
 }
 
+pub fn truncate_to_chain_state_below_birthday<T: ShieldedPoolTester, Dsf>(
+    ds_factory: Dsf,
+    cache: impl TestCache,
+) where
+    Dsf: DataStoreFactory,
+    <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
+{
+    // Regression test: truncate_to_chain_state should succeed when truncating to a height
+    // below the wallet birthday (where no entry exists in the blocks table). Previously,
+    // this would fail with RequestedRewindInvalid because select_truncation_height requires
+    // the target height to have an entry in the blocks table.
+
+    use crate::data_api::ll::wallet::PRUNING_DEPTH;
+
+    let mut st = TestBuilder::new()
+        .with_data_store_factory(ds_factory)
+        .with_block_cache(cache)
+        .with_initial_chain_state(|rng, network| {
+            let birthday_height = network.activation_height(NetworkUpgrade::Sapling).unwrap() + 200;
+
+            let (prior_sapling_roots, sapling_initial_tree) =
+                Frontier::random_with_prior_subtree_roots(rng, 1u64, NonZeroU8::new(16).unwrap());
+            let prior_sapling_roots = prior_sapling_roots
+                .into_iter()
+                .map(|root| CommitmentTreeRoot::from_parts(birthday_height - 100, root))
+                .collect::<Vec<_>>();
+
+            #[cfg(feature = "orchard")]
+            let (prior_orchard_roots, orchard_initial_tree) =
+                Frontier::random_with_prior_subtree_roots(rng, 1u64, NonZeroU8::new(16).unwrap());
+            #[cfg(feature = "orchard")]
+            let prior_orchard_roots = prior_orchard_roots
+                .into_iter()
+                .map(|root| CommitmentTreeRoot::from_parts(birthday_height - 100, root))
+                .collect::<Vec<_>>();
+
+            InitialChainState {
+                chain_state: ChainState::new(
+                    birthday_height - 1,
+                    BlockHash([5; 32]),
+                    sapling_initial_tree,
+                    #[cfg(feature = "orchard")]
+                    orchard_initial_tree,
+                ),
+                prior_sapling_roots,
+                #[cfg(feature = "orchard")]
+                prior_orchard_roots,
+            }
+        })
+        .with_account_having_current_birthday()
+        .build();
+
+    // Generate and scan a few initial blocks from the birthday height.
+    let other_fvk = T::random_fvk(st.rng_mut());
+    let birthday_height = st.test_account().unwrap().birthday().height();
+
+    for _ in 0..5 {
+        st.generate_next_block(
+            &other_fvk,
+            AddressType::DefaultExternal,
+            Zatoshis::const_from_u64(10000),
+        );
+    }
+    st.scan_cached_blocks(birthday_height, 5);
+
+    // Generate and scan blocks well beyond PRUNING_DEPTH to ensure early checkpoints
+    // are pruned from the note commitment tree.
+    let extra_blocks = PRUNING_DEPTH + 10;
+    for _ in 0..extra_blocks {
+        st.generate_next_block(
+            &other_fvk,
+            AddressType::DefaultExternal,
+            Zatoshis::const_from_u64(5000),
+        );
+    }
+    st.scan_cached_blocks(birthday_height + 5, extra_blocks as usize);
+
+    // Get the prior chain state from the account birthday. This chain state is at
+    // birthday_height - 1, which has valid tree frontiers but NO entry in the blocks
+    // table (since the wallet never scanned a block at that height).
+    let prior_chain_state = st
+        .test_account()
+        .unwrap()
+        .birthday()
+        .prior_chain_state()
+        .clone();
+
+    // This should succeed. On the buggy code, this fails with RequestedRewindInvalid
+    // because select_truncation_height cannot find an entry in the blocks table at the
+    // target height.
+    let _target_height = prior_chain_state.block_height();
+    st.wallet_mut()
+        .truncate_to_chain_state(prior_chain_state)
+        .expect("truncate_to_chain_state below birthday should succeed");
+
+    // All blocks were above the target height, so they should have been removed.
+    assert_eq!(
+        st.wallet().get_block_hash(birthday_height).unwrap(),
+        None,
+        "blocks at birthday height should be removed after truncating below birthday"
+    );
+}
+
 pub fn reorg_to_checkpoint<T: ShieldedPoolTester, Dsf, C>(ds_factory: Dsf, cache: C)
 where
     Dsf: DataStoreFactory,
diff --git a/zcash_client_sqlite/src/chain.rs b/zcash_client_sqlite/src/chain.rs
index 36911c4680..621672ce65 100644
--- a/zcash_client_sqlite/src/chain.rs
+++ b/zcash_client_sqlite/src/chain.rs
@@ -373,6 +373,17 @@ mod tests {
         testing::pool::truncate_to_chain_state::<OrchardPoolTester>()
     }
 
+    #[test]
+    fn truncate_to_chain_state_below_birthday_sapling() {
+        testing::pool::truncate_to_chain_state_below_birthday::<SaplingPoolTester>()
+    }
+
+    #[test]
+    #[cfg(feature = "orchard")]
+    fn truncate_to_chain_state_below_birthday_orchard() {
+        testing::pool::truncate_to_chain_state_below_birthday::<OrchardPoolTester>()
+    }
+
     #[test]
     fn reorg_to_checkpoint_sapling() {
         testing::pool::reorg_to_checkpoint::<SaplingPoolTester>()
diff --git a/zcash_client_sqlite/src/testing/pool.rs b/zcash_client_sqlite/src/testing/pool.rs
index 0fcaa40a21..87fe0018ed 100644
--- a/zcash_client_sqlite/src/testing/pool.rs
+++ b/zcash_client_sqlite/src/testing/pool.rs
@@ -312,6 +312,13 @@ pub(crate) fn truncate_to_chain_state<T: ShieldedPoolTester>() {
     )
 }
 
+pub(crate) fn truncate_to_chain_state_below_birthday<T: ShieldedPoolTester>() {
+    zcash_client_backend::data_api::testing::pool::truncate_to_chain_state_below_birthday::<T, _>(
+        TestDbFactory::default(),
+        BlockCache::new(),
+    )
+}
+
 pub(crate) fn reorg_to_checkpoint<T: ShieldedPoolTester>() {
     zcash_client_backend::data_api::testing::pool::reorg_to_checkpoint::<T, _, _>(
         TestDbFactory::default(),

From 1931a496988cedbe09a99559234d71b89c5d1055 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Fri, 27 Mar 2026 09:48:16 -0600
Subject: [PATCH 248/263] zcash_client_sqlite: Fix min_shared_checkpoint_height
 to query checkpoint intersection

The previous query computed MAX(MIN(sapling), MIN(orchard)), which
returns a lower bound on where both trees have started checkpointing
but does not guarantee that a checkpoint at that specific height exists
in both tables. This caused incorrect safe rewind height reporting and
incorrect truncation targets in truncate_to_chain_state.

The fix queries for the actual minimum checkpoint height that exists in
the intersection of both checkpoint tables, matching the semantics used
by select_truncation_height.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 zcash_client_sqlite/src/wallet.rs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/zcash_client_sqlite/src/wallet.rs b/zcash_client_sqlite/src/wallet.rs
index 88f3ecce24..840124e163 100644
--- a/zcash_client_sqlite/src/wallet.rs
+++ b/zcash_client_sqlite/src/wallet.rs
@@ -3262,20 +3262,21 @@ pub(crate) fn set_transaction_status<P: consensus::Parameters>(
     Ok(())
 }
 
-/// Find the minimum checkpoint height for each tree and take the maximum of those minima.
-///
-/// This returns the earliest height at which all trees have a checkpoint. The orchard table exists
-/// unconditionally but is empty when the `orchard` feature is not active; MAX ignores NULLs, so
-/// this correctly returns only the sapling minimum in that case.
+/// Returns the minimum checkpoint height that exists in all note commitment trees that contain
+/// data. When both trees have checkpoints, returns the minimum of their intersection. When only
+/// one tree has checkpoints, returns that tree's minimum. Returns `None` when both are empty.
 fn min_shared_checkpoint_height(
     conn: &rusqlite::Connection,
 ) -> Result<Option<BlockHeight>, SqliteClientError> {
     Ok(conn
         .query_row(
-            "SELECT MAX(m) FROM (
-                 SELECT MIN(checkpoint_id) AS m FROM sapling_tree_checkpoints
+            "SELECT MIN(checkpoint_id) FROM (
+                 SELECT checkpoint_id FROM sapling_tree_checkpoints
+                 WHERE checkpoint_id IN (SELECT checkpoint_id FROM orchard_tree_checkpoints)
+                    OR NOT EXISTS (SELECT 1 FROM orchard_tree_checkpoints)
                  UNION ALL
-                 SELECT MIN(checkpoint_id) AS m FROM orchard_tree_checkpoints
+                 SELECT checkpoint_id FROM orchard_tree_checkpoints
+                 WHERE NOT EXISTS (SELECT 1 FROM sapling_tree_checkpoints)
              )",
             [],
             |row| row.get::<_, Option<u32>>(0),
@@ -3313,9 +3314,8 @@ fn select_truncation_height(
     .map_or_else(
         || {
             // If we don't have a checkpoint at a height less than or equal to the requested
-            // truncation height, query for the minimum height to which it's possible for us to
-            // truncate so that we can report it to the caller. We take the maximum of the per-tree
-            // minimums, since that is the earliest height at which all trees have a checkpoint.
+            // truncation height, query for the minimum shared checkpoint height so that we can
+            // report the safe rewind height to the caller.
             Err(SqliteClientError::RequestedRewindInvalid {
                 safe_rewind_height: min_shared_checkpoint_height(conn)?,
                 requested_height,

From ace053db5bd9137656cb271f60bfcc1f6ed355e4 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Fri, 27 Mar 2026 11:20:30 -0600
Subject: [PATCH 249/263] zcash_client_sqlite: Allow truncate_to_chain_state to
 truncate to unscanned heights.

Previously, truncate_to_chain_state could fail if no entry existed in
the `blocks` table at the given height. This change repeals that
restriction.
---
 zcash_client_sqlite/src/wallet.rs | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/zcash_client_sqlite/src/wallet.rs b/zcash_client_sqlite/src/wallet.rs
index 840124e163..0e41b3be5b 100644
--- a/zcash_client_sqlite/src/wallet.rs
+++ b/zcash_client_sqlite/src/wallet.rs
@@ -3501,18 +3501,22 @@ pub(crate) fn truncate_to_chain_state<P: consensus::Parameters, CL, R>(
         Err(SqliteClientError::RequestedRewindInvalid {
             safe_rewind_height, ..
         }) => {
-            // The safe rewind height is at a position greater than the requested height, so we
-            // truncate to that height first to clear out checkpoints that would otherwise cause
-            // the checkpoint we're about to insert to be immediately pruned, then, we fall through
-            // to insertion of the frontier.
             if let Some(min_checkpoint_height) = safe_rewind_height {
-                truncate_to_height(
+                // The safe rewind height is at a position greater than the requested height, so we
+                // truncate wallet data and tree state to the earliest shared checkpoint. This removes
+                // blocks and transaction data above that height. Given that we always add
+                // checkpoints in pairs, if there are at least two checkpoints in any table then
+                // the minimum between them will result in checkpoints having been removed, and so
+                // there will be space for the checkpoint that is about to be inserted.
+                truncate_to_height_internal(
                     wdb.conn.0,
                     &wdb.params,
                     #[cfg(feature = "transparent-inputs")]
                     &wdb.gap_limits,
                     min_checkpoint_height,
                 )?;
+            } else {
+                // There are no checkpoints in either table; just continue.
             }
         }
         Err(e) => {
@@ -3520,11 +3524,7 @@ pub(crate) fn truncate_to_chain_state<P: consensus::Parameters, CL, R>(
         }
     };
 
-    // If there are checkpoints, truncate to the earliest common one first. If there are no
-    // checkpoints at all, we can skip this step and proceed directly to inserting the frontier.
-
     // Insert the frontier from the chain state, creating a checkpoint at the target height.
-    // Because we just truncated down to a single checkpoint, there is room for this new one.
     wdb.with_sapling_tree_mut(|tree| {
         tree.insert_frontier(
             chain_state.final_sapling_tree().clone(),
@@ -3548,8 +3548,11 @@ pub(crate) fn truncate_to_chain_state<P: consensus::Parameters, CL, R>(
         Ok::<_, SqliteClientError>(())
     })?;
 
-    // Now truncate to the target height checkpoint we just created.
-    let truncated_height = truncate_to_height(
+    // Now truncate wallet data to the target height. We use truncate_to_height_internal
+    // directly (bypassing select_truncation_height) because the frontier insertion created
+    // tree checkpoints at target_height but did not add a blocks table entry, and
+    // select_truncation_height requires the height to be present in the blocks table.
+    let truncated_height = truncate_to_height_internal(
         wdb.conn.0,
         &wdb.params,
         #[cfg(feature = "transparent-inputs")]

From 67070dc5c73e8ac4ab3c17a134f33aa4f6274267 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Sat, 28 Mar 2026 16:29:07 -0600
Subject: [PATCH 250/263] zcash_client_sqlite: Improve legibility of
 `min_shared_checkpoint_height` query.

---
 zcash_client_sqlite/src/wallet.rs | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/zcash_client_sqlite/src/wallet.rs b/zcash_client_sqlite/src/wallet.rs
index 0e41b3be5b..3ed342f853 100644
--- a/zcash_client_sqlite/src/wallet.rs
+++ b/zcash_client_sqlite/src/wallet.rs
@@ -3271,12 +3271,19 @@ fn min_shared_checkpoint_height(
     Ok(conn
         .query_row(
             "SELECT MIN(checkpoint_id) FROM (
-                 SELECT checkpoint_id FROM sapling_tree_checkpoints
-                 WHERE checkpoint_id IN (SELECT checkpoint_id FROM orchard_tree_checkpoints)
-                    OR NOT EXISTS (SELECT 1 FROM orchard_tree_checkpoints)
-                 UNION ALL
-                 SELECT checkpoint_id FROM orchard_tree_checkpoints
-                 WHERE NOT EXISTS (SELECT 1 FROM sapling_tree_checkpoints)
+                -- When both trees have checkpoints, returns the minimum of their intersection.
+                SELECT MIN(sc.checkpoint_id) AS checkpoint_id
+                    FROM sapling_tree_checkpoints sc
+                    JOIN orchard_tree_checkpoints oc ON oc.checkpoint_id = sc.checkpoint_id
+                -- When only one tree has checkpoints, returns that tree's minimum.
+                UNION ALL
+                    SELECT MIN(sc.checkpoint_id) AS checkpoint_id
+                    FROM sapling_tree_checkpoints sc
+                    WHERE NOT EXISTS (SELECT 1 FROM orchard_tree_checkpoints)
+                UNION ALL
+                    SELECT MIN(oc.checkpoint_id) AS checkpoint_id
+                    FROM orchard_tree_checkpoints oc
+                    WHERE NOT EXISTS (SELECT 1 FROM sapling_tree_checkpoints)
              )",
             [],
             |row| row.get::<_, Option<u32>>(0),

From 3d91f05f4c277032d96d8b942a79b9b94f3ab357 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Sun, 29 Mar 2026 17:56:34 -0600
Subject: [PATCH 251/263] zcash_client_sqlite: Test truncate_to_chain_state
 when target > max_scanned.

This tests the scenario where the wallet has been truncated to an
earlier chain state (for example, when adding an account with an earlier
birthday) and then truncate_to_chain_state is called again with a
*greater* height, such that a discontinuity would be introduced in the
subtree roots by the chain state insertion.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../src/data_api/testing/pool.rs              | 120 ++++++++++++++++++
 zcash_client_sqlite/src/chain.rs              |  11 ++
 zcash_client_sqlite/src/testing/pool.rs       |   7 +
 3 files changed, 138 insertions(+)

diff --git a/zcash_client_backend/src/data_api/testing/pool.rs b/zcash_client_backend/src/data_api/testing/pool.rs
index 5fc840a769..71b0651672 100644
--- a/zcash_client_backend/src/data_api/testing/pool.rs
+++ b/zcash_client_backend/src/data_api/testing/pool.rs
@@ -4473,6 +4473,126 @@ pub fn truncate_to_chain_state_below_birthday<T: ShieldedPoolTester, Dsf>(
     );
 }
 
+pub fn truncate_to_chain_state_above_scanned<T: ShieldedPoolTester, Dsf>(
+    ds_factory: Dsf,
+    cache: impl TestCache,
+) where
+    Dsf: DataStoreFactory,
+    <Dsf as DataStoreFactory>::AccountId: std::fmt::Debug,
+{
+    // Regression test: when truncate_to_chain_state is called with a target height above
+    // the max scanned height, the frontier insertion must be skipped (it would introduce
+    // a subtree root discontinuity) but the scan queue must still be trimmed. Without the
+    // fix, inserting a frontier in shard 2 when the wallet only has shard 0 fails because
+    // shard 1's subtree root is unknown.
+
+    use crate::data_api::ll::wallet::PRUNING_DEPTH;
+
+    let mut st = TestDsl::with_sapling_birthday_account(ds_factory, cache).build::<T>();
+
+    let birthday_height = st.test_account().unwrap().birthday().height();
+
+    // Generate and scan initial blocks, then scan beyond PRUNING_DEPTH to ensure
+    // early checkpoints are pruned.
+    let other_fvk = T::random_fvk(st.rng_mut());
+    let initial_blocks = 5u32;
+    for _ in 0..initial_blocks {
+        st.generate_next_block(
+            &other_fvk,
+            AddressType::DefaultExternal,
+            Zatoshis::const_from_u64(10000),
+        );
+    }
+    st.scan_cached_blocks(birthday_height, initial_blocks as usize);
+
+    let extra_blocks = PRUNING_DEPTH + 10;
+    for _ in 0..extra_blocks {
+        st.generate_next_block(
+            &other_fvk,
+            AddressType::DefaultExternal,
+            Zatoshis::const_from_u64(5000),
+        );
+    }
+    st.scan_cached_blocks(birthday_height + initial_blocks, extra_blocks as usize);
+    let max_scanned = birthday_height + initial_blocks + extra_blocks - 1;
+
+    // Simulate downloading subtree roots from the network: add a known subtree root
+    // for shard 0 only. This creates a state where shard 0 exists in the shard store
+    // but shard 1 does not.
+    T::put_subtree_roots(
+        &mut st,
+        0,
+        &[CommitmentTreeRoot::from_parts(
+            birthday_height,
+            T::empty_tree_leaf(),
+        )],
+    )
+    .unwrap();
+
+    // Extend the scan queue beyond max_scanned.
+    let chain_tip = max_scanned + 500;
+    st.wallet_mut().update_chain_tip(chain_tip).unwrap();
+
+    // Construct a ChainState above max_scanned with a frontier in shard 2. The wallet
+    // has shard 0 (from put_subtree_roots above) but does NOT have shard 1. Inserting a
+    // frontier in shard 2 introduces a discontinuity because shard 1's subtree root is
+    // unknown.
+    let target_height = max_scanned + 50;
+    let shard_2_tree_size: u64 = (0x2 << 16) + 2;
+    let (_, shard2_sapling_frontier) = Frontier::random_with_prior_subtree_roots(
+        st.rng_mut(),
+        shard_2_tree_size,
+        NonZeroU8::new(16).unwrap(),
+    );
+    #[cfg(feature = "orchard")]
+    let (_, shard2_orchard_frontier) = Frontier::random_with_prior_subtree_roots(
+        st.rng_mut(),
+        shard_2_tree_size,
+        NonZeroU8::new(16).unwrap(),
+    );
+
+    let target_chain_state = ChainState::new(
+        target_height,
+        BlockHash([7; 32]),
+        shard2_sapling_frontier,
+        #[cfg(feature = "orchard")]
+        shard2_orchard_frontier,
+    );
+
+    // Verify the scan queue extends beyond the target.
+    let pre_truncation_tip = st
+        .wallet()
+        .chain_height()
+        .unwrap()
+        .expect("chain tip should be set");
+    assert!(pre_truncation_tip > target_height);
+
+    // Truncate to the target height, which is above max_scanned. With the fix, this
+    // skips the frontier insertion (avoiding the discontinuity) and trims the scan queue.
+    // Without the fix, this would fail because inserting a frontier in shard 2 requires
+    // shard 1's subtree root, which is unknown.
+    st.wallet_mut()
+        .truncate_to_chain_state(target_chain_state)
+        .expect("truncate_to_chain_state above max scanned should succeed");
+
+    // The scan queue should have been trimmed to the target height.
+    let post_truncation_tip = st
+        .wallet()
+        .chain_height()
+        .unwrap()
+        .expect("chain tip should still be set after truncation");
+    assert_eq!(
+        post_truncation_tip, target_height,
+        "scan queue should be trimmed to target height, not extend to the old chain tip"
+    );
+
+    // Existing blocks below max_scanned should be preserved.
+    assert!(
+        st.wallet().get_block_hash(max_scanned).unwrap().is_some(),
+        "blocks at max_scanned should be preserved"
+    );
+}
+
 pub fn reorg_to_checkpoint<T: ShieldedPoolTester, Dsf, C>(ds_factory: Dsf, cache: C)
 where
     Dsf: DataStoreFactory,
diff --git a/zcash_client_sqlite/src/chain.rs b/zcash_client_sqlite/src/chain.rs
index 621672ce65..20af5f26b8 100644
--- a/zcash_client_sqlite/src/chain.rs
+++ b/zcash_client_sqlite/src/chain.rs
@@ -384,6 +384,17 @@ mod tests {
         testing::pool::truncate_to_chain_state_below_birthday::<OrchardPoolTester>()
     }
 
+    #[test]
+    fn truncate_to_chain_state_above_scanned_sapling() {
+        testing::pool::truncate_to_chain_state_above_scanned::<SaplingPoolTester>()
+    }
+
+    #[test]
+    #[cfg(feature = "orchard")]
+    fn truncate_to_chain_state_above_scanned_orchard() {
+        testing::pool::truncate_to_chain_state_above_scanned::<OrchardPoolTester>()
+    }
+
     #[test]
     fn reorg_to_checkpoint_sapling() {
         testing::pool::reorg_to_checkpoint::<SaplingPoolTester>()
diff --git a/zcash_client_sqlite/src/testing/pool.rs b/zcash_client_sqlite/src/testing/pool.rs
index 87fe0018ed..4db2a7643c 100644
--- a/zcash_client_sqlite/src/testing/pool.rs
+++ b/zcash_client_sqlite/src/testing/pool.rs
@@ -319,6 +319,13 @@ pub(crate) fn truncate_to_chain_state_below_birthday<T: ShieldedPoolTester>() {
     )
 }
 
+pub(crate) fn truncate_to_chain_state_above_scanned<T: ShieldedPoolTester>() {
+    zcash_client_backend::data_api::testing::pool::truncate_to_chain_state_above_scanned::<T, _>(
+        TestDbFactory::default(),
+        BlockCache::new(),
+    )
+}
+
 pub(crate) fn reorg_to_checkpoint<T: ShieldedPoolTester>() {
     zcash_client_backend::data_api::testing::pool::reorg_to_checkpoint::<T, _, _>(
         TestDbFactory::default(),

From eb3ea655f03ffaea7537621d0e1b2ff14f25f3b8 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Sat, 28 Mar 2026 18:14:09 -0600
Subject: [PATCH 252/263] zcash_client_sqlite: Do not insert birthday chain
 states above max-scanned height.

`Shardtree` will return an error if insertion results in a discontinuity
in subtree roots. When adding an account after truncation, this can
cause the insertion to fail.
---
 zcash_client_sqlite/src/wallet.rs | 265 ++++++++++++++++--------------
 1 file changed, 143 insertions(+), 122 deletions(-)

diff --git a/zcash_client_sqlite/src/wallet.rs b/zcash_client_sqlite/src/wallet.rs
index 3ed342f853..68f9bfb2d7 100644
--- a/zcash_client_sqlite/src/wallet.rs
+++ b/zcash_client_sqlite/src/wallet.rs
@@ -539,59 +539,65 @@ pub(crate) fn add_account<P: consensus::Parameters>(
         birthday: birthday.height(),
     };
 
-    // If a birthday frontier is available, insert it into the note commitment tree. If the
-    // birthday frontier is the empty frontier, we don't need to do anything.
-    if let Some(frontier) = birthday.sapling_frontier().value() {
-        debug!("Inserting Sapling frontier into ShardTree: {:?}", frontier);
-        let shard_store =
-            SqliteShardStore::<_, ::sapling::Node, SAPLING_SHARD_HEIGHT>::from_connection(
-                conn,
-                crate::SAPLING_TABLES_PREFIX,
+    // If a birthday frontiers are available and the birthday height is less than or equal to the
+    // max-scanned height, insert them into the note commitment trees. Otherwise, we don't need to
+    // do anything.
+    if block_max_scanned(conn, params)?
+        .iter()
+        .any(|m| m.block_height() > birthday.height())
+    {
+        if let Some(frontier) = birthday.sapling_frontier().value() {
+            debug!("Inserting Sapling frontier into ShardTree: {:?}", frontier);
+            let shard_store =
+                SqliteShardStore::<_, ::sapling::Node, SAPLING_SHARD_HEIGHT>::from_connection(
+                    conn,
+                    crate::SAPLING_TABLES_PREFIX,
+                )?;
+            let mut shard_tree: ShardTree<
+                _,
+                { ::sapling::NOTE_COMMITMENT_TREE_DEPTH },
+                SAPLING_SHARD_HEIGHT,
+            > = ShardTree::new(shard_store, PRUNING_DEPTH.try_into().unwrap());
+            shard_tree.insert_frontier_nodes(
+                frontier.clone(),
+                Retention::Checkpoint {
+                    // This subtraction is safe, because all leaves in the tree appear in blocks, and
+                    // the invariant that birthday.height() always corresponds to the block for which
+                    // `frontier` is the tree state at the start of the block. Together, this means
+                    // there exists a prior block for which frontier is the tree state at the end of
+                    // the block.
+                    id: birthday.height() - 1,
+                    marking: Marking::Reference,
+                },
             )?;
-        let mut shard_tree: ShardTree<
-            _,
-            { ::sapling::NOTE_COMMITMENT_TREE_DEPTH },
-            SAPLING_SHARD_HEIGHT,
-        > = ShardTree::new(shard_store, PRUNING_DEPTH.try_into().unwrap());
-        shard_tree.insert_frontier_nodes(
-            frontier.clone(),
-            Retention::Checkpoint {
-                // This subtraction is safe, because all leaves in the tree appear in blocks, and
-                // the invariant that birthday.height() always corresponds to the block for which
-                // `frontier` is the tree state at the start of the block. Together, this means
-                // there exists a prior block for which frontier is the tree state at the end of
-                // the block.
-                id: birthday.height() - 1,
-                marking: Marking::Reference,
-            },
-        )?;
-    }
+        }
 
-    #[cfg(feature = "orchard")]
-    if let Some(frontier) = birthday.orchard_frontier().value() {
-        debug!("Inserting Orchard frontier into ShardTree: {:?}", frontier);
-        let shard_store = SqliteShardStore::<
-            _,
-            ::orchard::tree::MerkleHashOrchard,
-            ORCHARD_SHARD_HEIGHT,
-        >::from_connection(conn, crate::ORCHARD_TABLES_PREFIX)?;
-        let mut shard_tree: ShardTree<
-            _,
-            { ::orchard::NOTE_COMMITMENT_TREE_DEPTH as u8 },
-            ORCHARD_SHARD_HEIGHT,
-        > = ShardTree::new(shard_store, PRUNING_DEPTH.try_into().unwrap());
-        shard_tree.insert_frontier_nodes(
-            frontier.clone(),
-            Retention::Checkpoint {
-                // This subtraction is safe, because all leaves in the tree appear in blocks, and
-                // the invariant that birthday.height() always corresponds to the block for which
-                // `frontier` is the tree state at the start of the block. Together, this means
-                // there exists a prior block for which frontier is the tree state at the end of
-                // the block.
-                id: birthday.height() - 1,
-                marking: Marking::Reference,
-            },
-        )?;
+        #[cfg(feature = "orchard")]
+        if let Some(frontier) = birthday.orchard_frontier().value() {
+            debug!("Inserting Orchard frontier into ShardTree: {:?}", frontier);
+            let shard_store = SqliteShardStore::<
+                _,
+                ::orchard::tree::MerkleHashOrchard,
+                ORCHARD_SHARD_HEIGHT,
+            >::from_connection(conn, crate::ORCHARD_TABLES_PREFIX)?;
+            let mut shard_tree: ShardTree<
+                _,
+                { ::orchard::NOTE_COMMITMENT_TREE_DEPTH as u8 },
+                ORCHARD_SHARD_HEIGHT,
+            > = ShardTree::new(shard_store, PRUNING_DEPTH.try_into().unwrap());
+            shard_tree.insert_frontier_nodes(
+                frontier.clone(),
+                Retention::Checkpoint {
+                    // This subtraction is safe, because all leaves in the tree appear in blocks, and
+                    // the invariant that birthday.height() always corresponds to the block for which
+                    // `frontier` is the tree state at the start of the block. Together, this means
+                    // there exists a prior block for which frontier is the tree state at the end of
+                    // the block.
+                    id: birthday.height() - 1,
+                    marking: Marking::Reference,
+                },
+            )?;
+        }
     }
 
     // The ignored range always starts at Sapling activation
@@ -3483,82 +3489,97 @@ pub(crate) fn truncate_to_chain_state<P: consensus::Parameters, CL, R>(
 ) -> Result<(), SqliteClientError> {
     let target_height = chain_state.block_height();
 
-    // Try the simple case first: if a checkpoint exists at or below the target height,
-    // truncate_to_height will succeed directly.
-    match select_truncation_height(wdb.conn.0, target_height) {
-        Ok(h) => {
-            if h == target_height {
-                // There is a checkpoint for the requested height, we can just truncate to it and
-                // return.
-                return truncate_to_height_internal(
-                    wdb.conn.0,
-                    &wdb.params,
-                    #[cfg(feature = "transparent-inputs")]
-                    &wdb.gap_limits,
-                    h,
-                )
-                .map(|_| ());
-            } else {
-                // The returned height corresponds to a checkpoint that is below the requested
-                // height. Inserting a checkpoint at a height *greater* than this returned height
-                // may cause an older checkpoint to be deleted, but that's fine, so we just fall
-                // through here.
+    // Only truncate trees when the maximum scanned height is greater than the target height. When
+    // the target height is at or above the max scanned height, we skip frontier insertion (it is
+    // unnecessary at the max scanned height, and could introduce a subtree root discontinuity
+    // above it,and the frontier will be added naturally during scanning). We will however still
+    // need to truncate the scan queue so that ranges above the target are removed.
+    let truncate_trees = block_max_scanned(wdb.conn.0, &wdb.params)?
+        .is_some_and(|meta| meta.block_height() > target_height);
+
+    if truncate_trees {
+        // Try the simple case first: if a checkpoint exists at or below the target height,
+        // truncate_to_height will succeed directly.
+        match select_truncation_height(wdb.conn.0, target_height) {
+            Ok(h) => {
+                if h == target_height {
+                    // There is a checkpoint for the requested height, we can just truncate to
+                    // it and return.
+                    return truncate_to_height_internal(
+                        wdb.conn.0,
+                        &wdb.params,
+                        #[cfg(feature = "transparent-inputs")]
+                        &wdb.gap_limits,
+                        h,
+                    )
+                    .map(|_| ());
+                } else {
+                    // The returned height corresponds to a checkpoint that is below the
+                    // requested height. Inserting a checkpoint at a height *greater* than this
+                    // returned height may cause an older checkpoint to be deleted, but that's
+                    // fine, so we just fall through here.
+                }
             }
-        }
-        Err(SqliteClientError::RequestedRewindInvalid {
-            safe_rewind_height, ..
-        }) => {
-            if let Some(min_checkpoint_height) = safe_rewind_height {
-                // The safe rewind height is at a position greater than the requested height, so we
-                // truncate wallet data and tree state to the earliest shared checkpoint. This removes
-                // blocks and transaction data above that height. Given that we always add
-                // checkpoints in pairs, if there are at least two checkpoints in any table then
-                // the minimum between them will result in checkpoints having been removed, and so
-                // there will be space for the checkpoint that is about to be inserted.
-                truncate_to_height_internal(
-                    wdb.conn.0,
-                    &wdb.params,
-                    #[cfg(feature = "transparent-inputs")]
-                    &wdb.gap_limits,
-                    min_checkpoint_height,
-                )?;
-            } else {
-                // There are no checkpoints in either table; just continue.
+            Err(SqliteClientError::RequestedRewindInvalid {
+                safe_rewind_height, ..
+            }) => {
+                if let Some(min_checkpoint_height) = safe_rewind_height {
+                    // The safe rewind height is at a position greater than the requested
+                    // height, so we truncate wallet data and tree state to the earliest shared
+                    // checkpoint. This removes blocks and transaction data above that height.
+                    // Given that we always add checkpoints in pairs, if there are at least two
+                    // checkpoints in any table then the minimum between them will result in
+                    // checkpoints having been removed, and so there will be space for the
+                    // checkpoint that is about to be inserted.
+                    truncate_to_height_internal(
+                        wdb.conn.0,
+                        &wdb.params,
+                        #[cfg(feature = "transparent-inputs")]
+                        &wdb.gap_limits,
+                        min_checkpoint_height,
+                    )?;
+                } else {
+                    // There are no checkpoints in either table; just continue.
+                }
             }
-        }
-        Err(e) => {
-            return Err(e);
-        }
-    };
+            Err(e) => {
+                return Err(e);
+            }
+        };
 
-    // Insert the frontier from the chain state, creating a checkpoint at the target height.
-    wdb.with_sapling_tree_mut(|tree| {
-        tree.insert_frontier(
-            chain_state.final_sapling_tree().clone(),
-            Retention::Checkpoint {
-                id: target_height,
-                marking: Marking::None,
-            },
-        )?;
-        Ok::<_, SqliteClientError>(())
-    })?;
+        // Insert the frontier from the chain state, creating a checkpoint at the target
+        // height.
+        wdb.with_sapling_tree_mut(|tree| {
+            tree.insert_frontier(
+                chain_state.final_sapling_tree().clone(),
+                Retention::Checkpoint {
+                    id: target_height,
+                    marking: Marking::None,
+                },
+            )?;
+            Ok::<_, SqliteClientError>(())
+        })?;
 
-    #[cfg(feature = "orchard")]
-    wdb.with_orchard_tree_mut(|tree| {
-        tree.insert_frontier(
-            chain_state.final_orchard_tree().clone(),
-            Retention::Checkpoint {
-                id: target_height,
-                marking: Marking::None,
-            },
-        )?;
-        Ok::<_, SqliteClientError>(())
-    })?;
+        #[cfg(feature = "orchard")]
+        wdb.with_orchard_tree_mut(|tree| {
+            tree.insert_frontier(
+                chain_state.final_orchard_tree().clone(),
+                Retention::Checkpoint {
+                    id: target_height,
+                    marking: Marking::None,
+                },
+            )?;
+            Ok::<_, SqliteClientError>(())
+        })?;
+    }
 
-    // Now truncate wallet data to the target height. We use truncate_to_height_internal
-    // directly (bypassing select_truncation_height) because the frontier insertion created
-    // tree checkpoints at target_height but did not add a blocks table entry, and
-    // select_truncation_height requires the height to be present in the blocks table.
+    // Truncate wallet data to the target height. This always trims the scan queue so that
+    // ranges above target_height are removed. When truncate_trees is true, it also truncates
+    // blocks and note commitment trees (using the checkpoint created by the frontier insertion
+    // above). We use truncate_to_height_internal directly (bypassing select_truncation_height)
+    // because the frontier insertion created tree checkpoints at target_height but did not add
+    // a blocks table entry, and select_truncation_height requires the height to be present in
+    // the blocks table.
     let truncated_height = truncate_to_height_internal(
         wdb.conn.0,
         &wdb.params,

From 5921afca7994cccfad3a541a3171b2778ec08f35 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Mon, 30 Mar 2026 13:22:58 -0600
Subject: [PATCH 253/263] Address comments from code review.

---
 zcash_client_sqlite/src/wallet.rs | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/zcash_client_sqlite/src/wallet.rs b/zcash_client_sqlite/src/wallet.rs
index 68f9bfb2d7..e3f0a27cbd 100644
--- a/zcash_client_sqlite/src/wallet.rs
+++ b/zcash_client_sqlite/src/wallet.rs
@@ -542,10 +542,7 @@ pub(crate) fn add_account<P: consensus::Parameters>(
     // If a birthday frontiers are available and the birthday height is less than or equal to the
     // max-scanned height, insert them into the note commitment trees. Otherwise, we don't need to
     // do anything.
-    if block_max_scanned(conn, params)?
-        .iter()
-        .any(|m| m.block_height() > birthday.height())
-    {
+    if block_max_scanned(conn, params)?.is_some_and(|m| m.block_height() > birthday.height()) {
         if let Some(frontier) = birthday.sapling_frontier().value() {
             debug!("Inserting Sapling frontier into ShardTree: {:?}", frontier);
             let shard_store =
@@ -2834,8 +2831,7 @@ fn parse_block_metadata<P: consensus::Parameters>(
         #[cfg(feature = "orchard")]
         if _params
             .activation_height(NetworkUpgrade::Nu5)
-            .iter()
-            .any(|nu5_activation| &block_height >= nu5_activation)
+            .is_some_and(|nu5_activation| block_height >= nu5_activation)
         {
             _orchard_tree_size_opt
         } else {
@@ -3477,8 +3473,8 @@ pub(crate) fn truncate_to_height_internal<P: consensus::Parameters>(
 /// This function enables precise truncation even when the target height's checkpoint has been
 /// pruned from the note commitment tree. It works in two cases:
 ///
-/// - If a checkpoint exists at or below the target height, it delegates to
-///   [`truncate_to_height`] directly.
+/// - If a checkpoint exists at the target height, this behaves identically to
+///   [`truncate_to_height`].
 /// - If the target height is below the oldest available checkpoint, it first truncates to the
 ///   oldest checkpoint to ensure that the a checkpoint added at the provided frontier position does
 ///   not get immediately pruned, then inserts the provided frontier as a new checkpoint at the
@@ -3492,8 +3488,8 @@ pub(crate) fn truncate_to_chain_state<P: consensus::Parameters, CL, R>(
     // Only truncate trees when the maximum scanned height is greater than the target height. When
     // the target height is at or above the max scanned height, we skip frontier insertion (it is
     // unnecessary at the max scanned height, and could introduce a subtree root discontinuity
-    // above it,and the frontier will be added naturally during scanning). We will however still
-    // need to truncate the scan queue so that ranges above the target are removed.
+    // above it; the frontier will be added naturally during scanning). We will however still need
+    // to truncate the scan queue so that ranges above the target are removed.
     let truncate_trees = block_max_scanned(wdb.conn.0, &wdb.params)?
         .is_some_and(|meta| meta.block_height() > target_height);
 

From 37488570331f635f775111afe4e6237d9d6933ef Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Sat, 28 Mar 2026 16:00:45 -0600
Subject: [PATCH 254/263] zcash_client_backend: Add
 data_api::Account::birthday_height

---
 zcash_client_backend/CHANGELOG.md            |  1 +
 zcash_client_backend/src/data_api.rs         | 23 +++++++++++++++-----
 zcash_client_backend/src/data_api/testing.rs |  6 ++++-
 zcash_client_memory/src/types/account.rs     | 12 ++++++----
 zcash_client_sqlite/src/wallet.rs            |  6 ++++-
 5 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index 3890166d4a..add82033ad 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -78,6 +78,7 @@ workspace.
       input selection avoids pools incompatible with the requested transaction
       version.
     - `input_selection::InputSelector::propose_transaction` trait method.
+  - Trait `Account` has added method `birthday_height`
 - `zcash_client_backend::fees`:
   - The associated type `ChangeStrategy::MetaSource` is now bounded on the newly
     added `MetaSource` type instead of `zcash_client_backend::data_api::InputSource`.
diff --git a/zcash_client_backend/src/data_api.rs b/zcash_client_backend/src/data_api.rs
index 3c959916af..2f11c07893 100644
--- a/zcash_client_backend/src/data_api.rs
+++ b/zcash_client_backend/src/data_api.rs
@@ -552,6 +552,9 @@ pub trait Account {
     /// Returns the human-readable name for the account, if any has been configured.
     fn name(&self) -> Option<&str>;
 
+    /// Returns the birthday height for the account.
+    fn birthday_height(&self) -> BlockHeight;
+
     /// Returns whether this account is derived or imported, and the derivation parameters
     /// if applicable.
     fn source(&self) -> &AccountSource;
@@ -581,13 +584,21 @@ pub trait Account {
 }
 
 #[cfg(any(test, feature = "test-dependencies"))]
-impl<A: Copy> Account for (A, UnifiedFullViewingKey) {
+impl<A: Copy> Account for (A, UnifiedFullViewingKey, BlockHeight) {
     type AccountId = A;
 
     fn id(&self) -> A {
         self.0
     }
 
+    fn name(&self) -> Option<&str> {
+        None
+    }
+
+    fn birthday_height(&self) -> BlockHeight {
+        self.2
+    }
+
     fn source(&self) -> &AccountSource {
         &AccountSource::Imported {
             purpose: AccountPurpose::ViewOnly,
@@ -602,14 +613,10 @@ impl<A: Copy> Account for (A, UnifiedFullViewingKey) {
     fn uivk(&self) -> UnifiedIncomingViewingKey {
         self.1.to_unified_incoming_viewing_key()
     }
-
-    fn name(&self) -> Option<&str> {
-        None
-    }
 }
 
 #[cfg(any(test, feature = "test-dependencies"))]
-impl<A: Copy> Account for (A, UnifiedIncomingViewingKey) {
+impl<A: Copy> Account for (A, UnifiedIncomingViewingKey, BlockHeight) {
     type AccountId = A;
 
     fn id(&self) -> A {
@@ -620,6 +627,10 @@ impl<A: Copy> Account for (A, UnifiedIncomingViewingKey) {
         None
     }
 
+    fn birthday_height(&self) -> BlockHeight {
+        self.2
+    }
+
     fn source(&self) -> &AccountSource {
         &AccountSource::Imported {
             purpose: AccountPurpose::ViewOnly,
diff --git a/zcash_client_backend/src/data_api/testing.rs b/zcash_client_backend/src/data_api/testing.rs
index 5c643c1ee6..b5b2a48901 100644
--- a/zcash_client_backend/src/data_api/testing.rs
+++ b/zcash_client_backend/src/data_api/testing.rs
@@ -403,6 +403,10 @@ impl<A: Account> Account for TestAccount<A> {
         self.account.name()
     }
 
+    fn birthday_height(&self) -> BlockHeight {
+        self.account.birthday_height()
+    }
+
     fn source(&self) -> &AccountSource {
         self.account.source()
     }
@@ -2635,7 +2639,7 @@ impl InputSource for MockWalletDb {
 impl WalletRead for MockWalletDb {
     type Error = ();
     type AccountId = u32;
-    type Account = (Self::AccountId, UnifiedFullViewingKey);
+    type Account = (Self::AccountId, UnifiedFullViewingKey, BlockHeight);
 
     fn get_account_ids(&self) -> Result<Vec<Self::AccountId>, Self::Error> {
         Ok(Vec::new())
diff --git a/zcash_client_memory/src/types/account.rs b/zcash_client_memory/src/types/account.rs
index e19712304d..e60a904b62 100644
--- a/zcash_client_memory/src/types/account.rs
+++ b/zcash_client_memory/src/types/account.rs
@@ -523,6 +523,14 @@ impl zcash_client_backend::data_api::Account for Account {
         self.account_id
     }
 
+    fn name(&self) -> Option<&str> {
+        None
+    }
+
+    fn birthday_height(&self) -> zcash_protocol::consensus::BlockHeight {
+        self.birthday().height()
+    }
+
     fn source(&self) -> &AccountSource {
         &self.kind
     }
@@ -534,10 +542,6 @@ impl zcash_client_backend::data_api::Account for Account {
     fn uivk(&self) -> UnifiedIncomingViewingKey {
         self.viewing_key.to_unified_incoming_viewing_key()
     }
-
-    fn name(&self) -> Option<&str> {
-        todo!()
-    }
 }
 
 mod serialization {
diff --git a/zcash_client_sqlite/src/wallet.rs b/zcash_client_sqlite/src/wallet.rs
index e3f0a27cbd..42490ef47f 100644
--- a/zcash_client_sqlite/src/wallet.rs
+++ b/zcash_client_sqlite/src/wallet.rs
@@ -288,6 +288,10 @@ impl zcash_client_backend::data_api::Account for Account {
         self.name.as_deref()
     }
 
+    fn birthday_height(&self) -> BlockHeight {
+        self.birthday()
+    }
+
     fn source(&self) -> &AccountSource {
         &self.kind
     }
@@ -539,7 +543,7 @@ pub(crate) fn add_account<P: consensus::Parameters>(
         birthday: birthday.height(),
     };
 
-    // If a birthday frontiers are available and the birthday height is less than or equal to the
+    // If birthday frontiers are available and the birthday height is less than or equal to the
     // max-scanned height, insert them into the note commitment trees. Otherwise, we don't need to
     // do anything.
     if block_max_scanned(conn, params)?.is_some_and(|m| m.block_height() > birthday.height()) {

From 5595e19b1f9cdffbd3b263deba5a113c6f47fc88 Mon Sep 17 00:00:00 2001
From: Schell Carl Scivally <efsubenovex@gmail.com>
Date: Tue, 31 Mar 2026 09:21:37 +1300
Subject: [PATCH 255/263] eip681: crates.io release v0.1.0

---
 Cargo.lock                     | 2 +-
 components/eip681/CHANGELOG.md | 6 ++++--
 components/eip681/Cargo.toml   | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2b3947a538..f9d9a5fbba 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1472,7 +1472,7 @@ dependencies = [
 
 [[package]]
 name = "eip681"
-version = "0.0.0"
+version = "0.1.0"
 dependencies = [
  "base64",
  "ens-normalize-rs",
diff --git a/components/eip681/CHANGELOG.md b/components/eip681/CHANGELOG.md
index efda2fa12d..bd5da272ba 100644
--- a/components/eip681/CHANGELOG.md
+++ b/components/eip681/CHANGELOG.md
@@ -9,6 +9,8 @@ indicated by the `PLANNED` status in order to make it possible to correctly
 represent the transitive `semver` implications of changes within the enclosing
 workspace.
 
-## Unreleased
+## [Unreleased]
 
-- Initial commit.
+## [0.1.0] - Tue 31 March 2026
+
+- Initial release!
diff --git a/components/eip681/Cargo.toml b/components/eip681/Cargo.toml
index a6a1aa8b76..762b11d6e6 100644
--- a/components/eip681/Cargo.toml
+++ b/components/eip681/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "eip681"
 description = "Parsing functions and data types for Ethereum EIP 681 Payment Request URIs"
-version = "0.0.0"
+version = "0.1.0"
 authors = [
-    "Schell Scivally <schell@electriccoin.co>"
+    "Schell Scivally <schell@zodl.com>"
 ]
 homepage = "https://github.com/zcash/librustzcash"
 edition.workspace = true

From 11f1d592f8a3bde58c1d34500796f63939b04874 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Mon, 30 Mar 2026 23:32:13 +0000
Subject: [PATCH 256/263] zcash_client_sqlite: Enable `WalletWrite` calls in
 `WalletDb::transactionally`

This enables amortizing the database transaction overhead, which gives a
significant performance boost to repeated operations. For example, in
Zallet this reduces the time to make 200 `WalletWrite::store_decrypted_tx`
calls from 28s to 11s on my development machine.
---
 zcash_client_sqlite/CHANGELOG.md |   3 +
 zcash_client_sqlite/src/lib.rs   | 554 +++++++++++++++++++------------
 2 files changed, 353 insertions(+), 204 deletions(-)

diff --git a/zcash_client_sqlite/CHANGELOG.md b/zcash_client_sqlite/CHANGELOG.md
index 07b7731dd1..eb7bd31182 100644
--- a/zcash_client_sqlite/CHANGELOG.md
+++ b/zcash_client_sqlite/CHANGELOG.md
@@ -27,6 +27,9 @@ workspace.
 - `zcash_client_sqlite::AccountRef` is now public.
 - Implement standalone P2SH address import support
   - `impl zcash_client_backend::data_api::WalletWrite::import_standalone_transparent_script()`
+- `impl<'conn, P, CL, R> WalletWrite for WalletDb<SqlTransaction<'conn>, P, CL, R>` to
+  enable calling `WalletWrite` methods inside `WalletDb::transactionally` (amortizing the
+  database transaction overhead).
 
 ### Changed
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`.
diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs
index 798c359bd1..e777a6bd7d 100644
--- a/zcash_client_sqlite/src/lib.rs
+++ b/zcash_client_sqlite/src/lib.rs
@@ -362,6 +362,16 @@ impl<C: Borrow<rusqlite::Connection>, P, CL, R> WalletDb<C, P, CL, R> {
 }
 
 impl<C: BorrowMut<rusqlite::Connection>, P, CL, R> WalletDb<C, P, CL, R> {
+    /// Performs several wallet database operations atomically.
+    ///
+    /// This has two main uses:
+    /// - Ensuring that several [`WalletRead`] and/or [`WalletWrite`] operations either
+    ///   all succeed, or nothing happens. If an error occurs inside the given function,
+    ///   any operations completed by it are rolled back.
+    /// - Amortizing the cost of database transactionality. If several identical
+    ///   operations are planned in sequence (e.g. [`WalletWrite::store_decrypted_tx`]),
+    ///   this function can be used to avoid the overhead of a separate database
+    ///   transaction per insert.
     pub fn transactionally<F, A, E: From<rusqlite::Error>>(&mut self, f: F) -> Result<A, E>
     where
         F: FnOnce(&mut WalletDb<SqlTransaction<'_>, &P, &CL, &mut R>) -> Result<A, E>,
@@ -1183,53 +1193,219 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
         birthday: &AccountBirthday,
         key_source: Option<&str>,
     ) -> Result<(Self::AccountId, UnifiedSpendingKey), Self::Error> {
-        self.borrow_mut().transactionally(|wdb| {
-            let seed_fingerprint =
-                SeedFingerprint::from_seed(seed.expose_secret()).ok_or_else(|| {
-                    SqliteClientError::BadAccountData(
-                        "Seed must be between 32 and 252 bytes in length.".to_owned(),
-                    )
-                })?;
-            let zip32_account_index =
-                wallet::max_zip32_account_index(wdb.conn.0, &seed_fingerprint)?
-                    .map(|a| {
-                        a.next()
-                            .ok_or(SqliteClientError::Zip32AccountIndexOutOfRange)
-                    })
-                    .transpose()?
-                    .unwrap_or(zip32::AccountId::ZERO);
-
-            let usk = UnifiedSpendingKey::from_seed(
-                &wdb.params,
-                seed.expose_secret(),
-                zip32_account_index,
-            )
-            .map_err(|_| SqliteClientError::KeyDerivationError(zip32_account_index))?;
-            let ufvk = usk.to_unified_full_viewing_key();
+        self.borrow_mut()
+            .transactionally(|wdb| wdb.create_account(account_name, seed, birthday, key_source))
+    }
 
-            let account = wallet::add_account(
-                wdb.conn.0,
-                &wdb.params,
-                account_name,
-                &AccountSource::Derived {
-                    derivation: Zip32Derivation::new(
-                        seed_fingerprint,
-                        zip32_account_index,
-                        #[cfg(feature = "zcashd-compat")]
-                        None,
-                    ),
-                    key_source: key_source.map(|s| s.to_owned()),
-                },
-                wallet::ViewingKey::Full(Box::new(ufvk)),
-                birthday,
-                #[cfg(feature = "transparent-inputs")]
-                &wdb.gap_limits,
-            )?;
+    fn import_account_hd(
+        &mut self,
+        account_name: &str,
+        seed: &SecretVec<u8>,
+        account_index: zip32::AccountId,
+        birthday: &AccountBirthday,
+        key_source: Option<&str>,
+    ) -> Result<(Self::Account, UnifiedSpendingKey), Self::Error> {
+        self.transactionally(|wdb| {
+            wdb.import_account_hd(account_name, seed, account_index, birthday, key_source)
+        })
+    }
 
-            Ok((account.id(), usk))
+    fn import_account_ufvk(
+        &mut self,
+        account_name: &str,
+        ufvk: &UnifiedFullViewingKey,
+        birthday: &AccountBirthday,
+        purpose: AccountPurpose,
+        key_source: Option<&str>,
+    ) -> Result<Self::Account, Self::Error> {
+        self.transactionally(|wdb| {
+            wdb.import_account_ufvk(account_name, ufvk, birthday, purpose, key_source)
         })
     }
 
+    fn delete_account(&mut self, account_uuid: Self::AccountId) -> Result<(), Self::Error> {
+        self.transactionally(|wdb| wdb.delete_account(account_uuid))
+    }
+
+    #[cfg(feature = "transparent-key-import")]
+    fn import_standalone_transparent_pubkey(
+        &mut self,
+        account: Self::AccountId,
+        pubkey: secp256k1::PublicKey,
+    ) -> Result<(), Self::Error> {
+        self.transactionally(|wdb| wdb.import_standalone_transparent_pubkey(account, pubkey))
+    }
+
+    #[cfg(feature = "transparent-key-import")]
+    fn import_standalone_transparent_script(
+        &mut self,
+        account: Self::AccountId,
+        script: zcash_script::script::Redeem,
+    ) -> Result<(), Self::Error> {
+        self.transactionally(|wdb| wdb.import_standalone_transparent_script(account, script))
+    }
+
+    fn get_next_available_address(
+        &mut self,
+        account_uuid: Self::AccountId,
+        request: UnifiedAddressRequest,
+    ) -> Result<Option<(UnifiedAddress, DiversifierIndex)>, Self::Error> {
+        self.transactionally(|wdb| wdb.get_next_available_address(account_uuid, request))
+    }
+
+    fn get_address_for_index(
+        &mut self,
+        account: Self::AccountId,
+        diversifier_index: DiversifierIndex,
+        request: UnifiedAddressRequest,
+    ) -> Result<Option<UnifiedAddress>, Self::Error> {
+        self.transactionally(|wdb| wdb.get_address_for_index(account, diversifier_index, request))
+    }
+
+    fn update_chain_tip(&mut self, tip_height: BlockHeight) -> Result<(), Self::Error> {
+        self.transactionally(|wdb| wdb.update_chain_tip(tip_height))
+    }
+
+    #[tracing::instrument(skip_all, fields(height = blocks.first().map(|b| u32::from(b.height())), count = blocks.len()))]
+    #[allow(clippy::type_complexity)]
+    fn put_blocks(
+        &mut self,
+        from_state: &ChainState,
+        blocks: Vec<ScannedBlock<Self::AccountId>>,
+    ) -> Result<(), Self::Error> {
+        self.transactionally(|wdb| wdb.put_blocks(from_state, blocks))
+    }
+
+    fn put_received_transparent_utxo(
+        &mut self,
+        _output: &WalletTransparentOutput,
+    ) -> Result<Self::UtxoRef, Self::Error> {
+        #[cfg(feature = "transparent-inputs")]
+        return self.transactionally(|wdb| wdb.put_received_transparent_utxo(_output));
+
+        #[cfg(not(feature = "transparent-inputs"))]
+        panic!(
+            "The wallet must be compiled with the transparent-inputs feature to use this method."
+        );
+    }
+
+    fn store_decrypted_tx(
+        &mut self,
+        d_tx: DecryptedTransaction<Transaction, Self::AccountId>,
+    ) -> Result<(), Self::Error> {
+        self.transactionally(|wdb| wdb.store_decrypted_tx(d_tx))
+    }
+
+    fn set_tx_trust(&mut self, txid: TxId, trusted: bool) -> Result<(), Self::Error> {
+        self.transactionally(|wdb| wdb.set_tx_trust(txid, trusted))
+    }
+
+    fn store_transactions_to_be_sent(
+        &mut self,
+        transactions: &[SentTransaction<Self::AccountId>],
+    ) -> Result<(), Self::Error> {
+        self.transactionally(|wdb| wdb.store_transactions_to_be_sent(transactions))
+    }
+
+    fn truncate_to_height(&mut self, max_height: BlockHeight) -> Result<BlockHeight, Self::Error> {
+        self.transactionally(|wdb| wdb.truncate_to_height(max_height))
+    }
+
+    fn truncate_to_chain_state(&mut self, chain_state: ChainState) -> Result<(), Self::Error> {
+        self.transactionally(|wdb| wdb.truncate_to_chain_state(chain_state))
+    }
+
+    #[cfg(feature = "transparent-inputs")]
+    fn reserve_next_n_ephemeral_addresses(
+        &mut self,
+        account_id: Self::AccountId,
+        n: usize,
+    ) -> Result<Vec<(TransparentAddress, TransparentAddressMetadata)>, Self::Error> {
+        self.transactionally(|wdb| wdb.reserve_next_n_ephemeral_addresses(account_id, n))
+    }
+
+    fn set_transaction_status(
+        &mut self,
+        txid: TxId,
+        status: data_api::TransactionStatus,
+    ) -> Result<(), Self::Error> {
+        self.transactionally(|wdb| WalletWrite::set_transaction_status(wdb, txid, status))
+    }
+
+    #[cfg(feature = "transparent-inputs")]
+    fn schedule_next_check(
+        &mut self,
+        address: &TransparentAddress,
+        offset_seconds: u32,
+    ) -> Result<Option<SystemTime>, Self::Error> {
+        self.transactionally(|wdb| wdb.schedule_next_check(address, offset_seconds))
+    }
+
+    #[cfg(feature = "transparent-inputs")]
+    fn notify_address_checked(
+        &mut self,
+        request: TransactionsInvolvingAddress,
+        as_of_height: BlockHeight,
+    ) -> Result<(), Self::Error> {
+        self.transactionally(|wdb| wdb.notify_address_checked(request, as_of_height))
+    }
+}
+
+/// This impl block is only usable when you already have an [`SqlTransaction`], meaning
+/// you are inside a [`WalletDb::transactionally`] block with a lock on the database.
+impl<P: consensus::Parameters, CL: Clock, R: RngCore> WalletWrite
+    for WalletDb<SqlTransaction<'_>, P, CL, R>
+{
+    type UtxoRef = UtxoId;
+
+    fn create_account(
+        &mut self,
+        account_name: &str,
+        seed: &SecretVec<u8>,
+        birthday: &AccountBirthday,
+        key_source: Option<&str>,
+    ) -> Result<(Self::AccountId, UnifiedSpendingKey), Self::Error> {
+        let seed_fingerprint =
+            SeedFingerprint::from_seed(seed.expose_secret()).ok_or_else(|| {
+                SqliteClientError::BadAccountData(
+                    "Seed must be between 32 and 252 bytes in length.".to_owned(),
+                )
+            })?;
+        let zip32_account_index = wallet::max_zip32_account_index(self.conn.0, &seed_fingerprint)?
+            .map(|a| {
+                a.next()
+                    .ok_or(SqliteClientError::Zip32AccountIndexOutOfRange)
+            })
+            .transpose()?
+            .unwrap_or(zip32::AccountId::ZERO);
+
+        let usk =
+            UnifiedSpendingKey::from_seed(&self.params, seed.expose_secret(), zip32_account_index)
+                .map_err(|_| SqliteClientError::KeyDerivationError(zip32_account_index))?;
+        let ufvk = usk.to_unified_full_viewing_key();
+
+        let account = wallet::add_account(
+            self.conn.0,
+            &self.params,
+            account_name,
+            &AccountSource::Derived {
+                derivation: Zip32Derivation::new(
+                    seed_fingerprint,
+                    zip32_account_index,
+                    #[cfg(feature = "zcashd-compat")]
+                    None,
+                ),
+                key_source: key_source.map(|s| s.to_owned()),
+            },
+            wallet::ViewingKey::Full(Box::new(ufvk)),
+            birthday,
+            #[cfg(feature = "transparent-inputs")]
+            &self.gap_limits,
+        )?;
+
+        Ok((account.id(), usk))
+    }
+
     fn import_account_hd(
         &mut self,
         account_name: &str,
@@ -1238,40 +1414,37 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
         birthday: &AccountBirthday,
         key_source: Option<&str>,
     ) -> Result<(Self::Account, UnifiedSpendingKey), Self::Error> {
-        self.transactionally(|wdb| {
-            let seed_fingerprint =
-                SeedFingerprint::from_seed(seed.expose_secret()).ok_or_else(|| {
-                    SqliteClientError::BadAccountData(
-                        "Seed must be between 32 and 252 bytes in length.".to_owned(),
-                    )
-                })?;
+        let seed_fingerprint =
+            SeedFingerprint::from_seed(seed.expose_secret()).ok_or_else(|| {
+                SqliteClientError::BadAccountData(
+                    "Seed must be between 32 and 252 bytes in length.".to_owned(),
+                )
+            })?;
 
-            let usk =
-                UnifiedSpendingKey::from_seed(&wdb.params, seed.expose_secret(), account_index)
-                    .map_err(|_| SqliteClientError::KeyDerivationError(account_index))?;
-            let ufvk = usk.to_unified_full_viewing_key();
+        let usk = UnifiedSpendingKey::from_seed(&self.params, seed.expose_secret(), account_index)
+            .map_err(|_| SqliteClientError::KeyDerivationError(account_index))?;
+        let ufvk = usk.to_unified_full_viewing_key();
 
-            let account = wallet::add_account(
-                wdb.conn.0,
-                &wdb.params,
-                account_name,
-                &AccountSource::Derived {
-                    derivation: Zip32Derivation::new(
-                        seed_fingerprint,
-                        account_index,
-                        #[cfg(feature = "zcashd-compat")]
-                        None,
-                    ),
-                    key_source: key_source.map(|s| s.to_owned()),
-                },
-                wallet::ViewingKey::Full(Box::new(ufvk)),
-                birthday,
-                #[cfg(feature = "transparent-inputs")]
-                &wdb.gap_limits,
-            )?;
+        let account = wallet::add_account(
+            self.conn.0,
+            &self.params,
+            account_name,
+            &AccountSource::Derived {
+                derivation: Zip32Derivation::new(
+                    seed_fingerprint,
+                    account_index,
+                    #[cfg(feature = "zcashd-compat")]
+                    None,
+                ),
+                key_source: key_source.map(|s| s.to_owned()),
+            },
+            wallet::ViewingKey::Full(Box::new(ufvk)),
+            birthday,
+            #[cfg(feature = "transparent-inputs")]
+            &self.gap_limits,
+        )?;
 
-            Ok((account, usk))
-        })
+        Ok((account, usk))
     }
 
     fn import_account_ufvk(
@@ -1282,25 +1455,23 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
         purpose: AccountPurpose,
         key_source: Option<&str>,
     ) -> Result<Self::Account, Self::Error> {
-        self.transactionally(|wdb| {
-            wallet::add_account(
-                wdb.conn.0,
-                &wdb.params,
-                account_name,
-                &AccountSource::Imported {
-                    purpose,
-                    key_source: key_source.map(|s| s.to_owned()),
-                },
-                wallet::ViewingKey::Full(Box::new(ufvk.to_owned())),
-                birthday,
-                #[cfg(feature = "transparent-inputs")]
-                &wdb.gap_limits,
-            )
-        })
+        wallet::add_account(
+            self.conn.0,
+            &self.params,
+            account_name,
+            &AccountSource::Imported {
+                purpose,
+                key_source: key_source.map(|s| s.to_owned()),
+            },
+            wallet::ViewingKey::Full(Box::new(ufvk.to_owned())),
+            birthday,
+            #[cfg(feature = "transparent-inputs")]
+            &self.gap_limits,
+        )
     }
 
     fn delete_account(&mut self, account_uuid: Self::AccountId) -> Result<(), Self::Error> {
-        self.transactionally(|wdb| wallet::delete_account(wdb.conn.0, account_uuid))
+        wallet::delete_account(self.conn.0, account_uuid)
     }
 
     #[cfg(feature = "transparent-key-import")]
@@ -1309,9 +1480,7 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
         account: Self::AccountId,
         pubkey: secp256k1::PublicKey,
     ) -> Result<(), Self::Error> {
-        self.transactionally(|wdb| {
-            wallet::import_standalone_transparent_pubkey(wdb.conn.0, wdb.params, account, pubkey)
-        })
+        wallet::import_standalone_transparent_pubkey(self.conn.0, &self.params, account, pubkey)
     }
 
     #[cfg(feature = "transparent-key-import")]
@@ -1320,9 +1489,7 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
         account: Self::AccountId,
         script: zcash_script::script::Redeem,
     ) -> Result<(), Self::Error> {
-        self.transactionally(|wdb| {
-            wallet::import_standalone_transparent_script(wdb.conn.0, wdb.params, account, script)
-        })
+        wallet::import_standalone_transparent_script(self.conn.0, &self.params, account, script)
     }
 
     fn get_next_available_address(
@@ -1330,17 +1497,15 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
         account_uuid: Self::AccountId,
         request: UnifiedAddressRequest,
     ) -> Result<Option<(UnifiedAddress, DiversifierIndex)>, Self::Error> {
-        self.transactionally(|wdb| {
-            wallet::get_next_available_address(
-                wdb.conn.0,
-                &wdb.params,
-                &wdb.clock,
-                account_uuid,
-                request,
-                #[cfg(feature = "transparent-inputs")]
-                &wdb.gap_limits,
-            )
-        })
+        wallet::get_next_available_address(
+            self.conn.0,
+            &self.params,
+            &self.clock,
+            account_uuid,
+            request,
+            #[cfg(feature = "transparent-inputs")]
+            &self.gap_limits,
+        )
     }
 
     fn get_address_for_index(
@@ -1378,29 +1543,24 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
     }
 
     fn update_chain_tip(&mut self, tip_height: BlockHeight) -> Result<(), Self::Error> {
-        self.transactionally(|wdb| {
-            wallet::scanning::update_chain_tip(wdb.conn.0, &wdb.params, tip_height)?;
-            Ok(())
-        })
+        wallet::scanning::update_chain_tip(self.conn.0, &self.params, tip_height)?;
+        Ok(())
     }
 
-    #[tracing::instrument(skip_all, fields(height = blocks.first().map(|b| u32::from(b.height())), count = blocks.len()))]
     #[allow(clippy::type_complexity)]
     fn put_blocks(
         &mut self,
         from_state: &ChainState,
         blocks: Vec<ScannedBlock<Self::AccountId>>,
     ) -> Result<(), Self::Error> {
-        self.transactionally(|wdb| {
-            ll::wallet::put_blocks::<_, SqliteClientError, commitment_tree::Error>(
-                wdb,
-                #[cfg(feature = "transparent-inputs")]
-                wdb.gap_limits,
-                from_state,
-                blocks,
-            )
-            .map_err(SqliteClientError::from)
-        })
+        ll::wallet::put_blocks::<_, SqliteClientError, commitment_tree::Error>(
+            self,
+            #[cfg(feature = "transparent-inputs")]
+            self.gap_limits,
+            from_state,
+            blocks,
+        )
+        .map_err(SqliteClientError::from)
     }
 
     fn put_received_transparent_utxo(
@@ -1408,21 +1568,21 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
         _output: &WalletTransparentOutput,
     ) -> Result<Self::UtxoRef, Self::Error> {
         #[cfg(feature = "transparent-inputs")]
-        return self.transactionally(|wdb| {
+        return {
             let (account_id, _, key_scope, utxo_id) =
                 wallet::transparent::put_received_transparent_utxo(
-                    wdb.conn.0,
-                    &wdb.params,
-                    &wdb.gap_limits,
+                    self.conn.0,
+                    &self.params,
+                    &self.gap_limits,
                     _output,
                 )?;
 
             if let Some(t_key_scope) = <Option<TransparentKeyScope>>::from(key_scope) {
                 use ReceiverRequirement::*;
                 wallet::transparent::generate_gap_addresses(
-                    wdb.conn.0,
-                    &wdb.params,
-                    &wdb.gap_limits,
+                    self.conn.0,
+                    &self.params,
+                    &self.gap_limits,
                     account_id,
                     t_key_scope,
                     UnifiedAddressRequest::unsafe_custom(Allow, Allow, Require),
@@ -1431,7 +1591,7 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
             }
 
             Ok(utxo_id)
-        });
+        };
 
         #[cfg(not(feature = "transparent-inputs"))]
         panic!(
@@ -1443,56 +1603,50 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
         &mut self,
         d_tx: DecryptedTransaction<Transaction, Self::AccountId>,
     ) -> Result<(), Self::Error> {
-        self.transactionally(|wdb| {
-            let chain_tip = wallet::chain_tip_height(wdb.conn.borrow())?
-                .ok_or(SqliteClientError::ChainHeightUnknown)?;
-            store_decrypted_tx(
-                wdb,
-                wdb.params,
-                #[cfg(feature = "transparent-inputs")]
-                wdb.gap_limits,
-                chain_tip,
-                d_tx,
-            )
-        })
+        let chain_tip = wallet::chain_tip_height(self.conn.borrow())?
+            .ok_or(SqliteClientError::ChainHeightUnknown)?;
+        store_decrypted_tx(
+            self,
+            &self.params.clone(),
+            #[cfg(feature = "transparent-inputs")]
+            self.gap_limits,
+            chain_tip,
+            d_tx,
+        )
     }
 
     fn set_tx_trust(&mut self, txid: TxId, trusted: bool) -> Result<(), Self::Error> {
-        self.transactionally(|wdb| wallet::set_tx_trust(wdb.conn.0, txid, trusted))
+        wallet::set_tx_trust(self.conn.0, txid, trusted)
     }
 
     fn store_transactions_to_be_sent(
         &mut self,
         transactions: &[SentTransaction<Self::AccountId>],
     ) -> Result<(), Self::Error> {
-        self.transactionally(|wdb| {
-            for sent_tx in transactions {
-                wallet::store_transaction_to_be_sent(
-                    wdb.conn.0,
-                    &wdb.params,
-                    #[cfg(feature = "transparent-inputs")]
-                    &wdb.gap_limits,
-                    sent_tx,
-                )?;
-            }
-            Ok(())
-        })
+        for sent_tx in transactions {
+            wallet::store_transaction_to_be_sent(
+                self.conn.0,
+                &self.params,
+                #[cfg(feature = "transparent-inputs")]
+                &self.gap_limits,
+                sent_tx,
+            )?;
+        }
+        Ok(())
     }
 
     fn truncate_to_height(&mut self, max_height: BlockHeight) -> Result<BlockHeight, Self::Error> {
-        self.transactionally(|wdb| {
-            wallet::truncate_to_height(
-                wdb.conn.0,
-                &wdb.params,
-                #[cfg(feature = "transparent-inputs")]
-                &wdb.gap_limits,
-                max_height,
-            )
-        })
+        wallet::truncate_to_height(
+            self.conn.0,
+            &self.params,
+            #[cfg(feature = "transparent-inputs")]
+            &self.gap_limits,
+            max_height,
+        )
     }
 
     fn truncate_to_chain_state(&mut self, chain_state: ChainState) -> Result<(), Self::Error> {
-        self.transactionally(|wdb| wallet::truncate_to_chain_state(wdb, chain_state))
+        wallet::truncate_to_chain_state(self, chain_state)
     }
 
     #[cfg(feature = "transparent-inputs")]
@@ -1501,19 +1655,17 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
         account_id: Self::AccountId,
         n: usize,
     ) -> Result<Vec<(TransparentAddress, TransparentAddressMetadata)>, Self::Error> {
-        self.transactionally(|wdb| {
-            let account_id = wallet::get_account_ref(wdb.conn.0, account_id)?;
-            let reserved = wallet::transparent::reserve_next_n_addresses(
-                wdb.conn.0,
-                &wdb.params,
-                account_id,
-                TransparentKeyScope::EPHEMERAL,
-                wdb.gap_limits.ephemeral(),
-                n,
-            )?;
+        let account_id = wallet::get_account_ref(self.conn.0, account_id)?;
+        let reserved = wallet::transparent::reserve_next_n_addresses(
+            self.conn.0,
+            &self.params,
+            account_id,
+            TransparentKeyScope::EPHEMERAL,
+            self.gap_limits.ephemeral(),
+            n,
+        )?;
 
-            Ok(reserved.into_iter().map(|(_, a, m)| (a, m)).collect())
-        })
+        Ok(reserved.into_iter().map(|(_, a, m)| (a, m)).collect())
     }
 
     fn set_transaction_status(
@@ -1521,16 +1673,14 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
         txid: TxId,
         status: data_api::TransactionStatus,
     ) -> Result<(), Self::Error> {
-        self.transactionally(|wdb| {
-            wallet::set_transaction_status(
-                wdb.conn.0,
-                &wdb.params,
-                #[cfg(feature = "transparent-inputs")]
-                &wdb.gap_limits,
-                txid,
-                status,
-            )
-        })
+        wallet::set_transaction_status(
+            self.conn.0,
+            &self.params,
+            #[cfg(feature = "transparent-inputs")]
+            &self.gap_limits,
+            txid,
+            status,
+        )
     }
 
     #[cfg(feature = "transparent-inputs")]
@@ -1539,16 +1689,14 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
         address: &TransparentAddress,
         offset_seconds: u32,
     ) -> Result<Option<SystemTime>, Self::Error> {
-        self.transactionally(|wdb| {
-            wallet::transparent::schedule_next_check(
-                wdb.conn.0,
-                &wdb.params,
-                wdb.clock,
-                &mut wdb.rng,
-                address,
-                offset_seconds,
-            )
-        })
+        wallet::transparent::schedule_next_check(
+            self.conn.0,
+            &self.params,
+            &self.clock,
+            &mut self.rng,
+            address,
+            offset_seconds,
+        )
     }
 
     #[cfg(feature = "transparent-inputs")]
@@ -1567,14 +1715,12 @@ impl<C: BorrowMut<rusqlite::Connection>, P: consensus::Parameters, CL: Clock, R:
             }
         }
 
-        self.transactionally(|wdb| {
-            wallet::transparent::update_observed_unspent_heights(
-                wdb.conn.0,
-                &wdb.params,
-                request.address(),
-                as_of_height,
-            )
-        })
+        wallet::transparent::update_observed_unspent_heights(
+            self.conn.0,
+            &self.params,
+            request.address(),
+            as_of_height,
+        )
     }
 }
 

From e43603381f9ab4fd62d4576dbacecd5da8493674 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Tue, 31 Mar 2026 00:00:15 +0000
Subject: [PATCH 257/263] zcash_client_sqlite: Make `SqlTransaction` internals
 private

Apparently we weren't relying on accessing them outside this module, and
this is better for ensuring it is used correctly.
---
 zcash_client_sqlite/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs
index e777a6bd7d..5f7315b102 100644
--- a/zcash_client_sqlite/src/lib.rs
+++ b/zcash_client_sqlite/src/lib.rs
@@ -274,7 +274,7 @@ pub struct WalletDb<C, P, CL, R> {
 }
 
 /// A wrapper for a SQLite transaction affecting the wallet database.
-pub struct SqlTransaction<'conn>(pub(crate) &'conn rusqlite::Transaction<'conn>);
+pub struct SqlTransaction<'conn>(&'conn rusqlite::Transaction<'conn>);
 
 impl Borrow<rusqlite::Connection> for SqlTransaction<'_> {
     fn borrow(&self) -> &rusqlite::Connection {

From 7125237c86f0c2ba2a259bef4a7ea9f53d4d7c14 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Tue, 24 Mar 2026 19:53:04 -0600
Subject: [PATCH 258/263] feat(zcash_client_sqlite): enable
 #![deny(missing_docs)]

Add documentation for all public items that were missing doc comments
and enable the missing_docs lint to prevent undocumented APIs from
being merged in future.

Closes zcash/librustzcash#491

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 zcash_client_sqlite/src/chain.rs                      |  6 ++++++
 zcash_client_sqlite/src/chain/migrations.rs           |  2 ++
 zcash_client_sqlite/src/chain/migrations/blockmeta.rs |  5 +++++
 zcash_client_sqlite/src/error.rs                      |  6 ++++++
 zcash_client_sqlite/src/lib.rs                        |  9 +++++++++
 zcash_client_sqlite/src/util.rs                       |  1 +
 zcash_client_sqlite/src/wallet.rs                     |  1 +
 zcash_client_sqlite/src/wallet/commitment_tree.rs     | 10 ++++++++++
 zcash_client_sqlite/src/wallet/init.rs                |  1 +
 9 files changed, 41 insertions(+)

diff --git a/zcash_client_sqlite/src/chain.rs b/zcash_client_sqlite/src/chain.rs
index 20af5f26b8..c6e00cd53a 100644
--- a/zcash_client_sqlite/src/chain.rs
+++ b/zcash_client_sqlite/src/chain.rs
@@ -97,15 +97,21 @@ where
 #[cfg(feature = "unstable")]
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct BlockMeta {
+    /// The height of the block.
     pub height: BlockHeight,
+    /// The hash of the block.
     pub block_hash: BlockHash,
+    /// The block timestamp as a Unix epoch time.
     pub block_time: u32,
+    /// The number of Sapling outputs in the block.
     pub sapling_outputs_count: u32,
+    /// The number of Orchard actions in the block.
     pub orchard_actions_count: u32,
 }
 
 #[cfg(feature = "unstable")]
 impl BlockMeta {
+    /// Returns the path to this block's file within the given blocks directory.
     pub fn block_file_path<P: AsRef<Path>>(&self, blocks_dir: &P) -> PathBuf {
         blocks_dir.as_ref().join(Path::new(&format!(
             "{}-{}-compactblock",
diff --git a/zcash_client_sqlite/src/chain/migrations.rs b/zcash_client_sqlite/src/chain/migrations.rs
index 0bc8f92a33..7b4f3ce410 100644
--- a/zcash_client_sqlite/src/chain/migrations.rs
+++ b/zcash_client_sqlite/src/chain/migrations.rs
@@ -1 +1,3 @@
+//! Database migrations for the chain cache database.
+
 pub mod blockmeta;
diff --git a/zcash_client_sqlite/src/chain/migrations/blockmeta.rs b/zcash_client_sqlite/src/chain/migrations/blockmeta.rs
index 6ab2387c6f..260e714653 100644
--- a/zcash_client_sqlite/src/chain/migrations/blockmeta.rs
+++ b/zcash_client_sqlite/src/chain/migrations/blockmeta.rs
@@ -1,15 +1,20 @@
+//! Migrations for the `compactblocks_meta` table used by [`FsBlockDb`](crate::FsBlockDb).
+
 use schemerz_rusqlite::RusqliteMigration;
 
+/// Returns all migrations required for the block metadata database.
 pub fn all_migrations() -> Vec<Box<dyn RusqliteMigration<Error = rusqlite::Error>>> {
     vec![Box::new(init::Migration {})]
 }
 
+/// The initial migration that creates the `compactblocks_meta` table.
 pub mod init {
     use rusqlite::{self};
     use schemerz::{self, migration};
     use schemerz_rusqlite::RusqliteMigration;
     use uuid::Uuid;
 
+    /// The migration that creates the `compactblocks_meta` table.
     pub struct Migration;
 
     /// The migration that added the `compactblocks_meta` table.
diff --git a/zcash_client_sqlite/src/error.rs b/zcash_client_sqlite/src/error.rs
index e5f03f86bc..6eb61b0df2 100644
--- a/zcash_client_sqlite/src/error.rs
+++ b/zcash_client_sqlite/src/error.rs
@@ -78,7 +78,10 @@ pub enum SqliteClientError {
     /// this error is (safe rewind height, requested height). If no safe rewind height can be
     /// determined, the safe rewind height member will be `None`.
     RequestedRewindInvalid {
+        /// The height to which it is possible to safely rewind, or `None` if no safe
+        /// rewind height could be determined.
         safe_rewind_height: Option<BlockHeight>,
+        /// The block height that was requested for the rewind.
         requested_height: BlockHeight,
     },
 
@@ -164,10 +167,13 @@ pub enum SqliteClientError {
     /// [`TransactionsInvolvingAddress`]: zcash_client_backend::data_api::TransactionsInvolvingAddress
     #[cfg(feature = "transparent-inputs")]
     NotificationMismatch {
+        /// The expected ending block height.
         expected: BlockHeight,
+        /// The actual ending block height returned.
         actual: BlockHeight,
     },
 
+    /// One or more gap addresses were detected in the transparent address sequence.
     #[cfg(feature = "transparent-inputs")]
     GapAddresses,
 
diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs
index 5f7315b102..afb4d5396c 100644
--- a/zcash_client_sqlite/src/lib.rs
+++ b/zcash_client_sqlite/src/lib.rs
@@ -31,6 +31,7 @@
 #![cfg_attr(docsrs, doc(auto_cfg))]
 // Catch documentation errors caused by code changes.
 #![deny(rustdoc::broken_intra_doc_links)]
+#![deny(missing_docs)]
 
 use incrementalmerkletree::Position;
 use nonempty::NonEmpty;
@@ -2458,13 +2459,21 @@ pub struct FsBlockDb {
 #[derive(Debug)]
 #[cfg(feature = "unstable")]
 pub enum FsBlockDbError {
+    /// Filesystem I/O error.
     Fs(io::Error),
+    /// SQLite database error.
     Db(rusqlite::Error),
+    /// Protobuf decoding error.
     Protobuf(prost::DecodeError),
+    /// The expected block file was not found at the given path.
     MissingBlockPath(PathBuf),
+    /// The block store root directory is invalid.
     InvalidBlockstoreRoot(PathBuf),
+    /// A block file path within the store is invalid.
     InvalidBlockPath(PathBuf),
+    /// Data in the block store is corrupted.
     CorruptedData(String),
+    /// The requested block was not found in the cache.
     CacheMiss(BlockHeight),
 }
 
diff --git a/zcash_client_sqlite/src/util.rs b/zcash_client_sqlite/src/util.rs
index 260e2eb266..407eafbfbe 100644
--- a/zcash_client_sqlite/src/util.rs
+++ b/zcash_client_sqlite/src/util.rs
@@ -30,6 +30,7 @@ impl<C: Clock> Clock for &C {
     }
 }
 
+/// Test utilities for clock simulation.
 #[cfg(any(test, feature = "test-dependencies"))]
 pub mod testing {
     use std::sync::{Arc, RwLock};
diff --git a/zcash_client_sqlite/src/wallet.rs b/zcash_client_sqlite/src/wallet.rs
index 42490ef47f..e26a6f458f 100644
--- a/zcash_client_sqlite/src/wallet.rs
+++ b/zcash_client_sqlite/src/wallet.rs
@@ -4530,6 +4530,7 @@ pub(crate) fn get_received_outputs(
     Ok(results)
 }
 
+/// Test utilities for wallet database assertions.
 #[cfg(any(test, feature = "test-dependencies"))]
 pub mod testing {
     use incrementalmerkletree::Position;
diff --git a/zcash_client_sqlite/src/wallet/commitment_tree.rs b/zcash_client_sqlite/src/wallet/commitment_tree.rs
index 6f4104c964..69e77343f7 100644
--- a/zcash_client_sqlite/src/wallet/commitment_tree.rs
+++ b/zcash_client_sqlite/src/wallet/commitment_tree.rs
@@ -1,3 +1,6 @@
+//! SQLite-backed implementation of [`ShardStore`](shardtree::store::ShardStore)
+//! for note commitment trees.
+
 use rusqlite::{self, OptionalExtension, named_params};
 use std::{
     collections::BTreeSet,
@@ -41,15 +44,21 @@ pub enum Error {
     /// already exists, but the tree state being checkpointed or the marks removed at that
     /// checkpoint conflict with the existing tree state.
     CheckpointConflict {
+        /// The block height of the conflicting checkpoint.
         checkpoint_id: BlockHeight,
+        /// The checkpoint data that was attempted to be inserted.
         checkpoint: Checkpoint,
+        /// The tree state already stored at that checkpoint height.
         extant_tree_state: TreeState,
+        /// The marks-removed set already stored at that checkpoint height, if any.
         extant_marks_removed: Option<BTreeSet<Position>>,
     },
     /// Raised when attempting to add shard roots to the database that
     /// are discontinuous with the existing roots in the database.
     SubtreeDiscontinuity {
+        /// The index range of the subtree roots that were attempted to be inserted.
         attempted_insertion_range: Range<u64>,
+        /// The index range of subtree roots already present in the database.
         existing_range: Range<u64>,
     },
 }
@@ -94,6 +103,7 @@ impl error::Error for Error {
     }
 }
 
+/// An implementation of [`ShardStore`] backed by an SQLite database.
 pub struct SqliteShardStore<C, H, const SHARD_HEIGHT: u8> {
     pub(crate) conn: C,
     table_prefix: &'static str,
diff --git a/zcash_client_sqlite/src/wallet/init.rs b/zcash_client_sqlite/src/wallet/init.rs
index 7ea7f3c096..c8fae448ba 100644
--- a/zcash_client_sqlite/src/wallet/init.rs
+++ b/zcash_client_sqlite/src/wallet/init.rs
@@ -28,6 +28,7 @@ const MIN_SQLITE_MINOR_VERSION: u32 = 35;
 
 const MIGRATIONS_TABLE: &str = "schemer_migrations";
 
+/// Errors that can occur when applying migrations to the wallet database.
 #[derive(Debug)]
 pub enum WalletMigrationError {
     /// A feature required by the wallet database is not supported by the version of

From dec07ac4d371ada807a93bdbf79aa185c0e16151 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Mon, 30 Mar 2026 20:01:58 -0600
Subject: [PATCH 259/263] Trivial zip321 docstring fix.

---
 components/zip321/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/zip321/src/lib.rs b/components/zip321/src/lib.rs
index 570804fcad..6beed30954 100644
--- a/components/zip321/src/lib.rs
+++ b/components/zip321/src/lib.rs
@@ -187,7 +187,7 @@ impl Payment {
     /// - `amount`: The amount of the payment that is being requested, if any. If no amount is
     ///   provided, this indicates that the sender of should specify the amount.
     /// - `memo`: A memo that, if included, must be provided with the payment. If a memo is present
-    ///   and [`recipient_address`] is not a shielded address, the wallet should report an error.
+    ///   and `recipient_address` is not a shielded address, the wallet should report an error.
     /// - `label` A human-readable label for this payment (usually identifying information
     ///   associated with the recipient address) within the larger structure of the transaction
     ///   request.

From 84f5a221b1abc47eb0770ad7609748ab212821c2 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Mon, 30 Mar 2026 20:08:23 -0600
Subject: [PATCH 260/263] Remove unused `SqliteClientError::GapAddresses`
 variant.

---
 zcash_client_sqlite/CHANGELOG.md       |  1 -
 zcash_client_sqlite/src/error.rs       | 11 -----------
 zcash_client_sqlite/src/wallet/init.rs |  4 ----
 3 files changed, 16 deletions(-)

diff --git a/zcash_client_sqlite/CHANGELOG.md b/zcash_client_sqlite/CHANGELOG.md
index eb7bd31182..9599cf07f4 100644
--- a/zcash_client_sqlite/CHANGELOG.md
+++ b/zcash_client_sqlite/CHANGELOG.md
@@ -33,7 +33,6 @@ workspace.
 
 ### Changed
 - Migrated to `orchard 0.12`, `sapling-crypto 0.6`.
-- `zcash_client_sqlite::error::SqliteClientError` has added variant `GapAddresses`.
 - Renamed `zcash_client_sqlite::error::PubkeyImportConflict` to
   `zcash_client_sqlite::error::StandaloneImportConflict`
 - P2SH UTXOs returned by `get_spendable_transparent_outputs` now include a
diff --git a/zcash_client_sqlite/src/error.rs b/zcash_client_sqlite/src/error.rs
index 6eb61b0df2..0d877acb43 100644
--- a/zcash_client_sqlite/src/error.rs
+++ b/zcash_client_sqlite/src/error.rs
@@ -173,10 +173,6 @@ pub enum SqliteClientError {
         actual: BlockHeight,
     },
 
-    /// One or more gap addresses were detected in the transparent address sequence.
-    #[cfg(feature = "transparent-inputs")]
-    GapAddresses,
-
     /// An attempt to import a standalone transparent address failed because it had already been
     /// imported to a different account.
     #[cfg(feature = "transparent-key-import")]
@@ -309,13 +305,6 @@ impl fmt::Display for SqliteClientError {
                     u128::from(*i)
                 )
             }
-            #[cfg(feature = "transparent-inputs")]
-            SqliteClientError::GapAddresses => {
-                write!(
-                    f,
-                    "An error occured while generating a transparent gap addresses"
-                )
-            }
             SqliteClientError::AddressReuse(address_str, txids) => {
                 write!(
                     f,
diff --git a/zcash_client_sqlite/src/wallet/init.rs b/zcash_client_sqlite/src/wallet/init.rs
index c8fae448ba..b2473b8a23 100644
--- a/zcash_client_sqlite/src/wallet/init.rs
+++ b/zcash_client_sqlite/src/wallet/init.rs
@@ -213,10 +213,6 @@ fn sqlite_client_error_to_wallet_migration_error(e: SqliteClientError) -> Wallet
         SqliteClientError::AccountUnknown => {
             unreachable!("all accounts are known in migration context")
         }
-        #[cfg(feature = "transparent-inputs")]
-        SqliteClientError::GapAddresses => {
-            unreachable!("we don't deal with gap addresses in migrations")
-        }
         SqliteClientError::UnknownZip32Derivation => {
             unreachable!("we don't call methods that require operating on imported accounts")
         }

From 6fbea22bb798e3bd0bca393f483512c3aefaf643 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Mon, 30 Mar 2026 20:13:00 -0600
Subject: [PATCH 261/263] zcash_client_sqlite: Remove inadvertently-public
 blockmeta migration from the public API.

---
 zcash_client_sqlite/CHANGELOG.md                      | 2 ++
 zcash_client_sqlite/src/chain/migrations/blockmeta.rs | 8 +++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/zcash_client_sqlite/CHANGELOG.md b/zcash_client_sqlite/CHANGELOG.md
index 9599cf07f4..b442618e85 100644
--- a/zcash_client_sqlite/CHANGELOG.md
+++ b/zcash_client_sqlite/CHANGELOG.md
@@ -41,6 +41,8 @@ workspace.
 ### Removed
 - `zcash_client_sqlite::GapLimits` use `zcash_keys::keys::transparent::GapLimits` instead.
 - `zcash_client_sqlite::UtxoId` contents are now private.
+- The inadvertently-exposed `zcash_client_sqlite::chain::migrations::blockmeta::init` 
+  module has been removed from the public API.
 
 ### Fixed
 - `get_transparent_balances` no longer fails for standalone transparent addresses
diff --git a/zcash_client_sqlite/src/chain/migrations/blockmeta.rs b/zcash_client_sqlite/src/chain/migrations/blockmeta.rs
index 260e714653..e3c44c111b 100644
--- a/zcash_client_sqlite/src/chain/migrations/blockmeta.rs
+++ b/zcash_client_sqlite/src/chain/migrations/blockmeta.rs
@@ -7,20 +7,18 @@ pub fn all_migrations() -> Vec<Box<dyn RusqliteMigration<Error = rusqlite::Error
     vec![Box::new(init::Migration {})]
 }
 
-/// The initial migration that creates the `compactblocks_meta` table.
-pub mod init {
+mod init {
     use rusqlite::{self};
     use schemerz::{self, migration};
     use schemerz_rusqlite::RusqliteMigration;
     use uuid::Uuid;
 
-    /// The migration that creates the `compactblocks_meta` table.
-    pub struct Migration;
+    pub(super) struct Migration;
 
     /// The migration that added the `compactblocks_meta` table.
     ///
     /// 68525b40-36e5-46aa-a765-720f8389b99d
-    pub const MIGRATION_ID: Uuid = Uuid::from_fields(
+    pub(super) const MIGRATION_ID: Uuid = Uuid::from_fields(
         0x68525b40,
         0x36e5,
         0x46aa,

From 32548443adafd5591333d933ff1bde1a75839aab Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Tue, 31 Mar 2026 16:27:58 +0000
Subject: [PATCH 262/263] zcash_primitives: Add `Block` struct

Kinda surprised we didn't add this sooner tbh.
---
 zcash_primitives/CHANGELOG.md           |   3 +
 zcash_primitives/src/block.rs           | 214 +++++++++++++++++++++++-
 zcash_primitives/src/transaction/mod.rs |  16 ++
 3 files changed, 225 insertions(+), 8 deletions(-)

diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md
index 2207af7f43..28ac3ffa36 100644
--- a/zcash_primitives/CHANGELOG.md
+++ b/zcash_primitives/CHANGELOG.md
@@ -11,6 +11,9 @@ workspace.
 ## [0.27.0] - PENDING
 
 ### Added
+- `zcash_primitives::block`:
+  - `Block`
+  - `impl Debug for {BlockHeader, BlockHeaderData}`
 - `zcash_primitives::transaction::builder`:
   - `impl<FE> From<coinbase::Error> for Error<FE>`
   - `Builder::add_transparent_p2pkh_input`
diff --git a/zcash_primitives/src/block.rs b/zcash_primitives/src/block.rs
index 9748941f00..86c368793f 100644
--- a/zcash_primitives/src/block.rs
+++ b/zcash_primitives/src/block.rs
@@ -5,12 +5,20 @@ use alloc::vec::Vec;
 use core::fmt;
 use core::ops::Deref;
 use core2::io::{self, Read, Write};
+use transparent::bundle::OutPoint;
+use zcash_script::{Opcode, opcode::PossiblyBad};
 
-use crate::encoding::{ReadBytesExt, WriteBytesExt};
 use memuse::DynamicUsage;
+use nonempty::NonEmpty;
 use sha2::{Digest, Sha256};
 
-use zcash_encoding::Vector;
+use zcash_encoding::{Array, CompactSize, Vector};
+use zcash_protocol::consensus::{self, BlockHeight};
+
+use crate::{
+    encoding::{ReadBytesExt, WriteBytesExt},
+    transaction::{Transaction, TxVersion},
+};
 
 pub use equihash;
 
@@ -64,6 +72,7 @@ impl BlockHash {
 }
 
 /// A Zcash block header.
+#[derive(Debug)]
 pub struct BlockHeader {
     hash: BlockHash,
     data: BlockHeaderData,
@@ -78,6 +87,7 @@ impl Deref for BlockHeader {
 }
 
 /// The information contained in a Zcash block header.
+#[derive(Debug)]
 pub struct BlockHeaderData {
     pub version: i32,
     pub prev_block: BlockHash,
@@ -161,12 +171,173 @@ impl BlockHeader {
     }
 }
 
+/// A Zcash block.
+#[derive(Debug)]
+pub struct Block {
+    header: BlockHeader,
+    vtx: NonEmpty<Transaction>,
+    claimed_height: BlockHeight,
+}
+
+impl Block {
+    /// Parses a block from bytes.
+    ///
+    /// Limitation: currently this method returns an error if given a genesis block.
+    pub fn read<R: Read, P: consensus::Parameters>(mut reader: R, params: &P) -> io::Result<Self> {
+        let header = BlockHeader::read(&mut reader)?;
+
+        // Instead of using `Vector::read`, we manually read the length, so we can then
+        // individually read the coinbase transaction before the rest.
+        let n_tx: usize = CompactSize::read_t(&mut reader)?;
+        if n_tx == 0 {
+            return Err(io::Error::new(
+                io::ErrorKind::Other,
+                "block has no coinbase tx",
+            ));
+        }
+
+        // Parse with an arbitrary consensus branch ID initially; we will fix it later.
+        let coinbase = Transaction::read(&mut reader, consensus::BranchId::Sprout)?;
+
+        // Extract the claimed block height from the coinbase transaction.
+        let claimed_height = {
+            let coinbase_transparent = coinbase
+                .transparent_bundle()
+                .filter(|b| b.is_coinbase())
+                .ok_or_else(|| {
+                    io::Error::new(io::ErrorKind::Other, "first tx of block is not coinbase")
+                })?;
+
+            // Verify some simple structural consensus rules on the coinbase transaction.
+            if coinbase.sprout_bundle().is_some() {
+                return Err(io::Error::new(
+                    io::ErrorKind::Other,
+                    "coinbase tx has sprout data",
+                ));
+            }
+
+            let coinbase_txin = coinbase_transparent.vin.first().expect("checked above");
+
+            match coinbase_txin.script_sig().0.parse().next() {
+                Some(Ok(PossiblyBad::Good(Opcode::PushValue(height)))) => height
+                    .to_num()
+                    .map_err(|_| {
+                        io::Error::new(
+                            io::ErrorKind::Other,
+                            "coinbase input specifies an invalid block height",
+                        )
+                    })
+                    .and_then(|h| {
+                        BlockHeight::try_from(h).map_err(|_| {
+                            io::Error::new(
+                                io::ErrorKind::Other,
+                                "coinbase input specifies an invalid block height",
+                            )
+                        })
+                    }),
+                // TODO: Permit missing height in genesis blocks by matching their block
+                // hash against the provided params.
+                _ => Err(io::Error::new(
+                    io::ErrorKind::Other,
+                    "coinbase scriptSig missing height",
+                )),
+            }?
+        };
+
+        // Fix the coinbase tx's consensus branch ID if necessary.
+        let consensus_branch_id = consensus::BranchId::for_height(params, claimed_height);
+        let coinbase = match coinbase.version() {
+            TxVersion::Sprout(_) | TxVersion::V3 | TxVersion::V4 => coinbase
+                .into_data()
+                .fix_consensus_branch_id(consensus_branch_id)
+                .freeze()
+                .expect("valid"),
+            // All later tx versions directly commit to the consensus branch ID.
+            _ => {
+                if coinbase.consensus_branch_id() != consensus_branch_id {
+                    return Err(io::Error::new(
+                        io::ErrorKind::Other,
+                        "coinbase tx's claimed height doesn't match its consensus branch ID for given network parameters",
+                    ));
+                }
+                coinbase
+            }
+        };
+
+        // Now parse the rest of the transactions with the expected consensus branch ID.
+        let mut non_coinbase = Array::read(&mut reader, n_tx - 1, |r| {
+            Transaction::read(r, consensus_branch_id)
+        })?;
+
+        // Verify some simple structural consensus rules on the non-coinbase transactions.
+        if non_coinbase
+            .iter()
+            .flat_map(|tx| tx.transparent_bundle())
+            .flat_map(|b| &b.vin)
+            .any(|txin| txin.prevout() == &OutPoint::NULL)
+        {
+            return Err(io::Error::new(
+                io::ErrorKind::Other,
+                "non-coinbase tx has null transparent input",
+            ));
+        }
+
+        let mut vtx = NonEmpty::singleton(coinbase);
+        vtx.append(&mut non_coinbase);
+
+        Ok(Self {
+            header,
+            vtx,
+            claimed_height,
+        })
+    }
+
+    /// Writes the block to the given writer.
+    pub fn write<W: Write>(&self, mut writer: W) -> io::Result<()> {
+        self.header.write(&mut writer)?;
+        Vector::write_nonempty(&mut writer, &self.vtx, |w, tx| tx.write(w))?;
+        Ok(())
+    }
+
+    /// Breaks this block into its component parts for further processing.
+    pub fn into_parts(self) -> (BlockHeader, NonEmpty<Transaction>) {
+        (self.header, self.vtx)
+    }
+
+    /// Returns the block's header.
+    pub fn header(&self) -> &BlockHeader {
+        &self.header
+    }
+
+    /// Returns the block's transactions, in consensus order (the order they are encoded
+    /// in the block and applied to chain state).
+    ///
+    /// The first transaction is always the coinbase transaction.
+    pub fn vtx(&self) -> &NonEmpty<Transaction> {
+        &self.vtx
+    }
+
+    /// Returns the claimed height of this block.
+    ///
+    /// This is a "claimed height" for two reasons:
+    /// - It is the value recorded in the `scriptSig` of the coinbase transaction's null
+    ///   transparent input, and thus can only be trusted if the block has been fully
+    ///   validated in the context of a chain.
+    /// - Blocks not in the main chain **do not have heights** (because heights are by
+    ///   definition measured with respect to the longest chain). This value can only be
+    ///   used as a "height" if the block is verified to be currently in the main chain.
+    pub fn claimed_height(&self) -> BlockHeight {
+        self.claimed_height
+    }
+}
+
 #[cfg(test)]
 mod tests {
-    use super::BlockHeader;
+    use super::{Block, BlockHeader};
     use alloc::vec::Vec;
+    use zcash_protocol::consensus::MAIN_NETWORK;
 
-    const HEADER_MAINNET_415000: [u8; 1487] = [
+    const BLOCK_MAINNET_415000: [u8; 1640] = [
         0x04, 0x00, 0x00, 0x00, 0x52, 0x74, 0xb4, 0x3b, 0x9e, 0x4a, 0xd8, 0xf4, 0x3e, 0x93, 0xf7,
         0x84, 0x63, 0xd2, 0x4d, 0xcf, 0xe5, 0x31, 0xae, 0xb4, 0x71, 0x98, 0x19, 0xf4, 0xf9, 0x7f,
         0x7e, 0x03, 0x00, 0x00, 0x00, 0x00, 0x66, 0x30, 0x73, 0xbc, 0x4b, 0xfa, 0x95, 0xc9, 0xbe,
@@ -266,18 +437,45 @@ mod tests {
         0x4a, 0x12, 0x5e, 0xbc, 0x25, 0x0e, 0x08, 0xfe, 0xdb, 0xfa, 0xa6, 0x6f, 0x45, 0x3d, 0x90,
         0x93, 0x2c, 0xab, 0x3f, 0xf4, 0x52, 0x21, 0x90, 0x99, 0x68, 0xe5, 0x1e, 0x6b, 0xc2, 0x54,
         0xd5, 0x09, 0xad, 0xeb, 0x75, 0xcb, 0xa7, 0x6d, 0x48, 0xfe, 0x02, 0x4e, 0x3e, 0x66, 0xd8,
-        0xdf, 0x5e,
+        0xdf, 0x5e, 0x01, 0x03, 0x00, 0x00, 0x80, 0x70, 0x82, 0xc4, 0x03, 0x01, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
+        0xff, 0xff, 0xff, 0x1a, 0x03, 0x18, 0x55, 0x06, 0x15, 0x2f, 0x56, 0x69, 0x61, 0x42, 0x54,
+        0x43, 0x2f, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x21, 0x2f,
+        0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0xca, 0x9a, 0x3b, 0x00, 0x00, 0x00, 0x00, 0x19, 0x76,
+        0xa9, 0x14, 0xfb, 0x8a, 0x6a, 0x4c, 0x11, 0xcb, 0x21, 0x6c, 0xe2, 0x1f, 0x9f, 0x37, 0x1d,
+        0xfc, 0x92, 0x71, 0xa4, 0x69, 0xbd, 0x6d, 0x88, 0xac, 0x80, 0xb2, 0xe6, 0x0e, 0x00, 0x00,
+        0x00, 0x00, 0x17, 0xa9, 0x14, 0xe0, 0xa5, 0xea, 0x13, 0x40, 0xcc, 0x6b, 0x1d, 0x6a, 0x82,
+        0xc0, 0x6c, 0x0a, 0x9c, 0x60, 0xb9, 0x89, 0x8b, 0x6a, 0xe9, 0x87, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00,
     ];
 
     #[test]
     fn header_read_write() {
-        let header = BlockHeader::read(&HEADER_MAINNET_415000[..]).unwrap();
+        let header_mainnet_415000 = &BLOCK_MAINNET_415000[..1487];
+
+        let header = BlockHeader::read(header_mainnet_415000).unwrap();
         assert_eq!(
             format!("{}", header.hash()),
             "0000000001ab37793ce771262b2ffa082519aa3fe891250a1adb43baaf856168"
         );
-        let mut encoded = Vec::with_capacity(HEADER_MAINNET_415000.len());
+        let mut encoded = Vec::with_capacity(header_mainnet_415000.len());
         header.write(&mut encoded).unwrap();
-        assert_eq!(&HEADER_MAINNET_415000[..], &encoded[..]);
+        assert_eq!(header_mainnet_415000, &encoded[..]);
+    }
+
+    #[test]
+    fn block_read_write() {
+        let block = Block::read(&BLOCK_MAINNET_415000[..], &MAIN_NETWORK).unwrap();
+        assert_eq!(
+            format!("{}", block.header().hash()),
+            "0000000001ab37793ce771262b2ffa082519aa3fe891250a1adb43baaf856168"
+        );
+        assert_eq!(block.claimed_height(), 415000.into());
+        assert_eq!(block.vtx().len(), 1);
+
+        let mut encoded = Vec::with_capacity(BLOCK_MAINNET_415000.len());
+        block.write(&mut encoded).unwrap();
+        assert_eq!(&BLOCK_MAINNET_415000[..], &encoded[..]);
     }
 }
diff --git a/zcash_primitives/src/transaction/mod.rs b/zcash_primitives/src/transaction/mod.rs
index 9011b0c187..a26799440a 100644
--- a/zcash_primitives/src/transaction/mod.rs
+++ b/zcash_primitives/src/transaction/mod.rs
@@ -563,6 +563,22 @@ impl<A: Authorization> TransactionData<A> {
         )
     }
 
+    /// Changes the consensus branch ID stored in this transaction for pre-v5 transactions.
+    ///
+    /// This can be used to fix an incorrect value passed to [`Transaction::read`]. Just
+    /// like that method, this method does nothing for v5+ transactions.
+    pub(crate) fn fix_consensus_branch_id(mut self, consensus_branch_id: BranchId) -> Self {
+        match self.version() {
+            TxVersion::Sprout(_) | TxVersion::V3 | TxVersion::V4 => {
+                self.consensus_branch_id = consensus_branch_id;
+            }
+            // All later tx versions directly commit to the consensus branch ID, so what
+            // we parse is what we trust.
+            _ => (),
+        }
+        self
+    }
+
     /// Maps the bundles from one type to another.
     ///
     /// This shouldn't be necessary for most use cases; it is provided for handling the

From 2e1c7ad27b0ed5965199016cb7f1eef4d5e5c605 Mon Sep 17 00:00:00 2001
From: roman <roman@osmosis.team>
Date: Thu, 2 Apr 2026 23:45:59 -0600
Subject: [PATCH 263/263] PIR integration

---
 zcash_client_sqlite/Cargo.toml                |  3 +
 zcash_client_sqlite/src/wallet.rs             | 14 ++++
 zcash_client_sqlite/src/wallet/common.rs      | 20 +++++-
 zcash_client_sqlite/src/wallet/db.rs          |  5 ++
 zcash_client_sqlite/src/wallet/init.rs        |  1 +
 .../src/wallet/init/migrations.rs             |  6 +-
 .../wallet/init/migrations/pir_spent_notes.rs | 67 +++++++++++++++++++
 7 files changed, 112 insertions(+), 4 deletions(-)
 create mode 100644 zcash_client_sqlite/src/wallet/init/migrations/pir_spent_notes.rs

diff --git a/zcash_client_sqlite/Cargo.toml b/zcash_client_sqlite/Cargo.toml
index 52508e31f2..76a4825a6f 100644
--- a/zcash_client_sqlite/Cargo.toml
+++ b/zcash_client_sqlite/Cargo.toml
@@ -169,6 +169,9 @@ expensive-tests = []
 ## protocol-specific flags. Test-only.
 pczt-tests = ["serde", "zcash_client_backend/pczt"]
 
+## Enables PIR (Private Information Retrieval) spent note tracking.
+sync-nullifier-pir = []
+
 [lib]
 bench = false
 
diff --git a/zcash_client_sqlite/src/wallet.rs b/zcash_client_sqlite/src/wallet.rs
index e23867f21d..7798a78f74 100644
--- a/zcash_client_sqlite/src/wallet.rs
+++ b/zcash_client_sqlite/src/wallet.rs
@@ -2154,6 +2154,13 @@ pub(crate) fn get_wallet_summary<P: consensus::Parameters>(
         let untrusted_height =
             target_height.saturating_sub(u32::from(confirmations_policy.untrusted()));
 
+        #[cfg(feature = "sync-nullifier-pir")]
+        let any_spendable = if table_prefix == "orchard" {
+            true
+        } else {
+            anchor_height.map_or(Ok(false), |h| is_any_spendable(tx, h, table_prefix))?
+        };
+        #[cfg(not(feature = "sync-nullifier-pir"))]
         let any_spendable =
             anchor_height.map_or(Ok(false), |h| is_any_spendable(tx, h, table_prefix))?;
 
@@ -3320,6 +3327,13 @@ pub(crate) fn truncate_to_height<P: consensus::Parameters>(
         named_params![":height": u32::from(truncation_height)],
     )?;
 
+    // Clear all PIR spent-note entries unconditionally. After a reorg the on-chain
+    // nullifier set may have changed, so stale PIR exclusions must not persist.
+    // The table is created unconditionally (migration is not feature-gated), so this
+    // DELETE is valid in all builds — for non-PIR builds it is a harmless no-op on
+    // an always-empty table.
+    conn.execute("DELETE FROM pir_spent_notes", [])?;
+
     // If we're removing scanned blocks, we need to truncate the note commitment tree and remove
     // affected block records from the database.
     if truncation_height < last_scanned_height {
diff --git a/zcash_client_sqlite/src/wallet/common.rs b/zcash_client_sqlite/src/wallet/common.rs
index 757413a362..6108d5113a 100644
--- a/zcash_client_sqlite/src/wallet/common.rs
+++ b/zcash_client_sqlite/src/wallet/common.rs
@@ -110,7 +110,7 @@ pub(crate) fn tx_unexpired_condition(tx: &str) -> String {
 /// - The parent must provide `:target_height` as a named argument.
 /// - The parent is responsible for enclosing this condition in parentheses as appropriate.
 pub(crate) fn spent_notes_clause(table_prefix: &str) -> String {
-    format!(
+    let base = format!(
         r#"
         SELECT rns.{table_prefix}_received_note_id
         FROM {table_prefix}_received_note_spends rns
@@ -118,7 +118,16 @@ pub(crate) fn spent_notes_clause(table_prefix: &str) -> String {
         WHERE {}
         "#,
         tx_unexpired_condition("stx")
-    )
+    );
+    // PIR rows are unconditional (no tx_unexpired_condition) because they reflect
+    // confirmed on-chain nullifier state, not pending transactions. Stale PIR rows
+    // are cleared by truncate_to_height on reorg/rescan. Keep in sync with
+    // UNSPENT_ORCHARD_NOTES_SQL in zcash-swift-wallet-sdk/rust/src/spendability.rs.
+    #[cfg(feature = "sync-nullifier-pir")]
+    if table_prefix == "orchard" {
+        return format!("{base} UNION SELECT note_id FROM pir_spent_notes");
+    }
+    base
 }
 
 fn unscanned_tip_exists(
@@ -540,7 +549,12 @@ where
         note_reconstruction_cols,
         ..
     } = table_constants::<SqliteClientError>(protocol)?;
-    if unscanned_tip_exists(conn, anchor_height, table_prefix)? {
+    #[cfg(feature = "sync-nullifier-pir")]
+    let skip_unscanned_check = matches!(protocol, ShieldedProtocol::Orchard);
+    #[cfg(not(feature = "sync-nullifier-pir"))]
+    let skip_unscanned_check = false;
+
+    if !skip_unscanned_check && unscanned_tip_exists(conn, anchor_height, table_prefix)? {
         return Ok(vec![]);
     }
 
diff --git a/zcash_client_sqlite/src/wallet/db.rs b/zcash_client_sqlite/src/wallet/db.rs
index 4942bc0f4a..42906ed271 100644
--- a/zcash_client_sqlite/src/wallet/db.rs
+++ b/zcash_client_sqlite/src/wallet/db.rs
@@ -1346,6 +1346,11 @@ UNION
     JOIN addresses a ON a.id = tro.address_id
     JOIN transactions t ON t.id_tx = tro.transaction_id";
 
+pub(super) const TABLE_PIR_SPENT_NOTES: &str = "CREATE TABLE pir_spent_notes (
+    note_id INTEGER NOT NULL PRIMARY KEY
+        REFERENCES orchard_received_notes ( id ) ON DELETE CASCADE
+)";
+
 pub(super) const VIEW_ADDRESS_FIRST_USE: &str = "
     CREATE VIEW v_address_first_use AS
     SELECT
diff --git a/zcash_client_sqlite/src/wallet/init.rs b/zcash_client_sqlite/src/wallet/init.rs
index 2737bc0147..92db0e2232 100644
--- a/zcash_client_sqlite/src/wallet/init.rs
+++ b/zcash_client_sqlite/src/wallet/init.rs
@@ -792,6 +792,7 @@ mod tests {
             db::TABLE_ORCHARD_TREE_CHECKPOINT_MARKS_REMOVED,
             db::TABLE_ORCHARD_TREE_CHECKPOINTS,
             db::TABLE_ORCHARD_TREE_SHARDS,
+            db::TABLE_PIR_SPENT_NOTES,
             db::TABLE_SAPLING_RECEIVED_NOTE_SPENDS,
             db::TABLE_SAPLING_RECEIVED_NOTES,
             db::TABLE_SAPLING_TREE_CAP,
diff --git a/zcash_client_sqlite/src/wallet/init/migrations.rs b/zcash_client_sqlite/src/wallet/init/migrations.rs
index c63ee2075d..d4234dd213 100644
--- a/zcash_client_sqlite/src/wallet/init/migrations.rs
+++ b/zcash_client_sqlite/src/wallet/init/migrations.rs
@@ -26,6 +26,7 @@ mod initial_setup;
 mod nullifier_map;
 mod orchard_received_notes;
 mod orchard_shardtree;
+mod pir_spent_notes;
 mod received_notes_nullable_nf;
 mod receiving_key_scopes;
 mod sapling_memo_consistency;
@@ -130,6 +131,8 @@ pub(super) fn all_migrations<
     //                     \                       \         v_received_output_spends_account      /        /
     //                      \                       \               /                             /        /
     //                       `------------------- account_delete_cascade ---------------------------------'
+    //                                                      |
+    //                                               pir_spent_notes
     //
     let rng = Rc::new(Mutex::new(rng));
     vec![
@@ -215,6 +218,7 @@ pub(super) fn all_migrations<
         Box::new(v_received_output_spends_account::Migration),
         Box::new(add_transaction_trust_marker::Migration),
         Box::new(account_delete_cascade::Migration),
+        Box::new(pir_spent_notes::Migration),
     ]
 }
 
@@ -355,7 +359,7 @@ pub const V_0_18_5: &[Uuid] = &[
 pub const V_0_19_0: &[Uuid] = &[account_delete_cascade::MIGRATION_ID];
 
 /// Leaf migrations as of the current repository state.
-pub const CURRENT_LEAF_MIGRATIONS: &[Uuid] = &[account_delete_cascade::MIGRATION_ID];
+pub const CURRENT_LEAF_MIGRATIONS: &[Uuid] = &[pir_spent_notes::MIGRATION_ID];
 
 pub(super) fn verify_network_compatibility<P: consensus::Parameters>(
     conn: &rusqlite::Connection,
diff --git a/zcash_client_sqlite/src/wallet/init/migrations/pir_spent_notes.rs b/zcash_client_sqlite/src/wallet/init/migrations/pir_spent_notes.rs
new file mode 100644
index 0000000000..9ce6fd4bb7
--- /dev/null
+++ b/zcash_client_sqlite/src/wallet/init/migrations/pir_spent_notes.rs
@@ -0,0 +1,67 @@
+//! This migration adds the `pir_spent_notes` table for tracking notes identified as spent
+//! by PIR (Private Information Retrieval) queries against the on-chain nullifier set.
+//!
+//! The table is created unconditionally (not gated by `#[cfg(feature = "sync-nullifier-pir")]`)
+//! to keep the migration DAG identical across all builds. When the feature is off, the table
+//! exists but is empty and unused.
+
+use std::collections::HashSet;
+
+use schemerz_rusqlite::RusqliteMigration;
+use tracing::debug;
+use uuid::Uuid;
+
+use crate::wallet::init::WalletMigrationError;
+
+use super::account_delete_cascade;
+
+pub(super) const MIGRATION_ID: Uuid = Uuid::from_u128(0xa40f05b9_1c3e_4b7a_9f2d_8e6c3d5a7b12);
+
+const DEPENDENCIES: &[Uuid] = &[account_delete_cascade::MIGRATION_ID];
+
+pub(super) struct Migration;
+
+impl schemerz::Migration<Uuid> for Migration {
+    fn id(&self) -> Uuid {
+        MIGRATION_ID
+    }
+
+    fn dependencies(&self) -> HashSet<Uuid> {
+        DEPENDENCIES.iter().copied().collect()
+    }
+
+    fn description(&self) -> &'static str {
+        "Adds a table for tracking notes identified as spent by PIR nullifier checks."
+    }
+}
+
+impl RusqliteMigration for Migration {
+    type Error = WalletMigrationError;
+
+    fn up(&self, transaction: &rusqlite::Transaction) -> Result<(), Self::Error> {
+        debug!("Creating pir_spent_notes table");
+        transaction.execute_batch(
+            "CREATE TABLE pir_spent_notes (
+                note_id INTEGER NOT NULL PRIMARY KEY
+                    REFERENCES orchard_received_notes(id) ON DELETE CASCADE
+            )",
+        )?;
+
+        Ok(())
+    }
+
+    fn down(&self, transaction: &rusqlite::Transaction) -> Result<(), Self::Error> {
+        transaction.execute_batch("DROP TABLE pir_spent_notes;")?;
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::wallet::init::migrations::tests::test_migrate;
+
+    #[test]
+    fn migrate() {
+        test_migrate(&[super::MIGRATION_ID]);
+    }
+}