diff --git a/.cargo/config.offline b/.cargo/config.offline
index a6339df37f3..28c93ea74d9 100644
--- a/.cargo/config.offline
+++ b/.cargo/config.offline
@@ -1,5 +1,28 @@
+[target.aarch64-unknown-linux-gnu]
+linker = "aarch64-linux-gnu-gcc"
+
 [source.crates-io]
 replace-with = "vendored-sources"
 
+[source."https://github.com/zcash/librustzcash.git"]
+git = "https://github.com/zcash/librustzcash.git"
+rev = "67cb63a5a6b1f2c4cf5a061dbe80e9a71477e289"
+replace-with = "vendored-sources"
+
+[source."https://github.com/zcash/orchard.git"]
+git = "https://github.com/zcash/orchard.git"
+rev = "f4587f790d7317df85a9ee77ce693a06ed6d8d02"
+replace-with = "vendored-sources"
+
+[source."https://github.com/zcash/incrementalmerkletree.git"]
+git = "https://github.com/zcash/incrementalmerkletree.git"
+rev = "62c33e4480a71170b02b9eb7d4b0160194f414ee"
+replace-with = "vendored-sources"
+
+[source."https://github.com/nuttycom/hdwallet.git"]
+git = "https://github.com/nuttycom/hdwallet.git"
+rev = "576683b9f2865f1118c309017ff36e01f84420c9"
+replace-with = "vendored-sources"
+
 [source.vendored-sources]
 # The directory for this source is set to RUST_VENDORED_SOURCES by src/Makefile.am
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index 9a101d34448..44778740470 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -36,7 +36,7 @@ Please provide a general summary of the issue you're experiencing
 Tell us what should happen
 
 ### Actual behaviour + errors
-Tell us what happens instead including any noticable error output (any messages
+Tell us what happens instead including any noticeable error output (any messages
 displayed on-screen when e.g. a crash occurred)
 
 ### The version of Zcash you were using:
diff --git a/.github/workflows/lints.yml b/.github/workflows/lints.yml
index d44001af5b2..2c26b85544b 100644
--- a/.github/workflows/lints.yml
+++ b/.github/workflows/lints.yml
@@ -34,10 +34,6 @@ jobs:
         if: always()
         continue-on-error: true # Temporary until we get this passing
 
-      - name: Python UTF-8 encoding
-        run: ./test/lint/lint-python-utf8-encoding.sh
-        if: always()
-
       - name: Shebang
         run: ./test/lint/lint-shebang.sh
         if: always()
@@ -57,20 +53,36 @@ jobs:
         run: ./test/lint/lint-whitespace.sh
         if: always()
 
+  python:
+    name: Python
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: sudo python3 -m pip install pyflakes
+
+      - name: Pyflakes
+        run: pyflakes qa src zcutil
+        if: always()
+
+      - name: UTF-8 encoding
+        run: ./test/lint/lint-python-utf8-encoding.sh
+        if: always()
+
   rust-clippy:
-    name: Clippy (1.54.0)
+    name: Clippy (1.59.0)
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.54.0
+          toolchain: 1.59.0
           components: clippy
           override: true
       - name: Run clippy
         uses: actions-rs/clippy-check@v1
         with:
-          name: Clippy (1.54.0)
+          name: Clippy (1.59.0)
           token: ${{ secrets.GITHUB_TOKEN }}
           args: --all-features --all-targets -- -D warnings
 
@@ -81,7 +93,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.54.0
+          toolchain: 1.59.0
           override: true
       - run: rustup component add rustfmt
       - uses: actions-rs/cargo@v1
diff --git a/.gitignore b/.gitignore
index 601e5351923..3402293c6eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.exe
 src/bitcoin
 src/zcashd
+src/zcashd-wallet-tool
 src/zcash-cli
 src/zcash-gtest
 src/zcash-tx
diff --git a/COPYING b/COPYING
index d7c52f033f3..e6e8c782da6 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
-Copyright (c) 2016-2021 The Zcash developers
-Copyright (c) 2009-2021 The Bitcoin Core developers
-Copyright (c) 2009-2021 Bitcoin Developers
+Copyright (c) 2016-2022 The Zcash developers
+Copyright (c) 2009-2022 The Bitcoin Core developers
+Copyright (c) 2009-2022 Bitcoin Developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Cargo.lock b/Cargo.lock
index 874259926bc..2b20b6cae13 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3,55 +3,48 @@
 version = 3
 
 [[package]]
-name = "aes"
-version = "0.6.0"
+name = "addr2line"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561"
+checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
 dependencies = [
- "aes-soft",
- "aesni",
- "cipher 0.2.5",
+ "gimli",
 ]
 
 [[package]]
-name = "aes"
-version = "0.7.4"
+name = "adler"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "495ee669413bfbe9e8cace80f4d3d78e6d8c8d99579f97fb93bde351b185f2d4"
-dependencies = [
- "cfg-if 1.0.0",
- "cipher 0.3.0",
- "cpufeatures",
- "opaque-debug",
-]
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
-name = "aes-soft"
-version = "0.6.4"
+name = "aead"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072"
+checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877"
 dependencies = [
- "cipher 0.2.5",
- "opaque-debug",
+ "generic-array",
 ]
 
 [[package]]
-name = "aesni"
-version = "0.10.0"
+name = "aes"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce"
+checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
 dependencies = [
- "cipher 0.2.5",
+ "cfg-if 1.0.0",
+ "cipher",
+ "cpufeatures",
  "opaque-debug",
 ]
 
 [[package]]
 name = "ahash"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98"
+checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
 dependencies = [
- "getrandom 0.2.3",
+ "getrandom 0.2.5",
  "once_cell",
  "version_check",
 ]
@@ -74,6 +67,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "anyhow"
+version = "1.0.55"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "159bb86af3a200e19a068f4224eae4c8bb2d0fa054c7e5d1cacd5cef95e684cd"
+
 [[package]]
 name = "arrayref"
 version = "0.3.6"
@@ -88,24 +87,39 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4dc07131ffa69b8072d35f5007352af944213cde02545e2103680baed38fcd"
+checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
 
 [[package]]
 name = "atomic-shim"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d20fdac7156779a1a30d970e838195558b4810dd06aa69e7c7461bdc518edf9b"
+checksum = "67cd4b51d303cf3501c301e8125df442128d3c6d7c69f71b27833d253de47e77"
 dependencies = [
- "crossbeam",
+ "crossbeam-utils",
 ]
 
 [[package]]
 name = "autocfg"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "backtrace"
+version = "0.3.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if 1.0.0",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
 
 [[package]]
 name = "base64ct"
@@ -121,21 +135,22 @@ checksum = "cf9ff0bbfd639f15c74af777d81383cf53efb7c93613f6cab67c6c11e05bbf8b"
 
 [[package]]
 name = "bellman"
-version = "0.10.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7db9a104adfbc817ea09dec27d616c32dbf1d56fd741dcdc2444a3dfa1b9fffd"
+checksum = "0944d18a9a37691b87733b39c9360c9950af9aa5f97e2455bc108d8eb64fc1c1"
 dependencies = [
  "bitvec",
- "blake2s_simd",
+ "blake2s_simd 0.5.11",
  "byteorder",
- "crossbeam",
+ "crossbeam-channel",
  "ff",
- "futures",
- "futures-cpupool",
  "group",
+ "lazy_static",
+ "log",
  "num_cpus",
  "pairing",
  "rand_core 0.6.3",
+ "rayon",
  "subtle",
 ]
 
@@ -151,13 +166,13 @@ dependencies = [
 
 [[package]]
 name = "bip0039"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac4d1925000f9183da41ed95477ea815512b5bb7e06e6c6964986ca077e2b75c"
+checksum = "d0830ae4cc96b0617cc912970c2b17e89456fecbf55e8eed53a956f37ab50c41"
 dependencies = [
  "hmac",
  "pbkdf2",
- "rand",
+ "rand 0.8.5",
  "sha2",
  "unicode-normalization",
  "zeroize",
@@ -165,9 +180,9 @@ dependencies = [
 
 [[package]]
 name = "bitflags"
-version = "1.2.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitvec"
@@ -192,6 +207,17 @@ dependencies = [
  "constant_time_eq",
 ]
 
+[[package]]
+name = "blake2b_simd"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72936ee4afc7f8f736d1c38383b56480b5497b4617b4a77bdbf1d2ababc76127"
+dependencies = [
+ "arrayref",
+ "arrayvec 0.7.2",
+ "constant_time_eq",
+]
+
 [[package]]
 name = "blake2s_simd"
 version = "0.5.11"
@@ -203,6 +229,17 @@ dependencies = [
  "constant_time_eq",
 ]
 
+[[package]]
+name = "blake2s_simd"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db539cc2b5f6003621f1cd9ef92d7ded8ea5232c7de0f9faa2de251cd98730d4"
+dependencies = [
+ "arrayref",
+ "arrayvec 0.7.2",
+ "constant_time_eq",
+]
+
 [[package]]
 name = "block-buffer"
 version = "0.9.0"
@@ -213,13 +250,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "block-modes"
-version = "0.7.0"
+name = "block-buffer"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57a0e8073e8baa88212fb5823574c02ebccb395136ba9a164ab89379ec6072f0"
+checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324"
 dependencies = [
- "block-padding",
- "cipher 0.2.5",
+ "generic-array",
 ]
 
 [[package]]
@@ -229,7 +265,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2cb03d1bed155d89dce0f845b7899b18a9a163e148fd004e1c28421a783e2d8e"
 dependencies = [
  "block-padding",
- "cipher 0.3.0",
+ "cipher",
 ]
 
 [[package]]
@@ -240,9 +276,9 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
 
 [[package]]
 name = "bls12_381"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54757888b09a69be70b5ec303e382a74227392086ba808cb01eeca29233a2397"
+checksum = "6d28daeeded7949f1c7c72693377c98473b00be0aa0023760a84a300e4e7c74b"
 dependencies = [
  "ff",
  "group",
@@ -260,6 +296,12 @@ dependencies = [
  "sha2",
 ]
 
+[[package]]
+name = "bumpalo"
+version = "3.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
+
 [[package]]
 name = "byteorder"
 version = "1.4.3"
@@ -268,9 +310,15 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "bytes"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
+checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
+
+[[package]]
+name = "cc"
+version = "1.0.73"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
 
 [[package]]
 name = "cfg-if"
@@ -285,25 +333,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
-name = "chrono"
-version = "0.4.19"
+name = "chacha20"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
+checksum = "01b72a433d0cf2aef113ba70f62634c56fddb0f244e6377185c56a7cadbd8f91"
 dependencies = [
- "libc",
- "num-integer",
- "num-traits",
- "time",
- "winapi",
+ "cfg-if 1.0.0",
+ "cipher",
+ "cpufeatures",
+ "zeroize",
 ]
 
 [[package]]
-name = "cipher"
-version = "0.2.5"
+name = "chacha20poly1305"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801"
+checksum = "3b84ed6d1d5f7aa9bdde921a5090e0ca4d934d250ea3b402a5fab3a994e28a2a"
 dependencies = [
- "generic-array",
+ "aead",
+ "chacha20",
+ "cipher",
+ "poly1305",
+ "zeroize",
 ]
 
 [[package]]
@@ -316,63 +367,41 @@ dependencies = [
 ]
 
 [[package]]
-name = "constant_time_eq"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
-
-[[package]]
-name = "cpufeatures"
-version = "0.1.5"
+name = "clearscreen"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef"
+checksum = "a7ed49b0e894fe6264a58496c7ec4e9d3c46f66b59efae527cd5bee429d0a418"
 dependencies = [
- "libc",
+ "nix",
+ "terminfo",
+ "thiserror",
+ "which",
+ "winapi",
 ]
 
 [[package]]
-name = "crossbeam"
-version = "0.7.3"
+name = "constant_time_eq"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e"
-dependencies = [
- "cfg-if 0.1.10",
- "crossbeam-channel 0.4.4",
- "crossbeam-deque 0.7.3",
- "crossbeam-epoch 0.8.2",
- "crossbeam-queue",
- "crossbeam-utils 0.7.2",
-]
+checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
 
 [[package]]
-name = "crossbeam-channel"
-version = "0.4.4"
+name = "cpufeatures"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87"
+checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469"
 dependencies = [
- "crossbeam-utils 0.7.2",
- "maybe-uninit",
+ "libc",
 ]
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
+checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa"
 dependencies = [
  "cfg-if 1.0.0",
- "crossbeam-utils 0.8.5",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
-dependencies = [
- "crossbeam-epoch 0.8.2",
- "crossbeam-utils 0.7.2",
- "maybe-uninit",
+ "crossbeam-utils",
 ]
 
 [[package]]
@@ -382,65 +411,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
 dependencies = [
  "cfg-if 1.0.0",
- "crossbeam-epoch 0.9.5",
- "crossbeam-utils 0.8.5",
+ "crossbeam-epoch",
+ "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.8.2"
+version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
-dependencies = [
- "autocfg",
- "cfg-if 0.1.10",
- "crossbeam-utils 0.7.2",
- "lazy_static",
- "maybe-uninit",
- "memoffset 0.5.6",
- "scopeguard",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
+checksum = "c00d6d2ea26e8b151d99093005cb442fb9a37aeaca582a03ec70946f49ab5ed9"
 dependencies = [
  "cfg-if 1.0.0",
- "crossbeam-utils 0.8.5",
+ "crossbeam-utils",
  "lazy_static",
- "memoffset 0.6.4",
+ "memoffset",
  "scopeguard",
 ]
 
-[[package]]
-name = "crossbeam-queue"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
-dependencies = [
- "cfg-if 0.1.10",
- "crossbeam-utils 0.7.2",
- "maybe-uninit",
-]
-
 [[package]]
 name = "crossbeam-utils"
-version = "0.7.2"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
-dependencies = [
- "autocfg",
- "cfg-if 0.1.10",
- "lazy_static",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
+checksum = "b5e5bed1f1c269533fa816a0a5492b3545209a205ca1a54842be180eb63a16a6"
 dependencies = [
  "cfg-if 1.0.0",
  "lazy_static",
@@ -453,48 +445,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2f4a431c5c9f662e1200b7c7f02c34e91361150e382089a8f2dec3ba680cbda"
 
 [[package]]
-name = "crypto-mac"
-version = "0.11.1"
+name = "crypto-common"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
+checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8"
 dependencies = [
  "generic-array",
- "subtle",
-]
-
-[[package]]
-name = "crypto_api"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f855e87e75a4799e18b8529178adcde6fd4f97c1449ff4821e747ff728bb102"
-
-[[package]]
-name = "crypto_api_chachapoly"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d930b6a026ce9d358a17f9c9046c55d90b14bb847f36b6ebb6b19365d4feffb8"
-dependencies = [
- "crypto_api",
+ "typenum",
 ]
 
 [[package]]
-name = "ctor"
-version = "0.1.20"
+name = "crypto-mac"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e98e2ad1a782e33928b96fc3948e7c355e5af34ba4de7670fe8bac2a3b2006d"
+checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
 dependencies = [
- "quote",
- "syn",
+ "generic-array",
+ "subtle",
 ]
 
 [[package]]
 name = "curve25519-dalek"
-version = "3.1.0"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "639891fde0dbea823fc3d798a0fdf9d2f9440a42d64a78ab3488b0ca025117b3"
+checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
 dependencies = [
  "byteorder",
- "digest",
+ "digest 0.9.0",
  "rand_core 0.5.1",
  "subtle",
  "zeroize",
@@ -519,15 +496,35 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "digest"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506"
+dependencies = [
+ "block-buffer 0.10.2",
+ "crypto-common",
+]
+
 [[package]]
 name = "directories"
-version = "3.0.2"
+version = "4.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e69600ff1703123957937708eb27f7a564e48885c537782722ed0ba3189ce1d7"
+checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210"
 dependencies = [
  "dirs-sys",
 ]
 
+[[package]]
+name = "dirs"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
+dependencies = [
+ "cfg-if 0.1.10",
+ "dirs-sys",
+]
+
 [[package]]
 name = "dirs-sys"
 version = "0.3.6"
@@ -541,8 +538,9 @@ dependencies = [
 
 [[package]]
 name = "ed25519-zebra"
-version = "2.2.0"
-source = "git+https://github.com/ZcashFoundation/ed25519-zebra.git?rev=d3512400227a362d08367088ffaa9bd4142a69c7#d3512400227a362d08367088ffaa9bd4142a69c7"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "403ef3e961ab98f0ba902771d29f842058578bb1ce7e3c59dad5a6a93e784c69"
 dependencies = [
  "curve25519-dalek",
  "hex",
@@ -568,17 +566,25 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 [[package]]
 name = "equihash"
 version = "0.1.0"
-source = "git+https://github.com/zcash/librustzcash.git?rev=19a97f16945c68c33aedcc89f2a4f4d398658b05#19a97f16945c68c33aedcc89f2a4f4d398658b05"
+source = "git+https://github.com/zcash/librustzcash.git?rev=67cb63a5a6b1f2c4cf5a061dbe80e9a71477e289#67cb63a5a6b1f2c4cf5a061dbe80e9a71477e289"
 dependencies = [
- "blake2b_simd",
+ "blake2b_simd 1.0.0",
  "byteorder",
 ]
 
+[[package]]
+name = "f4jumble"
+version = "0.0.0"
+source = "git+https://github.com/zcash/librustzcash.git?rev=67cb63a5a6b1f2c4cf5a061dbe80e9a71477e289#67cb63a5a6b1f2c4cf5a061dbe80e9a71477e289"
+dependencies = [
+ "blake2b_simd 1.0.0",
+]
+
 [[package]]
 name = "ff"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63eec06c61e487eecf0f7e6e6372e596a81922c28d33e645d6983ca6493a1af0"
+checksum = "b2958d04124b9f27f175eaeb9a9f383d026098aa837eadd8ba22c11f13a05b9e"
 dependencies = [
  "bitvec",
  "rand_core 0.6.3",
@@ -593,27 +599,14 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "fpe"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a25080721bbcd2cd4d765b7d607ea350425fa087ce53cd3e31afcacdab850352"
-dependencies = [
- "aes 0.6.0",
- "block-modes 0.7.0",
- "num-bigint 0.3.2",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "fpe"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcf3e40fc9accc7218e082db8a75aeea244b8f5db73e591774ef93b4276365e6"
+checksum = "cd910db5f9ca4dc3116f8c46367825807aa2b942f72565f16b4be0b208a00a9e"
 dependencies = [
- "block-modes 0.8.1",
- "cipher 0.3.0",
+ "block-modes",
+ "cipher",
  "libm",
- "num-bigint 0.4.0",
+ "num-bigint",
  "num-integer",
  "num-traits",
 ]
@@ -624,50 +617,33 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1847abb9cb65d566acd5942e94aea9c8f547ad02c98e1649326fc0e8910b8b1e"
 
-[[package]]
-name = "futures"
-version = "0.1.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
-
 [[package]]
 name = "futures-channel"
-version = "0.3.16"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9"
+checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010"
 dependencies = [
  "futures-core",
 ]
 
 [[package]]
 name = "futures-core"
-version = "0.3.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99"
-
-[[package]]
-name = "futures-cpupool"
-version = "0.1.8"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
-dependencies = [
- "futures",
- "num_cpus",
-]
+checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
 
 [[package]]
 name = "futures-task"
-version = "0.3.16"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2"
+checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
 
 [[package]]
 name = "futures-util"
-version = "0.3.16"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78"
+checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
 dependencies = [
- "autocfg",
  "futures-core",
  "futures-task",
  "pin-project-lite",
@@ -676,9 +652,9 @@ dependencies = [
 
 [[package]]
 name = "generic-array"
-version = "0.14.4"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
+checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
 dependencies = [
  "typenum",
  "version_check",
@@ -697,20 +673,26 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.3"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
+checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
  "wasi 0.10.2+wasi-snapshot-preview1",
 ]
 
+[[package]]
+name = "gimli"
+version = "0.26.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
+
 [[package]]
 name = "group"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c363a5301b8f153d80747126a04b3c82073b9fe3130571a9d170cacdeaf7912"
+checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89"
 dependencies = [
  "byteorder",
  "ff",
@@ -718,16 +700,37 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "gumdrop"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46571f5d540478cf70d2a42dd0d6d8e9f4b9cc7531544b93311e657b86568a0b"
+dependencies = [
+ "gumdrop_derive",
+]
+
+[[package]]
+name = "gumdrop_derive"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "915ef07c710d84733522461de2a734d4d62a3fd39a4d4f404c2f385ef8618d05"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "halo2"
-version = "0.0.1"
-source = "git+https://github.com/zcash/halo2.git?rev=27c4187673a9c6ade13fbdbd4f20955530c22d7f#27c4187673a9c6ade13fbdbd4f20955530c22d7f"
+version = "0.1.0-beta.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f186b85ed81082fb1cf59d52b0111f02915e89a4ac61d292b38d075e570f3a9"
 dependencies = [
- "blake2b_simd",
+ "blake2b_simd 0.5.11",
  "ff",
  "group",
  "pasta_curves",
- "rand",
+ "rand 0.8.5",
  "rayon",
 ]
 
@@ -740,6 +743,17 @@ dependencies = [
  "ahash",
 ]
 
+[[package]]
+name = "hdwallet"
+version = "0.3.0"
+source = "git+https://github.com/nuttycom/hdwallet?rev=576683b9f2865f1118c309017ff36e01f84420c9#576683b9f2865f1118c309017ff36e01f84420c9"
+dependencies = [
+ "lazy_static",
+ "rand_core 0.6.3",
+ "ring",
+ "secp256k1",
+]
+
 [[package]]
 name = "hermit-abi"
 version = "0.1.19"
@@ -762,25 +776,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
 dependencies = [
  "crypto-mac",
- "digest",
+ "digest 0.9.0",
 ]
 
 [[package]]
 name = "http"
-version = "0.2.4"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11"
+checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03"
 dependencies = [
  "bytes",
  "fnv",
- "itoa",
+ "itoa 1.0.1",
 ]
 
 [[package]]
 name = "http-body"
-version = "0.4.2"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9"
+checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
 dependencies = [
  "bytes",
  "http",
@@ -789,9 +803,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.4.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68"
+checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4"
 
 [[package]]
 name = "httpdate"
@@ -813,9 +827,9 @@ dependencies = [
  "http-body",
  "httparse",
  "httpdate",
- "itoa",
+ "itoa 0.4.8",
  "pin-project",
- "socket2",
+ "socket2 0.3.19",
  "tokio",
  "tower-service",
  "tracing",
@@ -824,17 +838,17 @@ dependencies = [
 
 [[package]]
 name = "incrementalmerkletree"
-version = "0.1.0"
-source = "git+https://github.com/zcash/incrementalmerkletree?rev=b7bd6246122a6e9ace8edb51553fbf5228906cbb#b7bd6246122a6e9ace8edb51553fbf5228906cbb"
+version = "0.2.0"
+source = "git+https://github.com/zcash/incrementalmerkletree.git?rev=62c33e4480a71170b02b9eb7d4b0160194f414ee#62c33e4480a71170b02b9eb7d4b0160194f414ee"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "indexmap"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"
+checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223"
 dependencies = [
  "autocfg",
  "hashbrown",
@@ -842,9 +856,9 @@ dependencies = [
 
 [[package]]
 name = "instant"
-version = "0.1.10"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -857,14 +871,30 @@ checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9"
 
 [[package]]
 name = "itoa"
-version = "0.4.7"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
+
+[[package]]
+name = "itoa"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
+checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
+
+[[package]]
+name = "js-sys"
+version = "0.3.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04"
+dependencies = [
+ "wasm-bindgen",
+]
 
 [[package]]
 name = "jubjub"
-version = "0.7.0"
-source = "git+https://github.com/zkcrypto/jubjub.git?rev=96ab4162b83303378eae32a326b54d88b75bffc2#96ab4162b83303378eae32a326b54d88b75bffc2"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2e7baec19d4e83f9145d4891178101a604565edff9645770fc979804138b04c"
 dependencies = [
  "bitvec",
  "bls12_381",
@@ -882,56 +912,67 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.98"
+version = "0.2.119"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790"
+checksum = "1bf2e165bb3457c8e098ea76f3e3bc9db55f87aa90d52d0e6be741470916aaa4"
 
 [[package]]
 name = "libm"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
+checksum = "33a33a362ce288760ec6a508b94caaec573ae7d3bbbd91b87aa0bad4456839db"
 
 [[package]]
 name = "librustzcash"
 version = "0.2.0"
 dependencies = [
+ "anyhow",
+ "backtrace",
  "bellman",
- "blake2b_simd",
- "blake2s_simd",
+ "blake2b_simd 1.0.0",
+ "blake2s_simd 1.0.0",
  "bls12_381",
  "byteorder",
+ "clearscreen",
  "ed25519-zebra",
  "group",
+ "gumdrop",
  "hyper",
  "incrementalmerkletree",
  "ipnet",
  "jubjub",
  "libc",
+ "memuse",
  "metrics",
  "metrics-exporter-prometheus",
  "nonempty",
  "orchard",
+ "rand 0.8.5",
  "rand_core 0.6.3",
+ "secp256k1",
+ "secrecy",
  "subtle",
  "thiserror",
+ "time",
  "tokio",
  "tracing",
  "tracing-appender",
  "tracing-core",
  "tracing-subscriber",
  "zcash_address",
+ "zcash_encoding",
  "zcash_history",
  "zcash_note_encryption",
  "zcash_primitives",
  "zcash_proofs",
+ "zeroize",
 ]
 
 [[package]]
 name = "lock_api"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb"
+checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b"
 dependencies = [
  "scopeguard",
 ]
@@ -956,59 +997,52 @@ dependencies = [
 
 [[package]]
 name = "matchers"
-version = "0.0.1"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
 dependencies = [
  "regex-automata",
 ]
 
-[[package]]
-name = "maybe-uninit"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
-
 [[package]]
 name = "memchr"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
+checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
 
 [[package]]
 name = "memoffset"
-version = "0.5.6"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa"
+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
-name = "memoffset"
-version = "0.6.4"
+name = "memuse"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
+checksum = "f69d25cd7528769ad3d897e99eb942774bff8b23165012af490351a44c5b583b"
 dependencies = [
- "autocfg",
+ "nonempty",
 ]
 
 [[package]]
 name = "metrics"
-version = "0.17.0"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a00f42f354a2ed4894db863b3a4db47aef2d2e4435b937221749bd37a8a7aaa8"
+checksum = "55586aa936c35f34ba8aa5d97356d554311206e1ce1f9e68fe7b07288e5ad827"
 dependencies = [
  "ahash",
  "metrics-macros",
- "proc-macro-hack",
 ]
 
 [[package]]
 name = "metrics-exporter-prometheus"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9db7052a7cb0b0c0922a1ce499c9e78576763b1d47499ba980a4fe731b96909d"
+checksum = "343a5ceb38235928e7a5687412590f07e6d281522dcd9ff51246f8856eef5fe5"
 dependencies = [
  "hyper",
  "ipnet",
@@ -1022,12 +1056,11 @@ dependencies = [
 
 [[package]]
 name = "metrics-macros"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caa72e4a3d157986dd2565c82ecbddcc23941513669a3766b938f6b72eb87f3f"
+checksum = "0daa0ab3a0ae956d0e2c1f42511422850e577d36a255357d1a7d08d45ee3a2f1"
 dependencies = [
  "lazy_static",
- "proc-macro-hack",
  "proc-macro2",
  "quote",
  "regex",
@@ -1036,15 +1069,15 @@ dependencies = [
 
 [[package]]
 name = "metrics-util"
-version = "0.10.0"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a58e622a425b7308e73e4390c68b8cb3df4443f2a57495e391b978412531638c"
+checksum = "1174223789e331d9d47a4a953dac36e397db60fa8d2a111ac505388c6c7fe32e"
 dependencies = [
  "ahash",
  "aho-corasick",
  "atomic-shim",
- "crossbeam-epoch 0.9.5",
- "crossbeam-utils 0.8.5",
+ "crossbeam-epoch",
+ "crossbeam-utils",
  "dashmap",
  "hashbrown",
  "indexmap",
@@ -1057,11 +1090,21 @@ dependencies = [
  "sketches-ddsketch",
 ]
 
+[[package]]
+name = "miniz_oxide"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
+dependencies = [
+ "adler",
+ "autocfg",
+]
+
 [[package]]
 name = "mio"
-version = "0.7.13"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16"
+checksum = "ba272f85fa0b41fc91872be579b3bbe0f56b792aa361a380eb669469f68dafb2"
 dependencies = [
  "libc",
  "log",
@@ -1089,36 +1132,48 @@ dependencies = [
 ]
 
 [[package]]
-name = "nonempty"
-version = "0.7.0"
+name = "nix"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9e591e719385e6ebaeb5ce5d3887f7d5676fceca6411d1925ccc95745f3d6f7"
+checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf"
+dependencies = [
+ "bitflags",
+ "cc",
+ "cfg-if 1.0.0",
+ "libc",
+ "memoffset",
+]
 
 [[package]]
-name = "ntapi"
-version = "0.3.6"
+name = "nom"
+version = "5.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
+checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
 dependencies = [
- "winapi",
+ "memchr",
+ "version_check",
 ]
 
 [[package]]
-name = "num-bigint"
-version = "0.3.2"
+name = "nonempty"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d0a3d5e207573f948a9e5376662aa743a2ea13f7c50a554d7af443a73fbfeba"
+checksum = "e9e591e719385e6ebaeb5ce5d3887f7d5676fceca6411d1925ccc95745f3d6f7"
+
+[[package]]
+name = "ntapi"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f"
 dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
+ "winapi",
 ]
 
 [[package]]
 name = "num-bigint"
-version = "0.4.0"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0d047c1062aa51e256408c560894e5251f08925980e53cf1aa5bd00eec6512"
+checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -1146,19 +1201,37 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.13.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
+checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
 dependencies = [
  "hermit-abi",
  "libc",
 ]
 
+[[package]]
+name = "num_threads"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97ba99ba6393e2c3734791401b66902d981cb03bf190af674ca69949b6d5fb15"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "object"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "once_cell"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
+checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"
 
 [[package]]
 name = "opaque-debug"
@@ -1168,23 +1241,24 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "orchard"
-version = "0.0.0"
-source = "git+https://github.com/zcash/orchard.git?rev=d0baa18fc6105df4a7847de2b6dc50c5919b3123#d0baa18fc6105df4a7847de2b6dc50c5919b3123"
+version = "0.1.0-beta.1"
+source = "git+https://github.com/zcash/orchard.git?rev=f4587f790d7317df85a9ee77ce693a06ed6d8d02#f4587f790d7317df85a9ee77ce693a06ed6d8d02"
 dependencies = [
- "aes 0.6.0",
- "arrayvec 0.7.1",
+ "aes",
+ "arrayvec 0.7.2",
  "bigint",
  "bitvec",
- "blake2b_simd",
+ "blake2b_simd 1.0.0",
  "ff",
- "fpe 0.4.0",
+ "fpe",
  "group",
  "halo2",
  "incrementalmerkletree",
  "lazy_static",
+ "memuse",
  "nonempty",
  "pasta_curves",
- "rand",
+ "rand 0.8.5",
  "reddsa",
  "serde",
  "subtle",
@@ -1193,27 +1267,27 @@ dependencies = [
 
 [[package]]
 name = "ordered-float"
-version = "2.7.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "039f02eb0f69271f26abe3202189275d7aa2258b903cb0281b5de710a2570ff3"
+checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87"
 dependencies = [
  "num-traits",
 ]
 
 [[package]]
 name = "pairing"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7de9d09263c9966e8196fe0380c9dbbc7ea114b5cf371ba29004bc1f9c6db7f3"
+checksum = "f2e415e349a3006dd7d9482cdab1c980a845bed1377777d768cb693a44540b42"
 dependencies = [
  "group",
 ]
 
 [[package]]
 name = "parking_lot"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
 dependencies = [
  "instant",
  "lock_api",
@@ -1222,9 +1296,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.8.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
+checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
 dependencies = [
  "cfg-if 1.0.0",
  "instant",
@@ -1236,9 +1310,9 @@ dependencies = [
 
 [[package]]
 name = "password-hash"
-version = "0.2.2"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd482dfb8cfba5a93ec0f91e1c0f66967cb2fdc1a8dba646c4f9202c5d05d785"
+checksum = "1d791538a6dcc1e7cb7fe6f6b58aca40e7f79403c45b2bc274008b5e647af1d8"
 dependencies = [
  "base64ct",
  "rand_core 0.6.3",
@@ -1247,43 +1321,81 @@ dependencies = [
 
 [[package]]
 name = "pasta_curves"
-version = "0.1.1"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "179df750e20069669699f537ec0c4bcb248283f45a78b8c66d797fb73dbbb455"
+checksum = "d647d91972bad78120fd61e06b225fcda117805c9bbf17676b51bd03a251278b"
 dependencies = [
- "blake2b_simd",
+ "blake2b_simd 0.5.11",
  "ff",
  "group",
  "lazy_static",
- "rand",
+ "rand 0.8.5",
  "static_assertions",
  "subtle",
 ]
 
 [[package]]
 name = "pbkdf2"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa"
+checksum = "f05894bce6a1ba4be299d0c5f29563e08af2bc18bb7d48313113bed71e904739"
 dependencies = [
  "crypto-mac",
  "password-hash",
 ]
 
+[[package]]
+name = "phf"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
+dependencies = [
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_codegen"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
+dependencies = [
+ "phf_shared",
+ "rand 0.7.3",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
+dependencies = [
+ "siphasher",
+]
+
 [[package]]
 name = "pin-project"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08"
+checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389"
+checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1292,9 +1404,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
+checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c"
 
 [[package]]
 name = "pin-utils"
@@ -1303,46 +1415,52 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
-name = "ppv-lite86"
-version = "0.2.10"
+name = "poly1305"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
+checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede"
+dependencies = [
+ "cpufeatures",
+ "opaque-debug",
+ "universal-hash",
+]
 
 [[package]]
-name = "proc-macro-hack"
-version = "0.5.19"
+name = "ppv-lite86"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
+checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.28"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612"
+checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
 dependencies = [
  "unicode-xid",
 ]
 
 [[package]]
 name = "quanta"
-version = "0.7.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e76a3afdefd0ce2c0363bf3146271e947782240ea617885dd64e56c4de9fb3c9"
+checksum = "20afe714292d5e879d8b12740aa223c6a88f118af41870e8b6196e39a02238a8"
 dependencies = [
- "atomic-shim",
- "ctor",
+ "crossbeam-utils",
  "libc",
  "mach",
  "once_cell",
  "raw-cpuid",
+ "wasi 0.10.2+wasi-snapshot-preview1",
+ "web-sys",
  "winapi",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.9"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
+checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145"
 dependencies = [
  "proc-macro2",
 ]
@@ -1365,14 +1483,37 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.8.4"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+dependencies = [
+ "getrandom 0.1.16",
+ "libc",
+ "rand_chacha 0.2.2",
+ "rand_core 0.5.1",
+ "rand_hc",
+ "rand_pcg",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
- "rand_chacha",
+ "rand_chacha 0.3.1",
  "rand_core 0.6.3",
- "rand_hc",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.5.1",
 ]
 
 [[package]]
@@ -1400,23 +1541,32 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
 dependencies = [
- "getrandom 0.2.3",
+ "getrandom 0.2.5",
 ]
 
 [[package]]
 name = "rand_hc"
-version = "0.3.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
 dependencies = [
- "rand_core 0.6.3",
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "rand_pcg"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
+dependencies = [
+ "rand_core 0.5.1",
 ]
 
 [[package]]
 name = "raw-cpuid"
-version = "9.1.1"
+version = "10.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1733f6f80c9c24268736a501cd00d41a9849b4faa7a9f9334c096e5d10553206"
+checksum = "929f54e29691d4e6a9cc558479de70db7aa3d98cd6fe7ab86d7507aa2886b9d2"
 dependencies = [
  "bitflags",
 ]
@@ -1428,7 +1578,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
 dependencies = [
  "autocfg",
- "crossbeam-deque 0.8.1",
+ "crossbeam-deque",
  "either",
  "rayon-core",
 ]
@@ -1439,21 +1589,22 @@ version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e"
 dependencies = [
- "crossbeam-channel 0.5.1",
- "crossbeam-deque 0.8.1",
- "crossbeam-utils 0.8.5",
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-utils",
  "lazy_static",
  "num_cpus",
 ]
 
 [[package]]
 name = "reddsa"
-version = "0.0.0"
-source = "git+https://github.com/str4d/redjubjub.git?rev=d5d8c5f3bb704bad8ae88fe4a29ae1f744774cb2#d5d8c5f3bb704bad8ae88fe4a29ae1f744774cb2"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a90e2c94bca3445cae0d55dff7370e29c24885d2403a1665ce19c106c79455e6"
 dependencies = [
- "blake2b_simd",
+ "blake2b_simd 0.5.11",
  "byteorder",
- "digest",
+ "digest 0.9.0",
  "group",
  "jubjub",
  "pasta_curves",
@@ -1465,9 +1616,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.9"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee"
+checksum = "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c"
 dependencies = [
  "bitflags",
 ]
@@ -1478,7 +1629,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
 dependencies = [
- "getrandom 0.2.3",
+ "getrandom 0.2.5",
  "redox_syscall",
 ]
 
@@ -1508,26 +1659,83 @@ version = "0.6.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
 
+[[package]]
+name = "ring"
+version = "0.16.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+dependencies = [
+ "cc",
+ "libc",
+ "once_cell",
+ "spin",
+ "untrusted",
+ "web-sys",
+ "winapi",
+]
+
+[[package]]
+name = "ripemd"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1facec54cb5e0dc08553501fa740091086d0259ad0067e0d4103448e4cb22ed3"
+dependencies = [
+ "digest 0.10.3",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
+
 [[package]]
 name = "scopeguard"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
+[[package]]
+name = "secp256k1"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97d03ceae636d0fed5bae6a7f4f664354c5f4fcedf6eef053fef17e49f837d0a"
+dependencies = [
+ "secp256k1-sys",
+]
+
+[[package]]
+name = "secp256k1-sys"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "957da2573cde917463ece3570eab4a0b3f19de6f1646cde62e6fd3868f566036"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "secrecy"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e"
+dependencies = [
+ "zeroize",
+]
+
 [[package]]
 name = "serde"
-version = "1.0.126"
+version = "1.0.136"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
+checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.126"
+version = "1.0.136"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43"
+checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1536,26 +1744,32 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.9.5"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12"
+checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
 dependencies = [
- "block-buffer",
+ "block-buffer 0.9.0",
  "cfg-if 1.0.0",
  "cpufeatures",
- "digest",
+ "digest 0.9.0",
  "opaque-debug",
 ]
 
 [[package]]
 name = "sharded-slab"
-version = "0.1.1"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79c719719ee05df97490f80a45acfc99e5a30ce98a1e4fb67aee422745ae14e3"
+checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
 dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "siphasher"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a86232ab60fa71287d7f2ddae4a7073f6b7aac33631c3015abb556f08c6d0a3e"
+
 [[package]]
 name = "sketches-ddsketch"
 version = "0.1.2"
@@ -1564,9 +1778,9 @@ checksum = "76a77a8fd93886010f05e7ea0720e569d6d16c65329dbe3ec033bbbccccb017b"
 
 [[package]]
 name = "smallvec"
-version = "1.6.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
+checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
 
 [[package]]
 name = "socket2"
@@ -1579,6 +1793,22 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "socket2"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -1593,9 +1823,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "syn"
-version = "1.0.74"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c"
+checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1604,9 +1834,9 @@ dependencies = [
 
 [[package]]
 name = "synstructure"
-version = "0.12.5"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa"
+checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1620,20 +1850,33 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
+[[package]]
+name = "terminfo"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76971977e6121664ec1b960d1313aacfa75642adc93b9d4d53b247bd4cb1747e"
+dependencies = [
+ "dirs",
+ "fnv",
+ "nom",
+ "phf",
+ "phf_codegen",
+]
+
 [[package]]
 name = "thiserror"
-version = "1.0.26"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2"
+checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.26"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745"
+checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1642,28 +1885,36 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd"
+checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
 dependencies = [
  "once_cell",
 ]
 
 [[package]]
 name = "time"
-version = "0.1.43"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
+checksum = "004cbc98f30fa233c61a38bc77e96a9106e65c88f2d3bef182ae952027e5753d"
 dependencies = [
+ "itoa 1.0.1",
  "libc",
- "winapi",
+ "num_threads",
+ "time-macros",
 ]
 
+[[package]]
+name = "time-macros"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25eb0ca3468fc0acc11828786797f6ef9aa1555e4a211a60d64cc8e4d1be47d6"
+
 [[package]]
 name = "tinyvec"
-version = "1.3.1"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338"
+checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -1676,23 +1927,23 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.9.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b7b349f11a7047e6d1276853e612d152f5e8a352c61917887cc2169e2366b4c"
+checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee"
 dependencies = [
- "autocfg",
  "libc",
  "mio",
  "pin-project-lite",
+ "socket2 0.4.4",
  "tokio-macros",
  "winapi",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "1.3.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110"
+checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1707,9 +1958,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
 
 [[package]]
 name = "tracing"
-version = "0.1.26"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d"
+checksum = "f6c650a8ef0cd2dd93736f033d21cbd1224c5a967aa0c258d00fcf7dafef9b9f"
 dependencies = [
  "cfg-if 1.0.0",
  "pin-project-lite",
@@ -1719,20 +1970,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-appender"
-version = "0.1.2"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9965507e507f12c8901432a33e31131222abac31edd90cabbcf85cf544b7127a"
+checksum = "9ab026b18a46ac429e5c98bec10ca06424a97b3ad7b3949d9b4a102fff6623c4"
 dependencies = [
- "chrono",
- "crossbeam-channel 0.5.1",
+ "crossbeam-channel",
+ "time",
  "tracing-subscriber",
 ]
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.15"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2"
+checksum = "8276d9a4a3a558d7b7ad5303ad50b53d58264641b82914b7ada36bd762e7a716"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1741,26 +1992,27 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.18"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052"
+checksum = "03cfcb51380632a72d3111cb8d3447a8d908e577d31beeac006f836383d29a23"
 dependencies = [
  "lazy_static",
+ "valuable",
 ]
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.2.19"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab69019741fca4d98be3c62d2b75254528b5432233fd8a4d2739fec20278de48"
+checksum = "9e0ab7bdc962035a87fba73f3acca9b8a8d0034c2e6f60b84aeaaddddc155dce"
 dependencies = [
  "ansi_term",
- "chrono",
  "lazy_static",
  "matchers",
  "regex",
  "sharded-slab",
  "thread_local",
+ "time",
  "tracing",
  "tracing-core",
 ]
@@ -1773,9 +2025,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 
 [[package]]
 name = "typenum"
-version = "1.13.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06"
+checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
 
 [[package]]
 name = "unicode-normalization"
@@ -1792,11 +2044,33 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
 
+[[package]]
+name = "universal-hash"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05"
+dependencies = [
+ "generic-array",
+ "subtle",
+]
+
+[[package]]
+name = "untrusted"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
 [[package]]
 name = "version_check"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "want"
@@ -1820,6 +2094,81 @@ version = "0.10.2+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
 
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06"
+dependencies = [
+ "cfg-if 1.0.0",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca"
+dependencies = [
+ "bumpalo",
+ "lazy_static",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2"
+
+[[package]]
+name = "web-sys"
+version = "0.3.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "which"
+version = "4.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a5a7e487e921cf220206864a94a89b6c6905bfc19f1057fa26a4cb360e5c1d2"
+dependencies = [
+ "either",
+ "lazy_static",
+ "libc",
+]
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -1854,33 +2203,40 @@ dependencies = [
 [[package]]
 name = "zcash_address"
 version = "0.0.0"
-source = "git+https://github.com/zcash/librustzcash.git?rev=19a97f16945c68c33aedcc89f2a4f4d398658b05#19a97f16945c68c33aedcc89f2a4f4d398658b05"
+source = "git+https://github.com/zcash/librustzcash.git?rev=67cb63a5a6b1f2c4cf5a061dbe80e9a71477e289#67cb63a5a6b1f2c4cf5a061dbe80e9a71477e289"
 dependencies = [
  "bech32",
- "blake2b_simd",
  "bs58",
+ "f4jumble",
+ "zcash_encoding",
+]
+
+[[package]]
+name = "zcash_encoding"
+version = "0.0.0"
+source = "git+https://github.com/zcash/librustzcash.git?rev=67cb63a5a6b1f2c4cf5a061dbe80e9a71477e289#67cb63a5a6b1f2c4cf5a061dbe80e9a71477e289"
+dependencies = [
+ "byteorder",
+ "nonempty",
 ]
 
 [[package]]
 name = "zcash_history"
 version = "0.2.0"
-source = "git+https://github.com/zcash/librustzcash.git?rev=19a97f16945c68c33aedcc89f2a4f4d398658b05#19a97f16945c68c33aedcc89f2a4f4d398658b05"
+source = "git+https://github.com/zcash/librustzcash.git?rev=67cb63a5a6b1f2c4cf5a061dbe80e9a71477e289#67cb63a5a6b1f2c4cf5a061dbe80e9a71477e289"
 dependencies = [
  "bigint",
- "blake2b_simd",
+ "blake2b_simd 1.0.0",
  "byteorder",
 ]
 
 [[package]]
 name = "zcash_note_encryption"
-version = "0.0.0"
-source = "git+https://github.com/zcash/librustzcash.git?rev=19a97f16945c68c33aedcc89f2a4f4d398658b05#19a97f16945c68c33aedcc89f2a4f4d398658b05"
+version = "0.1.0"
+source = "git+https://github.com/zcash/librustzcash.git?rev=67cb63a5a6b1f2c4cf5a061dbe80e9a71477e289#67cb63a5a6b1f2c4cf5a061dbe80e9a71477e289"
 dependencies = [
- "blake2b_simd",
- "byteorder",
- "crypto_api_chachapoly",
- "ff",
- "group",
+ "chacha20",
+ "chacha20poly1305",
  "rand_core 0.6.3",
  "subtle",
 ]
@@ -1888,42 +2244,46 @@ dependencies = [
 [[package]]
 name = "zcash_primitives"
 version = "0.5.0"
-source = "git+https://github.com/zcash/librustzcash.git?rev=19a97f16945c68c33aedcc89f2a4f4d398658b05#19a97f16945c68c33aedcc89f2a4f4d398658b05"
+source = "git+https://github.com/zcash/librustzcash.git?rev=67cb63a5a6b1f2c4cf5a061dbe80e9a71477e289#67cb63a5a6b1f2c4cf5a061dbe80e9a71477e289"
 dependencies = [
- "aes 0.7.4",
+ "aes",
  "bip0039",
  "bitvec",
- "blake2b_simd",
- "blake2s_simd",
+ "blake2b_simd 1.0.0",
+ "blake2s_simd 1.0.0",
  "bls12_381",
+ "bs58",
  "byteorder",
- "crypto_api_chachapoly",
+ "chacha20poly1305",
  "equihash",
  "ff",
- "fpe 0.5.0",
+ "fpe",
  "group",
+ "hdwallet",
  "hex",
  "incrementalmerkletree",
  "jubjub",
  "lazy_static",
- "log",
+ "memuse",
  "nonempty",
  "orchard",
- "pasta_curves",
- "rand",
+ "rand 0.8.5",
  "rand_core 0.6.3",
+ "ripemd",
+ "secp256k1",
  "sha2",
  "subtle",
+ "zcash_encoding",
  "zcash_note_encryption",
 ]
 
 [[package]]
 name = "zcash_proofs"
 version = "0.5.0"
-source = "git+https://github.com/zcash/librustzcash.git?rev=19a97f16945c68c33aedcc89f2a4f4d398658b05#19a97f16945c68c33aedcc89f2a4f4d398658b05"
+source = "git+https://github.com/zcash/librustzcash.git?rev=67cb63a5a6b1f2c4cf5a061dbe80e9a71477e289#67cb63a5a6b1f2c4cf5a061dbe80e9a71477e289"
 dependencies = [
  "bellman",
- "blake2b_simd",
+ "blake2b_simd 1.0.0",
  "bls12_381",
  "byteorder",
  "directories",
@@ -1937,18 +2297,18 @@ dependencies = [
 
 [[package]]
 name = "zeroize"
-version = "1.4.1"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "377db0846015f7ae377174787dd452e1c5f5a9050bc6f954911d01f116daa0cd"
+checksum = "d68d9dcec5f9b43a30d38c49f91dfedfaac384cb8f085faca366c26207dd1619"
 dependencies = [
  "zeroize_derive",
 ]
 
 [[package]]
 name = "zeroize_derive"
-version = "1.1.0"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2c1e130bebaeab2f23886bf9acbaca14b092408c452543c857f66399cd6dab1"
+checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index 6be4d0aa848..9227b9a9fc9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,45 +3,59 @@ name = "librustzcash"
 description = "Rust FFI used by the zcashd binary. Not an official API."
 version = "0.2.0"
 authors = [
-    "Sean Bowe <ewillbefull@gmail.com>",
-    "Jack Grigg <jack@z.cash>",
-    "Jay Graber <jay@z.cash>",
-    "Simon Liu <simon@z.cash>"
+    "Sean Bowe <sean@electriccoin.co>",
+    "Jay Graber",
+    "Jack Grigg <jack@electriccoin.co>",
+    "Daira Hopwood <daira@electriccoin.co>",
+    "Ying Tong Lai <yingtong@electriccoin.co>",
+    "Simon Liu",
+    "Kris Nuttycombe <kris@electriccoin.co>",
+    "Larry Ruane <larry@electriccoin.co>",
+    "Steven Smith <steven@electriccoin.co>"
 ]
 homepage = "https://github.com/zcash/zcash"
 repository = "https://github.com/zcash/zcash"
 readme = "README.md"
 license = "MIT OR Apache-2.0"
 edition = "2018"
+rust-version = "1.59"
 
 [lib]
 name = "rustzcash"
 path = "src/rust/src/rustzcash.rs"
 crate-type = ["staticlib"]
 
+[[bin]]
+name = "zcashd-wallet-tool"
+path = "src/rust/bin/wallet_tool.rs"
+
 [dependencies]
-bellman = "0.10"
-blake2b_simd = "0.5"
-blake2s_simd = "0.5"
-bls12_381 = "0.5"
+bellman = "0.11"
+blake2b_simd = "1"
+blake2s_simd = "1"
+bls12_381 = "0.6"
 byteorder = "1"
-group = "0.10"
-incrementalmerkletree = "0.1"
+group = "0.11"
+incrementalmerkletree = "0.2"
 libc = "0.2"
-jubjub = "0.7"
+jubjub = "0.8"
+memuse = "0.2"
 nonempty = "0.7"
-orchard = "0.0"
+orchard = "=0.1.0-beta.1"
+secp256k1 = "0.20"
 subtle = "2.2"
 rand_core = "0.6"
 tracing = "0.1"
 tracing-core = "0.1"
-tracing-appender = "0.1"
+tracing-appender = "0.2"
 zcash_address = "0.0"
+zcash_encoding = "0.0"
 zcash_history = "0.2"
-zcash_note_encryption = "0.0"
-zcash_primitives = "0.5"
+zcash_note_encryption = "0.1"
+zcash_primitives = { version = "0.5", features = ["transparent-inputs"] }
 zcash_proofs = "0.5"
-ed25519-zebra = "2.2.0"
+ed25519-zebra = "3"
+zeroize = "1.4.2"
 
 # Metrics
 hyper = { version = "=0.14.2", default-features = false, features = ["server", "tcp", "http1"] }
@@ -51,10 +65,20 @@ metrics-exporter-prometheus = "0.6"
 thiserror = "1"
 tokio = { version = "1.0", features = ["rt", "net", "time", "macros"] }
 
+# Wallet tool
+# (also depends on thiserror, tracing, and tracing-subscriber with "env-filter" and "fmt" features)
+anyhow = "1.0"
+backtrace = "0.3"
+clearscreen = "1.0"
+gumdrop = "0.8"
+rand = "0.8"
+secrecy = "0.8"
+time = { version = "0.3", features = ["formatting", "macros"] }
+
 [dependencies.tracing-subscriber]
-version = "0.2.12"
+version = "0.3"
 default-features = false
-features = ["ansi", "chrono", "env-filter"]
+features = ["ansi", "env-filter", "fmt", "time"]
 
 [profile.release]
 lto = true
@@ -62,13 +86,12 @@ panic = 'abort'
 codegen-units = 1
 
 [patch.crates-io]
-ed25519-zebra = { git = "https://github.com/ZcashFoundation/ed25519-zebra.git", rev = "d3512400227a362d08367088ffaa9bd4142a69c7" }
-halo2 = { git = "https://github.com/zcash/halo2.git", rev = "27c4187673a9c6ade13fbdbd4f20955530c22d7f" }
-incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "b7bd6246122a6e9ace8edb51553fbf5228906cbb" }
-jubjub = { git = "https://github.com/zkcrypto/jubjub.git", rev = "96ab4162b83303378eae32a326b54d88b75bffc2" }
-orchard = { git = "https://github.com/zcash/orchard.git", rev = "d0baa18fc6105df4a7847de2b6dc50c5919b3123" }
-zcash_address = { git = "https://github.com/zcash/librustzcash.git", rev = "19a97f16945c68c33aedcc89f2a4f4d398658b05" }
-zcash_history = { git = "https://github.com/zcash/librustzcash.git", rev = "19a97f16945c68c33aedcc89f2a4f4d398658b05" }
-zcash_note_encryption = { git = "https://github.com/zcash/librustzcash.git", rev = "19a97f16945c68c33aedcc89f2a4f4d398658b05" }
-zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "19a97f16945c68c33aedcc89f2a4f4d398658b05" }
-zcash_proofs = { git = "https://github.com/zcash/librustzcash.git", rev = "19a97f16945c68c33aedcc89f2a4f4d398658b05" }
+hdwallet = { git = "https://github.com/nuttycom/hdwallet", rev = "576683b9f2865f1118c309017ff36e01f84420c9" }
+incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree.git", rev = "62c33e4480a71170b02b9eb7d4b0160194f414ee" }
+orchard = { git = "https://github.com/zcash/orchard.git", rev = "f4587f790d7317df85a9ee77ce693a06ed6d8d02" }
+zcash_address = { git = "https://github.com/zcash/librustzcash.git", rev = "67cb63a5a6b1f2c4cf5a061dbe80e9a71477e289" }
+zcash_encoding = { git = "https://github.com/zcash/librustzcash.git", rev = "67cb63a5a6b1f2c4cf5a061dbe80e9a71477e289" }
+zcash_history = { git = "https://github.com/zcash/librustzcash.git", rev = "67cb63a5a6b1f2c4cf5a061dbe80e9a71477e289" }
+zcash_note_encryption = { git = "https://github.com/zcash/librustzcash.git", rev = "67cb63a5a6b1f2c4cf5a061dbe80e9a71477e289" }
+zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "67cb63a5a6b1f2c4cf5a061dbe80e9a71477e289" }
+zcash_proofs = { git = "https://github.com/zcash/librustzcash.git", rev = "67cb63a5a6b1f2c4cf5a061dbe80e9a71477e289" }
diff --git a/Makefile.am b/Makefile.am
index a77f7e9802d..d5a8eac6358 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,6 +48,12 @@ $(BITCOIND_BIN): FORCE
 $(BITCOIN_CLI_BIN): FORCE
 	$(MAKE) -C src $(@F)
 
+check-security: FORCE
+	$(MAKE) -C src check-security
+
+check-symbols: FORCE
+	$(MAKE) -C src check-symbols
+
 if USE_LCOV
 
 baseline.info:
diff --git a/README.md b/README.md
index 1a84cfe6425..5a276efa5be 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Zcash 4.4.1
+Zcash 4.6.0-1
 <img align="right" width="120" height="80" src="doc/imgs/logo.png">
 ===========
 
diff --git a/configure.ac b/configure.ac
index ac565f294cc..d9181b344c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,13 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 4)
-define(_CLIENT_VERSION_MINOR, 4)
-define(_CLIENT_VERSION_REVISION, 1)
-define(_CLIENT_VERSION_BUILD, 50)
+define(_CLIENT_VERSION_MINOR, 6)
+define(_CLIENT_VERSION_REVISION, 0)
+define(_CLIENT_VERSION_BUILD, 51)
 define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))
 define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1)))
 define(_CLIENT_VERSION_IS_RELEASE, true)
-define(_COPYRIGHT_YEAR, 2021)
+define(_COPYRIGHT_YEAR, 2022)
 AC_INIT([Zcash],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_SUFFIX(_ZC_BUILD_VAL)],[https://github.com/zcash/zcash/issues],[zcash])
 AC_CONFIG_SRCDIR([src/main.cpp])
 AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
diff --git a/contrib/debian/changelog b/contrib/debian/changelog
index 91583c1792e..84754abf585 100644
--- a/contrib/debian/changelog
+++ b/contrib/debian/changelog
@@ -1,3 +1,45 @@
+zcash (4.6.0+1) stable; urgency=medium
+
+  * 4.6.0-1 release.
+
+ -- Electric Coin Company <team@electriccoin.co>  Wed, 05 Jan 2022 20:18:43 +0000
+
+zcash (4.6.0) stable; urgency=medium
+
+  * 4.6.0 release.
+
+ -- Electric Coin Company <team@electriccoin.co>  Thu, 23 Dec 2021 00:35:41 +0000
+
+zcash (4.6.0~rc1) stable; urgency=medium
+
+  * 4.6.0-rc1 release.
+
+ -- Electric Coin Company <team@electriccoin.co>  Sat, 18 Dec 2021 04:25:50 +0000
+
+zcash (4.5.1+1) stable; urgency=medium
+
+  * 4.5.1-1 release.
+
+ -- Electric Coin Company <team@electriccoin.co>  Fri, 08 Oct 2021 17:03:31 +0000
+
+zcash (4.5.1) stable; urgency=medium
+
+  * 4.5.1 release.
+
+ -- Electric Coin Company <team@electriccoin.co>  Wed, 29 Sep 2021 01:49:51 +0100
+
+zcash (4.5.0) stable; urgency=medium
+
+  * 4.5.0 release.
+
+ -- Electric Coin Company <team@electriccoin.co>  Thu, 23 Sep 2021 04:20:16 +0100
+
+zcash (4.5.0~rc1) stable; urgency=medium
+
+  * 4.5.0-rc1 release.
+
+ -- Electric Coin Company <team@electriccoin.co>  Thu, 16 Sep 2021 23:34:14 +0100
+
 zcash (4.4.1) stable; urgency=medium
 
   * 4.4.1 release.
diff --git a/contrib/debian/copyright b/contrib/debian/copyright
index 434b7e2f33e..8e1b2d83659 100644
--- a/contrib/debian/copyright
+++ b/contrib/debian/copyright
@@ -4,9 +4,9 @@ Upstream-Contact: Electric Coin Company <team@electriccoin.co>
 Source: https://github.com/zcash/zcash
 
 Files: *
-Copyright: 2016-2021, The Zcash developers
- 2009-2021, Bitcoin Core developers
- 2009-2021, Bitcoin Developers
+Copyright: 2016-2022, The Zcash developers
+ 2009-2022, Bitcoin Core developers
+ 2009-2022, Bitcoin Developers
 License: Expat
 Comment: The Bitcoin Core developers encompasses the current developers listed on
  bitcoin.org, as well as the numerous contributors to the project.
@@ -71,18 +71,18 @@ Files: build-aux/m4/ax_check_compile_flag.m4
  build-aux/m4/ax_check_preproc_flag.m4
 Copyright: 2008, Guido U. Draheim <guidod@gmx.de>
  2011, Maarten Bosmans <mkbosmans@gmail.com>
-License: GPLv3-or-later-with-Autoconf-exception
+License: GPL-3+ with Autoconf exception
 
 Files: build-aux/m4/ax_pthread.m4
 Copyright: 2008, Steven G. Johnson <stevenj@alum.mit.edu>
  2011, Daniel Richard G. <skunk@iSKUNK.ORG>
-License: GPLv3-or-later-with-Autoconf-exception
+License: GPL-3+ with Autoconf exception
 
 Files: qa/zcash/checksec.sh
 Copyright: 2014-2015, Brian Davis
  2013, Robin David
  2009-2011, Tobias Klein
-License: BSD-3clause-Tobias-Klein
+License: BSD-3-clause-Tobias-Klein
 
 Files: depends/sources/libsodium-*.tar.gz
 Copyright: 2013-2016 Frank Denis
@@ -92,6 +92,12 @@ Files: depends/sources/boost_*.tar.gz
 Copyright: 2008 Beman Dawes
 License: Boost-Software-License-1.0
 
+Files: depends/sources/clang-llvm-*.tar.xz
+Copyright: The libc++ Authors
+License: Apache-2 with LLVM exception
+Comment: This entry is specifically for the libc++ library. The libc++ Authors
+ are listed in https://github.com/llvm/llvm-project/blob/main/libcxx/CREDITS.TXT .
+
 Files: depends/sources/db-*.tar.gz
 Copyright: 1990, 2016 Oracle and/or its affiliates;
  1990, 1993, 1994, 1995 The Regents of the University of California;
@@ -99,6 +105,18 @@ Copyright: 1990, 2016 Oracle and/or its affiliates;
  2000-2005 INRIA, France Telecom
 License: BDB
 
+Files: depends/sources/libevent-*.tar.gz
+Copyright: 2000-2007 Niels Provos <provos@citi.umich.edu>
+ 2007-2012 Niels Provos and Nick Mathewson
+ 2000 Dug Song <dugsong@monkey.org>
+ 1993 The Regents of the University of California.
+ 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ 2003 Michael A. Davis <mike@datanerds.net>
+ 2007 Sun Microsystems
+ 2002 Christopher Clark
+ 2006 Maxim Yegorushkin <maxim.yegorushkin@gmail.com>
+License: BSD-3-clause
+
 Files: depends/sources/zeromq-*.tar.gz
 Copyright:
  1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
@@ -110,11 +128,11 @@ Copyright:
  2013 Ericsson AB
  2014 AppDynamics Inc.
  2015-2016 Brocade Communications Systems Inc.
-License: LGPL-with-ZeroMQ-exception
+License: LGPL-3+ with ZeroMQ exception
 
 Files: depends/sources/google*.tar.gz
 Copyright: 2008 Google Inc.
-License: BSD-3clause-Google
+License: BSD-3-clause-Google
 
 Files: depends/sources/utfcpp-*.tar.gz
 Copyright: 2006 Nemanja Trifunovic
@@ -122,9 +140,8 @@ License: Boost-Software-License-1.0
 
 Files: depends/*/vendored-sources/halo2/*
  depends/*/vendored-sources/orchard/*
- depends/*/vendored-sources/pasta_curves/*
-Copyright: 2020 The Electric Coin Company
-License: Bootstrap-Open-Source-Licence-1.0
+Copyright: 2020-2021 The Electric Coin Company
+License: BOSL-1+ with Zcash exception
 
 Files: src/crypto/ctaes/*
 Copyright: Copyright (c) 2016 Pieter Wuille
@@ -158,9 +175,33 @@ License: GNU-All-permissive-License
 
 Files src/leveldb/*
 Copyright: 2011, The LevelDB Authors
-License: BSD-3clause-Google
+License: BSD-3-clause-Google
 Comment: The LevelDB Authors are listed in src/leveldb/AUTHORS.
 
+License: Apache-2 with LLVM exception
+ ==============================================================================
+ The LLVM Project is under the Apache License v2.0 with LLVM Exceptions:
+ ==============================================================================
+ .
+ On Debian systems, the full text of the Apache License v2.0 can be found in the
+ file `/usr/share/common-licenses/Apache-2.0`.
+ .
+ ---- LLVM Exceptions to the Apache 2.0 License ----
+ .
+ As an exception, if, as a result of your compiling your source code, portions
+ of this Software are embedded into an Object form of such source code, you
+ may redistribute such embedded portions in such Object form without complying
+ with the conditions of Sections 4(a), 4(b) and 4(d) of the License.
+ .
+ In addition, if you combine or link compiled forms of this Software with
+ software that is licensed under the GPLv2 ("Combined Software") and if a
+ court of competent jurisdiction determines that the patent provision (Section
+ 3), the indemnity provision (Section 9) or other Section of the License
+ conflicts with the conditions of the GPLv2, you may retroactively and
+ prospectively choose to deem waived or otherwise exclude such Section(s) of
+ the License, but only in their entirety and only with respect to the Combined
+ Software.
+
 License: Boost-Software-License-1.0
  Permission is hereby granted, free of charge, to any person or organization
  obtaining a copy of the software and accompanying documentation covered by
@@ -943,7 +984,7 @@ License: BDB
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-License: BSD-3clause
+License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
  .
@@ -987,7 +1028,7 @@ License: Expat
  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-License: BSD-3clause-Google
+License: BSD-3-clause-Google
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are
  met:
@@ -1014,7 +1055,7 @@ License: BSD-3clause-Google
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-License: BSD-3clause-Tobias-Klein
+License: BSD-3-clause-Tobias-Klein
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
  .
@@ -1068,7 +1109,7 @@ Comment:
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-License: LGPL-with-ZeroMQ-exception
+License: LGPL-3+ with ZeroMQ exception
  GNU LESSER GENERAL PUBLIC LICENSE
  Version 3, 29 June 2007
  .
@@ -1103,7 +1144,7 @@ License: GNU-All-permissive-License
  and this notice are preserved. This file is offered as-is, without any
  warranty.
 
-License: GPLv3-or-later-with-Autoconf-exception
+License: GPL-3+ with Autoconf exception
  This program is free software: you can redistribute it and/or modify it
  under the terms of the GNU General Public License as published by the
  Free Software Foundation, either version 3 of the License, or (at your
@@ -1117,6 +1158,9 @@ License: GPLv3-or-later-with-Autoconf-exception
  You should have received a copy of the GNU General Public License along
  with this program. If not, see <http://www.gnu.org/licenses/>.
  .
+ On Debian systems, the full text of the GNU General Public License
+ version 3 can be found in the file `/usr/share/common-licenses/GPL-3'.
+ .
  As a special exception, the respective Autoconf Macro's copyright owner
  gives unlimited permission to copy, distribute and modify the configure
  scripts that are the output of Autoconf when processing the Macro. You
@@ -1158,7 +1202,42 @@ License: Expat-with-advertising-clause
  promote the sale, use or other dealings in this Software without
  prior written authorization from the authors.
 
-License: Bootstrap-Open-Source-Licence-1.0
+License: BOSL-1+ with Zcash exception
+ This package ("Original Work") is licensed under the terms of the Bootstrap Open
+ Source License, version 1.0, or at your option, any later version ("BOSL"). See
+ the file ./LICENSE-BOSL for the terms of the Bootstrap Open Source Licence,
+ version 1.0.
+ .
+ Only if this Original Work is included as part of the distribution of one of the
+ following projects ("the Project"):
+ .
+ - The Zcash projects published by the Electric Coin Company,
+ - The Zebra project published by the Zcash Foundation,
+ .
+ then License is granted to use this package under the BOSL as modified by the
+ following clarification and special exception. This exception applies only to
+ the Original Work when linked or combined with the Project and not to the
+ Original Work when linked, combined, or included in or with any other software
+ or project or on a standalone basis.
+ .
+     Under the terms of the BOSL, linking or combining this Original Work with
+     the Project creates a Derivative Work based upon the Original Work and the
+     terms of the BOSL thus apply to both the Original Work and that Derivative
+     Work. As a special exception to the BOSL, and to allow this Original Work to
+     be linked and combined with the Project without having to apply the BOSL to
+     the other portions of the Project, you are granted permission to link or
+     combine this Original Work with the Project and to copy and distribute the
+     resulting work ("Resulting Work") under the open source license applicable
+     to the Project ("Project License"), provided that any portions of this
+     Original Work included in the Resulting Work remain subject to the BOSL. For
+     clarity, you may continue to treat all other portions of the Project under
+     the Project License, provided that you comply with the BOSL with respect to
+     the Original Work. If you modify this Original Work, your version of the
+     Original Work must remain under the BOSL. You may also extend this exception
+     to your version, but you are not obligated to do so. If you do not wish to
+     do so, delete this exception statement from your version.
+
+License: BOSL-1
  =======================================================
  Bootstrap Open Source Licence ("BOSL") v. 1.0
  =======================================================
diff --git a/contrib/devtools/rust-deps-graph.sh b/contrib/devtools/rust-deps-graph.sh
new file mode 100755
index 00000000000..7e7804f1ca2
--- /dev/null
+++ b/contrib/devtools/rust-deps-graph.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+export LC_ALL=C
+
+# default arguments are --no-transitive-deps
+ARGS="${*:---no-transitive-deps}"
+echo "Using args: $ARGS"
+
+cargo deps $ARGS | dot \
+    -Earrowhead=vee \
+    -Gratio=0.45 \
+    -Gsize=50 \
+    -Nheight=0.8 \
+    -Nfillcolor=LavenderBlush \
+    -Nstyle=filled \
+    -Nfontsize=18 \
+    -Nmargin=0.05,0.05 \
+    -Tpng > rust-dependency-graph.png
diff --git a/contrib/devtools/security-check.py b/contrib/devtools/security-check.py
index 43c825bdec7..ca1a6e0eaf6 100755
--- a/contrib/devtools/security-check.py
+++ b/contrib/devtools/security-check.py
@@ -189,8 +189,12 @@ def identify_executable(executable):
     return None
 
 if __name__ == '__main__':
+    args = sys.argv[1:]
+    allow_no_canary = "--allow-no-canary" in args
+    files = [arg for arg in args if not arg.startswith("--")]
+
     retval = 0
-    for filename in sys.argv[1:]:
+    for filename in files:
         try:
             etype = identify_executable(filename)
             if etype is None:
@@ -201,6 +205,8 @@ def identify_executable(executable):
             failed = []
             warning = []
             for (name, func) in CHECKS[etype]:
+                if name == "Canary" and allow_no_canary:
+                    continue
                 if not func(filename):
                     if name in NONFATAL:
                         warning.append(name)
diff --git a/contrib/devtools/update-rust-hashes.sh b/contrib/devtools/update-rust-hashes.sh
new file mode 100755
index 00000000000..ad036bebf1e
--- /dev/null
+++ b/contrib/devtools/update-rust-hashes.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+export LC_ALL=C
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+RUST_PACKAGE="$SCRIPT_DIR/../../depends/packages/native_rust.mk"
+
+RUST_VERSION=$( cat $RUST_PACKAGE | grep -oP "_version=\K.*" )
+
+update_hash() {
+    url="https://static.rust-lang.org/dist/$1-$RUST_VERSION-$2.tar.gz"
+    echo "Fetching $url"
+    hash=$( curl $url | sha256sum | awk '{print $1}' )
+    sed -i "/\$(package)_$3_$4=/c\\\$(package)_$3_$4=$hash" $RUST_PACKAGE
+}
+
+update_rust_hash() {
+    update_hash rust $1 sha256_hash $2
+}
+
+update_stdlib_hash() {
+    update_hash rust-std $1 rust_std_sha256_hash $1
+}
+
+# For native targets
+# update_rust_hash RUST_TARGET MAKEFILE_PACKAGE_IDENTIFIER
+update_rust_hash aarch64-unknown-linux-gnu aarch64_linux
+update_rust_hash x86_64-apple-darwin darwin
+update_rust_hash x86_64-unknown-linux-gnu linux
+update_rust_hash x86_64-unknown-freebsd freebsd
+
+# For cross-compilation targets
+# update_stdlib_hash RUST_TARGET
+update_stdlib_hash aarch64-unknown-linux-gnu
+update_stdlib_hash x86_64-apple-darwin
+update_stdlib_hash x86_64-pc-windows-gnu
+update_stdlib_hash x86_64-unknown-freebsd
diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile
index 2c0a127c4dd..c5fd9513ffd 100644
--- a/contrib/docker/Dockerfile
+++ b/contrib/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:10
+FROM debian:11
 
 RUN apt-get update \
   && apt-get install -y gnupg2 apt-transport-https curl
diff --git a/contrib/docker/README.md b/contrib/docker/README.md
index 912604517f2..69f5b7e9d8c 100644
--- a/contrib/docker/README.md
+++ b/contrib/docker/README.md
@@ -76,7 +76,7 @@ mkdir {./zcash-params-dir,./zcash-data-dir}
 sudo chown -R 2001.2001 {./zcash-params-dir,./zcash-data-dir}
 docker run -d --name my_zcashd \
   -v $(pwd)/zcash-data-dir:/srv/zcashd/.zcash \
-  -v $(pwd)/zcash-params-dir/srv/zcashd/.zcash-params \
+  -v $(pwd)/zcash-params-dir:/srv/zcashd/.zcash-params \
   electriccoinco/zcashd
 ```  
 
diff --git a/contrib/docker/entrypoint.sh b/contrib/docker/entrypoint.sh
index 0dc336851fe..adcbbf8fca3 100755
--- a/contrib/docker/entrypoint.sh
+++ b/contrib/docker/entrypoint.sh
@@ -40,6 +40,8 @@ if [[ -n "${ZCASHD_RPCPORT}" ]];then ZCASHD_CMD+=" -rpcport=${ZCASHD_RPCPORT}";f
 if [[ -n "${ZCASHD_ALLOWIP}" ]];then ZCASHD_CMD+=" -rpcallowip=${ZCASHD_ALLOWIP}";fi
 if [[ -n "${ZCASHD_TXINDEX}" ]];then ZCASHD_CMD+=" -txindex";fi
 if [[ -n "${ZCASHD_INSIGHTEXPLORER}" ]];then ZCASHD_CMD+=" -insightexplorer";fi
+if [[ -n "${ZCASHD_PROMETHEUSPORT}" ]];then ZCASHD_CMD+=" -prometheusport=${ZCASHD_PROMETHEUSPORT}";fi
+if [[ -n "${ZCASHD_METRICSIP}" ]];then ZCASHD_CMD+=" -metricsallowip=${ZCASHD_METRICSIP}";fi
 if [[ -n "${ZCASHD_ZMQPORT}" && -n "${ZCASHD_ZMQBIND}" ]];then
   ZCASHD_CMD+=" -zmqpubhashblock=tcp://${ZCASHD_ZMQBIND}:${ZCASHD_ZMQPORT}"
   ZCASHD_CMD+=" -zmqpubhashtx=tcp://${ZCASHD_ZMQBIND}:${ZCASHD_ZMQPORT}"
diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index 3eddeff5a54..69db0cca2d2 100644
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -1,9 +1,10 @@
 ---
-name: "zcash-4.4.1"
+name: "zcash-4.6.0-1"
 enable_cache: true
 distro: "debian"
 suites:
 - "stretch"
+- "buster"
 architectures:
 - "amd64"
 packages:
@@ -17,6 +18,7 @@ packages:
 - "g++-multilib"
 - "git-core"
 - "libc6-dev"
+- "libtinfo5"
 - "libtool"
 - "libxml2"
 - "m4"
diff --git a/depends/builders/freebsd.mk b/depends/builders/freebsd.mk
index fb2fefe2a2e..7a61043e93e 100644
--- a/depends/builders/freebsd.mk
+++ b/depends/builders/freebsd.mk
@@ -1,2 +1,4 @@
+build_freebsd_CC = clang
+build_freebsd_CXX = clang++
 build_freebsd_SHA256SUM = shasum -a 256
 build_freebsd_DOWNLOAD = curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -o
diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk
index 7d31a88032c..f64c3474e1c 100644
--- a/depends/packages/boost.mk
+++ b/depends/packages/boost.mk
@@ -1,10 +1,9 @@
 package=boost
-$(package)_version=1_74_0
+$(package)_version=1_78_0
 $(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/$(subst _,.,$($(package)_version))/source/
 $(package)_file_name=boost_$($(package)_version).tar.bz2
-$(package)_sha256_hash=83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1
+$(package)_sha256_hash=8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc
 $(package)_dependencies=native_b2
-$(package)_patches=iostreams-106.patch signals2-noise.patch deprecated-two-arg-allocate.diff
 
 ifneq ($(host_os),darwin)
 $(package)_dependencies+=libcxx
@@ -42,9 +41,6 @@ endif
 endef
 
 define $(package)_preprocess_cmds
-  patch -p2 < $($(package)_patch_dir)/iostreams-106.patch && \
-  patch -p2 < $($(package)_patch_dir)/signals2-noise.patch && \
-  patch -p2 < $($(package)_patch_dir)/deprecated-two-arg-allocate.diff && \
   echo "using $($(package)_toolset_$(host_os)) : : $($(package)_cxx) : <cflags>\"$($(package)_cflags)\" <cxxflags>\"$($(package)_cxxflags)\" <compileflags>\"$($(package)_cppflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$($(package)_ar)\" <striper>\"$(host_STRIP)\"  <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam
 endef
 
diff --git a/depends/packages/libcxx.mk b/depends/packages/libcxx.mk
index 0acb979298f..bbadd228e3f 100644
--- a/depends/packages/libcxx.mk
+++ b/depends/packages/libcxx.mk
@@ -8,10 +8,10 @@ ifneq ($(host_os),mingw32)
 $(package)_download_path=$(native_clang_download_path)
 $(package)_download_file_aarch64_linux=clang+llvm-$($(package)_version)-aarch64-linux-gnu.tar.xz
 $(package)_file_name_aarch64_linux=clang-llvm-$($(package)_version)-aarch64-linux-gnu.tar.xz
-$(package)_sha256_hash_aarch64_linux=3d4ad804b7c85007686548cbc917ab067bf17eaedeab43d9eb83d3a683d8e9d4
-$(package)_download_file_linux=clang+llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-16.04.tar.xz
-$(package)_file_name_linux=clang-llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-16.04.tar.xz
-$(package)_sha256_hash_linux=6b3cc55d3ef413be79785c4dc02828ab3bd6b887872b143e3091692fc6acefe7
+$(package)_sha256_hash_aarch64_linux=15ff2db12683e69e552b6668f7ca49edaa01ce32cb1cbc8f8ed2e887ab291069
+$(package)_download_file_linux=clang+llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-18.04.tar.xz
+$(package)_file_name_linux=clang-llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-18.04.tar.xz
+$(package)_sha256_hash_linux=84a54c69781ad90615d1b0276a83ff87daaeded99fbc64457c350679df7b4ff0
 
 define $(package)_stage_cmds
   mkdir -p $($(package)_staging_prefix_dir)/lib && \
@@ -21,14 +21,15 @@ endef
 
 else
 # For Windows cross-compilation, use the MSYS2 binaries.
+# Using 13.0.0-3 because 13.0.1-1 has missing `new` and `delete` symbols.
 $(package)_download_path=https://repo.msys2.org/mingw/x86_64
-$(package)_download_file=mingw-w64-x86_64-libc++-12.0.1-1-any.pkg.tar.zst
-$(package)_file_name=mingw-w64-x86_64-libcxx-12.0.1-1-any.pkg.tar.zst
-$(package)_sha256_hash=847d86435c35f12b4bc779c91c800a86499ba5c9d419d6ed5e2386c7582c2e81
+$(package)_download_file=mingw-w64-x86_64-libc++-13.0.0-3-any.pkg.tar.zst
+$(package)_file_name=mingw-w64-x86_64-libcxx-13.0.0-3-any.pkg.tar.zst
+$(package)_sha256_hash=0f8819e88273579f7c9262456c6b8f4d73e1693095c2364d1192c61c5f6a1a4f
 
-$(package)_libcxxabi_download_file=mingw-w64-x86_64-libc++abi-12.0.1-1-any.pkg.tar.zst
-$(package)_libcxxabi_file_name=mingw-w64-x86_64-libcxxabi-12.0.1-1-any.pkg.tar.zst
-$(package)_libcxxabi_sha256_hash=a60294cb611916f4b9db27b7a6f3d6dc0f75d9006ad6a5bb830427df9b5bc9d2
+$(package)_libcxxabi_download_file=mingw-w64-x86_64-libc++abi-13.0.0-3-any.pkg.tar.zst
+$(package)_libcxxabi_file_name=mingw-w64-x86_64-libcxxabi-13.0.0-3-any.pkg.tar.zst
+$(package)_libcxxabi_sha256_hash=7224a7252a566938afe91ea8f130682abd29b10e13c9a3c2347af523ca0d7c42
 
 $(package)_extra_sources += $($(package)_libcxxabi_file_name)
 
diff --git a/depends/packages/native_clang.mk b/depends/packages/native_clang.mk
index 4db1a43390a..662e088ebf2 100644
--- a/depends/packages/native_clang.mk
+++ b/depends/packages/native_clang.mk
@@ -1,23 +1,26 @@
 package=native_clang
-$(package)_major_version=12
-$(package)_version=12.0.1
+$(package)_major_version=13
+$(package)_version=13.0.1
 $(package)_download_path=https://github.com/llvm/llvm-project/releases/download/llvmorg-$($(package)_version)
 $(package)_download_path_linux=https://github.com/llvm/llvm-project/releases/download/llvmorg-$($(package)_version)
-$(package)_download_file_linux=clang+llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-16.04.tar.xz
-$(package)_file_name_linux=clang-llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-16.04.tar.xz
-$(package)_sha256_hash_linux=6b3cc55d3ef413be79785c4dc02828ab3bd6b887872b143e3091692fc6acefe7
-$(package)_download_path_darwin=https://github.com/llvm/llvm-project/releases/download/llvmorg-$($(package)_major_version).0.0
-$(package)_download_file_darwin=clang+llvm-$($(package)_major_version).0.0-x86_64-apple-darwin.tar.xz
-$(package)_file_name_darwin=clang-llvm-$($(package)_major_version).0.0-x86_64-apple-darwin.tar.xz
-$(package)_sha256_hash_darwin=7bc2259bf75c003f644882460fc8e844ddb23b27236fe43a2787870a4cd8ab50
+$(package)_download_file_linux=clang+llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-18.04.tar.xz
+$(package)_file_name_linux=clang-llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-18.04.tar.xz
+$(package)_sha256_hash_linux=84a54c69781ad90615d1b0276a83ff87daaeded99fbc64457c350679df7b4ff0
+$(package)_download_path_darwin=https://github.com/llvm/llvm-project/releases/download/llvmorg-$($(package)_version)
+$(package)_download_file_darwin=clang+llvm-$($(package)_version)-x86_64-apple-darwin.tar.xz
+$(package)_file_name_darwin=clang-llvm-$($(package)_version)-x86_64-apple-darwin.tar.xz
+$(package)_sha256_hash_darwin=dec02d17698514d0fc7ace8869c38937851c542b02adf102c4e898f027145a4d
 $(package)_download_path_freebsd=https://github.com/llvm/llvm-project/releases/download/llvmorg-$($(package)_version)
-$(package)_download_file_freebsd=clang+llvm-$($(package)_version)-amd64-unknown-freebsd11.tar.xz
-$(package)_file_name_freebsd=clang-llvm-$($(package)_version)-amd64-unknown-freebsd11.tar.xz
-$(package)_sha256_hash_freebsd=94dfe48d9e483283edbee968056d487a850b30de25258fa48f049cca3ede5db4
-
+$(package)_download_file_freebsd=clang+llvm-$($(package)_version)-amd64-unknown-freebsd12.tar.xz
+$(package)_file_name_freebsd=clang-llvm-$($(package)_version)-amd64-unknown-freebsd12.tar.xz
+$(package)_sha256_hash_freebsd=8101c8d3a920bf930b33987ada5373f43537c5de8c194be0ea10530fd0ad5617
 $(package)_download_file_aarch64_linux=clang+llvm-$($(package)_version)-aarch64-linux-gnu.tar.xz
 $(package)_file_name_aarch64_linux=clang-llvm-$($(package)_version)-aarch64-linux-gnu.tar.xz
-$(package)_sha256_hash_aarch64_linux=3d4ad804b7c85007686548cbc917ab067bf17eaedeab43d9eb83d3a683d8e9d4
+$(package)_sha256_hash_aarch64_linux=15ff2db12683e69e552b6668f7ca49edaa01ce32cb1cbc8f8ed2e887ab291069
+
+ifneq (,$(wildcard /etc/arch-release))
+$(package)_dependencies=native_libtinfo
+endif
 
 # Ensure we have clang native to the builder, not the target host
 ifneq ($(canonical_host),$(build))
diff --git a/depends/packages/native_libtinfo.mk b/depends/packages/native_libtinfo.mk
new file mode 100644
index 00000000000..d3c200660dd
--- /dev/null
+++ b/depends/packages/native_libtinfo.mk
@@ -0,0 +1,22 @@
+package=native_tinfo
+$(package)_version=5.6.0
+$(package)_download_path_linux=http://ftp.debian.org/debian/pool/main/n/ncurses/
+$(package)_download_file_linux=libtinfo5_6.0+20161126-1+deb9u2_amd64.deb
+$(package)_file_name_linux=libtinfo5_6.0+20161126-1+deb9u2_amd64.deb
+$(package)_sha256_hash_linux=1d249a3193568b5ef785ad8993b9ba6d6fdca0eb359204c2355532b82d25e9f5
+
+define $(package)_extract_cmds
+	mkdir -p $($(package)_extract_dir) && \
+	echo "$($(package)_sha256_hash)  $($(package)_source)" > $($(package)_extract_dir)/.$($(package)_file_name).hash && \
+	$(build_SHA256SUM) -c $($(package)_extract_dir)/.$($(package)_file_name).hash && \
+	mkdir -p libtinfo5 && \
+	ar x --output libtinfo5 $($(package)_source_dir)/$($(package)_file_name) && \
+	cd libtinfo5 && \
+	tar xf data.tar.xz
+endef
+
+define $(package)_stage_cmds
+	pwd && \
+	mkdir -p $($(package)_staging_prefix_dir)/lib && \
+	cp libtinfo5/lib/x86_64-linux-gnu/libtinfo.so.5.9 $($(package)_staging_prefix_dir)/lib/libtinfo.so.5
+endef
diff --git a/depends/packages/native_rust.mk b/depends/packages/native_rust.mk
index 0cab70854b8..a1901a8fe0c 100644
--- a/depends/packages/native_rust.mk
+++ b/depends/packages/native_rust.mk
@@ -1,15 +1,14 @@
 package=native_rust
-$(package)_version=1.54.0
+$(package)_version=1.59.0
 $(package)_download_path=https://static.rust-lang.org/dist
 $(package)_file_name_linux=rust-$($(package)_version)-x86_64-unknown-linux-gnu.tar.gz
-$(package)_sha256_hash_linux=350354495b1d4b6dd2ec7cf96aa9bc61d031951cf667a31e8cf401dc508639e6
+$(package)_sha256_hash_linux=0c1c2da3fa26372e5178123aa5bb0fdcd4933fbad9bfb268ffbd71807182ecae
 $(package)_file_name_darwin=rust-$($(package)_version)-x86_64-apple-darwin.tar.gz
-$(package)_sha256_hash_darwin=5eb27a4f5f7a4699bc70cf1848e340ddd74e151488bfcb26853fd584958e3d33
+$(package)_sha256_hash_darwin=d82204f536af0c7bfd2ea2213dc46b99911860cfc5517f7321244412ae96f159
 $(package)_file_name_freebsd=rust-$($(package)_version)-x86_64-unknown-freebsd.tar.gz
-$(package)_sha256_hash_freebsd=026a40470b9fddfbb4abff3546e620eceaa2812ffc13e180bbb9360c01501a16
-
+$(package)_sha256_hash_freebsd=83f9c49b6e9025b712fc5d65e49f1b6ad959966534cd39c8dc2ce2c85a6ca484
 $(package)_file_name_aarch64_linux=rust-$($(package)_version)-aarch64-unknown-linux-gnu.tar.gz
-$(package)_sha256_hash_aarch64_linux=33a50c5366a57aaab43c1c19e4a49ab7d8ffcd99a72925c315fb1f9389139e6f
+$(package)_sha256_hash_aarch64_linux=ab5da30a3de5433e26cbc74c56b9d97b569769fc2e456fc54378adc8baaee4f0
 
 # Mapping from GCC canonical hosts to Rust targets
 # If a mapping is not present, we assume they are identical, unless $host_os is
@@ -18,9 +17,10 @@ $(package)_rust_target_x86_64-pc-linux-gnu=x86_64-unknown-linux-gnu
 $(package)_rust_target_x86_64-w64-mingw32=x86_64-pc-windows-gnu
 
 # Mapping from Rust targets to SHA-256 hashes
-$(package)_rust_std_sha256_hash_aarch64-unknown-linux-gnu=2d90cd90734a2d057b2a4eeee36a72d96569fb5fff0ac1e22eeb5fab93e66848
-$(package)_rust_std_sha256_hash_x86_64-apple-darwin=3908ff438cdf39c3f46a103f3a0fa04a0d8add996c87e4290c80f1a766df6a04
-$(package)_rust_std_sha256_hash_x86_64-pc-windows-gnu=b3d234211c4255bef6eca800cfb4c44e7779e9d4cb7c0dbe6cd69d8722dd55d6
+$(package)_rust_std_sha256_hash_aarch64-unknown-linux-gnu=81dbd37919f631f962ac0798111803eb8f06ffde608f0e5dd3682d701cf5566d
+$(package)_rust_std_sha256_hash_x86_64-apple-darwin=959af8bafbc9f3916a1d1111d7378fdd7aa459410cdd2d3bbfc2d9d9a6db0683
+$(package)_rust_std_sha256_hash_x86_64-pc-windows-gnu=9a67ae84e9e75efb57eeeab617e32379a555de336a30bb74a476e575cd38f63a
+$(package)_rust_std_sha256_hash_x86_64-unknown-freebsd=cf5e4303dd7c3b70a738a2336097c9f2189c8b702a89a8c453d83ac0dee4602c
 
 define rust_target
 $(if $($(1)_rust_target_$(2)),$($(1)_rust_target_$(2)),$(if $(findstring darwin,$(3)),x86_64-apple-darwin,$(if $(findstring freebsd,$(3)),x86_64-unknown-freebsd,$(2))))
diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk
index b7407c8619c..2d85c322685 100644
--- a/depends/packages/packages.mk
+++ b/depends/packages/packages.mk
@@ -2,6 +2,10 @@ zcash_packages := libsodium utfcpp
 packages := boost libevent zeromq $(zcash_packages) googletest
 native_packages := native_clang native_ccache native_rust
 
+ifneq (,$(wildcard /etc/arch-release))
+native_packages += native_libtinfo
+endif
+
 wallet_packages=bdb
 
 $(host_arch)_$(host_os)_native_packages += native_b2
diff --git a/depends/patches/boost/deprecated-two-arg-allocate.diff b/depends/patches/boost/deprecated-two-arg-allocate.diff
deleted file mode 100644
index f9622856636..00000000000
--- a/depends/patches/boost/deprecated-two-arg-allocate.diff
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -ur orig/include/boost/core/allocator_access.hpp patched/include/boost/core/allocator_access.hpp
---- orig/include/boost/core/allocator_access.hpp	2021-01-18 21:42:05.926895400 +0000
-+++ patched/include/boost/core/allocator_access.hpp	2021-01-18 21:44:26.426895400 +0000
-@@ -11,7 +11,7 @@
- #include <boost/config.hpp>
- #if !defined(BOOST_NO_CXX11_ALLOCATOR)
- #include <boost/core/pointer_traits.hpp>
--#if !defined(BOOST_MSVC)
-+#if !defined(BOOST_MSVC) && !defined(BOOST_CLANG)
- #include <limits>
- #else
- #include <memory>
-@@ -49,7 +49,7 @@
- struct allocator_pointer {
-     typedef typename A::pointer type;
- };
--#elif defined(BOOST_MSVC)
-+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG)
- template<class A>
- struct allocator_pointer {
-     typedef typename std::allocator_traits<A>::pointer type;
-@@ -72,7 +72,7 @@
- struct allocator_const_pointer {
-     typedef typename A::const_pointer type;
- };
--#elif defined(BOOST_MSVC)
-+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG)
- template<class A>
- struct allocator_const_pointer {
-     typedef typename std::allocator_traits<A>::const_pointer type;
-@@ -137,7 +137,7 @@
- struct allocator_difference_type {
-     typedef typename A::difference_type type;
- };
--#elif defined(BOOST_MSVC)
-+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG)
- template<class A>
- struct allocator_difference_type {
-     typedef typename std::allocator_traits<A>::difference_type type;
-@@ -161,7 +161,7 @@
- struct allocator_size_type {
-     typedef typename A::size_type type;
- };
--#elif defined(BOOST_MSVC)
-+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG)
- template<class A>
- struct allocator_size_type {
-     typedef typename std::allocator_traits<A>::size_type type;
-@@ -260,7 +260,7 @@
- struct allocator_rebind {
-     typedef typename A::template rebind<T>::other type;
- };
--#elif defined(BOOST_MSVC)
-+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG)
- template<class A, class T>
- struct allocator_rebind {
-     typedef typename std::allocator_traits<A>::template rebind_alloc<T> type;
-@@ -313,7 +313,7 @@
- {
-     return a.allocate(n, h);
- }
--#elif defined(BOOST_MSVC)
-+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG)
- template<class A>
- inline typename allocator_pointer<A>::type
- allocator_allocate(A& a, typename allocator_size_type<A>::type n,
-@@ -400,7 +400,7 @@
-     ::new((void*)p) T(v);
- }
- #endif
--#elif defined(BOOST_MSVC)
-+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG)
- template<class A, class T, class... Args>
- inline void
- allocator_construct(A& a, T* p, Args&&... args)
-@@ -449,7 +449,7 @@
-     p->~T();
-     (void)p;
- }
--#elif defined(BOOST_MSVC)
-+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG)
- template<class A, class T>
- inline void
- allocator_destroy(A& a, T* p)
-@@ -496,7 +496,7 @@
- {
-     return a.max_size();
- }
--#elif defined(BOOST_MSVC)
-+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG)
- template<class A>
- inline typename allocator_size_type<A>::type
- allocator_max_size(const A& a)
-@@ -545,7 +545,7 @@
- {
-     return a;
- }
--#elif defined(BOOST_MSVC)
-+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG)
- template<class A>
- inline A
- allocator_select_on_container_copy_construction(const A& a)
diff --git a/depends/patches/boost/iostreams-106.patch b/depends/patches/boost/iostreams-106.patch
deleted file mode 100644
index dcecd5d0df7..00000000000
--- a/depends/patches/boost/iostreams-106.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4e76f73826fd0a7067b837e4850a9051436f5ec5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jean-Micha=C3=ABl=20Celerier?=
- <jeanmichael.celerier+github@gmail.com>
-Date: Sun, 22 Dec 2019 10:26:38 +0100
-Subject: [PATCH] Fix build on windows with libc++
-
-Proposed by @SquallATF in #67
----
- include/boost/iostreams/detail/config/fpos.hpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/include/boost/iostreams/detail/config/fpos.hpp b/include/boost/iostreams/detail/config/fpos.hpp
-index c5dc6cf59..a5835421f 100644
---- a/include/boost/iostreams/detail/config/fpos.hpp
-+++ b/include/boost/iostreams/detail/config/fpos.hpp
-@@ -26,7 +26,8 @@
- 
- # if (defined(_YVALS) || defined(_CPPLIB_VER)) && !defined(__SGI_STL_PORT) && \
-      !defined(_STLPORT_VERSION) && !defined(__QNX__) && !defined(_VX_CPU) && !defined(__VXWORKS__) \
--     && !((defined(BOOST_MSVC) || defined(BOOST_CLANG)) && _MSVC_STL_VERSION >= 141)
-+     && !((defined(BOOST_MSVC) || defined(BOOST_CLANG)) && _MSVC_STL_VERSION >= 141) \
-+     && !defined(_LIBCPP_VERSION)
-      /**/
- 
- #include <boost/iostreams/detail/ios.hpp>
diff --git a/depends/patches/boost/signals2-noise.patch b/depends/patches/boost/signals2-noise.patch
deleted file mode 100644
index e0a9ce48f34..00000000000
--- a/depends/patches/boost/signals2-noise.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From fd27423fea5537bc857c1fa14bb0c25b994f77b3 Mon Sep 17 00:00:00 2001
-From: Frank Mori Hess <fmh6jj@gmail.com>
-Date: Mon, 20 Jul 2020 14:17:05 -0400
-Subject: [PATCH] Fix warning about deprecated
- boost/function_output_iterator.hpp
-
----
- include/boost/signals2/detail/null_output_iterator.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/boost/signals2/detail/null_output_iterator.hpp b/include/boost/signals2/detail/null_output_iterator.hpp
-index 9e986959..dee4373c 100644
---- a/include/boost/signals2/detail/null_output_iterator.hpp
-+++ b/include/boost/signals2/detail/null_output_iterator.hpp
-@@ -11,7 +11,7 @@
- #ifndef BOOST_SIGNALS2_NULL_OUTPUT_ITERATOR_HPP
- #define BOOST_SIGNALS2_NULL_OUTPUT_ITERATOR_HPP
- 
--#include <boost/function_output_iterator.hpp>
-+#include <boost/iterator/function_output_iterator.hpp>
- 
- namespace boost
- {
diff --git a/doc/authors.md b/doc/authors.md
index 80fe6602653..c7d8886ddd0 100644
--- a/doc/authors.md
+++ b/doc/authors.md
@@ -1,33 +1,34 @@
 Zcash Contributors
 ==================
 
-Jack Grigg (1100)
+Jack Grigg (1127)
 Simon Liu (460)
 Sean Bowe (367)
-Daira Hopwood (262)
+Daira Hopwood (270)
 Eirik Ogilvie-Wigley (216)
-Wladimir J. van der Laan (133)
-Kris Nuttycombe (117)
+Kris Nuttycombe (181)
+Wladimir J. van der Laan (150)
 Alfredo Garcia (116)
 Taylor Hornby (114)
-Marshall Gaucher (105)
+Marshall Gaucher (111)
+Pieter Wuille (102)
+Jonas Schnelli (89)
 Jay Graber (89)
-Jonas Schnelli (88)
-Pieter Wuille (86)
-Marco Falke (80)
+Marco Falke (82)
 Cory Fields (75)
-Larry Ruane (60)
+Larry Ruane (72)
 Ying Tong Lai (56)
 Nathan Wilcox (56)
-Matt Corallo (48)
+Matt Corallo (52)
 practicalswift (38)
 Kevin Gallagher (38)
 fanquake (36)
-Dimitris Apostolou (34)
+Dimitris Apostolou (35)
 Carl Dong (26)
+Gregory Maxwell (23)
 Jorge Timón (22)
-Luke Dashjr (20)
-Gregory Maxwell (19)
+Luke Dashjr (21)
+John Newbery (21)
 Jonathan "Duke" Leto (18)
 syd (16)
 Patick Strateman (16)
@@ -36,24 +37,24 @@ avnish (14)
 Per Grön (14)
 Benjamin Winston (13)
 Pavel Janík (12)
+Patrick Strateman (12)
 Ariel Gabizon (12)
+Suhas Daftuar (11)
 Paige Peterson (11)
 Kaz Wesley (11)
-John Newbery (11)
+Alex Morcos (11)
 Philip Kaufmann (10)
 Peter Todd (10)
 João Barbosa (10)
+Charlie O'Keefe (10)
 nomnombtc (9)
 Marius Kjærstad (9)
+teor (8)
 kozyilmaz (8)
-Suhas Daftuar (8)
 Jeremy Rubin (8)
 Jeff Garzik (8)
-Charlie O'Keefe (8)
 Ben Wilson (8)
-Patrick Strateman (7)
 Karl-Johan Alm (7)
-Alex Morcos (7)
 ying tong (6)
 James O'Beirne (6)
 David Mercer (6)
@@ -63,6 +64,7 @@ Chun Kuan Lee (6)
 Casey Rodarmor (6)
 jnewbery (5)
 ca333 (5)
+Sasha (5)
 MeshCollider (5)
 Johnathan Corgan (5)
 George Tankersley (5)
@@ -73,7 +75,9 @@ gladcow (4)
 Zancas Wilcox (4)
 WO (4)
 Sjors Provoost (4)
+Russell Yanofsky (4)
 Nate Wilcox (4)
+Alex Wied (4)
 mruddy (3)
 lpescher (3)
 isle2983 (3)
@@ -84,16 +88,18 @@ Julian Fleischer (3)
 Jim Posen (3)
 Jason Davies (3)
 Evan Klitzke (3)
+Ethan Heilman (3)
+Eric Lombrozo (3)
 Danny Willems (3)
 Anthony Towns (3)
 Alfie John (3)
-Alex Wied (3)
 whythat (2)
 rofl0r (2)
 ptschip (2)
 noname45688@gmail.com (2)
 kpcyrd (2)
 kobake (2)
+hexabot (2)
 face (2)
 aniemerg (2)
 Yuri Zhykin (2)
@@ -104,7 +110,6 @@ Solar Designer (2)
 Sebastian Falbesoner (2)
 Scott (2)
 S. Matthew English (2)
-Russell Yanofsky (2)
 Robert C. Seacord (2)
 Pejvan (2)
 Pavol Rusnak (2)
@@ -116,7 +121,6 @@ Joe Turgeon (2)
 Jeffrey Czyz (2)
 Jack Gavigan (2)
 ITH4Coinomia (2)
-Ethan Heilman (2)
 Dagur Valberg Johannsson (2)
 Bryant Eisenbach (2)
 Brad Miller (2)
@@ -125,13 +129,14 @@ Ben Woosley (2)
 Amgad Abdelhafez (2)
 Alex Tsankov (2)
 Akio Nakamura (2)
+Aditya Kulkarni (2)
 ロハン ダル (1)
 zathras-crypto (1)
 vim88 (1)
 unsystemizer (1)
 tulip (1)
 tpantin (1)
-teor (1)
+sgmoore (1)
 randy-waterhouse (1)
 plutoforever (1)
 murrayn (1)
@@ -158,8 +163,10 @@ Vasil Dimov (1)
 Ulrich Kempken (1)
 Tom Ritter (1)
 Tom Harding (1)
+Technetium (1)
 Steven Smith (1)
 Stephen (1)
+Shaul Kfir (1)
 Ross Nicoll (1)
 Rod Vagg (1)
 Robert McLaughlin (1)
@@ -197,6 +204,7 @@ Josh Ellithorpe (1)
 Jonas Nick (1)
 Jesse Cohen (1)
 Jeffrey Walton (1)
+Janito Vaqueiro Ferreira Filho (1)
 Jainan-Tandel (1)
 Igor Cota (1)
 Ian T (1)
@@ -207,7 +215,6 @@ Gregory Sanders (1)
 Gaurav Rana (1)
 Forrest Voight (1)
 Florian Schmaus (1)
-Eric Lombrozo (1)
 Eran Tromer (1)
 Elliot Olds (1)
 Dimitris Tsapakidis (1)
@@ -232,7 +239,6 @@ Allan Niemerg (1)
 Alex van der Peet (1)
 Alex (1)
 Ahmad Kazi (1)
-Aditya Kulkarni (1)
 Adam Weiss (1)
 Adam Langley (1)
 Adam Brown (1)
diff --git a/doc/book/src/dev/rust.md b/doc/book/src/dev/rust.md
index eb318e8dde3..cae406f3ac8 100644
--- a/doc/book/src/dev/rust.md
+++ b/doc/book/src/dev/rust.md
@@ -5,7 +5,7 @@ where possible.
 
 ## Adding new dependencies in online-Rust mode
 
-The `zcashd` build system pins all dependencies, and in order to faciliate
+The `zcashd` build system pins all dependencies, and in order to facilitate
 deterministic builds, `cargo` is configured to run in offline mode with vendored
 crates. This means that if, for example, you add the `foobar` crate to
 `Cargo.toml`, you will likely see an error similar to this:
diff --git a/doc/man/zcash-cli.1 b/doc/man/zcash-cli.1
index f0161a6ccd4..51ebcfcf104 100644
--- a/doc/man/zcash-cli.1
+++ b/doc/man/zcash-cli.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.13.
-.TH ZCASH-CLI "1" "June 2021" "zcash-cli v4.4.1" "User Commands"
+.TH ZCASH-CLI "1" "January 2022" "zcash-cli v4.6.0-1" "User Commands"
 .SH NAME
-zcash-cli \- manual page for zcash-cli v4.4.1
+zcash-cli \- manual page for zcash-cli v4.6.0-1
 .SH DESCRIPTION
-Zcash RPC client version v4.4.1
+Zcash RPC client version v4.6.0\-1
 .PP
 In order to ensure you are adequately protecting your privacy when using Zcash,
 please see <https://z.cash/support/security/>.
diff --git a/doc/man/zcash-tx.1 b/doc/man/zcash-tx.1
index 950fdb3885c..ddb563fcfab 100644
--- a/doc/man/zcash-tx.1
+++ b/doc/man/zcash-tx.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.13.
-.TH ZCASH-TX "1" "June 2021" "zcash-tx v4.4.1" "User Commands"
+.TH ZCASH-TX "1" "January 2022" "zcash-tx v4.6.0-1" "User Commands"
 .SH NAME
-zcash-tx \- manual page for zcash-tx v4.4.1
+zcash-tx \- manual page for zcash-tx v4.6.0-1
 .SH DESCRIPTION
-Zcash zcash\-tx utility version v4.4.1
+Zcash zcash\-tx utility version v4.6.0\-1
 .SS "Usage:"
 .TP
 zcash\-tx [options] <hex\-tx> [commands]
diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1
index cd103ba400a..cb512e41c7d 100644
--- a/doc/man/zcashd.1
+++ b/doc/man/zcashd.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.13.
-.TH ZCASHD "1" "June 2021" "zcashd v4.4.1" "User Commands"
+.TH ZCASHD "1" "January 2022" "zcashd v4.6.0-1" "User Commands"
 .SH NAME
-zcashd \- manual page for zcashd v4.4.1
+zcashd \- manual page for zcashd v4.6.0-1
 .SH DESCRIPTION
-Zcash Daemon version v4.4.1
+Zcash Daemon version v4.6.0\-1
 .PP
 In order to ensure you are adequately protecting your privacy when using Zcash,
 please see <https://z.cash/support/security/>.
@@ -84,7 +84,7 @@ Keep at most <n> unconnectable transactions in memory (default: 100)
 .HP
 \fB\-par=\fR<n>
 .IP
-Set the number of script verification threads (\fB\-6\fR to 16, 0 = auto, <0 =
+Set the number of script verification threads (\fB\-16\fR to 16, 0 = auto, <0 =
 leave that many cores free, default: 0)
 .HP
 \fB\-pid=\fR<file>
@@ -99,9 +99,13 @@ Reverting this setting requires re\-downloading the entire blockchain.
 (default: 0 = disable pruning blocks, >550 = target size in MiB to use
 for block files)
 .HP
+\fB\-reindex\-chainstate\fR
+.IP
+Rebuild chain state from the currently indexed blocks
+.HP
 \fB\-reindex\fR
 .IP
-Rebuild block chain index from current blk000??.dat files on startup
+Rebuild chain state and block index from the blk*.dat files on disk
 .HP
 \fB\-sysperms\fR
 .IP
@@ -395,7 +399,7 @@ Debugging/Testing options:
 Output debugging information (default: 0, supplying <category> is
 optional). If <category> is not supplied or if <category> = 1, output
 all debugging information. <category> can be: addrman, alert, bench,
-coindb, db, estimatefee, http, libevent, lock, mempool, net,
+coindb, db, estimatefee, http, libevent, lock, mempool, mempoolrej, net,
 partitioncheck, pow, proxy, prune, rand, receiveunsafe, reindex, rpc,
 selectcoins, tor, zmq, zrpc, zrpcunsafe (implies zrpc). For multiple
 specific categories use \fB\-debug=\fR<category> multiple times.
diff --git a/doc/reduce-traffic.md b/doc/reduce-traffic.md
index d9cb6195b9f..e5ccd8ca299 100644
--- a/doc/reduce-traffic.md
+++ b/doc/reduce-traffic.md
@@ -46,8 +46,8 @@ Be reminded of the effects of this setting.
 
 - Fee estimation will no longer work.
 - It sets the flag "-walletbroadcast" to be "0", only if it is currently unset.
-  Doing so disables the automatic broadcasting of transactions from wallet. Not
-  relaying other's transactions could hurt your privacy if used while a wallet
+  Doing so disables the automatic broadcasting of transactions from the wallet. Not
+  relaying other's transactions could hurt your privacy if used while the wallet
   is loaded or if you use the node to broadcast transactions.
 - If a peer is whitelisted and "-whitelistforcerelay" is set to "1" (which will
   also set "whitelistrelay" to "1"), we will still receive and relay their transactions.
diff --git a/doc/release-notes.md b/doc/release-notes.md
index a29094b5174..7e0fec699a0 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -4,3 +4,94 @@ release-notes at release time)
 Notable changes
 ===============
 
+Mnemonic Recovery Phrases
+-------------------------
+
+The zcashd wallet has been modified to support BIP 39, which describes how to
+derive the wallet's HD seed from a mnemonic phrase.  The mnemonic phrase will
+be generated on load of the wallet, or the first time the wallet is unlocked,
+and is available via the `z_exportwallet` RPC call. All new addresses produced
+by the wallet are now derived from this seed using the HD wallet functionality
+described in ZIP 32 and ZIP 316. For users upgrading an existing Zcashd wallet,
+it is recommended that the wallet be backed up prior to upgrading to the 4.7.0
+Zcashd release.
+
+Following the upgrade to 4.7.0, Zcashd will require that the user confirm that
+they have backed up their new emergency recovery phrase, which may be obtained
+from the output of the `z_exportwallet` RPC call. This confirmation can be
+performed manually using the `zcashd-wallet-tool` utility that is supplied
+with this release (built or installed in the same directory as `zcashd`).
+The wallet will not allow the generation of new addresses until this
+confirmation has been performed. It is recommended that after this upgrade,
+that funds tied to preexisting addresses be migrated to newly generated
+addresses so that all wallet funds are recoverable using the emergency
+recovery phrase going forward. If you choose not to migrate funds in this
+fashion, you will continue to need to securely back up the entire `wallet.dat`
+file to ensure that you do not lose access to existing funds; EXISTING FUNDS
+WILL NOT BE RECOVERABLE USING THE EMERGENCY RECOVERY PHRASE UNLESS THEY HAVE
+BEEN MOVED TO A NEWLY GENERATED ADDRESS FOLLOWING THE 4.7.0 UPGRADE.
+
+New RPC Methods
+---------------
+
+- 'walletconfirmbackup' This newly created API checks a provided emergency
+  recovery phrase against the wallet's emergency recovery phrase; if the phrases
+  match then it updates the wallet state to allow the generation of new addresses.
+  This backup confirmation workflow can be disabled by starting zcashd with 
+  `-requirewalletbackup=false` but this is not recommended unless you know what
+  you're doing (and have otherwise backed up the wallet's recovery phrase anyway).
+  For security reasons, this RPC method is not intended for use via zcash-cli 
+  but is provided to enable `zcashd-wallet-tool` and other third-party wallet 
+  interfaces to satisfy the backup confirmation requirement. Use of the 
+  `walletconfirmbackup` API via zcash-cli would risk that the recovery phrase 
+  being confirmed might be leaked via the user's shell history or the system
+  process table; `zcashd-wallet-tool` is specifically provided to avoid this
+  problem.
+- 'z_getbalanceforviewingkey' This newly created API allows a user to obtain
+  balance information for funds visible to a Sapling or Unified full
+  viewing key; if a Sprout viewing key is provided, this method allows 
+  retrieval of the balance only in the case that the wallet controls the
+  corresponding spending key.
+
+RPC Changes
+-----------
+
+- The results of the 'dumpwallet' and 'z_exportwallet' RPC methods have been modified
+  to now include the wallet's newly generated emergency recovery phrase as part of the
+  exported data.
+
+- The results of the 'getwalletinfo' RPC have been modified to return two new fields:
+  `mnemonic_seedfp` and `legacy_seedfp`, the latter of which replaces the field that
+  was previously named `seedfp`. 
+
+Wallet
+------
+
+'z_sendmany'
+------------
+
+- The 'z_sendmany' RPC call no longer permits Sprout recipients in the 
+  list of recipient addresses. Transactions spending Sprout funds will
+  still result in change being sent back into the Sprout pool, but no
+  other `Sprout->Sprout` transactions will be constructed by the Zcashd
+  wallet. 
+
+- The restriction that prohibited `Sprout->Sapling` transactions has been 
+  lifted; however, since such transactions reveal the amount crossing 
+  pool boundaries, they must be explicitly enabled via a parameter to
+  the 'z_sendmany' call.
+
+- A new string parameter, `privacyPolicy`, has been added to the list of
+  arguments accepted by `z_sendmany`. This parameter enables the caller to
+  control what kind of information they permit `zcashd` to reveal when creating
+  the transaction. If the transaction can only be created by revealing more
+  information than the given strategy permits, `z_sendmany` will return an
+  error. The parameter defaults to `LegacyCompat`, which applies the most
+  restrictive strategy `FullPrivacy` when a Unified Address is present as the
+  sender or a recipient, and otherwise preserves existing behaviour (which
+  corresponds to the `AllowFullyTransparent` policy).
+
+- Since Sprout outputs are no longer created (with the exception of change)
+  'z_sendmany' no longer generates payment disclosures (which were only 
+  available for Sprout outputs) when the `-paymentdisclosure` experimental
+  feature flag is set.
diff --git a/doc/release-notes/release-notes-4.5.0-rc1.md b/doc/release-notes/release-notes-4.5.0-rc1.md
new file mode 100644
index 00000000000..c91384283d7
--- /dev/null
+++ b/doc/release-notes/release-notes-4.5.0-rc1.md
@@ -0,0 +1,311 @@
+Changelog
+=========
+
+Aditya Kulkarni (1):
+      Sort taddr txns by txindex in addition to height
+
+Alex Morcos (4):
+      Store the total sig op count of a tx.
+      Add a score index to the mempool.
+      Add TxPriority class and comparator
+      tidy up CInv::GetCommand
+
+Daira Hopwood (8):
+      Improve error message when a block would overfill the Orchard commitment tree.
+      More precise terminology: "lock free" -> "unlocked"
+      ZIP 339 support.
+      Update URL for Boost source download (from dl.bintray.com to boostorg.jfrog.io).
+      Cargo.toml: use librustzcash after the merge of https://github.com/zcash/librustzcash/pull/424 .
+      Update unified address test data to take account of HRPs in padding (https://github.com/zcash/librustzcash/pull/419).
+      Avoid need to cast away const in the C caller of zip339_free_phrase.
+      Update authors of librustzcash to everyone currently and formerly on Core team (in alphabetical order).
+
+Eric Lombrozo (2):
+      Removed ppszTypeName from protocol.cpp
+      getdata enum issue fix
+
+Ethan Heilman (1):
+      Fix typo adddrman to addrman as requested in #8070
+
+Ethan Heilman (1):
+      Remove non-determinism which is breaking net_tests #8069
+
+Gregory Maxwell (4):
+      Eliminate TX trickle bypass, sort TX invs for privacy and priority.
+      Move bloom and feerate filtering to just prior to tx sending.
+      Do not use mempool for GETDATA for tx accepted after the last mempool req.
+      Defer inserting into maprelay until just before relaying.
+
+Jack Grigg (109):
+      Re-include reading blocks from disk in block connection benchmark
+      cargo update
+      Migrate to latest zcash_* crates
+      metrics 0.16 and metrics-exporter-prometheus 0.5
+      Implement ZIP 216 consensus rules
+      Extract SpendDescriptionV5 and OutputDescriptionV5 classes
+      rust: Enable C++ streams to be passed into Rust code
+      ZIP 225 tx format constants
+      v5 transaction format parser
+      contrib: Add BOSL to contrib/debian/copyright
+      Remove early return logic from transaction parsing
+      rust: Document read_callback_t and write_callback_t
+      CTransaction: Make new ZIP 225 fields non-const and private
+      ZIP 244 transaction digests
+      ZIP 244 signature digests
+      ZIP 244 hashAuthDataRoot computation
+      Fix tests that assume CTxOuts can be "null"
+      test: Generate valid Sapling types
+      test: Small fixes to sighash test vector generation
+      test: Regenerate sighash.json after generator fixes
+      Throw an exception instead of asserting if Rust tx parser fails
+      CI: Publish correct book directory
+      CI: Build book with latest mdbook
+      rust: Documentation improvements to FFI methods
+      Implement Orchard authorization batch validator
+      Implement Orchard signature validation consensus rules
+      rust: Fix patched dependencies
+      book: Add dev guide page about Rust dependencies
+      Rename hashLightClientRoot to hashBlockCommitments in block header
+      ZIP 244 hashBlockCommitments implementation
+      test: Check for valid hashBlockCommitments construction post-NU5
+      Skip hashBlockCommitments check when testing block templates
+      test: Check hashBlockCommitments before, at, and after NU5 activation
+      ConnectBlock: Check NU activation when deriving block commitments
+      Copy authDigest in CTransaction::operator=(const CTransaction &tx)
+      rust: Move history tree FFI logic into a module
+      rust: Migrate to zcash_history with versioned trees
+      rust: Move history tree FFI declarations into a separate header
+      test: Use valid consensus branch IDs in history tree tests
+      Use V2 history trees from NU5 onward
+      test: Check history trees across Canopy and NU5 activations
+      rpc: Document getblock RPC finalorchardroot field, omit before NU5
+      rust: Document some requirements for history tree FFI methods
+      test: Add test case for popping from an empty history tree
+      Implement Orchard pool value tracking
+      rust: Load Orchard circuit parameters at startup
+      Check Orchard bundle-specific consensus rules, i.e. proofs
+      test: Update CCoinsViewTest with changes to CCoinsView interface
+      Include Orchard bundle in transaction dynamic usage
+      ZIP 203: Enforce coinbase nExpiryHeight consensus rule from NU5
+      test: Check for updated empty-tx reject messages in transaction tests
+      test: Fix OverwinterExpiryHeight test after ZIP 203 contextual changes
+      miner: Set coinbase expiry height to block height from NU5 activation
+      Introduce libzcash::RawAddress type
+      Use `libzcash::RawAddress` in `CWallet::GetFilteredNotes`
+      Use a visitor for handling -mineraddress config option
+      Add support for decoding and encoding Unified Addresses
+      Pass network type through to UA address handling logic
+      CI: Add workflow that runs general lints
+      CI: Check scripted diffs
+      CI: Add Rust lints
+      Document why a nested call to ExtractMinerAddress is not recursive
+      Add constants for UA typecodes
+      Postpone dependency updates we aren't doing in this release
+      depends: Update Rust to 1.54.0
+      depends: Update Clang / libcxx to LLVM 12
+      depends: Update utfcpp to 3.2.1
+      depends: Fix issue cross-compiling BDB to Windows with Clang 12
+      rust: cargo update
+      rust: metrics 0.17
+      CI: Use Rust 1.54 for lints
+      cargo fmt
+      test: Wait for transaction propagation in shorter_block_times RPC test
+      test: Fix race condition in p2p_txexpiringsoon
+      Revert "Remove reference to -reindex-chainstate"
+      test: Flush wallet in WriteCryptedSaplingZkeyDirectToDb before reopening
+      qa: Bump `sync_mempool` timeout for `prioritisetransaction.py`
+      ProcessGetData(): Rework IsExpiringSoon check
+      test: Print reject reason if RPC test block rejected instead of accepted
+      test: Fix pyflakes warnings
+      CI: Ignore errors from general lints we don't yet have passing
+      lint: remove duplicate include
+      lint: Add missing include guards
+      test: Add NU5 test cases to existing RPC tests
+      builder: Generate v5 transactions from NU5 activation
+      Print `nConsensusBranchId` in `CTransaction::ToString`
+      Separate the consensus and internal consistency checks for branch ID
+      Parse consensus branch ID when reading v5 transaction format
+      test: Use correct field of getnetworkinfo to read protocol version
+      CI: Add Dependabot config to keep Actions up-to-date
+      Introduce a WTxId struct
+      Implement CInv message type MSG_WTX
+      test: Fix bugs in mininode transaction parser
+      test: Add v5 tx support to mininode
+      ProcessGetData: Respond to MSG_WTX requests
+      Add MSG_WTX support to inv messages
+      Use wtxid for peer state management
+      test: Implement CInv.__eq__() for mininode to simplify RPC test
+      Postpone dependency updates that require CMake
+      depends: Update Rust to 1.54.0
+      test: Fix bug in mininode.SpendDescription.deserialize
+      Add named constants for legacy tx authDigest placeholder value
+      qa: Boost 1.77.0
+      cargo update
+      Migrate to latest revisions of Zcash Rust crates
+      test: Set up mininodes at the start of feature_zip239
+      net: Reject unknown CInv message types
+      make-release.py: Versioning changes for 4.5.0-rc1.
+      make-release.py: Updated manpages for 4.5.0-rc1.
+
+John Newbery (10):
+      [tests] Remove wallet accounts test
+      [wallet] GetBalance can take an isminefilter filter.
+      [wallet] Factor out GetWatchOnlyBalance()
+      [wallet] deduplicate GetAvailableCredit logic
+      [wallet] factor out GetAvailableWatchOnlyBalance()
+      [wallet] GetBalance can take a min_depth argument.
+      [RPC] [wallet] allow getbalance to use min_conf and watch_only without accounts.
+      [wallet] Remove wallet account RPCs
+      [wallet] Kill accounts
+      [net] split PushInventory()
+
+Jonas Schnelli (1):
+      fix locking issue with new mempool limiting
+
+Kris Nuttycombe (46):
+      Update transaction auth commitments for pre-v5 transactions.
+      Move OrchardBundle to its own header file.
+      Implement the Rust side of the incremental merkle tree FFI.
+      Orchard changes to coins & consensus.
+      Return std::optional for GetAnchor
+      Check nullifiers length against bundle actions length.
+      Add Orchard bundle commitments to merkle tree.
+      Add Orchard merkle tree anchor tests.
+      Documentation cleanup.
+      Update orchard dependency.
+      Update to released version of incrementalmerkletree
+      Apply suggestions from code review
+      Apply suggestions from code review
+      Fix Orchard incremental Merkle tree empty root.
+      Fix header guards for incremental_sinsemilla_tree.h
+      Apply style suggestions.
+      Consistently panic on null commitment tree pointers.
+      Fix implmentation of OrchardMerkleTree.DynamicMemoryUsage
+      Document source of Orchard merkle tree test data.
+      Apply suggestions from code review
+      Add consensus check for duplicate Orchard nullifiers within a single transaction.
+      Add Orchard nullifiers to nullifiers cache.
+      Apply suggestions from code review
+      Ensure Sapling versions are valid after NU5
+      Make CTransaction::nConsensusBranchId a std::optional
+      Add NU5 upper bound check on nSpendsSapling, nOutputsSapling, nActionsOrchard
+      Check consensus branch ID for V5 transactions.
+      Rename tx.valueBalance -> tx.valueBalanceSapling
+      Make valueBalanceSapling a private non-const member of CTransaction.
+      Add Orchard value balance checks.
+      Account for Orchard balance in GetValueOut and GetShieldedValueIn.
+      Retract partial Orchard test support.
+      Add check that v5 transactions have empty Sprout joinsplits.
+      Prevent undefined behaviour in `CTransaction::GetValueOut()`
+      ZIP 213: Add checks to support Orchard shielded coinbase outputs.
+      Add check for consistency between nActionsOrchard and Orchard flags.
+      Ensure that the Orchard note commitment tree does not exceed its maximum size.
+      Update Orchard commitment tree hashes to use total MerkleCRH^Orchard.
+      Apply suggestions from code review
+      Make Sapling Spend and Ouput count, and Orchard Action count checks be noncontextual.
+      Use DOS level 100 for noncontextual checks.
+      Fix error strings to correctly reflect context.
+      Remove unused account-related wallet methods.
+      Use manual serialization for Merkle frontiers rather than bincode.
+      Fix clippy complaints.
+      Lock the wallet in SetBestChainINTERNAL
+
+Larry Ruane (1):
+      ZIP 225: v5 transaction check rules
+
+Luke Dashjr (1):
+      Optimisation: Store transaction list order in memory rather than compute it every need
+
+Marco Falke (1):
+      [qa] py2: Unfiddle strings into bytes explicitly
+
+Matt Corallo (4):
+      Fix calling mempool directly, instead of pool, in ATMP
+      Track (and define) ::minRelayTxFee in CTxMemPool
+      Add CFeeRate += operator
+      Print mempool size in KB when adding txn
+
+Patrick Strateman (5):
+      Fix insanity of CWalletDB::WriteTx and CWalletTx::WriteToDisk
+      Add CWallet::ListAccountCreditDebit
+      Add CWallet::ReorderTransactions and use in accounting_tests.cpp
+      Move CWalletDB::ReorderTransactions to CWallet
+      Move GetAccountBalance from rpcwallet.cpp into CWallet::GetAccountBalance
+
+Pieter Wuille (16):
+      Replace trickle nodes with per-node/message Poisson delays
+      Change mapRelay to store CTransactions
+      Make ProcessNewBlock dbp const and update comment
+      Switch reindexing to AcceptBlock in-loop and ActivateBestChain afterwards
+      Optimize ActivateBestChain for long chains
+      Add -reindex-chainstate that does not rebuild block index
+      Report reindexing progress in GUI
+      Split up and optimize transaction and block inv queues
+      Handle mempool requests in send loop, subject to trickle
+      Return mempool queries in dependency order
+      Add support for unique_ptr and shared_ptr to memusage
+      Switch CTransaction storage in mempool to std::shared_ptr
+      Optimize the relay map to use shared_ptr's
+      Optimization: don't check the mempool at all if no mempool req ever
+      Optimization: use usec in expiration and reuse nNow
+      Get rid of CTxMempool::lookup() entirely
+
+Russell Yanofsky (2):
+      [wallet] Add GetLegacyBalance method to simplify getbalance RPC
+      [wallet] Remove unneeded legacy getbalance code
+
+Shaul Kfir (1):
+      Add absurdly high fee message to validation state (for RPC propagation)
+
+Suhas Daftuar (3):
+      Use txid as key in mapAlreadyAskedFor
+      Reverse the sort on the mempool's feerate index
+      Only use AddInventoryKnown for transactions
+
+Technetium (1):
+      add missing aarch64 build deps
+
+Wladimir J. van der Laan (17):
+      streams: Add data() method to CDataStream
+      streams: Remove special cases for ancient MSVC
+      dbwrapper: Use new .data() method of CDataStream
+      wallet: Use CDataStream.data()
+      net: Consistent checksum handling
+      net: Hardcode protocol sizes and use fixed-size types
+      protocol.h: Move MESSAGE_START_SIZE into CMessageHeader
+      protocol.h: Make enums in GetDataMsg concrete values
+      Add assertion and cast before sending reject code
+      Add debug message to CValidationState for optional extra information
+      Introduce REJECT_INTERNAL codes for local AcceptToMempool errors
+      Add function to convert CValidationState to a human-readable message
+      Remove most logging from transaction validation
+      Add information to errors in ConnectBlock, CheckBlock
+      Move mempool rejections to new debug category
+      net: Fix sent reject messages for blocks and transactions
+      test: Add basic test for `reject` code
+
+hexabot (2):
+      Update depends/packages/native_clang.mk
+      Update depends/packages/native_rust.mk
+
+Marshall Gaucher (5):
+      Remove sprout funding flow logic
+      Add fix and note for timing issue
+      Update funding logic bug
+      Add usage documentation for manual and faucet driven tests
+      Update funding logic
+
+Jack Grigg (12):
+      Document next_pow2 effects and algorithm source
+      Improvements to CBlock::BuildAuthDataMerkleTree
+      rust: Explicitly return null hash for pre-v5 auth digests
+      book: Note that cargo patches work with absolute paths
+      Improve docs about setting CBlockIndex hash fields
+      test: Cleanups to ZIP 221 Python test code
+      Minor fixes to documentation and formatting
+      Fix typo in method documentation
+      Track lengths when copying receiver data from C++ to Rust
+      depends: Greatly simplify the Clang 12 patch
+      Adjust code comments to remove topological-sort references
+      Fix typos
+
diff --git a/doc/release-notes/release-notes-4.5.0.md b/doc/release-notes/release-notes-4.5.0.md
new file mode 100644
index 00000000000..94453bd741e
--- /dev/null
+++ b/doc/release-notes/release-notes-4.5.0.md
@@ -0,0 +1,387 @@
+Notable changes
+===============
+
+Network Upgrade 5
+-----------------
+
+The code preparations for the Network Upgrade 5 consensus rules are finished and
+included in this release. The following ZIPs are being deployed:
+
+- [ZIP 216: Require Canonical Jubjub Point Encodings](https://zips.z.cash/zip-0216)
+- [ZIP 224: Orchard Shielded Protocol](https://zips.z.cash/zip-0224)
+- [ZIP 225: Version 5 Transaction Format](https://zips.z.cash/zip-0225)
+- [ZIP 239: Relay of Version 5 Transactions](https://zips.z.cash/zip-0239)
+- [ZIP 244: Transaction Identifier Non-Malleability](https://zips.z.cash/zip-0244)
+
+NU5 will activate on testnet at height **1,590,000**, and can also be activated
+at a specific height in regtest mode by setting the config option
+`-nuparams=f919a198:HEIGHT`.
+
+The testnet activation of NU5, and `zcashd` v4.5.0 itself, is aimed at enabling
+existing Zcash users to test their software and make the necessary changes to be
+compatible with the new consensus rules. In particular:
+
+- Wallets should start adding support for v5 transactions.
+- Miners and mining pools should ensure that their software is compatible with
+  the semantic change to the block header specified in
+  [ZIP 244](https://zips.z.cash/zip-0244#block-header-changes)
+
+A subsequent v4.5.1 release in the coming weeks will add support for generating
+and using Unified Addresses ([ZIP 316](https://zips.z.cash/zip-0316)), which
+will enable `zcashd` wallets to interact with the Orchard shielded pool.
+
+As with previous network upgrades, it is possible that backwards-incompatible
+changes might be made to the consensus rules in this testing phase, prior to
+setting the mainnet activation height. In the event that this happens, testnet
+will be rolled back in v5.0.0 and a second testnet activation will occur.
+
+See [ZIP 252](https://zips.z.cash/zip-0252) for additional information about the
+deployment process for NU5.
+
+Rejecting unknown `CInv` message types
+--------------------------------------
+
+Previously, if `zcashd` received an `inv` or `getdata` message containing
+unknown `CInv` message types, it would ignore them and process the remainder of
+the message. Starting with v4.5.0, `zcashd` will instead drop the entire `inv`
+or `getdata` message and reply with a `reject` message. This will enable node
+operators to discover whether their nodes are sending unexpected `CInv` types;
+in particular, node operators should ensure their software does not produce the
+`MSG_WTX` CInv message type intended for the Bitcoin network, which is
+incompatible with the `MSG_WTX` CInv message type defined in ZIP 239 (which will
+be used from NU5 activation for advertising v5 transactions).
+
+Deprecated or removed RPCs
+--------------------------
+
+- The 'account' API inherited from Bitcoin Core has been disabled since the
+  launch of Zcash. Following its deprecation in Bitcoin Core v0.17 and removal
+  in Bitcoin Core v0.18, we have now removed the API from `zcashd`.
+
+
+Changelog
+=========
+
+Aditya Kulkarni (1):
+      Sort taddr txns by txindex in addition to height
+
+Alex Morcos (4):
+      Store the total sig op count of a tx.
+      Add a score index to the mempool.
+      Add TxPriority class and comparator
+      tidy up CInv::GetCommand
+
+Daira Hopwood (8):
+      Improve error message when a block would overfill the Orchard commitment tree.
+      More precise terminology: "lock free" -> "unlocked"
+      ZIP 339 support.
+      Update URL for Boost source download (from dl.bintray.com to boostorg.jfrog.io).
+      Cargo.toml: use librustzcash after the merge of https://github.com/zcash/librustzcash/pull/424 .
+      Update unified address test data to take account of HRPs in padding (https://github.com/zcash/librustzcash/pull/419).
+      Avoid need to cast away const in the C caller of zip339_free_phrase.
+      Update authors of librustzcash to everyone currently and formerly on Core team (in alphabetical order).
+
+Eric Lombrozo (2):
+      Removed ppszTypeName from protocol.cpp
+      getdata enum issue fix
+
+Ethan Heilman (1):
+      Fix typo adddrman to addrman as requested in #8070
+
+Ethan Heilman (1):
+      Remove non-determinism which is breaking net_tests #8069
+
+Gregory Maxwell (4):
+      Eliminate TX trickle bypass, sort TX invs for privacy and priority.
+      Move bloom and feerate filtering to just prior to tx sending.
+      Do not use mempool for GETDATA for tx accepted after the last mempool req.
+      Defer inserting into maprelay until just before relaying.
+
+Jack Grigg (124):
+      Re-include reading blocks from disk in block connection benchmark
+      cargo update
+      Migrate to latest zcash_* crates
+      metrics 0.16 and metrics-exporter-prometheus 0.5
+      Implement ZIP 216 consensus rules
+      Extract SpendDescriptionV5 and OutputDescriptionV5 classes
+      rust: Enable C++ streams to be passed into Rust code
+      ZIP 225 tx format constants
+      v5 transaction format parser
+      contrib: Add BOSL to contrib/debian/copyright
+      Remove early return logic from transaction parsing
+      rust: Document read_callback_t and write_callback_t
+      CTransaction: Make new ZIP 225 fields non-const and private
+      ZIP 244 transaction digests
+      ZIP 244 signature digests
+      ZIP 244 hashAuthDataRoot computation
+      Fix tests that assume CTxOuts can be "null"
+      test: Generate valid Sapling types
+      test: Small fixes to sighash test vector generation
+      test: Regenerate sighash.json after generator fixes
+      Throw an exception instead of asserting if Rust tx parser fails
+      CI: Publish correct book directory
+      CI: Build book with latest mdbook
+      rust: Documentation improvements to FFI methods
+      Implement Orchard authorization batch validator
+      Implement Orchard signature validation consensus rules
+      rust: Fix patched dependencies
+      book: Add dev guide page about Rust dependencies
+      Rename hashLightClientRoot to hashBlockCommitments in block header
+      ZIP 244 hashBlockCommitments implementation
+      test: Check for valid hashBlockCommitments construction post-NU5
+      Skip hashBlockCommitments check when testing block templates
+      test: Check hashBlockCommitments before, at, and after NU5 activation
+      ConnectBlock: Check NU activation when deriving block commitments
+      Copy authDigest in CTransaction::operator=(const CTransaction &tx)
+      rust: Move history tree FFI logic into a module
+      rust: Migrate to zcash_history with versioned trees
+      rust: Move history tree FFI declarations into a separate header
+      test: Use valid consensus branch IDs in history tree tests
+      Use V2 history trees from NU5 onward
+      test: Check history trees across Canopy and NU5 activations
+      rpc: Document getblock RPC finalorchardroot field, omit before NU5
+      rust: Document some requirements for history tree FFI methods
+      test: Add test case for popping from an empty history tree
+      Implement Orchard pool value tracking
+      rust: Load Orchard circuit parameters at startup
+      Check Orchard bundle-specific consensus rules, i.e. proofs
+      test: Update CCoinsViewTest with changes to CCoinsView interface
+      Include Orchard bundle in transaction dynamic usage
+      ZIP 203: Enforce coinbase nExpiryHeight consensus rule from NU5
+      test: Check for updated empty-tx reject messages in transaction tests
+      test: Fix OverwinterExpiryHeight test after ZIP 203 contextual changes
+      miner: Set coinbase expiry height to block height from NU5 activation
+      Introduce libzcash::RawAddress type
+      Use `libzcash::RawAddress` in `CWallet::GetFilteredNotes`
+      Use a visitor for handling -mineraddress config option
+      Add support for decoding and encoding Unified Addresses
+      Pass network type through to UA address handling logic
+      CI: Add workflow that runs general lints
+      CI: Check scripted diffs
+      CI: Add Rust lints
+      Document why a nested call to ExtractMinerAddress is not recursive
+      Add constants for UA typecodes
+      Postpone dependency updates we aren't doing in this release
+      depends: Update Rust to 1.54.0
+      depends: Update Clang / libcxx to LLVM 12
+      depends: Update utfcpp to 3.2.1
+      depends: Fix issue cross-compiling BDB to Windows with Clang 12
+      rust: cargo update
+      rust: metrics 0.17
+      CI: Use Rust 1.54 for lints
+      cargo fmt
+      test: Wait for transaction propagation in shorter_block_times RPC test
+      test: Fix race condition in p2p_txexpiringsoon
+      Revert "Remove reference to -reindex-chainstate"
+      test: Flush wallet in WriteCryptedSaplingZkeyDirectToDb before reopening
+      qa: Bump `sync_mempool` timeout for `prioritisetransaction.py`
+      ProcessGetData(): Rework IsExpiringSoon check
+      test: Print reject reason if RPC test block rejected instead of accepted
+      test: Fix pyflakes warnings
+      CI: Ignore errors from general lints we don't yet have passing
+      lint: remove duplicate include
+      lint: Add missing include guards
+      test: Add NU5 test cases to existing RPC tests
+      builder: Generate v5 transactions from NU5 activation
+      Print `nConsensusBranchId` in `CTransaction::ToString`
+      Separate the consensus and internal consistency checks for branch ID
+      Parse consensus branch ID when reading v5 transaction format
+      test: Use correct field of getnetworkinfo to read protocol version
+      CI: Add Dependabot config to keep Actions up-to-date
+      Introduce a WTxId struct
+      Implement CInv message type MSG_WTX
+      test: Fix bugs in mininode transaction parser
+      test: Add v5 tx support to mininode
+      ProcessGetData: Respond to MSG_WTX requests
+      Add MSG_WTX support to inv messages
+      Use wtxid for peer state management
+      test: Implement CInv.__eq__() for mininode to simplify RPC test
+      Postpone dependency updates that require CMake
+      depends: Update Rust to 1.54.0
+      test: Fix bug in mininode.SpendDescription.deserialize
+      Add named constants for legacy tx authDigest placeholder value
+      qa: Boost 1.77.0
+      cargo update
+      Migrate to latest revisions of Zcash Rust crates
+      test: Set up mininodes at the start of feature_zip239
+      net: Reject unknown CInv message types
+      make-release.py: Versioning changes for 4.5.0-rc1.
+      make-release.py: Updated manpages for 4.5.0-rc1.
+      make-release.py: Updated release notes and changelog for 4.5.0-rc1.
+      Migrate to latest revisions of orchard and the zcash_* crates
+      contrib: Add script for generating a graph of our Rust dependencies
+      cargo update
+      build: Add primitives/orchard.h to list of header files
+      build: Ensure that cargo uses vendored dependencies for git repos
+      build: Add missing source file to zcash_gtest_SOURCES
+      rust: Move Orchard batch logic into BatchValidator methods
+      wallet: Batch-validate all Orchard signatures in the wallet on load
+      rust: Skip running the Orchard batch validator on an empty batch
+      bench: Add Orchard logic to zcbenchmarks
+      cargo update
+      Update halo2 and orchard dependencies with BOSL Zcash exception
+      make-release.py: Versioning changes for 4.5.0.
+      make-release.py: Updated manpages for 4.5.0.
+
+John Newbery (10):
+      [tests] Remove wallet accounts test
+      [wallet] GetBalance can take an isminefilter filter.
+      [wallet] Factor out GetWatchOnlyBalance()
+      [wallet] deduplicate GetAvailableCredit logic
+      [wallet] factor out GetAvailableWatchOnlyBalance()
+      [wallet] GetBalance can take a min_depth argument.
+      [RPC] [wallet] allow getbalance to use min_conf and watch_only without accounts.
+      [wallet] Remove wallet account RPCs
+      [wallet] Kill accounts
+      [net] split PushInventory()
+
+Jonas Schnelli (1):
+      fix locking issue with new mempool limiting
+
+Kris Nuttycombe (46):
+      Update transaction auth commitments for pre-v5 transactions.
+      Move OrchardBundle to its own header file.
+      Implement the Rust side of the incremental merkle tree FFI.
+      Orchard changes to coins & consensus.
+      Return std::optional for GetAnchor
+      Check nullifiers length against bundle actions length.
+      Add Orchard bundle commitments to merkle tree.
+      Add Orchard merkle tree anchor tests.
+      Documentation cleanup.
+      Update orchard dependency.
+      Update to released version of incrementalmerkletree
+      Apply suggestions from code review
+      Apply suggestions from code review
+      Fix Orchard incremental Merkle tree empty root.
+      Fix header guards for incremental_sinsemilla_tree.h
+      Apply style suggestions.
+      Consistently panic on null commitment tree pointers.
+      Fix implmentation of OrchardMerkleTree.DynamicMemoryUsage
+      Document source of Orchard merkle tree test data.
+      Apply suggestions from code review
+      Add consensus check for duplicate Orchard nullifiers within a single transaction.
+      Add Orchard nullifiers to nullifiers cache.
+      Apply suggestions from code review
+      Ensure Sapling versions are valid after NU5
+      Make CTransaction::nConsensusBranchId a std::optional
+      Add NU5 upper bound check on nSpendsSapling, nOutputsSapling, nActionsOrchard
+      Check consensus branch ID for V5 transactions.
+      Rename tx.valueBalance -> tx.valueBalanceSapling
+      Make valueBalanceSapling a private non-const member of CTransaction.
+      Add Orchard value balance checks.
+      Account for Orchard balance in GetValueOut and GetShieldedValueIn.
+      Retract partial Orchard test support.
+      Add check that v5 transactions have empty Sprout joinsplits.
+      Prevent undefined behaviour in `CTransaction::GetValueOut()`
+      ZIP 213: Add checks to support Orchard shielded coinbase outputs.
+      Add check for consistency between nActionsOrchard and Orchard flags.
+      Ensure that the Orchard note commitment tree does not exceed its maximum size.
+      Update Orchard commitment tree hashes to use total MerkleCRH^Orchard.
+      Apply suggestions from code review
+      Make Sapling Spend and Ouput count, and Orchard Action count checks be noncontextual.
+      Use DOS level 100 for noncontextual checks.
+      Fix error strings to correctly reflect context.
+      Remove unused account-related wallet methods.
+      Use manual serialization for Merkle frontiers rather than bincode.
+      Fix clippy complaints.
+      Lock the wallet in SetBestChainINTERNAL
+
+Larry Ruane (1):
+      ZIP 225: v5 transaction check rules
+
+Luke Dashjr (1):
+      Optimisation: Store transaction list order in memory rather than compute it every need
+
+Marco Falke (1):
+      [qa] py2: Unfiddle strings into bytes explicitly
+
+Matt Corallo (4):
+      Fix calling mempool directly, instead of pool, in ATMP
+      Track (and define) ::minRelayTxFee in CTxMemPool
+      Add CFeeRate += operator
+      Print mempool size in KB when adding txn
+
+Patrick Strateman (5):
+      Fix insanity of CWalletDB::WriteTx and CWalletTx::WriteToDisk
+      Add CWallet::ListAccountCreditDebit
+      Add CWallet::ReorderTransactions and use in accounting_tests.cpp
+      Move CWalletDB::ReorderTransactions to CWallet
+      Move GetAccountBalance from rpcwallet.cpp into CWallet::GetAccountBalance
+
+Pieter Wuille (16):
+      Replace trickle nodes with per-node/message Poisson delays
+      Change mapRelay to store CTransactions
+      Make ProcessNewBlock dbp const and update comment
+      Switch reindexing to AcceptBlock in-loop and ActivateBestChain afterwards
+      Optimize ActivateBestChain for long chains
+      Add -reindex-chainstate that does not rebuild block index
+      Report reindexing progress in GUI
+      Split up and optimize transaction and block inv queues
+      Handle mempool requests in send loop, subject to trickle
+      Return mempool queries in dependency order
+      Add support for unique_ptr and shared_ptr to memusage
+      Switch CTransaction storage in mempool to std::shared_ptr
+      Optimize the relay map to use shared_ptr's
+      Optimization: don't check the mempool at all if no mempool req ever
+      Optimization: use usec in expiration and reuse nNow
+      Get rid of CTxMempool::lookup() entirely
+
+Russell Yanofsky (2):
+      [wallet] Add GetLegacyBalance method to simplify getbalance RPC
+      [wallet] Remove unneeded legacy getbalance code
+
+Shaul Kfir (1):
+      Add absurdly high fee message to validation state (for RPC propagation)
+
+Suhas Daftuar (3):
+      Use txid as key in mapAlreadyAskedFor
+      Reverse the sort on the mempool's feerate index
+      Only use AddInventoryKnown for transactions
+
+Technetium (1):
+      add missing aarch64 build deps
+
+Wladimir J. van der Laan (17):
+      streams: Add data() method to CDataStream
+      streams: Remove special cases for ancient MSVC
+      dbwrapper: Use new .data() method of CDataStream
+      wallet: Use CDataStream.data()
+      net: Consistent checksum handling
+      net: Hardcode protocol sizes and use fixed-size types
+      protocol.h: Move MESSAGE_START_SIZE into CMessageHeader
+      protocol.h: Make enums in GetDataMsg concrete values
+      Add assertion and cast before sending reject code
+      Add debug message to CValidationState for optional extra information
+      Introduce REJECT_INTERNAL codes for local AcceptToMempool errors
+      Add function to convert CValidationState to a human-readable message
+      Remove most logging from transaction validation
+      Add information to errors in ConnectBlock, CheckBlock
+      Move mempool rejections to new debug category
+      net: Fix sent reject messages for blocks and transactions
+      test: Add basic test for `reject` code
+
+hexabot (2):
+      Update depends/packages/native_clang.mk
+      Update depends/packages/native_rust.mk
+
+Marshall Gaucher (5):
+      Remove sprout funding flow logic
+      Add fix and note for timing issue
+      Update funding logic bug
+      Add usage documentation for manual and faucet driven tests
+      Update funding logic
+
+Jack Grigg (12):
+      Document next_pow2 effects and algorithm source
+      Improvements to CBlock::BuildAuthDataMerkleTree
+      rust: Explicitly return null hash for pre-v5 auth digests
+      book: Note that cargo patches work with absolute paths
+      Improve docs about setting CBlockIndex hash fields
+      test: Cleanups to ZIP 221 Python test code
+      Minor fixes to documentation and formatting
+      Fix typo in method documentation
+      Track lengths when copying receiver data from C++ to Rust
+      depends: Greatly simplify the Clang 12 patch
+      Adjust code comments to remove topological-sort references
+      Fix typos
+
diff --git a/doc/release-notes/release-notes-4.5.1-1.md b/doc/release-notes/release-notes-4.5.1-1.md
new file mode 100644
index 00000000000..f7847c3bcdd
--- /dev/null
+++ b/doc/release-notes/release-notes-4.5.1-1.md
@@ -0,0 +1,46 @@
+Notable changes
+===============
+
+Added v5 transactions to standard rules
+---------------------------------------
+
+In v4.5.0 we added the v5 transaction format to the NU5 consensus rules for
+testnet. However, it was omitted from the standard rules, which meant that
+`zcashd` testnet nodes would not accept v5 transactions into their mempools,
+causing them to not be propagated or mined. This release updates the `zcashd`
+standard rules to accept v5 transactions alongside v4 transactions.
+
+New `listaddresses` RPC method
+------------------------------
+
+The `listaddresses` endpoint has been added to the RPC API. This method
+allows the caller to obtain addresses managed by the wallet, grouped
+by the source of the address, including both those addresses generated
+by the wallet and those associated with imported viewing or spending
+keys. This provides functionality that replaces and subsumes the 
+previously-removed `getaddressesbyaccount` method.
+
+Changelog
+=========
+
+Jack Grigg (6):
+      Mark v5 transaction format as standard for NU5
+      Fix comment
+      cargo update
+      depends: Postpone dependency updates
+      make-release.py: Versioning changes for 4.5.1-1.
+      make-release.py: Updated manpages for 4.5.1-1.
+
+Kris Nuttycombe (11):
+      Add `listaddresses` RPC method.
+      Categorize listaddresses result by source type.
+      Correctly handle imported Sapling addresses
+      Apply suggestions from code review
+      Apply suggestions from code review
+      Group legacy_hdseed Sapling addresses by account ID.
+      Update release notes for v4.5.1-1 to reflect the addition of `listaddresses`
+      Include `ImportedWatchOnly` as a PaymentAddressSource result.
+      Add listaddresses check to wallet_addresses.py
+      Consistently group Sapling addresses by IVK for every source.
+      Use lowerCamelCase for listaddresses JSON
+
diff --git a/doc/release-notes/release-notes-4.5.1.md b/doc/release-notes/release-notes-4.5.1.md
new file mode 100644
index 00000000000..c0229a5e75b
--- /dev/null
+++ b/doc/release-notes/release-notes-4.5.1.md
@@ -0,0 +1,80 @@
+Notable changes
+===============
+
+Fixed bugs in the testnet Orchard circuit
+-----------------------------------------
+
+In the `zcashd v4.5.0` release notes we indicated that a testnet rollback might
+occur to update the consensus rules, if we needed to make backwards-incompatible
+changes. Shortly after `zcashd v4.5.0` was released, during another internal
+review of the Orchard circuit, we identified two bugs that would affect the
+upcoming testnet activation of NU5:
+
+- The diversifier base `g_d_old`, for the note being spent, is required to be a
+  non-identity point. A note created from a payment address with `g_d` set to
+  the identity (via collaboration between sender and recipient) could be spent
+  multiple times with different nullifiers (corresponding to different `ivk`s).
+  The code outside the circuit correctly enforced the non-identity requirement,
+  but the circuit did not correctly constrain this, and allowed the prover to
+  witness the identity.
+
+- SinsemillaCommit can be modeled as a Pedersen commitment to an output of
+  SinsemillaHash: `SinsemillaCommit(r, M) = SinsemillaHashToPoint(M) + [r] R`.
+  The specification used incomplete addition here, matching its use inside
+  SinsemillaHash. However, unlike in SinsemillaHash, an exceptional case can be
+  produced here when `r = 0`. The derivations of `rivk` (for computing `ivk`)
+  and `rcm` (for computing the note commitment) normally ensure that `r = 0`
+  can only occur with negligible probability, but these derivations are not
+  checked by the circuit for efficiency; thus SinsemillaCommit needs to use
+  complete addition.
+
+These bugs do not affect mainnet, as `zcashd v4.5.0` only set the activation
+height for NU5 on testnet for testing purposes. Nevertheless, in the interest of
+keeping the testnet environment as close to mainnet as possible, we are fixing
+these bugs immediately. This means a change to the NU5 consensus rules, and a
+new testnet activation height for NU5.
+
+To this end, the following changes are made in `zcashd v4.5.1`:
+
+- The consensus branch ID for NU5 is changed to `0x37519621`.
+- The protocol version indicating NU5-aware testnet nodes is set to `170015`.
+- The testnet activation height for NU5 is set to **1,599,200**.
+
+Testnet nodes that upgrade to `zcashd v4.5.1` prior to block height 1,590,000
+will follow the new testnet network upgrade. Testnet nodes that are running
+`zcashd v4.5.0` at that height will need to upgrade to `v4.5.1` and then run
+with `-reindex`.
+
+As always, it is possible that further backwards-incompatible changes might be
+made to the NU5 consensus rules in this testing phase, prior to setting the
+mainnet activation height, as we continue to conduct additional internal review.
+In the event that this happens, testnet will be rolled back in (or prior to)
+v5.0.0, and a new testnet activation will occur.
+
+Fixed regression in `getbalance` RPC method
+-------------------------------------------
+
+`zcashd v4.5.0` removed the account API from the wallet, following its
+deprecation and removal in upstream Bitcoin Core. As part of the upstream
+changes, the `getbalance` RPC method was altered from using two custom balance
+computation methods, to instead relying on `CWallet::GetBalance`. This method
+internally relies on `CWalletTx::IsFromMe` as part of identifying "trusted"
+zero-confirmation transactions to include in the balance calculation.
+
+There is an equivalent and closely-named `CWallet::IsFromMe` method, which is
+used throughout the wallet, and had been updated before Zcash launched to be
+aware of spent shielded notes. The change to `getbalance` exposed a bug:
+`CWalletTx::IsFromMe` had not been similarly updated, which caused `getbalance`
+to ignore wallet-internal (sent between two addresses in the node's wallet)
+unshielding transactions with zero confirmations. This release fixes the bug.
+
+Changelog
+=========
+
+Jack Grigg (5):
+      wallet: Check spent shielded notes in CWalletTx::IsFromMe
+      Fix bugs in testnet Orchard circuit
+      depends: Postpone native_ccache 4.4.2
+      make-release.py: Versioning changes for 4.5.1.
+      make-release.py: Updated manpages for 4.5.1.
+
diff --git a/doc/release-notes/release-notes-4.6.0-1.md b/doc/release-notes/release-notes-4.6.0-1.md
new file mode 100644
index 00000000000..975376aa164
--- /dev/null
+++ b/doc/release-notes/release-notes-4.6.0-1.md
@@ -0,0 +1,37 @@
+`getblocktemplate` regression fix
+=================================
+
+We added support for the NU5 consensus rules in v4.5.0, which alters the
+block header to contain a `hashBlockCommitments` value instead of the
+chain history root. However, the output of `getblocktemplate` wasn't
+returning this value; once NU5 activated, the `blockcommitmentshash`
+field was being set to "null" (all-zeroes).
+
+In v4.6.0 we added full NU5 support to `getblocktemplate`, by adding a
+`defaultroots` field that gave default values for `hashBlockCommitments`
+and the components required to derive it. However, in doing so we
+introduced a regression in the (now-deprecated) legacy fields, where
+prior to NU5 activation they contained nonsense.
+
+This release fixes the output of `getblocktemplate` to have the intended
+semantics for all fields:
+
+- The `blockcommitmentshash` and `authdataroot` fields in `defaultroots`
+  are now omitted from block templates for heights before NU5 activation.
+
+- The legacy fields now always contain the default value to be placed
+  into the block header (regaining their previous semantics).
+
+Changelog
+=========
+
+Jack Grigg (3):
+      rpc: Fix regression in getblocktemplate output
+      make-release.py: Versioning changes for 4.6.0-1.
+      make-release.py: Updated manpages for 4.6.0-1.
+
+Larry Ruane (3):
+      assert that the return value of submitblock is None
+      test: check getblocktemplate output before and after NU5
+      test: Fix ZIP 244 implementation
+
diff --git a/doc/release-notes/release-notes-4.6.0-rc1.md b/doc/release-notes/release-notes-4.6.0-rc1.md
new file mode 100644
index 00000000000..1bfd543d0f1
--- /dev/null
+++ b/doc/release-notes/release-notes-4.6.0-rc1.md
@@ -0,0 +1,111 @@
+Notable changes
+===============
+
+Wallet
+------
+
+From this release, newly-created wallets will save the chain name ("Zcash") and
+network identifier (e.g. "main") to the `wallet.dat` file. This will enable the
+`zcashd` node to check on subsequent starts that the `wallet.dat` file matches
+the node's configuration. Existing wallets will start saving this information in
+a later release.
+
+`libzcash_script`
+-----------------
+
+Two new APIs have been added to this library (`zcash_script_legacy_sigop_count`
+and `zcash_script_legacy_sigop_count_precomputed`), for counting the number of
+signature operations in the transparent inputs and outputs of a transaction.
+The presence of these APIs is indicated by a library API version of 2.
+
+Updated RPCs
+------------
+
+- Fixed an issue where `ERROR: spent index not enabled` would be logged
+  unnecessarily on nodes that have either insightexplorer or lightwalletd
+  configuration options enabled.
+
+- The `getmininginfo` RPC now omits `currentblockize` and `currentblocktx`
+  when a block was never assembled via RPC on this node during its current
+  process instantiation. (#5404)
+
+Changelog
+=========
+
+Alex Wied (1):
+      Update support for FreeBSD
+
+Charlie O'Keefe (1):
+      Add buster to the list of suites used by gitian
+
+Dimitris Apostolou (1):
+      Fix typos
+
+Jack Grigg (22):
+      contrib: Update Debian copyright file to follow the v1 format
+      contrib: Add license information for libc++ and libevent
+      cargo update
+      tracing-subscriber 0.3
+      Bump all postponed dependencies
+      depends: Update Rust to 1.56.1
+      depends: Update Clang / libcxx to LLVM 13
+      rust: Move `incremental_sinsemilla_tree_ffi` into crate root
+      CI: Add Pyflakes to lints workflow
+      cargo update
+      ed25519-zebra 3
+      cargo update
+      cargo update
+      depends: Update Boost to 1.78.0
+      depends Update Rust to 1.57.0
+      qa: Postpone recent CCache releases
+      Revert "lint: Fix false positive"
+      rust: Remove misleading log message
+      Migrate to latest revisions of Zcash Rust crates
+      Update release notes
+      make-release.py: Versioning changes for 4.6.0-rc1.
+      make-release.py: Updated manpages for 4.6.0-rc1.
+
+Janito Vaqueiro Ferreira Filho (1):
+      Move `CurrentTxVersionInfo` into a new file
+
+Kris Nuttycombe (7):
+      Add BIP 44 coin type to persisted wallet state.
+      Persist network id string instead of bip44 coin type.
+      Add a check to test that wallet load fails if we're on the wrong network.
+      Remove unused `AddDestData` method.
+      Fix wallet-related wording in doc/reduce-traffic.md
+      Rename OrchardMerkleTree -> OrchardMerkleFrontier
+      Batch-verify Orchard transactions at the block level.
+
+Larry Ruane (6):
+      add TestSetIBD(bool) for testing
+      Disable IBD for all boost tests
+      better wallet network info error handling
+      test: automatically add missing nuparams
+      Don't log 'ERROR: spent index not enabled'
+      getblocktemplate: add NU5 commitments to new `defaultroots` section
+
+Marco Falke (1):
+      [rpc] mining: Omit uninitialized currentblockweight, currentblocktx
+
+Marshall Gaucher (1):
+      Update entrypoint.sh
+
+Sasha (1):
+      fix typo in docker run's volume argument
+
+sgmoore (1):
+      Update reduce-traffic.md - add one word
+
+Jack Grigg (1):
+      contrib: Add space between URL and period
+
+teor (7):
+      Add sigop count functions to zcash_script library
+      Increment the zcash_script API version
+      Remove an unused header
+      Use correct copyright header
+      Remove redundant variable
+      Explain UINT_MAX error return value
+      Explain how to get rid of a tiny duplicated function
+
diff --git a/doc/release-notes/release-notes-4.6.0.md b/doc/release-notes/release-notes-4.6.0.md
new file mode 100644
index 00000000000..26e1f36527b
--- /dev/null
+++ b/doc/release-notes/release-notes-4.6.0.md
@@ -0,0 +1,126 @@
+Notable changes
+===============
+
+Wallet
+------
+
+From this release, newly-created wallets will save the chain name ("Zcash") and
+network identifier (e.g. "main") to the `wallet.dat` file. This will enable the
+`zcashd` node to check on subsequent starts that the `wallet.dat` file matches
+the node's configuration. Existing wallets will start saving this information in
+a later release.
+
+`libzcash_script`
+-----------------
+
+Two new APIs have been added to this library (`zcash_script_legacy_sigop_count`
+and `zcash_script_legacy_sigop_count_precomputed`), for counting the number of
+signature operations in the transparent inputs and outputs of a transaction.
+The presence of these APIs is indicated by a library API version of 2.
+
+Updated RPCs
+------------
+
+- The `getblocktemplate` RPC method output now includes a `defaultroots` field,
+  which provides various tree roots and block commitments matching the contents
+  of the block template. If any part of the block template marked as `mutable`
+  in the RPC method output is mutated, these roots may need to be recomputed.
+  For more information on the derivation process, see the block header changes
+  in [ZIP 244](https://zips.z.cash/zip-0244#block-header-changes).
+
+- Fixed an issue where `ERROR: spent index not enabled` would be logged
+  unnecessarily on nodes that have either `-insightexplorer` or `-lightwalletd`
+  configuration options enabled.
+
+- The `getmininginfo` RPC now omits `currentblocksize` and `currentblocktx`
+  when a block was never assembled via RPC on this node during its current
+  process instantiation. (#5404)
+
+Changelog
+=========
+
+Alex Wied (1):
+      Update support for FreeBSD
+
+Charlie O'Keefe (2):
+      Add buster to the list of suites used by gitian
+      Add libtinfo5 to gitian packages list
+
+Dimitris Apostolou (1):
+      Fix typos
+
+Jack Grigg (23):
+      contrib: Update Debian copyright file to follow the v1 format
+      contrib: Add license information for libc++ and libevent
+      cargo update
+      tracing-subscriber 0.3
+      Bump all postponed dependencies
+      depends: Update Rust to 1.56.1
+      depends: Update Clang / libcxx to LLVM 13
+      rust: Move `incremental_sinsemilla_tree_ffi` into crate root
+      CI: Add Pyflakes to lints workflow
+      cargo update
+      ed25519-zebra 3
+      cargo update
+      cargo update
+      depends: Update Boost to 1.78.0
+      depends Update Rust to 1.57.0
+      qa: Postpone recent CCache releases
+      Revert "lint: Fix false positive"
+      rust: Remove misleading log message
+      Migrate to latest revisions of Zcash Rust crates
+      Update release notes
+      make-release.py: Versioning changes for 4.6.0-rc1.
+      make-release.py: Updated manpages for 4.6.0-rc1.
+      make-release.py: Updated release notes and changelog for 4.6.0-rc1.
+
+Janito Vaqueiro Ferreira Filho (1):
+      Move `CurrentTxVersionInfo` into a new file
+
+Kris Nuttycombe (7):
+      Add BIP 44 coin type to persisted wallet state.
+      Persist network id string instead of bip44 coin type.
+      Add a check to test that wallet load fails if we're on the wrong network.
+      Remove unused `AddDestData` method.
+      Fix wallet-related wording in doc/reduce-traffic.md
+      Rename OrchardMerkleTree -> OrchardMerkleFrontier
+      Batch-verify Orchard transactions at the block level.
+
+Larry Ruane (8):
+      add TestSetIBD(bool) for testing
+      Disable IBD for all boost tests
+      better wallet network info error handling
+      test: automatically add missing nuparams
+      Don't log 'ERROR: spent index not enabled'
+      getblocktemplate: add NU5 commitments to new `defaultroots` section
+      test: fix bugs in test framework
+      test: Use result of getblocktemplate to submitblock
+
+Marco Falke (1):
+      [rpc] mining: Omit uninitialized currentblockweight, currentblocktx
+
+Marshall Gaucher (1):
+      Update entrypoint.sh
+
+Sasha (5):
+      fix typo in docker run's volume argument
+      update hash for librustzcash
+      only librustzcash in config.offline
+      make-release.py: Versioning changes for 4.6.0.
+      make-release.py: Updated manpages for 4.6.0.
+
+sgmoore (1):
+      Update reduce-traffic.md - add one word
+
+Jack Grigg (1):
+      contrib: Add space between URL and period
+
+teor (7):
+      Add sigop count functions to zcash_script library
+      Increment the zcash_script API version
+      Remove an unused header
+      Use correct copyright header
+      Remove redundant variable
+      Explain UINT_MAX error return value
+      Explain how to get rid of a tiny duplicated function
+
diff --git a/doc/release-process.md b/doc/release-process.md
index cb22989ba37..ebd28446bc6 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -32,7 +32,7 @@ Check that dependencies are up-to-date or have been postponed:
 $ ./qa/zcash/updatecheck.py
 ```
 
-If you are missing the `.updatecheck-token` file requried to run this script,
+If you are missing the `.updatecheck-token` file required to run this script,
 please ask Taylor or another Zcash developer for a copy, or create an
 unprivileged personal access token for a github account and save it to the
 file in the format `username:hex-token`.
diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 159c81620fc..66c5c75cd07 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -46,6 +46,8 @@
     'zcjoinsplit.py',
     'mergetoaddress_mixednotes.py',
     'wallet_shieldcoinbase_sapling.py',
+    'wallet_shieldcoinbase_ua_sapling.py',
+    'wallet_shieldcoinbase_ua_nu5.py',
     'turnstile.py',
     'walletbackup.py',
     'zkey_import_export.py',
@@ -58,17 +60,20 @@
     'wallet_persistence.py',
     'wallet_listnotes.py',
     # vv Tests less than 60s vv
+    'orchard_reorg.py',
     'fundrawtransaction.py',
     'reorg_limit.py',
     'mempool_limit.py',
     'p2p-fullblocktest.py',
-    'paymentdisclosure.py',
     # vv Tests less than 30s vv
     'wallet_1941.py',
+    'wallet_accounts.py',
     'wallet_addresses.py',
     'wallet_anchorfork.py',
     'wallet_changeindicator.py',
     'wallet_import_export.py',
+    'wallet_isfromme.py',
+    'wallet_orchard.py',
     'wallet_nullifiers.py',
     'wallet_sapling.py',
     'wallet_sendmany_any_taddr.py',
@@ -102,6 +107,7 @@
     'disablewallet.py',
     'keypool.py',
     'getblocktemplate.py',
+    'getmininginfo.py',
     'bip65-cltv-p2p.py',
     'bipdersig-p2p.py',
     'invalidblockrequest.py',
@@ -121,6 +127,7 @@
     'feature_zip239.py',
     'feature_zip244_blockcommitments.py',
     'upgrade_golden.py',
+    'nuparams.py',
     'post_heartwood_rollback.py',
     'feature_logging.py',
     'feature_walletfile.py',
diff --git a/qa/rpc-tests/bip65-cltv-p2p.py b/qa/rpc-tests/bip65-cltv-p2p.py
index d1cebbd7923..2fb02ab3cea 100755
--- a/qa/rpc-tests/bip65-cltv-p2p.py
+++ b/qa/rpc-tests/bip65-cltv-p2p.py
@@ -23,10 +23,6 @@
 
 class BIP65Test(ComparisonTestFramework):
 
-    def __init__(self):
-        super().__init__()
-        self.num_nodes = 1
-
     def setup_network(self):
         self.nodes = start_nodes(self.num_nodes, self.options.tmpdir,
                                  extra_args=[['-debug', '-whitelist=127.0.0.1']],
diff --git a/qa/rpc-tests/bipdersig-p2p.py b/qa/rpc-tests/bipdersig-p2p.py
index 6f48a5e8e93..e61813c8c10 100755
--- a/qa/rpc-tests/bipdersig-p2p.py
+++ b/qa/rpc-tests/bipdersig-p2p.py
@@ -23,10 +23,6 @@
 '''
 class BIP66Test(ComparisonTestFramework):
 
-    def __init__(self):
-        super().__init__()
-        self.num_nodes = 1
-
     def setup_network(self):
         self.nodes = start_nodes(self.num_nodes, self.options.tmpdir,
                                  extra_args=[['-debug', '-whitelist=127.0.0.1']],
diff --git a/qa/rpc-tests/feature_zip239.py b/qa/rpc-tests/feature_zip239.py
index 62fbc14f11e..19ec1550fcd 100755
--- a/qa/rpc-tests/feature_zip239.py
+++ b/qa/rpc-tests/feature_zip239.py
@@ -11,6 +11,7 @@
     mininode_lock,
     msg_getdata,
     msg_mempool,
+    msg_reject,
     uint256_from_str,
 )
 from test_framework.test_framework import BitcoinTestFramework
@@ -26,23 +27,37 @@
     hex_str_to_bytes,
     nuparams,
     p2p_port,
-    start_nodes,
+    start_node,
     wait_and_assert_operationid_status,
 )
 from tx_expiry_helper import TestNode
 
+import tempfile
 import time
 
 # Test ZIP 239 behaviour before and after NU5.
 class Zip239Test(BitcoinTestFramework):
     def setup_nodes(self):
-        return start_nodes(self.num_nodes, self.options.tmpdir, extra_args=[[
+        extra_args=[
             # Enable Canopy at height 205 to allow shielding Sprout funds first.
             nuparams(BLOSSOM_BRANCH_ID, 205),
             nuparams(HEARTWOOD_BRANCH_ID, 205),
             nuparams(CANOPY_BRANCH_ID, 205),
             nuparams(NU5_BRANCH_ID, 210),
-        ]] * self.num_nodes)
+        ]
+
+        # We log the stderr of node 0, which the test nodes connect to. This
+        # enables us to check that we see the expected error logged, and also
+        # ensures that the test itself passes (as otherwise the stderr output
+        # would be interpreted as an error from the test itself).
+        self.log_stderr = tempfile.SpooledTemporaryFile(max_size=2**16)
+
+        nodes = []
+        nodes.append(start_node(0, self.options.tmpdir, extra_args, stderr=self.log_stderr))
+        nodes.append(start_node(1, self.options.tmpdir, extra_args))
+        nodes.append(start_node(2, self.options.tmpdir, extra_args))
+        nodes.append(start_node(3, self.options.tmpdir, extra_args))
+        return nodes
 
     def cinv_for(self, txid, authDigest=None):
         if authDigest is not None:
@@ -104,6 +119,32 @@ def verify_last_notfound(self, testnode, txid, authDigest=None):
             assert_equal(len(testnode.last_notfound.inv), 1)
             assert_equal(testnode.last_notfound.inv[0], self.cinv_for(txid, authDigest))
 
+    def verify_invalid_cinv(self, testnode, conn, msg_type, expected_msg):
+        # Send p2p message "getdata" containing an invalid CInv message
+        getdatamsg = msg_getdata()
+        getdatamsg.inv = [CInv(msg_type, 1)]
+        with mininode_lock:
+            testnode.last_tx = None
+            testnode.last_notfound = None
+            testnode.send_message(getdatamsg)
+
+        # Sync up with node after p2p messages delivered
+        testnode.sync_with_ping()
+
+        # Verify that we get a reject message
+        expected = msg_reject()
+        expected.message = b"getdata"
+        expected.code = msg_reject.REJECT_MALFORMED
+        expected.reason = b"error parsing message"
+        assert_equal(conn.rejectMessage, expected)
+
+        # Verify that we see the expected error on stderr
+        self.log_stderr.seek(0)
+        stderr = self.log_stderr.read().decode('utf-8')
+        self.log_stderr.truncate(0)
+        if expected_msg not in stderr:
+            raise AssertionError("Expected error \"" + expected_msg + "\" not found in:\n" + stderr)
+
     def verify_disconnected(self, testnode, timeout=30):
         sleep_time = 0.05
         while timeout > 0:
@@ -115,8 +156,38 @@ def verify_disconnected(self, testnode, timeout=30):
         fail("Should have received pong")
 
     def run_test(self):
+        # Set up test nodes.
+        # - test_nodes[0] will only request v4 transactions
+        # - test_nodes[1] will only request v5 transactions
+        # - test_nodes[2] will test invalid v4 request using MSG_WTXID
+        # - test_nodes[3] will test invalid v5 request using MSG_TX
+        test_nodes = []
+        connections = []
+
+        for i in range(4):
+            test_nodes.append(TestNode())
+            connections.append(NodeConn(
+                '127.0.0.1', p2p_port(0), self.nodes[0], test_nodes[i],
+                protocol_version=NU5_PROTO_VERSION))
+            test_nodes[i].add_connection(connections[i])
+
+        NetworkThread().start() # Start up network handling in another thread
+        [x.wait_for_verack() for x in test_nodes]
+
         net_version = self.nodes[0].getnetworkinfo()["protocolversion"]
         if net_version < NU5_PROTO_VERSION:
+            # Sending a getdata message containing a MSG_WTX CInv message type
+            # results in a reject message.
+            self.verify_invalid_cinv(
+                test_nodes[0], connections[0], 5,
+                "Negotiated protocol version does not support CInv message type MSG_WTX",
+            )
+
+            # Sending a getdata message containing an invalid CInv message type
+            # results in a reject message.
+            self.verify_invalid_cinv(
+                test_nodes[1], connections[1], 0xffff, "Unknown CInv message type")
+
             print("Node's block index is not NU5-aware, skipping remaining tests")
             return
 
@@ -152,24 +223,6 @@ def run_test(self):
         # Wait for the mempools to sync.
         self.sync_all()
 
-        # Set up test nodes.
-        # - test_nodes[0] will only request v4 transactions
-        # - test_nodes[1] will only request v5 transactions
-        # - test_nodes[2] will test invalid v4 request using MSG_WTXID
-        # - test_nodes[3] will test invalid v5 request using MSG_TX
-        test_nodes = []
-        connections = []
-
-        for i in range(4):
-            test_nodes.append(TestNode())
-            connections.append(NodeConn(
-                '127.0.0.1', p2p_port(0), self.nodes[0], test_nodes[i],
-                protocol_version=NU5_PROTO_VERSION))
-            test_nodes[i].add_connection(connections[i])
-
-        NetworkThread().start() # Start up network handling in another thread
-        [x.wait_for_verack() for x in test_nodes]
-
         #
         # inv
         #
@@ -207,7 +260,13 @@ def run_test(self):
         self.send_data_message(test_nodes[3], v5_txid)
         self.verify_disconnected(test_nodes[3])
 
+        # Sending a getdata message containing an invalid CInv message type
+        # results in a reject message.
+        self.verify_invalid_cinv(
+            test_nodes[0], connections[0], 0xffff, "Unknown CInv message type")
+
         [c.disconnect_node() for c in connections]
+        self.log_stderr.close()
 
 if __name__ == '__main__':
     Zip239Test().main()
diff --git a/qa/rpc-tests/feature_zip244_blockcommitments.py b/qa/rpc-tests/feature_zip244_blockcommitments.py
index 6113f856a4a..a0a5bde45f8 100755
--- a/qa/rpc-tests/feature_zip244_blockcommitments.py
+++ b/qa/rpc-tests/feature_zip244_blockcommitments.py
@@ -7,9 +7,14 @@
 from test_framework.blocktools import derive_block_commitments_hash
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
+    BLOSSOM_BRANCH_ID,
+    CANOPY_BRANCH_ID,
+    HEARTWOOD_BRANCH_ID,
+    NU5_BRANCH_ID,
     assert_equal,
     bytes_to_hex_str,
     hex_str_to_bytes,
+    nuparams,
     start_nodes,
 )
 
@@ -24,12 +29,10 @@ def __init__(self):
 
     def setup_nodes(self):
         return start_nodes(self.num_nodes, self.options.tmpdir, extra_args=[[
-            '-nuparams=5ba81b19:1', # Overwinter
-            '-nuparams=76b809bb:1', # Sapling
-            '-nuparams=2bb40e60:201', # Blossom
-            '-nuparams=f5b9230b:201', # Heartwood
-            '-nuparams=e9ff75a6:201', # Canopy
-            '-nuparams=f919a198:205', # NU5
+            nuparams(BLOSSOM_BRANCH_ID, 201),
+            nuparams(HEARTWOOD_BRANCH_ID, 201),
+            nuparams(CANOPY_BRANCH_ID, 201),
+            nuparams(NU5_BRANCH_ID, 205),
             '-nurejectoldversions=false',
         ]] * self.num_nodes)
 
diff --git a/qa/rpc-tests/finalsaplingroot.py b/qa/rpc-tests/finalsaplingroot.py
index 257d9893d04..789012284c7 100755
--- a/qa/rpc-tests/finalsaplingroot.py
+++ b/qa/rpc-tests/finalsaplingroot.py
@@ -6,9 +6,11 @@
 
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
+    NU5_BRANCH_ID,
     assert_equal,
     connect_nodes_bi,
     get_coinbase_address,
+    nuparams,
     start_nodes,
     wait_and_assert_operationid_status,
 )
@@ -17,6 +19,7 @@
 
 SPROUT_TREE_EMPTY_ROOT = "59d2cde5e65c1414c32ba54f0fe4bdb3d67618125286e6a191317917c812c6d7"
 SAPLING_TREE_EMPTY_ROOT = "3e49b5f954aa9d3545bc6c37744661eea48d7c34e3000d82b7f0010c30f4c2fb"
+ORCHARD_TREE_EMPTY_ROOT = "2fd8e51a03d9bbe2dd809831b1497aeb68a6e37ddf707ced4aa2d8dff13529ae"
 NULL_FIELD = "0000000000000000000000000000000000000000000000000000000000000000"
 
 # Verify block header field 'hashFinalSaplingRoot' (returned in rpc as 'finalsaplingroot')
@@ -25,17 +28,16 @@ class FinalSaplingRootTest(BitcoinTestFramework):
 
     def __init__(self):
         super().__init__()
-        self.num_nodes = 4
+        self.num_nodes = 2
         self.setup_clean_chain = True
 
     def setup_network(self, split=False):
         self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, extra_args=[[
-            '-txindex'                # Avoid JSONRPC error: No information available about transaction
+            '-txindex',                # Avoid JSONRPC error: No information available about transaction
+            nuparams(NU5_BRANCH_ID, 210),
+            '-debug',
             ]] * self.num_nodes)
         connect_nodes_bi(self.nodes,0,1)
-        connect_nodes_bi(self.nodes,1,2)
-        connect_nodes_bi(self.nodes,0,2)
-        connect_nodes_bi(self.nodes,0,3)
         self.is_network_split=False
         self.sync_all()
 
@@ -43,7 +45,7 @@ def run_test(self):
         self.nodes[0].generate(200)
         self.sync_all()
 
-        # Verfify genesis block contains null field for what is now called the final sapling root field.
+        # Verify genesis block contains null field for what is now called the final sapling root field.
         blk = self.nodes[0].getblock("0")
         assert_equal(blk["finalsaplingroot"], NULL_FIELD)
         treestate = self.nodes[0].z_gettreestate("0")
@@ -52,13 +54,19 @@ def run_test(self):
 
         assert_equal(treestate["sprout"]["commitments"]["finalRoot"], SPROUT_TREE_EMPTY_ROOT)
         assert_equal(treestate["sprout"]["commitments"]["finalState"], "000000")
-        assert("skipHash" not in treestate["sprout"])
+        assert "skipHash" not in treestate["sprout"]
 
         assert_equal(treestate["sapling"]["commitments"]["finalRoot"], NULL_FIELD)
         # There is no sapling state tree yet, and trying to find it in an earlier
         # block won't succeed (we're at genesis block), so skipHash is absent.
-        assert("finalState" not in treestate["sapling"])
-        assert("skipHash" not in treestate["sapling"])
+        assert "finalState" not in treestate["sapling"]
+        assert "skipHash" not in treestate["sapling"]
+
+        assert_equal(treestate["orchard"]["commitments"]["finalRoot"], NULL_FIELD)
+        # There is no orchard state tree yet, and trying to find it in an earlier
+        # block won't succeed (we're at genesis block), so skipHash is absent.
+        assert "finalState" not in treestate["orchard"]
+        assert "skipHash" not in treestate["orchard"]
 
         # Verify all generated blocks contain the empty root of the Sapling tree.
         blockcount = self.nodes[0].getblockcount()
@@ -70,14 +78,18 @@ def run_test(self):
             assert_equal(treestate["height"], height)
             assert_equal(treestate["hash"], self.nodes[0].getblockhash(height))
 
-            assert("skipHash" not in treestate["sprout"])
+            assert "skipHash" not in treestate["sprout"]
             assert_equal(treestate["sprout"]["commitments"]["finalRoot"], SPROUT_TREE_EMPTY_ROOT)
             assert_equal(treestate["sprout"]["commitments"]["finalState"], "000000")
 
-            assert("skipHash" not in treestate["sapling"])
+
+            assert "skipHash" not in treestate["sapling"]
             assert_equal(treestate["sapling"]["commitments"]["finalRoot"], SAPLING_TREE_EMPTY_ROOT)
             assert_equal(treestate["sapling"]["commitments"]["finalState"], "000000")
 
+            assert "skipHash" not in treestate["orchard"]
+            assert_equal(treestate["orchard"]["commitments"]["finalRoot"], NULL_FIELD)
+
         # Node 0 shields some funds
         taddr0 = get_coinbase_address(self.nodes[0])
         saplingAddr0 = self.nodes[0].z_getnewaddress('sapling')
@@ -93,8 +105,8 @@ def run_test(self):
         # Verify the final Sapling root has changed
         blk = self.nodes[0].getblock("201")
         root = blk["finalsaplingroot"]
-        assert(root is not SAPLING_TREE_EMPTY_ROOT)        
-        assert(root is not NULL_FIELD)  
+        assert root is not SAPLING_TREE_EMPTY_ROOT
+        assert root is not NULL_FIELD
 
         # Verify there is a Sapling output description (its commitment was added to tree)
         result = self.nodes[0].getrawtransaction(mytxid, 1)
@@ -105,8 +117,8 @@ def run_test(self):
         new_treestate = self.nodes[0].z_gettreestate(str(-1))
         assert_equal(new_treestate["sapling"]["commitments"]["finalRoot"], root)
         assert_equal(new_treestate["sprout"], treestate["sprout"])
-        assert(new_treestate["sapling"]["commitments"]["finalRoot"] != treestate["sapling"]["commitments"]["finalRoot"])
-        assert(new_treestate["sapling"]["commitments"]["finalState"] != treestate["sapling"]["commitments"]["finalState"])
+        assert new_treestate["sapling"]["commitments"]["finalRoot"] != treestate["sapling"]["commitments"]["finalRoot"]
+        assert new_treestate["sapling"]["commitments"]["finalState"] != treestate["sapling"]["commitments"]["finalState"]
         assert_equal(len(new_treestate["sapling"]["commitments"]["finalRoot"]), 64)
         assert_equal(len(new_treestate["sapling"]["commitments"]["finalState"]), 70)
         treestate = new_treestate
@@ -131,10 +143,8 @@ def run_test(self):
 
         # Mine a block with a Sprout shielded tx and verify the final Sapling root does not change
         zaddr1 = self.nodes[1].z_getnewaddress('sprout')
-        recipients = []
-        recipients.append({"address": zaddr1, "amount": Decimal('10')})
-        myopid = self.nodes[0].z_sendmany(taddr0, recipients, 1, 0)
-        wait_and_assert_operationid_status(self.nodes[0], myopid)
+        result = self.nodes[0].z_shieldcoinbase(taddr0, zaddr1, 0, 1)
+        wait_and_assert_operationid_status(self.nodes[0], result['opid'])
 
         self.sync_all()
         self.nodes[0].generate(1)
@@ -147,8 +157,8 @@ def run_test(self):
         new_treestate = self.nodes[0].z_gettreestate(str(-1))
         assert_equal(new_treestate["sapling"]["commitments"]["finalRoot"], root)
         assert_equal(new_treestate["sapling"], treestate["sapling"])
-        assert(new_treestate["sprout"]["commitments"]["finalRoot"] != treestate["sprout"]["commitments"]["finalRoot"])
-        assert(new_treestate["sprout"]["commitments"]["finalState"] != treestate["sprout"]["commitments"]["finalState"])
+        assert new_treestate["sprout"]["commitments"]["finalRoot"] != treestate["sprout"]["commitments"]["finalRoot"]
+        assert new_treestate["sprout"]["commitments"]["finalState"] != treestate["sprout"]["commitments"]["finalState"]
         assert_equal(len(new_treestate["sprout"]["commitments"]["finalRoot"]), 64)
         assert_equal(len(new_treestate["sprout"]["commitments"]["finalState"]), 134)
         treestate = new_treestate
@@ -166,7 +176,7 @@ def run_test(self):
 
         assert_equal(len(self.nodes[0].getblock("205")["tx"]), 2)
         assert_equal(self.nodes[1].z_getbalance(saplingAddr1), Decimal("12.34"))
-        assert(root is not self.nodes[0].getblock("205")["finalsaplingroot"])
+        assert root is not self.nodes[0].getblock("205")["finalsaplingroot"]
 
         # Verify there is a Sapling output description (its commitment was added to tree)
         result = self.nodes[0].getrawtransaction(mytxid, 1)
@@ -174,8 +184,8 @@ def run_test(self):
 
         new_treestate = self.nodes[0].z_gettreestate(str(-1))
         assert_equal(new_treestate["sprout"], treestate["sprout"])
-        assert(new_treestate["sapling"]["commitments"]["finalRoot"] != treestate["sapling"]["commitments"]["finalRoot"])
-        assert(new_treestate["sapling"]["commitments"]["finalState"] != treestate["sapling"]["commitments"]["finalState"])
+        assert new_treestate["sapling"]["commitments"]["finalRoot"] != treestate["sapling"]["commitments"]["finalRoot"]
+        assert new_treestate["sapling"]["commitments"]["finalState"] != treestate["sapling"]["commitments"]["finalState"]
         assert_equal(len(new_treestate["sapling"]["commitments"]["finalRoot"]), 64)
         assert_equal(len(new_treestate["sapling"]["commitments"]["finalState"]), 136)
         treestate = new_treestate
@@ -202,6 +212,21 @@ def run_test(self):
         assert_equal(new_treestate["sprout"], treestate["sprout"])
         assert_equal(new_treestate["sapling"], treestate["sapling"])
 
+        # Activate NU5; more testing should be added once we can mine orchard transactions.
+        self.sync_all()
+        self.nodes[0].generate(4)
+        self.sync_all()
+        new_treestate = self.nodes[0].z_gettreestate(str(-1))
+
+        # sprout and sapling results should not change
+        assert_equal(new_treestate["sprout"], treestate["sprout"])
+        assert_equal(new_treestate["sapling"], treestate["sapling"])
+
+        assert "skipHash" not in treestate["orchard"]
+        assert_equal(new_treestate["orchard"]["commitments"]["finalRoot"], ORCHARD_TREE_EMPTY_ROOT)
+        assert_equal(new_treestate["orchard"]["commitments"]["finalState"], "00")
+        pass
+
 
 if __name__ == '__main__':
     FinalSaplingRootTest().main()
diff --git a/qa/rpc-tests/fundrawtransaction.py b/qa/rpc-tests/fundrawtransaction.py
index de8dc39e435..f75470306c4 100755
--- a/qa/rpc-tests/fundrawtransaction.py
+++ b/qa/rpc-tests/fundrawtransaction.py
@@ -73,7 +73,7 @@ def run_test(self):
         rawtxfund = self.nodes[2].fundrawtransaction(rawtx)
         fee = rawtxfund['fee']
         dec_tx  = self.nodes[2].decoderawtransaction(rawtxfund['hex'])
-        assert_equal(len(dec_tx['vin']) > 0, True) #test if we have enought inputs
+        assert_equal(len(dec_tx['vin']) > 0, True) #test if we have enough inputs
 
         ##############################
         # simple test with two coins #
diff --git a/qa/rpc-tests/getblocktemplate.py b/qa/rpc-tests/getblocktemplate.py
index 223132da48f..da3f638f991 100755
--- a/qa/rpc-tests/getblocktemplate.py
+++ b/qa/rpc-tests/getblocktemplate.py
@@ -3,63 +3,185 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
+from io import BytesIO
+import codecs
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import assert_equal, connect_nodes_bi, \
-    start_nodes
-
+from test_framework.util import (
+    assert_equal,
+    CANOPY_BRANCH_ID,
+    NU5_BRANCH_ID,
+    hex_str_to_bytes,
+    nuparams,
+    start_nodes,
+    wait_and_assert_operationid_status,
+)
+from test_framework.mininode import (
+    CTransaction,
+    uint256_from_str,
+)
+from test_framework.blocktools import (
+    create_block
+)
+from decimal import Decimal
 
 class GetBlockTemplateTest(BitcoinTestFramework):
     '''
-    Test getblocktemplate.
+    Test getblocktemplate, ensure that a block created from its result
+    can be submitted and accepted.
     '''
 
     def __init__(self):
         super().__init__()
-        self.num_nodes = 2
+        self.num_nodes = 1
         self.setup_clean_chain = True
 
     def setup_network(self, split=False):
-        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir)
-        connect_nodes_bi(self.nodes,0,1)
-        self.is_network_split=False
+        args = [
+            nuparams(CANOPY_BRANCH_ID, 115),
+            nuparams(NU5_BRANCH_ID, 130),
+        ]
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, [args] * self.num_nodes)
+        self.is_network_split = False
+        self.node = self.nodes[0]
+
+    def add_nu5_v4_tx_to_mempool(self):
+        node = self.node
+        # sprout to transparent (v4)
+        recipients = [{"address": self.transparent_addr, "amount": Decimal('0.1')}]
+        myopid = node.z_sendmany(self.sprout_addr, recipients)
+        wait_and_assert_operationid_status(node, myopid)
+
+    def add_transparent_tx_to_mempool(self):
+        node = self.node
+        # transparent to transparent (v5 after nu5)
+        outputs = {self.transparent_addr: 0.1}
+        node.sendmany('', outputs)
+
+    def gbt_submitblock(self, nu5_active):
+        node = self.node
+        mempool_tx_list = node.getrawmempool()
+
+        gbt = node.getblocktemplate()
+
+        # make sure no transactions were left out (or added)
+        assert_equal(len(mempool_tx_list), len(gbt['transactions']))
+        assert_equal(set(mempool_tx_list), set([tx['hash'] for tx in gbt['transactions']]))
+
+        prevhash = int(gbt['previousblockhash'], 16)
+        nTime = gbt['mintime']
+        nBits = int(gbt['bits'], 16)
+
+        if nu5_active:
+            blockcommitmentshash = int(gbt['defaultroots']['blockcommitmentshash'], 16)
+        else:
+            blockcommitmentshash = int(gbt['defaultroots']['chainhistoryroot'], 16)
+            assert 'blockcommitmentshash' not in gbt['defaultroots']
+        # Confirm that the legacy fields match this default value.
+        assert_equal(blockcommitmentshash, int(gbt['blockcommitmentshash'], 16))
+        assert_equal(blockcommitmentshash, int(gbt['lightclientroothash'], 16))
+        assert_equal(blockcommitmentshash, int(gbt['finalsaplingroothash'], 16))
+
+        f = BytesIO(hex_str_to_bytes(gbt['coinbasetxn']['data']))
+        coinbase = CTransaction()
+        coinbase.deserialize(f)
+        coinbase.calc_sha256()
+        assert_equal(coinbase.hash, gbt['coinbasetxn']['hash'])
+        assert_equal(coinbase.auth_digest_hex, gbt['coinbasetxn']['authdigest'])
+
+        block = create_block(prevhash, coinbase, nTime, nBits, blockcommitmentshash)
+
+        # copy the non-coinbase transactions from the block template to the block
+        for gbt_tx in gbt['transactions']:
+            f = BytesIO(hex_str_to_bytes(gbt_tx['data']))
+            tx = CTransaction()
+            tx.deserialize(f)
+            tx.calc_sha256()
+            assert_equal(tx.auth_digest_hex, node.getrawtransaction(tx.hash, 1)['authdigest'])
+            block.vtx.append(tx)
+        block.hashMerkleRoot = int(gbt['defaultroots']['merkleroot'], 16)
+        assert_equal(block.hashMerkleRoot, block.calc_merkle_root(), "merkleroot")
+        assert_equal(len(block.vtx), len(gbt['transactions']) + 1, "number of transactions")
+        assert_equal(block.hashPrevBlock, int(gbt['previousblockhash'], 16), "prevhash")
+        if nu5_active:
+            assert_equal(uint256_from_str(block.calc_auth_data_root()), int(gbt['defaultroots']['authdataroot'], 16))
+        else:
+            assert 'authdataroot' not in gbt['defaultroots']
+        block.solve()
+        block.calc_sha256()
+
+        submitblock_reply = node.submitblock(codecs.encode(block.serialize(), 'hex_codec'))
+        assert_equal(None, submitblock_reply)
+        assert_equal(block.hash, node.getbestblockhash())
+        # Wait until the wallet has been notified of all blocks, so that it doesn't try to
+        # double-spend transparent coins in subsequent test phases.
         self.sync_all()
 
     def run_test(self):
-        node = self.nodes[0]
-        node.generate(1) # Mine a block to leave initial block download
-
-        # Test 1: Default to coinbasetxn
-        tmpl = node.getblocktemplate()
-        assert('coinbasetxn' in tmpl)
-        assert('coinbasevalue' not in tmpl)
-
-        # Test 2: Get coinbasetxn if requested
-        tmpl = node.getblocktemplate({'capabilities': ['coinbasetxn']})
-        assert('coinbasetxn' in tmpl)
-        assert('coinbasevalue' not in tmpl)
-
-        # Test 3: coinbasevalue not supported if requested
-        tmpl = node.getblocktemplate({'capabilities': ['coinbasevalue']})
-        assert('coinbasetxn' in tmpl)
-        assert('coinbasevalue' not in tmpl)
-
-        # Test 4: coinbasevalue not supported if both requested
-        tmpl = node.getblocktemplate({'capabilities': ['coinbasetxn', 'coinbasevalue']})
-        assert('coinbasetxn' in tmpl)
-        assert('coinbasevalue' not in tmpl)
-
-        # Test 5: General checks
-        tmpl = node.getblocktemplate()
-        assert_equal(16, len(tmpl['noncerange']))
-
-        # Test 6: coinbasetxn checks
-        assert('foundersreward' in tmpl['coinbasetxn'])
-        assert(tmpl['coinbasetxn']['required'])
-
-        # Test 7: hashFinalSaplingRoot checks
-        assert('finalsaplingroothash' in tmpl)
-        finalsaplingroothash = '3e49b5f954aa9d3545bc6c37744661eea48d7c34e3000d82b7f0010c30f4c2fb'
-        assert_equal(finalsaplingroothash, tmpl['finalsaplingroothash'])
+        node = self.node
+
+        # Generate Sprout funds before Canopy activates; using the Sprout address will
+        # force the generation of v4 transactions from NU5.
+        print("Generating pre-Canopy blocks to create sprout funds")
+        # coinbase only becomes mature after 100 blocks, so make one mature.
+        node.generate(105)
+
+        self.sprout_addr = node.z_getnewaddress('sprout')
+        myopid = node.z_shieldcoinbase('*', self.sprout_addr)['opid']
+        wait_and_assert_operationid_status(node, myopid)
+
+        self.transparent_addr = node.getnewaddress()
+        node.generate(15)
+
+        # at height 120, NU5 is not active
+        assert_equal(node.getblockchaininfo()['upgrades']['37519621']['status'], 'pending')
+
+        print("Testing getblocktemplate for pre-NU5")
+
+        # Only the coinbase; this covers the case where the Merkle root
+        # is equal to the coinbase txid.
+        print("- only coinbase")
+        self.gbt_submitblock(False)
+
+        # Adding one transaction triggering a single Merkle digest.
+        print("- one transaction (plus coinbase)")
+        self.add_transparent_tx_to_mempool()
+        self.gbt_submitblock(False)
+
+        # Adding two transactions to trigger hash Merkle root edge case.
+        print("- two transactions (plus coinbase)")
+        self.add_transparent_tx_to_mempool()
+        self.add_transparent_tx_to_mempool()
+        self.gbt_submitblock(False)
+
+        # Activate NU5, repeat the above cases
+        node.generate(7)
+        assert_equal(node.getblockchaininfo()['upgrades']['37519621']['status'], 'active')
+
+        print("Testing getblocktemplate for post-NU5")
+
+        # Only the coinbase; this covers the case where the block authdata root
+        # is equal to the coinbase authdata
+        print("- only coinbase")
+        self.gbt_submitblock(True)
+
+        # Adding one transaction triggering a single Merkle digest.
+        print("- one transaction (plus coinbase)")
+        self.add_transparent_tx_to_mempool()
+        self.gbt_submitblock(True)
+
+        # Adding two transactions to trigger hash Merkle root edge case.
+        print("- two transactions (plus coinbase)")
+        self.add_transparent_tx_to_mempool()
+        self.add_transparent_tx_to_mempool()
+        self.gbt_submitblock(True)
+
+        # Adding both v4 and v5 to cover legacy auth digest.
+        print("- both v4 and v5 transactions (plus coinbase)")
+        self.add_nu5_v4_tx_to_mempool()
+        self.add_transparent_tx_to_mempool()
+        self.add_transparent_tx_to_mempool()
+        self.gbt_submitblock(True)
+
 
 if __name__ == '__main__':
     GetBlockTemplateTest().main()
diff --git a/qa/rpc-tests/getmininginfo.py b/qa/rpc-tests/getmininginfo.py
new file mode 100755
index 00000000000..a1edaf12e37
--- /dev/null
+++ b/qa/rpc-tests/getmininginfo.py
@@ -0,0 +1,47 @@
+#!/usr/bin/env python3
+# Copyright (c) 2021 The Zcash developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import start_nodes
+
+
+class GetMiningInfoTest(BitcoinTestFramework):
+    '''
+    Test getmininginfo.
+    '''
+
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 1
+        self.setup_clean_chain = True
+
+    def setup_network(self, split=False):
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir)
+        self.is_network_split = False
+        self.sync_all()
+
+    def run_test(self):
+        node = self.nodes[0]
+
+        info = node.getmininginfo()
+        assert(info['blocks'] == 0)
+        # No blocks have been mined yet, so these fields should not be present.
+        assert('currentblocksize' not in info)
+        assert('currentblocktx' not in info)
+
+        node.generate(1)
+
+        info = node.getmininginfo()
+        assert(info['blocks'] == 1)
+        # One block has been mined, so these fields should now be present.
+        assert('currentblocksize' in info)
+        assert('currentblocktx' in info)
+        assert(info['currentblocksize'] > 0)
+        # The transaction count doesn't include the coinbase
+        assert(info['currentblocktx'] == 0)
+
+
+if __name__ == '__main__':
+    GetMiningInfoTest().main()
diff --git a/qa/rpc-tests/invalidblockrequest.py b/qa/rpc-tests/invalidblockrequest.py
index 7463dab5c8d..4fb916e10fe 100755
--- a/qa/rpc-tests/invalidblockrequest.py
+++ b/qa/rpc-tests/invalidblockrequest.py
@@ -26,10 +26,6 @@ class InvalidBlockRequestTest(ComparisonTestFramework):
 
     ''' Can either run this test as 1 node with expected answers, or two and compare them.
         Change the "outcome" variable from each TestInstance object to only do the comparison. '''
-    def __init__(self):
-        super().__init__()
-        self.num_nodes = 1
-
     def run_test(self):
         test = TestManager(self, self.options.tmpdir)
         test.add_all_connections(self.nodes)
diff --git a/qa/rpc-tests/invalidtxrequest.py b/qa/rpc-tests/invalidtxrequest.py
index 6b850a19804..8ec448f5066 100755
--- a/qa/rpc-tests/invalidtxrequest.py
+++ b/qa/rpc-tests/invalidtxrequest.py
@@ -20,10 +20,6 @@ class InvalidTxRequestTest(ComparisonTestFramework):
 
     ''' Can either run this test as 1 node with expected answers, or two and compare them. 
         Change the "outcome" variable from each TestInstance object to only do the comparison. '''
-    def __init__(self):
-        super().__init__()
-        self.num_nodes = 1
-
     def run_test(self):
         test = TestManager(self, self.options.tmpdir)
         test.add_all_connections(self.nodes)
diff --git a/qa/rpc-tests/keypool.py b/qa/rpc-tests/keypool.py
index ccba07ea9fc..d567be3a5b9 100755
--- a/qa/rpc-tests/keypool.py
+++ b/qa/rpc-tests/keypool.py
@@ -40,13 +40,13 @@ def run_test(self):
         bitcoind_processes[0].wait()
         # Restart node 0
         nodes[0] = start_node(0, self.options.tmpdir)
-        # Keep creating keys
-        addr = nodes[0].getnewaddress()
+        # We can't create any external addresses, which don't use the keypool.
+        # We should get an error that we need to unlock the wallet.
         try:
             addr = nodes[0].getnewaddress()
-            raise AssertionError('Keypool should be exhausted after one address')
+            raise AssertionError('Wallet should be locked.')
         except JSONRPCException as e:
-            assert(e.error['code']==-12)
+            assert_equal(e.error['code'], -13)
 
         # put three new keys in the keypool
         nodes[0].walletpassphrase('test', 12000)
diff --git a/qa/rpc-tests/mempool_nu_activation.py b/qa/rpc-tests/mempool_nu_activation.py
index 05e057a8b9f..14d5df2c2a9 100755
--- a/qa/rpc-tests/mempool_nu_activation.py
+++ b/qa/rpc-tests/mempool_nu_activation.py
@@ -6,7 +6,12 @@
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.mininode import NU5_PROTO_VERSION
 from test_framework.util import (
+    BLOSSOM_BRANCH_ID,
+    CANOPY_BRANCH_ID,
+    HEARTWOOD_BRANCH_ID,
+    NU5_BRANCH_ID,
     assert_equal, assert_true,
+    nuparams,
     start_node, connect_nodes, wait_and_assert_operationid_status,
     get_coinbase_address
 )
@@ -25,10 +30,10 @@ def __init__(self):
 
     def setup_network(self):
         args = ["-checkmempool", "-debug=mempool", "-blockmaxsize=4000",
-            "-nuparams=2bb40e60:200", # Blossom
-            "-nuparams=f5b9230b:210", # Heartwood
-            "-nuparams=e9ff75a6:220", # Canopy
-            "-nuparams=f919a198:230", # NU5
+            nuparams(BLOSSOM_BRANCH_ID, 200),
+            nuparams(HEARTWOOD_BRANCH_ID, 210),
+            nuparams(CANOPY_BRANCH_ID, 220),
+            nuparams(NU5_BRANCH_ID, 230),
         ]
         self.nodes = []
         self.nodes.append(start_node(0, self.options.tmpdir, args))
diff --git a/qa/rpc-tests/mergetoaddress_mixednotes.py b/qa/rpc-tests/mergetoaddress_mixednotes.py
index d0a67544d8e..fd772bfd195 100755
--- a/qa/rpc-tests/mergetoaddress_mixednotes.py
+++ b/qa/rpc-tests/mergetoaddress_mixednotes.py
@@ -29,8 +29,8 @@ def run_test(self):
         saplingAddr = self.nodes[0].z_getnewaddress('sapling')
         t_addr = self.nodes[1].getnewaddress()
 
-        opid = self.nodes[0].z_sendmany(coinbase_addr, [{"address": sproutAddr, "amount": Decimal('10')}], 1, 0)
-        wait_and_assert_operationid_status(self.nodes[0], opid)
+        result = self.nodes[0].z_shieldcoinbase(coinbase_addr, sproutAddr, 0, 1)
+        wait_and_assert_operationid_status(self.nodes[0], result['opid'])
         self.nodes[0].generate(1)
         self.sync_all()
         assert_equal(self.nodes[0].z_getbalance(sproutAddr), Decimal('10'))
diff --git a/qa/rpc-tests/merkle_blocks.py b/qa/rpc-tests/merkle_blocks.py
index 4b7f1468075..2945861b39a 100755
--- a/qa/rpc-tests/merkle_blocks.py
+++ b/qa/rpc-tests/merkle_blocks.py
@@ -75,7 +75,7 @@ def run_test(self):
         txid_spent = txin_spent["txid"]
         txid_unspent = txid1 if txin_spent["txid"] != txid1 else txid2
 
-        # We cant find the block from a fully-spent tx
+        # We can't find the block from a fully-spent tx
         assert_raises(JSONRPCException, self.nodes[2].gettxoutproof, [txid_spent])
         # ...but we can if we specify the block
         assert_equal(self.nodes[2].verifytxoutproof(self.nodes[2].gettxoutproof([txid_spent], blockhash)), [txid_spent])
diff --git a/qa/rpc-tests/mining_shielded_coinbase.py b/qa/rpc-tests/mining_shielded_coinbase.py
index 83c34401118..9d9fc517f53 100755
--- a/qa/rpc-tests/mining_shielded_coinbase.py
+++ b/qa/rpc-tests/mining_shielded_coinbase.py
@@ -6,10 +6,12 @@
 from decimal import Decimal
 from test_framework.authproxy import JSONRPCException
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.mininode import nuparams
+from test_framework.mininode import COIN, nuparams
 from test_framework.util import (
     BLOSSOM_BRANCH_ID,
     HEARTWOOD_BRANCH_ID,
+    CANOPY_BRANCH_ID,
+    NU5_BRANCH_ID,
     assert_equal,
     assert_raises,
     bitcoind_processes,
@@ -28,8 +30,12 @@ def __init__(self):
 
     def start_node_with(self, index, extra_args=[]):
         args = [
+            '-experimentalfeatures',
+            '-orchardwallet',
             nuparams(BLOSSOM_BRANCH_ID, 1),
             nuparams(HEARTWOOD_BRANCH_ID, 10),
+            nuparams(CANOPY_BRANCH_ID, 20),
+            nuparams(NU5_BRANCH_ID, 20),
             "-nurejectoldversions=false",
         ]
         return start_node(index, self.options.tmpdir, args + extra_args)
@@ -117,5 +123,50 @@ def run_test (self):
         assert_equal(self.nodes[0].z_getbalance(node0_taddr), 2)
         assert_equal(self.nodes[1].z_getbalance(node1_zaddr), 1)
 
+        # Generate a Unified Address for node 1
+        self.nodes[1].z_getnewaccount()
+        node1_addr0 = self.nodes[1].z_getaddressforaccount(0)
+        assert_equal(node1_addr0['account'], 0)
+        assert_equal(set(node1_addr0['pools']), set(['transparent', 'sapling', 'orchard']))
+        node1_ua = node1_addr0['unifiedaddress']
+
+        # Set node 1's miner address to the UA
+        self.nodes[1].stop()
+        bitcoind_processes[1].wait()
+        self.nodes[1] = self.start_node_with(1, [
+            "-mineraddress=%s" % node1_ua,
+        ])
+        connect_nodes(self.nodes[1], 0)
+
+        # The UA starts with zero balance.
+        assert_equal(self.nodes[1].z_getbalanceforaccount(0)['pools'], {})
+
+        # Node 1 can mine blocks because the miner selects the Sapling receiver
+        # of its UA.
+        print("Mining block with node 1")
+        self.nodes[1].generate(1)
+        self.sync_all()
+
+        # The UA balance should show that Sapling funds were received.
+        assert_equal(self.nodes[1].z_getbalanceforaccount(0)['pools'], {
+            'sapling': {'valueZat': 5 * COIN },
+        })
+
+        # Activate NU5
+        print("Activating NU5")
+        self.nodes[0].generate(7)
+        self.sync_all()
+
+        # Now any block mined by node 1 should use the Orchard receiver of its UA.
+        print("Mining block with node 1")
+        self.nodes[1].generate(1)
+        self.sync_all()
+        assert_equal(self.nodes[1].z_getbalanceforaccount(0)['pools'], {
+            'sapling': {'valueZat': 5 * COIN },
+            # 6.25 ZEC because the FR always ends when Canopy activates, and
+            # regtest has no defined funding streams.
+            'orchard': {'valueZat': 6.25 * COIN },
+        })
+
 if __name__ == '__main__':
     ShieldCoinbaseTest().main()
diff --git a/qa/rpc-tests/nodehandling.py b/qa/rpc-tests/nodehandling.py
index 40614d2e810..59cdbd60c45 100755
--- a/qa/rpc-tests/nodehandling.py
+++ b/qa/rpc-tests/nodehandling.py
@@ -27,7 +27,7 @@ def run_test(self):
         ###########################
         assert_equal(len(self.nodes[2].getpeerinfo()), 4) #we should have 4 nodes at this point
         self.nodes[2].setban("127.0.0.1", "add")
-        time.sleep(3) #wait till the nodes are disconected
+        time.sleep(3) #wait till the nodes are disconnected
         assert_equal(len(self.nodes[2].getpeerinfo()), 0) #all nodes must be disconnected at this point
         assert_equal(len(self.nodes[2].listbanned()), 1)
         self.nodes[2].clearbanned()
diff --git a/qa/rpc-tests/nuparams.py b/qa/rpc-tests/nuparams.py
new file mode 100755
index 00000000000..4482f116a4e
--- /dev/null
+++ b/qa/rpc-tests/nuparams.py
@@ -0,0 +1,217 @@
+#!/usr/bin/env python3
+# Copyright (c) 2021 The Zcash developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import (
+    assert_equal,
+    start_nodes,
+    nuparams,
+    HEARTWOOD_BRANCH_ID,
+    NU5_BRANCH_ID,
+)
+
+
+class NuparamsTest(BitcoinTestFramework):
+    '''
+    Test that unspecified network upgrades are activated automatically;
+    this is really more of a test of the test framework.
+    '''
+
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 1
+        self.setup_clean_chain = True
+
+    def setup_network(self, split=False):
+        args = [[
+            nuparams(HEARTWOOD_BRANCH_ID, 3),
+            nuparams(NU5_BRANCH_ID, 5),
+        ] * self.num_nodes]
+        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, args)
+        self.is_network_split = False
+        self.sync_all()
+
+    def run_test(self):
+        node = self.nodes[0]
+        # No blocks have been created, only the genesis block exists (height 0)
+        bci = node.getblockchaininfo()
+        assert_equal(bci['blocks'], 0)
+        upgrades = bci['upgrades']
+
+        overwinter = upgrades['5ba81b19']
+        assert_equal(overwinter['name'], 'Overwinter')
+        assert_equal(overwinter['activationheight'], 1)
+        assert_equal(overwinter['status'], 'pending')
+
+        sapling = upgrades['76b809bb']
+        assert_equal(sapling['name'], 'Sapling')
+        assert_equal(sapling['activationheight'], 1)
+        assert_equal(sapling['status'], 'pending')
+
+        blossom = upgrades['2bb40e60']
+        assert_equal(blossom['name'], 'Blossom')
+        assert_equal(blossom['activationheight'], 3)
+        assert_equal(blossom['status'], 'pending')
+
+        heartwood = upgrades['f5b9230b']
+        assert_equal(heartwood['name'], 'Heartwood')
+        assert_equal(heartwood['activationheight'], 3)
+        assert_equal(heartwood['status'], 'pending')
+
+        canopy = upgrades['e9ff75a6']
+        assert_equal(canopy['name'], 'Canopy')
+        assert_equal(canopy['activationheight'], 5)
+        assert_equal(canopy['status'], 'pending')
+
+        nu5 = upgrades['37519621']
+        assert_equal(nu5['name'], 'NU5')
+        assert_equal(nu5['activationheight'], 5)
+        assert_equal(nu5['status'], 'pending')
+
+        node.generate(1)
+
+        # start_node() hardcodes Sapling and Overwinter to activate a height 1
+        bci = node.getblockchaininfo()
+        assert_equal(bci['blocks'], 1)
+        upgrades = bci['upgrades']
+
+        overwinter = upgrades['5ba81b19']
+        assert_equal(overwinter['name'], 'Overwinter')
+        assert_equal(overwinter['activationheight'], 1)
+        assert_equal(overwinter['status'], 'active')
+
+        sapling = upgrades['76b809bb']
+        assert_equal(sapling['name'], 'Sapling')
+        assert_equal(sapling['activationheight'], 1)
+        assert_equal(sapling['status'], 'active')
+
+        blossom = upgrades['2bb40e60']
+        assert_equal(blossom['name'], 'Blossom')
+        assert_equal(blossom['activationheight'], 3)
+        assert_equal(blossom['status'], 'pending')
+
+        heartwood = upgrades['f5b9230b']
+        assert_equal(heartwood['name'], 'Heartwood')
+        assert_equal(heartwood['activationheight'], 3)
+        assert_equal(heartwood['status'], 'pending')
+
+        canopy = upgrades['e9ff75a6']
+        assert_equal(canopy['name'], 'Canopy')
+        assert_equal(canopy['activationheight'], 5)
+        assert_equal(canopy['status'], 'pending')
+
+        nu5 = upgrades['37519621']
+        assert_equal(nu5['name'], 'NU5')
+        assert_equal(nu5['activationheight'], 5)
+        assert_equal(nu5['status'], 'pending')
+
+        node.generate(1)
+        bci = node.getblockchaininfo()
+        assert_equal(bci['blocks'], 2)
+        upgrades = bci['upgrades']
+
+        overwinter = upgrades['5ba81b19']
+        assert_equal(overwinter['name'], 'Overwinter')
+        assert_equal(overwinter['activationheight'], 1)
+        assert_equal(overwinter['status'], 'active')
+
+        sapling = upgrades['76b809bb']
+        assert_equal(sapling['name'], 'Sapling')
+        assert_equal(sapling['activationheight'], 1)
+        assert_equal(sapling['status'], 'active')
+
+        blossom = upgrades['2bb40e60']
+        assert_equal(blossom['name'], 'Blossom')
+        assert_equal(blossom['activationheight'], 3)
+        assert_equal(blossom['status'], 'pending')
+
+        heartwood = upgrades['f5b9230b']
+        assert_equal(heartwood['name'], 'Heartwood')
+        assert_equal(heartwood['activationheight'], 3)
+        assert_equal(heartwood['status'], 'pending')
+
+        canopy = upgrades['e9ff75a6']
+        assert_equal(canopy['name'], 'Canopy')
+        assert_equal(canopy['activationheight'], 5)
+        assert_equal(canopy['status'], 'pending')
+
+        nu5 = upgrades['37519621']
+        assert_equal(nu5['name'], 'NU5')
+        assert_equal(nu5['activationheight'], 5)
+        assert_equal(nu5['status'], 'pending')
+
+        node.generate(2)
+        bci = node.getblockchaininfo()
+        assert_equal(bci['blocks'], 4)
+        upgrades = bci['upgrades']
+
+        overwinter = upgrades['5ba81b19']
+        assert_equal(overwinter['name'], 'Overwinter')
+        assert_equal(overwinter['activationheight'], 1)
+        assert_equal(overwinter['status'], 'active')
+
+        sapling = upgrades['76b809bb']
+        assert_equal(sapling['name'], 'Sapling')
+        assert_equal(sapling['activationheight'], 1)
+        assert_equal(sapling['status'], 'active')
+
+        blossom = upgrades['2bb40e60']
+        assert_equal(blossom['name'], 'Blossom')
+        assert_equal(blossom['activationheight'], 3)
+        assert_equal(blossom['status'], 'active')
+
+        heartwood = upgrades['f5b9230b']
+        assert_equal(heartwood['name'], 'Heartwood')
+        assert_equal(heartwood['activationheight'], 3)
+        assert_equal(heartwood['status'], 'active')
+
+        canopy = upgrades['e9ff75a6']
+        assert_equal(canopy['name'], 'Canopy')
+        assert_equal(canopy['activationheight'], 5)
+        assert_equal(canopy['status'], 'pending')
+
+        nu5 = upgrades['37519621']
+        assert_equal(nu5['name'], 'NU5')
+        assert_equal(nu5['activationheight'], 5)
+        assert_equal(nu5['status'], 'pending')
+
+        node.generate(1)
+        bci = node.getblockchaininfo()
+        assert_equal(bci['blocks'], 5)
+        upgrades = bci['upgrades']
+
+        overwinter = upgrades['5ba81b19']
+        assert_equal(overwinter['name'], 'Overwinter')
+        assert_equal(overwinter['activationheight'], 1)
+        assert_equal(overwinter['status'], 'active')
+
+        sapling = upgrades['76b809bb']
+        assert_equal(sapling['name'], 'Sapling')
+        assert_equal(sapling['activationheight'], 1)
+        assert_equal(sapling['status'], 'active')
+
+        blossom = upgrades['2bb40e60']
+        assert_equal(blossom['name'], 'Blossom')
+        assert_equal(blossom['activationheight'], 3)
+        assert_equal(blossom['status'], 'active')
+
+        heartwood = upgrades['f5b9230b']
+        assert_equal(heartwood['name'], 'Heartwood')
+        assert_equal(heartwood['activationheight'], 3)
+        assert_equal(heartwood['status'], 'active')
+
+        canopy = upgrades['e9ff75a6']
+        assert_equal(canopy['name'], 'Canopy')
+        assert_equal(canopy['activationheight'], 5)
+        assert_equal(canopy['status'], 'active')
+
+        nu5 = upgrades['37519621']
+        assert_equal(nu5['name'], 'NU5')
+        assert_equal(nu5['activationheight'], 5)
+        assert_equal(nu5['status'], 'active')
+
+
+if __name__ == '__main__':
+    NuparamsTest().main()
diff --git a/qa/rpc-tests/orchard_reorg.py b/qa/rpc-tests/orchard_reorg.py
new file mode 100755
index 00000000000..58d0bf8d9d7
--- /dev/null
+++ b/qa/rpc-tests/orchard_reorg.py
@@ -0,0 +1,130 @@
+#!/usr/bin/env python3
+# Copyright (c) 2022 The Zcash developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+#
+# Test the effect of reorgs on the Orchard commitment tree.
+#
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import (
+    BLOSSOM_BRANCH_ID,
+    HEARTWOOD_BRANCH_ID,
+    CANOPY_BRANCH_ID,
+    NU5_BRANCH_ID,
+    assert_equal,
+    get_coinbase_address,
+    nuparams,
+    start_nodes,
+    wait_and_assert_operationid_status,
+)
+
+from finalsaplingroot import ORCHARD_TREE_EMPTY_ROOT
+
+from decimal import Decimal
+
+class OrchardReorgTest(BitcoinTestFramework):
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 4
+        self.setup_clean_chain = True
+
+    def setup_nodes(self):
+        return start_nodes(self.num_nodes, self.options.tmpdir, extra_args=[[
+            nuparams(BLOSSOM_BRANCH_ID, 1),
+            nuparams(HEARTWOOD_BRANCH_ID, 5),
+            nuparams(CANOPY_BRANCH_ID, 5),
+            nuparams(NU5_BRANCH_ID, 10),
+            '-nurejectoldversions=false',
+            '-experimentalfeatures',
+            '-orchardwallet',
+            # '-debug',
+        ]] * self.num_nodes)
+
+    def run_test(self):
+        # Activate NU5 so we can test Orchard.
+        self.nodes[0].generate(10)
+        self.sync_all()
+
+        # Generate a UA with only an Orchard receiver.
+        account = self.nodes[0].z_getnewaccount()['account']
+        addr = self.nodes[0].z_getaddressforaccount(account, ['orchard'])
+        assert_equal(addr['account'], account)
+        assert_equal(set(addr['pools']), set(['orchard']))
+        ua = addr['unifiedaddress']
+
+        # Before mining any Orchard notes, finalorchardroot should be the empty Orchard root.
+        assert_equal(
+            ORCHARD_TREE_EMPTY_ROOT,
+            self.nodes[0].getblock(self.nodes[0].getbestblockhash())['finalorchardroot'],
+        )
+
+        # finalorchardroot should not change if we mine additional blocks without Orchard notes.
+        self.nodes[0].generate(100)
+        self.sync_all()
+        assert_equal(
+            ORCHARD_TREE_EMPTY_ROOT,
+            self.nodes[0].getblock(self.nodes[0].getbestblockhash())['finalorchardroot'],
+        )
+
+        # Create an Orchard note.
+        recipients = [{'address': ua, 'amount': Decimal('12.5')}]
+        opid = self.nodes[0].z_sendmany(get_coinbase_address(self.nodes[0]), recipients, 1, 0, 'AllowRevealedSenders')
+        wait_and_assert_operationid_status(self.nodes[0], opid)
+
+        # After mining a block, finalorchardroot should have changed.
+        self.sync_all()
+        self.nodes[0].generate(1)
+        self.sync_all()
+        orchardroot_oneleaf = self.nodes[0].getblock(self.nodes[0].getbestblockhash())['finalorchardroot']
+        print("Root of Orchard commitment tree with one leaf:", orchardroot_oneleaf)
+        assert(orchardroot_oneleaf != ORCHARD_TREE_EMPTY_ROOT)
+
+        # finalorchardroot should not change if we mine additional blocks without Orchard notes.
+        self.nodes[0].generate(4)
+        self.sync_all()
+        assert_equal(
+            orchardroot_oneleaf,
+            self.nodes[0].getblock(self.nodes[0].getbestblockhash())['finalorchardroot'],
+        )
+
+        # Split the network so we can test the effect of a reorg.
+        print("Splitting the network")
+        self.split_network()
+
+        # Create another Orchard note on node 0.
+        recipients = [{'address': ua, 'amount': Decimal('12.5')}]
+        opid = self.nodes[0].z_sendmany(get_coinbase_address(self.nodes[0]), recipients, 1, 0, 'AllowRevealedSenders')
+        wait_and_assert_operationid_status(self.nodes[0], opid)
+
+        # Mine two blocks on node 0.
+        print("Mining 2 blocks on node 0")
+        self.nodes[0].generate(2)
+        self.sync_all()
+        orchardroot_twoleaf = self.nodes[0].getblock(self.nodes[0].getbestblockhash())['finalorchardroot']
+        print("Root of Orchard commitment tree with two leaves:", orchardroot_twoleaf)
+        assert(orchardroot_twoleaf != ORCHARD_TREE_EMPTY_ROOT)
+        assert(orchardroot_twoleaf != orchardroot_oneleaf)
+
+        # Generate 10 blocks on node 2.
+        print("Mining alternate chain on node 2")
+        self.nodes[2].generate(10)
+        self.sync_all()
+        assert_equal(
+            orchardroot_oneleaf,
+            self.nodes[2].getblock(self.nodes[2].getbestblockhash())['finalorchardroot'],
+        )
+
+        # Reconnect the nodes; node 0 will re-org to node 2's chain.
+        print("Re-joining the network so that node 0 reorgs")
+        self.join_network()
+
+        # Verify that node 0's latest Orchard root matches what we expect.
+        orchardroot_postreorg = self.nodes[0].getblock(self.nodes[2].getbestblockhash())['finalorchardroot']
+        print("Root of Orchard commitment tree after reorg:", orchardroot_postreorg)
+        assert_equal(orchardroot_postreorg, orchardroot_oneleaf)
+
+
+if __name__ == '__main__':
+    OrchardReorgTest().main()
diff --git a/qa/rpc-tests/p2p-fullblocktest.py b/qa/rpc-tests/p2p-fullblocktest.py
index 2307cfcebc5..17cc3572c15 100755
--- a/qa/rpc-tests/p2p-fullblocktest.py
+++ b/qa/rpc-tests/p2p-fullblocktest.py
@@ -39,7 +39,6 @@ class FullBlockTest(ComparisonTestFramework):
         Change the "outcome" variable from each TestInstance object to only do the comparison. '''
     def __init__(self):
         super().__init__()
-        self.num_nodes = 1
         self.block_heights = {}
         self.coinbase_key = CECKey()
         self.coinbase_key.set_secretbytes(b"horsebattery")
@@ -159,7 +158,7 @@ def tip(number):
         yield test
 
 
-        # Start by bulding a couple of blocks on top (which output is spent is in parentheses):
+        # Start by building a couple of blocks on top (which output is spent is in parentheses):
         #     genesis -> b1 (0) -> b2 (1)
         out0 = get_spendable_output()
         block(1, spend=out0)
diff --git a/qa/rpc-tests/paymentdisclosure.py b/qa/rpc-tests/paymentdisclosure.py
deleted file mode 100755
index db9add40718..00000000000
--- a/qa/rpc-tests/paymentdisclosure.py
+++ /dev/null
@@ -1,218 +0,0 @@
-#!/usr/bin/env python3
-# Copyright (c) 2017 The Zcash developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or https://www.opensource.org/licenses/mit-license.php .
-
-from test_framework.test_framework import BitcoinTestFramework
-from test_framework.authproxy import JSONRPCException
-from test_framework.util import assert_equal, \
-    start_node, connect_nodes_bi, wait_and_assert_operationid_status, \
-    get_coinbase_address, DEFAULT_FEE
-
-from decimal import Decimal
-
-class PaymentDisclosureTest (BitcoinTestFramework):
-
-    def __init__(self):
-        super().__init__()
-        self.num_nodes = 3
-        self.setup_clean_chain = True
-
-    def setup_network(self, split=False):
-        args = ['-debug=zrpcunsafe,paymentdisclosure', '-experimentalfeatures', '-paymentdisclosure', '-txindex=1']
-        self.nodes = []
-        self.nodes.append(start_node(0, self.options.tmpdir, args))
-        self.nodes.append(start_node(1, self.options.tmpdir, args))
-        # node 2 does not enable payment disclosure
-        args2 = ['-debug=zrpcunsafe', '-experimentalfeatures', '-txindex=1']
-        self.nodes.append(start_node(2, self.options.tmpdir, args2))
-        connect_nodes_bi(self.nodes,0,1)
-        connect_nodes_bi(self.nodes,1,2)
-        connect_nodes_bi(self.nodes,0,2)
-        self.is_network_split=False
-        self.sync_all()
-
-    def run_test (self):
-        print("Mining blocks...")
-
-        self.nodes[0].generate(4)
-        self.sync_all()
-        walletinfo = self.nodes[0].getwalletinfo()
-        assert_equal(walletinfo['immature_balance'], 40)
-        assert_equal(walletinfo['balance'], 0)
-        self.sync_all()
-        self.nodes[2].generate(3)
-        self.sync_all()
-        self.nodes[1].generate(101)
-        self.sync_all()
-        assert_equal(self.nodes[0].getbalance(), 40)
-        assert_equal(self.nodes[1].getbalance(), 10)
-        assert_equal(self.nodes[2].getbalance(), 30)
-
-        mytaddr = get_coinbase_address(self.nodes[0])
-        myzaddr = self.nodes[0].z_getnewaddress('sprout')
-
-        # Check that Node 2 has payment disclosure disabled.
-        try:
-            self.nodes[2].z_getpaymentdisclosure("invalidtxid", 0, 0)
-            assert(False)
-        except JSONRPCException as e:
-            errorString = e.error['message']
-            assert("payment disclosure is disabled" in errorString)
-
-        # Check that Node 0 returns an error for an unknown txid
-        try:
-            self.nodes[0].z_getpaymentdisclosure("invalidtxid", 0, 0)
-            assert(False)
-        except JSONRPCException as e:
-            errorString = e.error['message']
-            assert("No information available about transaction" in errorString)
-
-        # Shield coinbase utxos from node 0 of value 40, default fee
-        recipients = [{"address": myzaddr, "amount": Decimal('40.0') - DEFAULT_FEE}]
-        myopid = self.nodes[0].z_sendmany(mytaddr, recipients)
-        txid = wait_and_assert_operationid_status(self.nodes[0], myopid)
-
-        # Check the tx has joinsplits
-        assert( len(self.nodes[0].getrawtransaction("" + txid, 1)["vjoinsplit"]) > 0 )
-
-        # Sync mempools
-        self.sync_all()
-
-        # Confirm that you can't create a payment disclosure for an unconfirmed tx
-        try:
-            self.nodes[0].z_getpaymentdisclosure(txid, 0, 0)
-            assert(False)
-        except JSONRPCException as e:
-            errorString = e.error['message']
-            assert("Transaction has not been confirmed yet" in errorString)
-
-        try:
-            self.nodes[1].z_getpaymentdisclosure(txid, 0, 0)
-            assert(False)
-        except JSONRPCException as e:
-            errorString = e.error['message']
-            assert("Transaction has not been confirmed yet" in errorString)
-
-        # Mine tx
-        self.nodes[0].generate(1)
-        self.sync_all()
-
-        # Confirm that Node 1 cannot create a payment disclosure for a transaction which does not impact its wallet
-        try:
-            self.nodes[1].z_getpaymentdisclosure(txid, 0, 0)
-            assert(False)
-        except JSONRPCException as e:
-            errorString = e.error['message']
-            assert("Transaction does not belong to the wallet" in errorString)
-
-        # Check that an invalid joinsplit index is rejected
-        try:
-            self.nodes[0].z_getpaymentdisclosure(txid, 1, 0)
-            assert(False)
-        except JSONRPCException as e:
-            errorString = e.error['message']
-            assert("Invalid js_index" in errorString)
-
-        try:
-            self.nodes[0].z_getpaymentdisclosure(txid, -1, 0)
-            assert(False)
-        except JSONRPCException as e:
-            errorString = e.error['message']
-            assert("Invalid js_index" in errorString)
-
-        # Check that an invalid output index is rejected
-        try:
-            self.nodes[0].z_getpaymentdisclosure(txid, 0, 2)
-            assert(False)
-        except JSONRPCException as e:
-            errorString = e.error['message']
-            assert("Invalid output_index" in errorString)
-
-        try:
-            self.nodes[0].z_getpaymentdisclosure(txid, 0, -1)
-            assert(False)
-        except JSONRPCException as e:
-            errorString = e.error['message']
-            assert("Invalid output_index" in errorString)
-
-        # Ask Node 0 to create and validate a payment disclosure for output 0
-        message = "Here is proof of my payment!"
-        pd = self.nodes[0].z_getpaymentdisclosure(txid, 0, 0, message)
-        result = self.nodes[0].z_validatepaymentdisclosure(pd)
-        assert(result["valid"])
-        output_value_sum = Decimal(result["value"])
-
-        # Ask Node 1 to confirm the payment disclosure is valid
-        result = self.nodes[1].z_validatepaymentdisclosure(pd)
-        assert(result["valid"])
-        assert_equal(result["message"], message)
-        assert_equal(result["value"], output_value_sum)
-
-        # Confirm that payment disclosure begins with prefix zpd:
-        assert(pd.startswith("zpd:"))
-
-        # Confirm that payment disclosure without prefix zpd: fails validation
-        try:
-            self.nodes[1].z_validatepaymentdisclosure(pd[4:])
-            assert(False)
-        except JSONRPCException as e:
-            errorString = e.error['message']
-            assert("payment disclosure prefix not found" in errorString)
-
-        # Check that total value of output index 0 and index 1 should equal shielding amount of 40 less standard fee.
-        pd = self.nodes[0].z_getpaymentdisclosure(txid, 0, 1)
-        result = self.nodes[0].z_validatepaymentdisclosure(pd)
-        output_value_sum += Decimal(result["value"])
-        assert_equal(output_value_sum, Decimal('40.0') - DEFAULT_FEE)
-
-        # Create a z->z transaction, sending shielded funds from node 0 to node 1
-        node1zaddr = self.nodes[1].z_getnewaddress('sprout')
-        recipients = [{"address":node1zaddr, "amount":Decimal('1')}]
-        myopid = self.nodes[0].z_sendmany(myzaddr, recipients)
-        txid = wait_and_assert_operationid_status(self.nodes[0], myopid)
-        self.sync_all()
-        self.nodes[0].generate(1)
-        self.sync_all()
-
-        # Confirm that Node 0 can create a valid payment disclosure
-        pd = self.nodes[0].z_getpaymentdisclosure(txid, 0, 0, "a message of your choice")
-        result = self.nodes[0].z_validatepaymentdisclosure(pd)
-        assert(result["valid"])
-
-        # Confirm that Node 1, even as recipient of shielded funds, cannot create a payment disclosure
-        # as the transaction was created by Node 0 and Node 1's payment disclosure database does not
-        # contain the necessary data to do so, where the data would only have been available on Node 0
-        # when executing z_shieldcoinbase.
-        try:
-            self.nodes[1].z_getpaymentdisclosure(txid, 0, 0)
-            assert(False)
-        except JSONRPCException as e:
-            errorString = e.error['message']
-            assert("Could not find payment disclosure info for the given joinsplit output" in errorString)
-
-        # Payment disclosures cannot be created for transparent transactions.
-        txid = self.nodes[2].sendtoaddress(mytaddr, 1.0)
-        self.sync_all()
-
-        # No matter the type of transaction, if it has not been confirmed, it is ignored.
-        try:
-            self.nodes[0].z_getpaymentdisclosure(txid, 0, 0)
-            assert(False)
-        except JSONRPCException as e:
-            errorString = e.error['message']
-            assert("Transaction has not been confirmed yet" in errorString)
-
-        self.nodes[0].generate(1)
-        self.sync_all()
-
-        # Confirm that a payment disclosure can only be generated for a shielded transaction.
-        try:
-            self.nodes[0].z_getpaymentdisclosure(txid, 0, 0)
-            assert(False)
-        except JSONRPCException as e:
-            errorString = e.error['message']
-            assert("Transaction is not a shielded transaction" in errorString)
-
-if __name__ == '__main__':
-    PaymentDisclosureTest().main()
diff --git a/qa/rpc-tests/pruning.py b/qa/rpc-tests/pruning.py
index 2916f76fefd..95a18ca920e 100755
--- a/qa/rpc-tests/pruning.py
+++ b/qa/rpc-tests/pruning.py
@@ -152,7 +152,7 @@ def reorg_test(self):
         print("Invalidating block at height:",invalidheight,badhash)
         self.nodes[1].invalidateblock(badhash)
 
-        # We've now switched to our previously mined-24 block fork on node 1, but thats not what we want
+        # We've now switched to our previously mined-24 block fork on node 1, but that's not what we want
         # So invalidate that fork as well, until we're on the same chain as node 0/2 (but at an ancestor 288 blocks ago)
         mainchainhash = self.nodes[0].getblockhash(invalidheight - 1)
         curhash = self.nodes[1].getblockhash(invalidheight - 1)
@@ -210,7 +210,7 @@ def reorg_back(self):
         goalbesthash = self.mainchainhash2
 
         # As of 0.10 the current block download logic is not able to reorg to the original chain created in
-        # create_chain_with_stale_blocks because it doesn't know of any peer thats on that chain from which to
+        # create_chain_with_stale_blocks because it doesn't know of any peer that's on that chain from which to
         # redownload its missing blocks.
         # Invalidate the reorg_test chain in node 0 as well, it can successfully switch to the original chain
         # because it has all the block data.
diff --git a/qa/rpc-tests/remove_sprout_shielding.py b/qa/rpc-tests/remove_sprout_shielding.py
index 9a84d19f2e2..e57ef30034b 100755
--- a/qa/rpc-tests/remove_sprout_shielding.py
+++ b/qa/rpc-tests/remove_sprout_shielding.py
@@ -41,6 +41,7 @@ def run_test (self):
 
         # Shield coinbase to Sprout on node 0. Should pass
         sprout_addr = self.nodes[0].z_getnewaddress('sprout')
+        sprout_addr_node2 = self.nodes[2].z_getnewaddress('sprout')
         myopid = self.nodes[0].z_shieldcoinbase(get_coinbase_address(self.nodes[0]), sprout_addr, 0)['opid']
         wait_and_assert_operationid_status(self.nodes[0], myopid)
         print("taddr -> Sprout z_shieldcoinbase tx accepted before Canopy on node 0")
@@ -59,14 +60,6 @@ def run_test (self):
             self.nodes[0].generate(1)
             self.sync_all()
 
-        # Create taddr -> Sprout transaction and mine on node 0 before it is Canopy-aware. Should pass
-        sendmany_tx_0 = self.nodes[0].z_sendmany(taddr_0, [{"address": self.nodes[1].z_getnewaddress('sprout'), "amount": 1}])
-        wait_and_assert_operationid_status(self.nodes[0], sendmany_tx_0)
-        print("taddr -> Sprout z_sendmany tx accepted before Canopy on node 0")
-
-        self.nodes[0].generate(1)
-        self.sync_all()
-
         # Create mergetoaddress taddr -> Sprout transaction and mine on node 0 before it is Canopy-aware. Should pass
         merge_tx_0 = self.nodes[0].z_mergetoaddress(["ANY_TADDR"], self.nodes[1].z_getnewaddress('sprout'))
         wait_and_assert_operationid_status(self.nodes[0], merge_tx_0['opid'])
@@ -75,8 +68,9 @@ def run_test (self):
         # Mine to one block before Canopy activation on node 0; adding value
         # to the Sprout pool will fail now since the transaction must be
         # included in the next (or later) block, after Canopy has activated.
-        self.nodes[0].generate(4)
+        self.nodes[0].generate(5)
         self.sync_all()
+        assert_equal(self.nodes[0].getblockchaininfo()['upgrades']['e9ff75a6']['status'], 'pending')
 
         # Shield coinbase to Sprout on node 0. Should fail
         sprout_addr = self.nodes[0].z_getnewaddress('sprout')
@@ -91,7 +85,7 @@ def run_test (self):
         sprout_addr = self.nodes[1].z_getnewaddress('sprout')
         assert_raises_message(
             JSONRPCException,
-            "Sprout shielding is not supported after Canopy",
+            "Sending funds into the Sprout pool is not supported by z_sendmany",
             self.nodes[0].z_sendmany,
             taddr_0, [{"address": sprout_addr, "amount": 1}])
         print("taddr -> Sprout z_sendmany tx rejected at Canopy activation on node 0")
@@ -109,8 +103,17 @@ def run_test (self):
         wait_and_assert_operationid_status(self.nodes[0], merge_tx_1['opid'])
         print("Sprout -> Sprout z_mergetoaddress tx accepted at Canopy activation on node 0")
 
+        # Activate Canopy
         self.nodes[0].generate(1)
         self.sync_all()
+        assert_equal(self.nodes[0].getblockchaininfo()['upgrades']['e9ff75a6']['status'], 'active')
+
+        # Generating a Sprout address should fail after Canopy.
+        assert_raises_message(
+            JSONRPCException,
+            "Invalid address type, \"sprout\" is not allowed after Canopy",
+            self.nodes[0].z_getnewaddress, 'sprout')
+        print("Sprout z_getnewaddress rejected at Canopy activation on node 0")
 
         # Shield coinbase to Sapling on node 0. Should pass
         sapling_addr = self.nodes[0].z_getnewaddress('sapling')
@@ -123,7 +126,7 @@ def run_test (self):
         self.sync_all()
 
         # Create z_mergetoaddress Sprout -> Sprout transaction on node 1. Should pass
-        merge_tx_2 = self.nodes[1].z_mergetoaddress(["ANY_SPROUT"], self.nodes[2].z_getnewaddress('sprout'))
+        merge_tx_2 = self.nodes[1].z_mergetoaddress(["ANY_SPROUT"], sprout_addr_node2)
         wait_and_assert_operationid_status(self.nodes[1], merge_tx_2['opid'])
         print("Sprout -> Sprout z_mergetoaddress tx accepted at NU5 activation on node 1")
 
diff --git a/qa/rpc-tests/smartfees.py b/qa/rpc-tests/smartfees.py
index 44086fa4fce..cc3659dad5d 100755
--- a/qa/rpc-tests/smartfees.py
+++ b/qa/rpc-tests/smartfees.py
@@ -29,7 +29,7 @@ def satoshi_round(amount):
 def small_txpuzzle_randfee(from_node, conflist, unconflist, amount, min_fee, fee_increment):
     '''
     Create and send a transaction with a random fee.
-    The transaction pays to a trival P2SH script, and assumes that its inputs
+    The transaction pays to a trivial P2SH script, and assumes that its inputs
     are of the same form.
     The function takes a list of confirmed outputs and unconfirmed outputs
     and attempts to use the confirmed list first for its inputs.
diff --git a/qa/rpc-tests/sprout_sapling_migration.py b/qa/rpc-tests/sprout_sapling_migration.py
index 78bcf73528b..680e4a040bd 100755
--- a/qa/rpc-tests/sprout_sapling_migration.py
+++ b/qa/rpc-tests/sprout_sapling_migration.py
@@ -158,8 +158,8 @@ def run_migration_test(self, node, sproutAddr, saplingAddr, target_height):
 
     def send_to_sprout_zaddr(self, tAddr, sproutAddr):
         # Send some ZEC to a Sprout address
-        opid = self.nodes[0].z_sendmany(tAddr, [{"address": sproutAddr, "amount": Decimal('10')}], 1, 0)
-        wait_and_assert_operationid_status(self.nodes[0], opid)
+        result = self.nodes[0].z_shieldcoinbase(tAddr, sproutAddr, 0, 1)
+        wait_and_assert_operationid_status(self.nodes[0], result['opid'])
         self.nodes[0].generate(1)
         self.sync_all()
 
diff --git a/qa/rpc-tests/test_framework/blocktools.py b/qa/rpc-tests/test_framework/blocktools.py
index 6cf7d8d2b87..53a2512caae 100644
--- a/qa/rpc-tests/test_framework/blocktools.py
+++ b/qa/rpc-tests/test_framework/blocktools.py
@@ -4,7 +4,7 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
-from pyblake2 import blake2b
+from hashlib import blake2b
 
 from .mininode import CBlock, CTransaction, CTxIn, CTxOut, COutPoint
 from .script import CScript, OP_0, OP_EQUAL, OP_HASH160, OP_TRUE, OP_CHECKSIG
diff --git a/qa/rpc-tests/test_framework/comptool.py b/qa/rpc-tests/test_framework/comptool.py
index 02d09fa203c..a09fbfe2086 100755
--- a/qa/rpc-tests/test_framework/comptool.py
+++ b/qa/rpc-tests/test_framework/comptool.py
@@ -30,6 +30,8 @@
 To use, create a class that implements get_tests(), and pass it in
 as the test generator to TestManager.  get_tests() should be a python
 generator that returns TestInstance objects.  See below for definition.
+
+In practice get_tests is always implemented on a subclass of ComparisonTestFramework.
 '''
 
 # TestNode behaves as follows:
diff --git a/qa/rpc-tests/test_framework/flyclient.py b/qa/rpc-tests/test_framework/flyclient.py
index 368c6516c52..4e01cf76c4a 100644
--- a/qa/rpc-tests/test_framework/flyclient.py
+++ b/qa/rpc-tests/test_framework/flyclient.py
@@ -1,4 +1,4 @@
-from pyblake2 import blake2b
+from hashlib import blake2b
 import struct
 from typing import (List, Optional)
 
diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index c5f5bc1bd7f..f6421e922b0 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -36,7 +36,7 @@
 from threading import Thread
 import logging
 import copy
-from pyblake2 import blake2b
+from hashlib import blake2b
 
 from .equihash import (
     gbp_basic,
@@ -52,7 +52,7 @@
 OVERWINTER_PROTO_VERSION = 170003
 SAPLING_PROTO_VERSION = 170006
 BLOSSOM_PROTO_VERSION = 170008
-NU5_PROTO_VERSION = 170014
+NU5_PROTO_VERSION = 170015
 
 MY_SUBVERSION = b"/python-mininode-tester:0.0.3/"
 
@@ -374,7 +374,7 @@ def __eq__(self, other):
 
     def __repr__(self):
         return "CInv(type=%s hash=%064x hash_aux=%064x)" \
-            % (self.typemap[self.type], self.hash, self.hash_aux)
+            % (self.typemap.get(self.type, self.type), self.hash, self.hash_aux)
 
 
 class CBlockLocator(object):
@@ -660,7 +660,7 @@ def deserialize(self, f):
         self.encCiphertext = f.read(580)
         self.outCiphertext = f.read(80)
         self.zkproof = Groth16Proof()
-        self.zkproof.deserialize()
+        self.zkproof.deserialize(f)
 
     def serialize(self):
         r = b""
@@ -971,6 +971,8 @@ def __init__(self, tx=None):
             self.nLockTime = 0
             self.nExpiryHeight = 0
             self.valueBalance = 0
+            self.saplingBundle = SaplingBundle()
+            self.orchardBundle = OrchardBundle()
             self.shieldedSpends = []
             self.shieldedOutputs = []
             self.vJoinSplit = []
@@ -988,6 +990,8 @@ def __init__(self, tx=None):
             self.nLockTime = tx.nLockTime
             self.nExpiryHeight = tx.nExpiryHeight
             self.valueBalance = tx.valueBalance
+            self.saplingBundle = copy.deepcopy(tx.saplingBundle)
+            self.orchardBundle = copy.deepcopy(tx.orchardBundle)
             self.shieldedSpends = copy.deepcopy(tx.shieldedSpends)
             self.shieldedOutputs = copy.deepcopy(tx.shieldedOutputs)
             self.vJoinSplit = copy.deepcopy(tx.vJoinSplit)
@@ -1075,6 +1079,7 @@ def serialize(self):
 
             # Common transaction fields
             r += struct.pack("<I", header)
+            r += struct.pack("<I", self.nVersionGroupId)
             r += struct.pack("<I", self.nConsensusBranchId)
             r += struct.pack("<I", self.nLockTime)
             r += struct.pack("<I", self.nExpiryHeight)
@@ -1121,11 +1126,14 @@ def calc_sha256(self):
         if self.nVersion >= 5:
             from . import zip244
             txid = zip244.txid_digest(self)
+            self.auth_digest = zip244.auth_digest(self)
         else:
             txid = hash256(self.serialize())
+            self.auth_digest = b'\xFF'*32
         if self.sha256 is None:
             self.sha256 = uint256_from_str(txid)
         self.hash = encode(txid[::-1], 'hex_codec').decode('ascii')
+        self.auth_digest_hex = encode(self.auth_digest[::-1], 'hex_codec').decode('ascii')
 
     def is_valid(self):
         self.calc_sha256()
@@ -1258,6 +1266,27 @@ def calc_merkle_root(self):
             hashes = newhashes
         return uint256_from_str(hashes[0])
 
+    def calc_auth_data_root(self):
+        hashes = []
+        nleaves = 0
+        for tx in self.vtx:
+            tx.calc_sha256()
+            hashes.append(tx.auth_digest)
+            nleaves += 1
+        # Continue adding leaves (of zeros) until reaching a power of 2
+        while nleaves & (nleaves-1) > 0:
+            hashes.append(b'\x00'*32)
+            nleaves += 1
+        while len(hashes) > 1:
+            newhashes = []
+            for i in range(0, len(hashes), 2):
+                digest = blake2b(digest_size=32, person=b'ZcashAuthDatHash')
+                digest.update(hashes[i])
+                digest.update(hashes[i+1])
+                newhashes.append(digest.digest())
+            hashes = newhashes
+        return hashes[0]
+
     def is_valid(self, n=48, k=5):
         # H(I||...
         digest = blake2b(digest_size=(512//n)*n//8, person=zcash_person(n, k))
@@ -1754,6 +1783,14 @@ def serialize(self):
             r += ser_uint256(self.data)
         return r
 
+    def __eq__(self, other):
+        return (
+            (type(self) == type(other)) and (
+                (self.message, self.code, self.reason, self.data) ==
+                (other.message, other.code, other.reason, other.data)
+            )
+        )
+
     def __repr__(self):
         return "msg_reject: %s %d %s [%064x]" \
             % (self.message, self.code, self.reason, self.data)
diff --git a/qa/rpc-tests/test_framework/script.py b/qa/rpc-tests/test_framework/script.py
index d9d548952fa..49192770da3 100644
--- a/qa/rpc-tests/test_framework/script.py
+++ b/qa/rpc-tests/test_framework/script.py
@@ -22,7 +22,7 @@
     bchr = lambda x: bytes([x])
     bord = lambda x: x
 
-from pyblake2 import blake2b
+from hashlib import blake2b
 
 from binascii import hexlify
 import struct
diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py
index 4048cf2a211..d8ba419c1bb 100755
--- a/qa/rpc-tests/test_framework/test_framework.py
+++ b/qa/rpc-tests/test_framework/test_framework.py
@@ -52,7 +52,7 @@ def setup_chain(self):
     def setup_nodes(self):
         return start_nodes(self.num_nodes, self.options.tmpdir)
 
-    def setup_network(self, split = False):
+    def setup_network(self, split = False, do_mempool_sync = True):
         self.nodes = self.setup_nodes()
 
         # Connect the nodes as a "chain".  This allows us
@@ -64,12 +64,13 @@ def setup_network(self, split = False):
         if not split:
             connect_nodes_bi(self.nodes, 1, 2)
             sync_blocks(self.nodes[1:3])
-            sync_mempools(self.nodes[1:3])
+            if do_mempool_sync:
+                sync_mempools(self.nodes[1:3])
 
         connect_nodes_bi(self.nodes, 0, 1)
         connect_nodes_bi(self.nodes, 2, 3)
         self.is_network_split = split
-        self.sync_all()
+        self.sync_all(do_mempool_sync)
 
     def split_network(self):
         """
@@ -80,15 +81,17 @@ def split_network(self):
         wait_bitcoinds()
         self.setup_network(True)
 
-    def sync_all(self):
+    def sync_all(self, do_mempool_sync = True):
         if self.is_network_split:
             sync_blocks(self.nodes[:2])
             sync_blocks(self.nodes[2:])
-            sync_mempools(self.nodes[:2])
-            sync_mempools(self.nodes[2:])
+            if do_mempool_sync:
+                sync_mempools(self.nodes[:2])
+                sync_mempools(self.nodes[2:])
         else:
             sync_blocks(self.nodes)
-            sync_mempools(self.nodes)
+            if do_mempool_sync:
+                sync_mempools(self.nodes)
 
     def join_network(self):
         """
@@ -97,7 +100,7 @@ def join_network(self):
         assert self.is_network_split
         stop_nodes(self.nodes)
         wait_bitcoinds()
-        self.setup_network(False)
+        self.setup_network(False, False)
 
     def main(self):
 
@@ -186,7 +189,7 @@ class ComparisonTestFramework(BitcoinTestFramework):
 
     def __init__(self):
         super().__init__()
-        self.num_nodes = 2
+        self.num_nodes = 1
         self.setup_clean_chain = True
 
     def add_options(self, parser):
@@ -203,3 +206,6 @@ def setup_network(self):
             extra_args=[['-debug', '-whitelist=127.0.0.1']] * self.num_nodes,
             binary=[self.options.testbinary] +
             [self.options.refbinary]*(self.num_nodes-1))
+
+    def get_tests(self):
+        raise NotImplementedError
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
index eb058b027a5..4c26ce0e669 100644
--- a/qa/rpc-tests/test_framework/util.py
+++ b/qa/rpc-tests/test_framework/util.py
@@ -40,7 +40,7 @@
 BLOSSOM_BRANCH_ID = 0x2BB40E60
 HEARTWOOD_BRANCH_ID = 0xF5B9230B
 CANOPY_BRANCH_ID = 0xE9FF75A6
-NU5_BRANCH_ID = 0xF919A198
+NU5_BRANCH_ID = 0x37519621
 
 # The maximum number of nodes a single test can spawn
 MAX_NODES = 8
diff --git a/qa/rpc-tests/test_framework/zip244.py b/qa/rpc-tests/test_framework/zip244.py
index 33c43e523dd..0277320533c 100644
--- a/qa/rpc-tests/test_framework/zip244.py
+++ b/qa/rpc-tests/test_framework/zip244.py
@@ -13,9 +13,9 @@
 
 import struct
 
-from pyblake2 import blake2b
+from hashlib import blake2b
 
-from .mininode import ser_uint256
+from .mininode import ser_string, ser_uint256
 from .script import (
     SIGHASH_ANYONECANPAY,
     SIGHASH_NONE,
@@ -41,7 +41,7 @@ def transparent_digest(tx):
 def transparent_scripts_digest(tx):
     digest = blake2b(digest_size=32, person=b'ZTxAuthTransHash')
     for x in tx.vin:
-        digest.update(bytes(x.scriptSig))
+        digest.update(ser_string(x.scriptSig))
     return digest.digest()
 
 # Sapling
@@ -52,7 +52,7 @@ def sapling_digest(saplingBundle):
     if len(saplingBundle.spends) + len(saplingBundle.outputs) > 0:
         digest.update(sapling_spends_digest(saplingBundle))
         digest.update(sapling_outputs_digest(saplingBundle))
-        digest.update(struct.pack('<Q', saplingBundle.valueBalance))
+        digest.update(struct.pack('<q', saplingBundle.valueBalance))
 
     return digest.digest()
 
@@ -126,7 +126,7 @@ def sapling_outputs_noncompact_digest(saplingBundle):
     for desc in saplingBundle.outputs:
         digest.update(ser_uint256(desc.cv))
         digest.update(desc.encCiphertext[564:])
-        digest.update(desc.outCipherText)
+        digest.update(desc.outCiphertext)
     return digest.digest()
 
 # Orchard
@@ -139,7 +139,7 @@ def orchard_digest(orchardBundle):
         digest.update(orchard_actions_memos_digest(orchardBundle))
         digest.update(orchard_actions_noncompact_digest(orchardBundle))
         digest.update(struct.pack('<B', orchardBundle.flags()))
-        digest.update(struct.pack('<Q', orchardBundle.valueBalance))
+        digest.update(struct.pack('<q', orchardBundle.valueBalance))
         digest.update(bytes(orchardBundle.anchor))
 
     return digest.digest()
@@ -288,7 +288,7 @@ def outputs_sig_digest(tx, nHashType, txin):
 def txin_sig_digest(tx, txin):
     digest = blake2b(digest_size=32, person=b'Zcash___TxInHash')
     digest.update(bytes(tx.vin[txin.nIn].prevout))
-    digest.update(bytes(txin.scriptCode))
+    digest.update(ser_string(txin.scriptCode))
     digest.update(struct.pack('<Q', txin.amount))
     digest.update(struct.pack('<I', tx.vin[txin.nIn].nSequence))
     return digest.digest()
diff --git a/qa/rpc-tests/turnstile.py b/qa/rpc-tests/turnstile.py
index 4b02b961966..9102d118cc0 100755
--- a/qa/rpc-tests/turnstile.py
+++ b/qa/rpc-tests/turnstile.py
@@ -29,6 +29,7 @@
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_equal,
+    fail,
     get_coinbase_address,
     start_node, start_nodes,
     sync_blocks, sync_mempools,
@@ -88,9 +89,14 @@ def run_test(self):
         # Node 0 shields some funds
         dest_addr = self.nodes[0].z_getnewaddress(POOL_NAME.lower())
         taddr0 = get_coinbase_address(self.nodes[0])
-        recipients = []
-        recipients.append({"address": dest_addr, "amount": Decimal('10')})
-        myopid = self.nodes[0].z_sendmany(taddr0, recipients, 1, 0)
+        if (POOL_NAME == "SPROUT"):
+            myopid = self.nodes[0].z_shieldcoinbase(taddr0, dest_addr, 0, 1)['opid']
+        elif (POOL_NAME == "SAPLING"):
+            recipients = []
+            recipients.append({"address": dest_addr, "amount": Decimal('10')})
+            myopid = self.nodes[0].z_sendmany(taddr0, recipients, 1, 0)
+        else:
+            fail("Unrecognized pool name: " + POOL_NAME)
         wait_and_assert_operationid_status(self.nodes[0], myopid)
         self.sync_all()
         self.nodes[0].generate(1)
diff --git a/qa/rpc-tests/upgrade_golden.py b/qa/rpc-tests/upgrade_golden.py
index 5e2e41eee23..b115b22a01a 100755
--- a/qa/rpc-tests/upgrade_golden.py
+++ b/qa/rpc-tests/upgrade_golden.py
@@ -44,7 +44,7 @@ def setup_network(self, split=False):
         logging.info("Initializing the network in "+self.options.tmpdir)
 
         # Node 0 will always be running with the most recent network upgrade version.
-        # The remaining nodes start with the nework upgrade versions in order that they
+        # The remaining nodes start with the network upgrade versions in order that they
         # are specified in the upgrades list.
         upgrade_args = [self.upgrades[-1].extra_args] + [u.extra_args for u in self.upgrades]
         self.nodes = start_nodes(len(self.upgrades) + 1, self.options.tmpdir, extra_args=upgrade_args)
diff --git a/qa/rpc-tests/wallet_accounts.py b/qa/rpc-tests/wallet_accounts.py
new file mode 100755
index 00000000000..1f90244684c
--- /dev/null
+++ b/qa/rpc-tests/wallet_accounts.py
@@ -0,0 +1,223 @@
+#!/usr/bin/env python3
+# Copyright (c) 2022 The Zcash developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+from test_framework.authproxy import JSONRPCException
+from test_framework.mininode import COIN
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import (
+    NU5_BRANCH_ID,
+    assert_equal,
+    assert_raises_message,
+    get_coinbase_address,
+    nuparams,
+    start_nodes,
+    wait_and_assert_operationid_status,
+)
+
+from decimal import Decimal
+
+# Test wallet accounts behaviour
+class WalletAccountsTest(BitcoinTestFramework):
+    def setup_nodes(self):
+        return start_nodes(self.num_nodes, self.options.tmpdir, [[
+            '-experimentalfeatures',
+            '-orchardwallet',
+            nuparams(NU5_BRANCH_ID, 210),
+        ]] * self.num_nodes)
+
+    def check_receiver_types(self, ua, expected):
+        actual = self.nodes[0].z_listunifiedreceivers(ua)
+        assert_equal(set(expected), set(actual))
+
+    # Check we only have balances in the expected pools.
+    # Remember that empty pools are omitted from the output.
+    def _check_balance_for_rpc(self, rpcmethod, node, account, expected, minconf):
+        rpc = getattr(self.nodes[node], rpcmethod)
+        actual = rpc(account, minconf)
+        assert_equal(set(expected), set(actual['pools']))
+        total_balance = 0
+        for pool in expected:
+            assert_equal(expected[pool] * COIN, actual['pools'][pool]['valueZat'])
+            total_balance += expected[pool]
+        assert_equal(actual['minimum_confirmations'], minconf)
+        return total_balance
+
+    def check_balance(self, node, account, address, expected, minconf=1):
+        acct_balance = self._check_balance_for_rpc('z_getbalanceforaccount', node, account, expected, minconf)
+        z_getbalance = self.nodes[node].z_getbalance(address, minconf)
+        assert_equal(acct_balance, z_getbalance)
+        fvk = self.nodes[node].z_exportviewingkey(address)
+        self._check_balance_for_rpc('z_getbalanceforviewingkey', node, fvk, expected, minconf)
+
+    def run_test(self):
+        # With a new wallet, the first account will be 0.
+        account0 = self.nodes[0].z_getnewaccount()
+        assert_equal(account0['account'], 0)
+
+        # The next account will be 1.
+        account1 = self.nodes[0].z_getnewaccount()
+        assert_equal(account1['account'], 1)
+
+        # Generate the first address for account 0.
+        addr0 = self.nodes[0].z_getaddressforaccount(0)
+        assert_equal(addr0['account'], 0)
+        assert_equal(set(addr0['pools']), set(['transparent', 'sapling', 'orchard']))
+        ua0 = addr0['unifiedaddress']
+
+        # We pick mnemonic phrases to ensure that we can always generate the default
+        # address in account 0; this is however not necessarily at diversifier index 0.
+        # We should be able to generate it directly and get the exact same data.
+        j = addr0['diversifier_index']
+        assert_equal(self.nodes[0].z_getaddressforaccount(0, [], j), addr0)
+        if j > 0:
+            # We should get an error if we generate the address at diversifier index 0.
+            assert_raises_message(
+                JSONRPCException,
+                'no address at diversifier index 0',
+                self.nodes[0].z_getaddressforaccount, 0, [], 0)
+
+        # The second address for account 0 is different to the first address.
+        addr0_2 = self.nodes[0].z_getaddressforaccount(0)
+        assert_equal(addr0_2['account'], 0)
+        assert_equal(set(addr0_2['pools']), set(['transparent', 'sapling', 'orchard']))
+        ua0_2 = addr0_2['unifiedaddress']
+        assert(ua0 != ua0_2)
+
+        # We can generate a fully-shielded address.
+        addr0_3 = self.nodes[0].z_getaddressforaccount(0, ['sapling', 'orchard'])
+        assert_equal(addr0_3['account'], 0)
+        assert_equal(set(addr0_3['pools']), set(['sapling', 'orchard']))
+        ua0_3 = addr0_3['unifiedaddress']
+
+        # We can generate an address without a Sapling receiver.
+        addr0_4 = self.nodes[0].z_getaddressforaccount(0, ['transparent', 'orchard'])
+        assert_equal(addr0_4['account'], 0)
+        assert_equal(set(addr0_4['pools']), set(['transparent', 'orchard']))
+        ua0_4 = addr0_4['unifiedaddress']
+
+        # The first address for account 1 is different to account 0.
+        addr1 = self.nodes[0].z_getaddressforaccount(1)
+        assert_equal(addr1['account'], 1)
+        assert_equal(set(addr1['pools']), set(['transparent', 'sapling', 'orchard']))
+        ua1 = addr1['unifiedaddress']
+        assert(ua0 != ua1)
+
+        # The UA contains the expected receiver kinds.
+        self.check_receiver_types(ua0,   ['transparent', 'sapling', 'orchard'])
+        self.check_receiver_types(ua0_2, ['transparent', 'sapling', 'orchard'])
+        self.check_receiver_types(ua0_3, [               'sapling', 'orchard'])
+        self.check_receiver_types(ua0_4, ['transparent',            'orchard'])
+        self.check_receiver_types(ua1,   ['transparent', 'sapling', 'orchard'])
+
+        # The balances of the accounts are all zero.
+        self.check_balance(0, 0, ua0, {})
+        self.check_balance(0, 1, ua1, {})
+
+        # Send coinbase funds to the UA.
+        print('Sending coinbase funds to account')
+        recipients = [{'address': ua0, 'amount': Decimal('10')}]
+        opid = self.nodes[0].z_sendmany(get_coinbase_address(self.nodes[0]), recipients, 1, 0, 'AllowRevealedSenders')
+        txid = wait_and_assert_operationid_status(self.nodes[0], opid)
+
+        # The wallet should detect the new note as belonging to the UA.
+        tx_details = self.nodes[0].z_viewtransaction(txid)
+        assert_equal(len(tx_details['outputs']), 1)
+        assert_equal(tx_details['outputs'][0]['type'], 'sapling')
+        assert_equal(tx_details['outputs'][0]['address'], ua0)
+
+        # The new balance should not be visible with the default minconf, but should be
+        # visible with minconf=0.
+        self.sync_all()
+        self.check_balance(0, 0, ua0, {})
+        self.check_balance(0, 0, ua0, {'sapling': 10}, 0)
+
+        self.nodes[2].generate(1)
+        self.sync_all()
+
+        # The default minconf should now detect the balance.
+        self.check_balance(0, 0, ua0, {'sapling': 10})
+
+        # Send Sapling funds from the UA.
+        print('Sending account funds to Sapling address')
+        node1sapling = self.nodes[1].z_getnewaddress('sapling')
+        recipients = [{'address': node1sapling, 'amount': Decimal('1')}]
+        opid = self.nodes[0].z_sendmany(ua0, recipients, 1, 0)
+        txid = wait_and_assert_operationid_status(self.nodes[0], opid)
+
+        # The wallet should detect the spent note as belonging to the UA.
+        tx_details = self.nodes[0].z_viewtransaction(txid)
+        assert_equal(len(tx_details['spends']), 1)
+        assert_equal(tx_details['spends'][0]['type'], 'sapling')
+        assert_equal(tx_details['spends'][0]['address'], ua0)
+
+        # The balances of the account should reflect whether zero-conf transactions are
+        # being considered. We will show either 0 (because the spent 10-ZEC note is never
+        # shown, as that transaction has been created and broadcast, and _might_ get mined
+        # up until the transaction expires), or 9 (if we include the unmined transaction).
+        self.sync_all()
+        self.check_balance(0, 0, ua0, {})
+        self.check_balance(0, 0, ua0, {'sapling': 9}, 0)
+
+        # Activate NU5
+        print('Activating NU5')
+        self.nodes[2].generate(9)
+        self.sync_all()
+        assert_equal(self.nodes[0].getblockchaininfo()['blocks'], 210)
+
+        # Send more coinbase funds to the UA.
+        print('Sending coinbase funds to account')
+        recipients = [{'address': ua0, 'amount': Decimal('10')}]
+        opid = self.nodes[0].z_sendmany(get_coinbase_address(self.nodes[0]), recipients, 1, 0, 'AllowRevealedSenders')
+        txid = wait_and_assert_operationid_status(self.nodes[0], opid)
+
+        # The wallet should detect the new note as belonging to the UA.
+        tx_details = self.nodes[0].z_viewtransaction(txid)
+        assert_equal(len(tx_details['outputs']), 1)
+        assert_equal(tx_details['outputs'][0]['type'], 'orchard')
+        assert_equal(tx_details['outputs'][0]['address'], ua0)
+
+        # The new balance should not be visible with the default minconf, but should be
+        # visible with minconf=0.
+        self.sync_all()
+        self.check_balance(0, 0, ua0, {'sapling': 9})
+        self.check_balance(0, 0, ua0, {'sapling': 9, 'orchard': 10}, 0)
+
+        # The total balance with the default minconf should be just the Sapling balance
+        assert_equal('9.00', self.nodes[0].z_gettotalbalance()['private'])
+        assert_equal('19.00', self.nodes[0].z_gettotalbalance(0)['private'])
+
+        self.nodes[2].generate(1)
+        self.sync_all()
+
+        # Send Orchard funds from the UA.
+        print('Sending account funds to Orchard-only UA')
+        node1account = self.nodes[1].z_getnewaccount()['account']
+        node1orchard = self.nodes[1].z_getaddressforaccount(node1account, ['orchard'])['unifiedaddress']
+        recipients = [{'address': node1orchard, 'amount': Decimal('1')}]
+        opid = self.nodes[0].z_sendmany(ua0, recipients, 1, 0)
+        txid = wait_and_assert_operationid_status(self.nodes[0], opid)
+
+        # The wallet should detect the spent note as belonging to the UA.
+        # TODO ORCHARD: Uncomment this once z_viewtransaction shows Orchard details (#5186).
+        # tx_details = self.nodes[0].z_viewtransaction(txid)
+        # assert_equal(len(tx_details['spends']), 1)
+        # assert_equal(tx_details['spends'][0]['type'], 'orchard')
+        # assert_equal(tx_details['spends'][0]['address'], ua0)
+        # assert_equal(len(tx_details['outputs']), 1)
+        # assert_equal(tx_details['outputs'][0]['type'], 'orchard')
+        # assert_equal(tx_details['outputs'][0]['address'], ua0)
+
+        # The balances of the account should reflect whether zero-conf transactions are
+        # being considered. The Sapling balance should remain at 9, while the Orchard
+        # balance will show either 0 (because the spent 10-ZEC note is never shown, as
+        # that transaction has been created and broadcast, and _might_ get mined up until
+        # the transaction expires), or 9 (if we include the unmined transaction).
+        self.sync_all()
+        self.check_balance(0, 0, ua0, {'sapling': 9})
+        self.check_balance(0, 0, ua0, {'sapling': 9, 'orchard': 9}, 0)
+
+
+if __name__ == '__main__':
+    WalletAccountsTest().main()
diff --git a/qa/rpc-tests/wallet_addresses.py b/qa/rpc-tests/wallet_addresses.py
index d70b1bca06a..aa282ea7735 100755
--- a/qa/rpc-tests/wallet_addresses.py
+++ b/qa/rpc-tests/wallet_addresses.py
@@ -27,6 +27,15 @@ def addr_checks(default_type):
                 assert_equal(res['type'], addr_type)
                 assert(addr in all_addresses)
 
+            listed_addresses = self.nodes[0].listaddresses()
+            legacy_random_src = next(src for src in listed_addresses if src['source'] == 'legacy_random')
+            legacy_hdseed_src = next(src for src in listed_addresses if src['source'] == 'legacy_hdseed')
+            for addr_type, addr in types_and_addresses:
+                if addr_type == 'sprout':
+                    assert(addr in legacy_random_src['sprout']['addresses'])
+                if addr_type == 'sapling':
+                    assert(addr in [x for obj in legacy_hdseed_src['sapling'] for x in obj['addresses']])
+
         # Sanity-check the test harness
         assert_equal(self.nodes[0].getblockcount(), 200)
 
diff --git a/qa/rpc-tests/wallet_broadcast.py b/qa/rpc-tests/wallet_broadcast.py
index f0cebe355fa..f625c8aacdb 100755
--- a/qa/rpc-tests/wallet_broadcast.py
+++ b/qa/rpc-tests/wallet_broadcast.py
@@ -13,7 +13,7 @@ def run_test(self):
         #do some -walletbroadcast tests
         stop_nodes(self.nodes)
         wait_bitcoinds()
-        self.nodes = start_nodes(3, self.options.tmpdir, [["-walletbroadcast=0"],["-walletbroadcast=0"],["-walletbroadcast=0"]])
+        self.nodes = start_nodes(3, self.options.tmpdir, [["-walletbroadcast=0"]] * 3)
         connect_nodes_bi(self.nodes,0,1)
         connect_nodes_bi(self.nodes,1,2)
         connect_nodes_bi(self.nodes,0,2)
diff --git a/qa/rpc-tests/wallet_changeaddresses.py b/qa/rpc-tests/wallet_changeaddresses.py
index 4e3dbf17ea1..409e2b94e8b 100755
--- a/qa/rpc-tests/wallet_changeaddresses.py
+++ b/qa/rpc-tests/wallet_changeaddresses.py
@@ -81,15 +81,11 @@ def check_change_taddr_reuse(target):
 
         taddr = self.nodes[0].getnewaddress()
         saplingAddr = self.nodes[0].z_getnewaddress('sapling')
-        sproutAddr = self.nodes[0].z_getnewaddress('sprout')
 
         print()
         print('Checking z_sendmany(taddr->Sapling)')
         check_change_taddr_reuse(saplingAddr)
         print()
-        print('Checking z_sendmany(taddr->Sprout)')
-        check_change_taddr_reuse(sproutAddr)
-        print()
         print('Checking z_sendmany(taddr->taddr)')
         check_change_taddr_reuse(taddr)
 
diff --git a/qa/rpc-tests/wallet_import_export.py b/qa/rpc-tests/wallet_import_export.py
index 67e43842c6d..b5d091ac3c1 100755
--- a/qa/rpc-tests/wallet_import_export.py
+++ b/qa/rpc-tests/wallet_import_export.py
@@ -3,13 +3,16 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
+from test_framework.authproxy import JSONRPCException
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import assert_equal, assert_true, start_nodes
 
 class WalletImportExportTest (BitcoinTestFramework):
     def setup_network(self, split=False):
         num_nodes = 3
-        extra_args = [["-exportdir={}/export{}".format(self.options.tmpdir, i)] for i in range(num_nodes)]
+        extra_args = [([
+            "-exportdir={}/export{}".format(self.options.tmpdir, i), 
+            ] + (["-walletrequirebackup"] if i == 0 else [])) for i in range(num_nodes)] 
         self.nodes = start_nodes(num_nodes, self.options.tmpdir, extra_args)
 
     def run_test(self):
@@ -17,12 +20,28 @@ def run_test(self):
         privkey2 = self.nodes[2].z_exportkey(sapling_address2)
         self.nodes[0].z_importkey(privkey2)
 
+        # test walletconfirmbackup
+        try:
+            self.nodes[0].getnewaddress()
+        except JSONRPCException as e:
+            errorString = e.error['message']
+        assert_equal("Error: Please acknowledge that you have backed up" in errorString, True)
+        try:
+            self.nodes[0].z_getnewaddress('sapling')
+        except JSONRPCException as e:
+            errorString = e.error['message']
+        assert_equal("Error: Please acknowledge that you have backed up" in errorString, True)
+        dump_path0 = self.nodes[0].z_exportwallet('walletdumpmnem')
+        (mnemonic, _, _, _) = parse_wallet_file(dump_path0)
+        self.nodes[0].walletconfirmbackup(mnemonic)
+
+        # Now that we've confirmed backup, we can generate addresses
         sprout_address0 = self.nodes[0].z_getnewaddress('sprout')
         sapling_address0 = self.nodes[0].z_getnewaddress('sapling')
 
         # node 0 should have the keys
         dump_path0 = self.nodes[0].z_exportwallet('walletdump')
-        (t_keys0, sprout_keys0, sapling_keys0) = parse_wallet_file(dump_path0)
+        (_, t_keys0, sprout_keys0, sapling_keys0) = parse_wallet_file(dump_path0)
 
         sapling_line_lengths = [len(sapling_key0.split(' #')[0].split()) for sapling_key0 in sapling_keys0.splitlines()]
         assert_equal(2, len(sapling_line_lengths), "Should have 2 sapling keys")
@@ -35,7 +54,7 @@ def run_test(self):
 
         # node 1 should not have the keys
         dump_path1 = self.nodes[1].z_exportwallet('walletdumpbefore')
-        (t_keys1, sprout_keys1, sapling_keys1) = parse_wallet_file(dump_path1)
+        (_, t_keys1, sprout_keys1, sapling_keys1) = parse_wallet_file(dump_path1)
         
         assert_true(sprout_address0 not in sprout_keys1)
         assert_true(sapling_address0 not in sapling_keys1)
@@ -45,13 +64,13 @@ def run_test(self):
 
         # node 1 should now have the keys
         dump_path1 = self.nodes[1].z_exportwallet('walletdumpafter')
-        (t_keys1, sprout_keys1, sapling_keys1) = parse_wallet_file(dump_path1)
+        (_, t_keys1, sprout_keys1, sapling_keys1) = parse_wallet_file(dump_path1)
         
         assert_true(sprout_address0 in sprout_keys1)
         assert_true(sapling_address0 in sapling_keys1)
         assert_true(sapling_address2 in sapling_keys1)
 
-        # make sure we have perserved the metadata
+        # make sure we have preserved the metadata
         for sapling_key0 in sapling_keys0.splitlines():
             assert_true(sapling_key0 in sapling_keys1)
 
@@ -59,15 +78,15 @@ def run_test(self):
 def parse_wallet_file(dump_path):
     file_lines = open(dump_path, "r", encoding="utf8").readlines()
     # We expect information about the HDSeed and fingerpring in the header
-    assert_true("HDSeed" in file_lines[4], "Expected HDSeed")
-    assert_true("fingerprint" in file_lines[4], "Expected fingerprint")
-    seed_comment_line = file_lines[4][2:].split()  # ["HDSeed=...", "fingerprint=..."]
-    assert_true(seed_comment_line[0].split("=")[1] != seed_comment_line[1].split("=")[1], "The seed should not equal the fingerprint")
+    assert_true("recovery_phrase" in file_lines[5], "Expected emergency recovery phrase")
+    assert_true("language" in file_lines[6], "Expected mnemonic seed language")
+    assert_true("fingerprint" in file_lines[7], "Expected mnemonic seed fingerprint")
+    mnemonic = file_lines[5].split("=")[1].replace("\"", "").strip()
     (t_keys, i) = parse_wallet_file_lines(file_lines, 0)
     (sprout_keys, i) = parse_wallet_file_lines(file_lines, i)
     (sapling_keys, i) = parse_wallet_file_lines(file_lines, i)
 
-    return (t_keys, sprout_keys, sapling_keys)
+    return (mnemonic, t_keys, sprout_keys, sapling_keys)
 
 def parse_wallet_file_lines(file_lines, i):
     keys = []
@@ -81,4 +100,4 @@ def parse_wallet_file_lines(file_lines, i):
     return ("".join(keys), i)
 
 if __name__ == '__main__':
-    WalletImportExportTest().main()
\ No newline at end of file
+    WalletImportExportTest().main()
diff --git a/qa/rpc-tests/wallet_isfromme.py b/qa/rpc-tests/wallet_isfromme.py
new file mode 100755
index 00000000000..aefef06771c
--- /dev/null
+++ b/qa/rpc-tests/wallet_isfromme.py
@@ -0,0 +1,93 @@
+#!/usr/bin/env python3
+# Copyright (c) 2021 The Zcash developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import (
+    BLOSSOM_BRANCH_ID,
+    CANOPY_BRANCH_ID,
+    HEARTWOOD_BRANCH_ID,
+    OVERWINTER_BRANCH_ID,
+    SAPLING_BRANCH_ID,
+    assert_equal,
+    get_coinbase_address,
+    initialize_chain_clean,
+    nuparams,
+    start_nodes,
+    wait_and_assert_operationid_status,
+)
+
+from decimal import Decimal
+
+class WalletIsFromMe(BitcoinTestFramework):
+    def setup_chain(self):
+        initialize_chain_clean(self.options.tmpdir, 1)
+
+    def setup_network(self, split=False):
+        self.nodes = start_nodes(1, self.options.tmpdir, extra_args=[[
+            nuparams(OVERWINTER_BRANCH_ID, 1),
+            nuparams(SAPLING_BRANCH_ID, 1),
+            nuparams(BLOSSOM_BRANCH_ID, 1),
+            nuparams(HEARTWOOD_BRANCH_ID, 1),
+            nuparams(CANOPY_BRANCH_ID, 1),
+        ]])
+        self.is_network_split=False
+
+    def run_test (self):
+        node = self.nodes[0]
+
+        node.generate(101)
+        assert_equal(node.getbalance('', 0), Decimal('6.25'))
+
+        coinbase_addr = get_coinbase_address(node)
+
+        # Send all available funds to a z-address.
+        zaddr = node.z_getnewaddress()
+        wait_and_assert_operationid_status(
+            node,
+            node.z_sendmany(
+                coinbase_addr,
+                [
+                    {'address': zaddr, 'amount': Decimal('6.25')},
+                ],
+                0,
+                0,
+            ),
+        )
+        self.sync_all()
+        assert_equal(node.getbalance('', 0), 0)
+
+        # Mine the transaction; we get another coinbase output.
+        self.nodes[0].generate(1)
+        self.sync_all()
+        assert_equal(node.getbalance('', 0), Decimal('6.25'))
+
+        # Now send the funds back to a new t-address.
+        taddr = node.getnewaddress()
+        wait_and_assert_operationid_status(
+            node,
+            node.z_sendmany(
+                zaddr,
+                [
+                    {'address': taddr, 'amount': Decimal('6.25')},
+                ],
+                1,
+                0,
+            ),
+        )
+        self.sync_all()
+
+        # At this point we have created the conditions for the bug in
+        # https://github.com/zcash/zcash/issues/5325.
+
+        # listunspent should show the coinbase output, and optionally the
+        # newly-received unshielding output.
+        assert_equal(len(node.listunspent()), 1)
+        assert_equal(len(node.listunspent(0)), 2)
+
+        # "getbalance '' 0" should count both outputs. The bug failed here.
+        assert_equal(node.getbalance('', 0), Decimal('12.5'))
+
+if __name__ == '__main__':
+    WalletIsFromMe().main ()
diff --git a/qa/rpc-tests/wallet_listnotes.py b/qa/rpc-tests/wallet_listnotes.py
index bdfb6ccad94..1986467454e 100755
--- a/qa/rpc-tests/wallet_listnotes.py
+++ b/qa/rpc-tests/wallet_listnotes.py
@@ -6,7 +6,6 @@
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_equal,
-    get_coinbase_address,
     wait_and_assert_operationid_status,
     DEFAULT_FEE
 )
@@ -20,7 +19,6 @@ def run_test(self):
         # Current height = 200
         assert_equal(200, self.nodes[0].getblockcount())
         sproutzaddr = self.nodes[0].z_getnewaddress('sprout')
-        saplingzaddr = self.nodes[0].z_getnewaddress('sapling')
 
         # we've got lots of coinbase (taddr) but no shielded funds yet
         assert_equal(0, Decimal(self.nodes[0].z_gettotalbalance()['private']))
@@ -30,11 +28,10 @@ def run_test(self):
         self.sync_all()
         assert_equal(201, self.nodes[0].getblockcount())
 
-        # Shield coinbase funds (must be a multiple of 10, no change allowed)
-        receive_amount_10 = Decimal('10.0') - DEFAULT_FEE
-        recipients = [{"address":sproutzaddr, "amount":receive_amount_10}]
-        myopid = self.nodes[0].z_sendmany(get_coinbase_address(self.nodes[0]), recipients)
-        txid_1 = wait_and_assert_operationid_status(self.nodes[0], myopid)
+        # Shield one coinbase output
+        receive_amount_1 = Decimal('10.0') - DEFAULT_FEE
+        result = self.nodes[0].z_shieldcoinbase('*', sproutzaddr, DEFAULT_FEE, 1)
+        txid_1 = wait_and_assert_operationid_status(self.nodes[0], result['opid'])
         self.sync_all()
 
         # No funds (with (default) one or more confirmations) in sproutzaddr yet
@@ -49,9 +46,10 @@ def run_test(self):
         assert_equal(1, len(unspent_cb))
         assert_equal(False,             unspent_cb[0]['change'])
         assert_equal(txid_1,            unspent_cb[0]['txid'])
+        assert_equal('sprout',          unspent_cb[0]['type'])
         assert_equal(True,              unspent_cb[0]['spendable'])
         assert_equal(sproutzaddr,       unspent_cb[0]['address'])
-        assert_equal(receive_amount_10, unspent_cb[0]['amount'])
+        assert_equal(receive_amount_1,  unspent_cb[0]['amount'])
 
         # list unspent, filtering by address, should produce same result
         unspent_cb_filter = self.nodes[0].z_listunspent(0, 9999, False, [sproutzaddr])
@@ -64,13 +62,13 @@ def run_test(self):
         # Current height = 202
         assert_equal(202, self.nodes[0].getblockcount())
 
-        # Send 1.0 minus default fee from sproutzaddr to a new zaddr
-        sproutzaddr2 = self.nodes[0].z_getnewaddress('sprout')
-        receive_amount_1 = Decimal('1.0') - DEFAULT_FEE
-        change_amount_9 = receive_amount_10 - Decimal('1.0')
-        assert_equal('sprout', self.nodes[0].z_validateaddress(sproutzaddr2)['type'])
-        recipients = [{"address": sproutzaddr2, "amount":receive_amount_1}]
-        myopid = self.nodes[0].z_sendmany(sproutzaddr, recipients)
+        # Send 1.0 minus default fee from sproutzaddr to a new Sapling zaddr
+        saplingzaddr = self.nodes[0].z_getnewaddress('sapling')
+        receive_amount_2 = Decimal('1.0')
+        change_amount_2 = receive_amount_1 - receive_amount_2 - DEFAULT_FEE
+        assert_equal('sapling', self.nodes[0].z_validateaddress(saplingzaddr)['type'])
+        recipients = [{"address": saplingzaddr, "amount":receive_amount_2}]
+        myopid = self.nodes[0].z_sendmany(sproutzaddr, recipients, 1, DEFAULT_FEE)
         txid_2 = wait_and_assert_operationid_status(self.nodes[0], myopid)
         self.sync_all()
 
@@ -81,17 +79,19 @@ def run_test(self):
         unspent_tx = sorted(unspent_tx, key=lambda k: k['amount'])
         assert_equal(False,             unspent_tx[0]['change'])
         assert_equal(txid_2,            unspent_tx[0]['txid'])
+        assert_equal('sapling',         unspent_tx[0]['type'])
         assert_equal(True,              unspent_tx[0]['spendable'])
-        assert_equal(sproutzaddr2,      unspent_tx[0]['address'])
-        assert_equal(receive_amount_1,  unspent_tx[0]['amount'])
+        assert_equal(saplingzaddr,      unspent_tx[0]['address'])
+        assert_equal(receive_amount_2,  unspent_tx[0]['amount'])
 
         assert_equal(True,              unspent_tx[1]['change'])
         assert_equal(txid_2,            unspent_tx[1]['txid'])
+        assert_equal('sprout',          unspent_tx[1]['type'])
         assert_equal(True,              unspent_tx[1]['spendable'])
         assert_equal(sproutzaddr,       unspent_tx[1]['address'])
-        assert_equal(change_amount_9,   unspent_tx[1]['amount'])
+        assert_equal(change_amount_2,   unspent_tx[1]['amount'])
 
-        unspent_tx_filter = self.nodes[0].z_listunspent(0, 9999, False, [sproutzaddr2])
+        unspent_tx_filter = self.nodes[0].z_listunspent(0, 9999, False, [saplingzaddr])
         assert_equal(1, len(unspent_tx_filter))
         assert_equal(unspent_tx[0], unspent_tx_filter[0])
 
@@ -99,15 +99,15 @@ def run_test(self):
         assert_equal(1, len(unspent_tx_filter))
         assert_equal(unspent_tx[1], unspent_tx_filter[0])
 
-        # No funds in saplingzaddr yet
-        assert_equal(0, len(self.nodes[0].z_listunspent(0, 9999, False, [saplingzaddr])))
+        self.nodes[0].generate(1)
+        self.sync_all()
 
-        # Send 2.0 minus default fee to our sapling zaddr
-        # (sending from a sprout zaddr to a sapling zaddr is disallowed,
-        # so send from coin base)
-        receive_amount_2 = Decimal('2.0') - DEFAULT_FEE
-        recipients = [{"address": saplingzaddr, "amount":receive_amount_2}]
-        myopid = self.nodes[0].z_sendmany(get_coinbase_address(self.nodes[0]), recipients)
+        # Send 2.0 minus default fee to a new sapling zaddr
+        saplingzaddr2 = self.nodes[0].z_getnewaddress('sapling')
+        receive_amount_3 = Decimal('2.0')
+        change_amount_3 = change_amount_2 - receive_amount_3 - DEFAULT_FEE
+        recipients = [{"address": saplingzaddr2, "amount":receive_amount_3}]
+        myopid = self.nodes[0].z_sendmany(sproutzaddr, recipients, 1, DEFAULT_FEE)
         txid_3 = wait_and_assert_operationid_status(self.nodes[0], myopid)
         self.sync_all()
         unspent_tx = self.nodes[0].z_listunspent(0)
@@ -118,32 +118,35 @@ def run_test(self):
 
         assert_equal(False,             unspent_tx[0]['change'])
         assert_equal(txid_2,            unspent_tx[0]['txid'])
+        assert_equal('sapling',         unspent_tx[0]['type'])
         assert_equal(True,              unspent_tx[0]['spendable'])
-        assert_equal(sproutzaddr2,      unspent_tx[0]['address'])
-        assert_equal(receive_amount_1,  unspent_tx[0]['amount'])
+        assert_equal(saplingzaddr,      unspent_tx[0]['address'])
+        assert_equal(receive_amount_2,  unspent_tx[0]['amount'])
 
         assert_equal(False,             unspent_tx[1]['change'])
         assert_equal(txid_3,            unspent_tx[1]['txid'])
+        assert_equal('sapling',         unspent_tx[1]['type'])
         assert_equal(True,              unspent_tx[1]['spendable'])
-        assert_equal(saplingzaddr,      unspent_tx[1]['address'])
-        assert_equal(receive_amount_2,  unspent_tx[1]['amount'])
+        assert_equal(saplingzaddr2,     unspent_tx[1]['address'])
+        assert_equal(receive_amount_3,  unspent_tx[1]['amount'])
 
         assert_equal(True,              unspent_tx[2]['change'])
-        assert_equal(txid_2,            unspent_tx[2]['txid'])
+        assert_equal(txid_3,            unspent_tx[2]['txid'])
+        assert_equal('sprout',          unspent_tx[2]['type'])
         assert_equal(True,              unspent_tx[2]['spendable'])
         assert_equal(sproutzaddr,       unspent_tx[2]['address'])
-        assert_equal(change_amount_9,   unspent_tx[2]['amount'])
+        assert_equal(change_amount_3,   unspent_tx[2]['amount'])
 
         unspent_tx_filter = self.nodes[0].z_listunspent(0, 9999, False, [saplingzaddr])
         assert_equal(1, len(unspent_tx_filter))
-        assert_equal(unspent_tx[1], unspent_tx_filter[0])
+        assert_equal(unspent_tx[0], unspent_tx_filter[0])
 
         # test that pre- and post-sapling can be filtered in a single call
         unspent_tx_filter = self.nodes[0].z_listunspent(0, 9999, False,
             [sproutzaddr, saplingzaddr])
         assert_equal(2, len(unspent_tx_filter))
         unspent_tx_filter = sorted(unspent_tx_filter, key=lambda k: k['amount'])
-        assert_equal(unspent_tx[1], unspent_tx_filter[0])
+        assert_equal(unspent_tx[0], unspent_tx_filter[0])
         assert_equal(unspent_tx[2], unspent_tx_filter[1])
 
         # so far, this node has no watchonly addresses, so results are the same
diff --git a/qa/rpc-tests/wallet_listreceived.py b/qa/rpc-tests/wallet_listreceived.py
index d63053bc32f..e85869485a9 100755
--- a/qa/rpc-tests/wallet_listreceived.py
+++ b/qa/rpc-tests/wallet_listreceived.py
@@ -3,9 +3,21 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
+from test_framework.authproxy import JSONRPCException
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import assert_equal, assert_true, assert_false, DEFAULT_FEE, DEFAULT_FEE_ZATS
-from test_framework.util import wait_and_assert_operationid_status
+from test_framework.util import (
+    assert_equal,
+    assert_true,
+    assert_false,
+    assert_raises_message,
+    connect_nodes_bi,
+    get_coinbase_address,
+    nuparams,
+    DEFAULT_FEE,
+    DEFAULT_FEE_ZATS,
+    NU5_BRANCH_ID,
+)
+from test_framework.util import wait_and_assert_operationid_status, start_nodes
 from decimal import Decimal
 
 my_memo_str = 'c0ffee' # stay awake
@@ -15,21 +27,195 @@
 no_memo = 'f6' + ('0'*1022) # see section 5.5 of the protocol spec
 
 class ListReceivedTest (BitcoinTestFramework):
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 3
+        self.setup_clean_chain = True
+
+    def setup_network(self):
+        self.nodes = start_nodes(
+            self.num_nodes, self.options.tmpdir,
+            extra_args=[[
+                '-experimentalfeatures',
+                '-orchardwallet',
+                nuparams(NU5_BRANCH_ID, 225),
+            ]] * self.num_nodes
+            )
+        connect_nodes_bi(self.nodes, 0, 1)
+        connect_nodes_bi(self.nodes, 1, 2)
+        connect_nodes_bi(self.nodes, 0, 2)
+        self.is_network_split = False
+        self.sync_all()
 
     def generate_and_sync(self, new_height):
         current_height = self.nodes[0].getblockcount()
         assert(new_height > current_height)
+        self.sync_all()
         self.nodes[0].generate(new_height - current_height)
         self.sync_all()
         assert_equal(new_height, self.nodes[0].getblockcount())
 
-    def run_test_release(self, release, height):
+    def test_received_sprout(self, height):
+        self.generate_and_sync(height+2)
+
+        zaddr1 = self.nodes[1].z_getnewaddress('sprout')
+
+        # Send 10 ZEC each zaddr1 and zaddrExt via z_shieldcoinbase
+        result = self.nodes[0].z_shieldcoinbase(get_coinbase_address(self.nodes[0]), zaddr1, 0, 1)
+        txid_shielding1 = wait_and_assert_operationid_status(self.nodes[0], result['opid'])
+
+        zaddrExt = self.nodes[2].z_getnewaddress('sprout')
+        result = self.nodes[0].z_shieldcoinbase(get_coinbase_address(self.nodes[0]), zaddrExt, 0, 1)
+        txid_shieldingExt = wait_and_assert_operationid_status(self.nodes[0], result['opid'])
+
+        self.sync_all()
+
+        # Decrypted transaction details should not be visible on node 0
+        pt = self.nodes[0].z_viewtransaction(txid_shielding1)
+        assert_equal(pt['txid'], txid_shielding1)
+        assert_equal(len(pt['spends']), 0)
+        assert_equal(len(pt['outputs']), 0)
+
+        # Decrypted transaction details should be correct on node 1
+        pt = self.nodes[1].z_viewtransaction(txid_shielding1)
+        assert_equal(pt['txid'], txid_shielding1)
+        assert_equal(len(pt['spends']), 0)
+        assert_equal(len(pt['outputs']), 1)
+        assert_equal(pt['outputs'][0]['type'], 'sprout')
+        assert_equal(pt['outputs'][0]['js'], 0)
+        assert_equal(pt['outputs'][0]['address'], zaddr1)
+        assert_equal(pt['outputs'][0]['value'], Decimal('10'))
+        assert_equal(pt['outputs'][0]['valueZat'], 1000000000)
+        assert_equal(pt['outputs'][0]['memo'], no_memo)
+        jsOutputPrev = pt['outputs'][0]['jsOutput']
+
+        # Second transaction should not be known to node 1
+        assert_raises_message(
+            JSONRPCException,
+            "Invalid or non-wallet transaction id",
+            self.nodes[1].z_viewtransaction,
+            txid_shieldingExt)
+
+        # Second transaction should be visible on node0
+        pt = self.nodes[2].z_viewtransaction(txid_shieldingExt)
+        assert_equal(pt['txid'], txid_shieldingExt)
+        assert_equal(len(pt['spends']), 0)
+        assert_equal(len(pt['outputs']), 1)
+        assert_equal(pt['outputs'][0]['type'], 'sprout')
+        assert_equal(pt['outputs'][0]['js'], 0)
+        assert_equal(pt['outputs'][0]['address'], zaddrExt)
+        assert_equal(pt['outputs'][0]['value'], Decimal('10'))
+        assert_equal(pt['outputs'][0]['valueZat'], 1000000000)
+        assert_equal(pt['outputs'][0]['memo'], no_memo)
+
+        r = self.nodes[1].z_listreceivedbyaddress(zaddr1)
+        assert_equal(0, len(r), "Should have received no confirmed note")
+        c = self.nodes[1].z_getnotescount()
+        assert_equal(0, c['sprout'], "Count of confirmed notes should be 0")
+
+        # No confirmation required, one note should be present
+        r = self.nodes[1].z_listreceivedbyaddress(zaddr1, 0)
+        assert_equal(1, len(r), "Should have received one (unconfirmed) note")
+        assert_equal(txid_shielding1, r[0]['txid'])
+        assert_equal(10, r[0]['amount'])
+        assert_equal(1000000000, r[0]['amountZat'])
+        assert_false(r[0]['change'], "Note should not be change")
+        assert_equal(no_memo, r[0]['memo'])
+        assert_equal(0, r[0]['confirmations'])
+        assert_equal(-1, r[0]['blockindex'])
+        assert_equal(0, r[0]['blockheight'])
+
+        c = self.nodes[1].z_getnotescount(0)
+        assert_equal(1, c['sprout'], "Count of unconfirmed notes should be 1")
+
+        # Confirm transaction (10 ZEC shielded)
+        self.generate_and_sync(height+3)
+
+        # Require one confirmation, note should be present
+        r0 = self.nodes[1].z_listreceivedbyaddress(zaddr1)
+        assert_equal(1, len(r0), "Should have received one (unconfirmed) note")
+        assert_equal(txid_shielding1, r0[0]['txid'])
+        assert_equal(10, r0[0]['amount'])
+        assert_equal(1000000000, r0[0]['amountZat'])
+        assert_false(r0[0]['change'], "Note should not be change")
+        assert_equal(no_memo, r0[0]['memo'])
+        assert_equal(1, r0[0]['confirmations'])
+        assert_equal(height + 3, r0[0]['blockheight'])
+
+        taddr = self.nodes[1].getnewaddress()
+        # Generate some change by sending part of zaddr1 back to taddr
+        opid = self.nodes[1].z_sendmany(zaddr1, [{'address': taddr, 'amount': 0.6}])
+        txid = wait_and_assert_operationid_status(self.nodes[1], opid)
+
+        self.generate_and_sync(height+4)
+
+        # Decrypted transaction details should be correct
+        pt = self.nodes[1].z_viewtransaction(txid)
+        assert_equal(pt['txid'], txid)
+        assert_equal(len(pt['spends']), 1)
+        # TODO: enable once z_viewtransaction displays transparent elements
+        # assert_equal(len(pt['outputs']), 2)
+        assert_equal(len(pt['outputs']), 1)
+
+        assert_equal(pt['spends'][0]['type'], 'sprout')
+        assert_equal(pt['spends'][0]['txidPrev'], txid_shielding1)
+        assert_equal(pt['spends'][0]['js'], 0)
+        assert_equal(pt['spends'][0]['jsPrev'], 0)
+        assert_equal(pt['spends'][0]['jsOutputPrev'], jsOutputPrev)
+        assert_equal(pt['spends'][0]['address'], zaddr1)
+        assert_equal(pt['spends'][0]['value'], Decimal('10.0'))
+        assert_equal(pt['spends'][0]['valueZat'], 1000000000)
+
+        # We expect a transparent output and a Sprout output, but the RPC does
+        # not define any particular ordering of these within the returned JSON.
+        outputs = [{
+            'type': output['type'],
+            'address': output['address'],
+            'value': output['value'],
+            'valueZat': output['valueZat'],
+        } for output in pt['outputs']]
+        for (i, output) in enumerate(pt['outputs']):
+            if 'memo' in output:
+                outputs[i]['memo'] = output['memo']
+
+        # TODO: enable once z_viewtransaction displays transparent elements
+        # assert({
+        #     'type': 'transparent',
+        #     'address': taddr,
+        #     'value': Decimal('0.6'),
+        #     'valueZat': 60000000,
+        # } in outputs)
+        assert({
+            'type': 'sprout',
+            'address': zaddr1,
+            'value': Decimal('9.4') - DEFAULT_FEE,
+            'valueZat': 940000000 - DEFAULT_FEE_ZATS,
+            'memo': no_memo,
+        } in outputs)
+
+        # zaddr1 should have a note with change
+        r = self.nodes[1].z_listreceivedbyaddress(zaddr1, 0)
+        assert_equal(2, len(r), "zaddr1 Should have received 2 notes")
+        r = sorted(r, key = lambda received: received['amount'])
+        assert_equal(txid, r[0]['txid'])
+        assert_equal(Decimal('9.4')-DEFAULT_FEE, r[0]['amount'])
+        assert_equal(940000000-DEFAULT_FEE_ZATS, r[0]['amountZat'])
+        assert_true(r[0]['change'], "Note valued at (9.4-"+str(DEFAULT_FEE)+") should be change")
+        assert_equal(no_memo, r[0]['memo'])
+
+        # The old note still exists (it's immutable), even though it is spent
+        assert_equal(Decimal('10.0'), r[1]['amount'])
+        assert_equal(1000000000, r[1]['amountZat'])
+        assert_false(r[1]['change'], "Note valued at 10.0 should not be change")
+        assert_equal(no_memo, r[1]['memo'])
+
+    def test_received_sapling(self, height):
         self.generate_and_sync(height+1)
         taddr = self.nodes[1].getnewaddress()
-        zaddr1 = self.nodes[1].z_getnewaddress(release)
-        zaddrExt = self.nodes[3].z_getnewaddress(release)
+        zaddr1 = self.nodes[1].z_getnewaddress('sapling')
+        zaddrExt = self.nodes[2].z_getnewaddress('sapling')
 
-        self.nodes[0].sendtoaddress(taddr, 4.0)
+        txid_taddr = self.nodes[0].sendtoaddress(taddr, 4.0)
         self.generate_and_sync(height+2)
 
         # Send 1 ZEC to zaddr1
@@ -42,62 +228,35 @@ def run_test_release(self, release, height):
 
         # Decrypted transaction details should be correct
         pt = self.nodes[1].z_viewtransaction(txid)
+
         assert_equal(pt['txid'], txid)
         assert_equal(len(pt['spends']), 0)
-        assert_equal(len(pt['outputs']), 1 if release == 'sprout' else 2)
-
-        # Output orders can be randomized, so we check the output
-        # positions and contents separately
-        outputs = []
-
-        assert_equal(pt['outputs'][0]['type'], release)
-        if release == 'sprout':
-            assert_equal(pt['outputs'][0]['js'], 0)
-            jsOutputPrev = pt['outputs'][0]['jsOutput']
-        elif pt['outputs'][0]['address'] == zaddr1:
-            assert_equal(pt['outputs'][0]['outgoing'], False)
-            assert_equal(pt['outputs'][0]['memoStr'], my_memo_str)
-        else:
-            assert_equal(pt['outputs'][0]['outgoing'], True)
-        outputs.append({
-            'address': pt['outputs'][0]['address'],
-            'value': pt['outputs'][0]['value'],
-            'valueZat': pt['outputs'][0]['valueZat'],
-            'memo': pt['outputs'][0]['memo'],
-        })
-
-        if release != 'sprout':
-            assert_equal(pt['outputs'][1]['type'], release)
-            if pt['outputs'][1]['address'] == zaddr1:
-                assert_equal(pt['outputs'][1]['outgoing'], False)
-                assert_equal(pt['outputs'][1]['memoStr'], my_memo_str)
-            else:
-                assert_equal(pt['outputs'][1]['outgoing'], True)
-            outputs.append({
-                'address': pt['outputs'][1]['address'],
-                'value': pt['outputs'][1]['value'],
-                'valueZat': pt['outputs'][1]['valueZat'],
-                'memo': pt['outputs'][1]['memo'],
-            })
+        assert_equal(len(pt['outputs']), 2)
 
-        assert({
-            'address': zaddr1,
-            'value': Decimal('1'),
-            'valueZat': 100000000,
-            'memo': my_memo,
-        } in outputs)
-        if release != 'sprout':
-            assert({
-                'address': zaddrExt,
-                'value': Decimal('2'),
-                'valueZat': 200000000,
-                'memo': no_memo,
-            } in outputs)
+        # Outputs are not returned in a defined order but the amounts are deterministic
+        outputs = sorted(pt['outputs'], key=lambda x: x['valueZat'])
+        assert_equal(outputs[0]['type'], 'sapling')
+        assert_equal(outputs[0]['address'], zaddr1)
+        assert_equal(outputs[0]['value'], Decimal('1'))
+        assert_equal(outputs[0]['valueZat'], 100000000)
+        assert_equal(outputs[0]['output'], 0)
+        assert_equal(outputs[0]['outgoing'], False)
+        assert_equal(outputs[0]['memo'], my_memo)
+        assert_equal(outputs[0]['memoStr'], my_memo_str)
+
+        assert_equal(outputs[1]['type'], 'sapling')
+        assert_equal(outputs[1]['address'], zaddrExt)
+        assert_equal(outputs[1]['value'], Decimal('2'))
+        assert_equal(outputs[1]['valueZat'], 200000000)
+        assert_equal(outputs[1]['output'], 1)
+        assert_equal(outputs[1]['outgoing'], True)
+        assert_equal(outputs[1]['memo'], no_memo)
+        assert 'memoStr' not in outputs[1]
 
         r = self.nodes[1].z_listreceivedbyaddress(zaddr1)
         assert_equal(0, len(r), "Should have received no confirmed note")
         c = self.nodes[1].z_getnotescount()
-        assert_equal(0, c[release], "Count of confirmed notes should be 0")
+        assert_equal(0, c['sapling'], "Count of confirmed notes should be 0")
 
         # No confirmation required, one note should be present
         r = self.nodes[1].z_listreceivedbyaddress(zaddr1, 0)
@@ -112,7 +271,7 @@ def run_test_release(self, release, height):
         assert_equal(0, r[0]['blockheight'])
 
         c = self.nodes[1].z_getnotescount(0)
-        assert_equal(1, c[release], "Count of unconfirmed notes should be 1")
+        assert_equal(1, c['sapling'], "Count of unconfirmed notes should be 1")
 
         # Confirm transaction (1 ZEC from taddr to zaddr1)
         self.generate_and_sync(height+3)
@@ -129,7 +288,7 @@ def run_test_release(self, release, height):
 
         # Generate some change by sending part of zaddr1 to zaddr2
         txidPrev = txid
-        zaddr2 = self.nodes[1].z_getnewaddress(release)
+        zaddr2 = self.nodes[1].z_getnewaddress('sapling')
         opid = self.nodes[1].z_sendmany(zaddr1,
             [{'address': zaddr2, 'amount': 0.6}])
         txid = wait_and_assert_operationid_status(self.nodes[1], opid)
@@ -142,92 +301,259 @@ def run_test_release(self, release, height):
         assert_equal(len(pt['spends']), 1)
         assert_equal(len(pt['outputs']), 2)
 
-        assert_equal(pt['spends'][0]['type'], release)
+        assert_equal(pt['spends'][0]['type'], 'sapling')
         assert_equal(pt['spends'][0]['txidPrev'], txidPrev)
-        if release == 'sprout':
-            assert_equal(pt['spends'][0]['js'], 0)
-            # jsSpend is randomised during transaction creation
-            assert_equal(pt['spends'][0]['jsPrev'], 0)
-            assert_equal(pt['spends'][0]['jsOutputPrev'], jsOutputPrev)
-        else:
-            assert_equal(pt['spends'][0]['spend'], 0)
-            assert_equal(pt['spends'][0]['outputPrev'], 0)
+        assert_equal(pt['spends'][0]['spend'], 0)
+        assert_equal(pt['spends'][0]['outputPrev'], 0)
         assert_equal(pt['spends'][0]['address'], zaddr1)
         assert_equal(pt['spends'][0]['value'], Decimal('1.0'))
         assert_equal(pt['spends'][0]['valueZat'], 100000000)
 
-        # Output orders can be randomized, so we check the output
-        # positions and contents separately
-        outputs = []
-
-        assert_equal(pt['outputs'][0]['type'], release)
-        if release == 'sapling':
-            assert_equal(pt['outputs'][0]['output'], 0)
-            assert_equal(pt['outputs'][0]['outgoing'], False)
-        outputs.append({
-            'address': pt['outputs'][0]['address'],
-            'value': pt['outputs'][0]['value'],
-            'valueZat': pt['outputs'][0]['valueZat'],
-            'memo': pt['outputs'][0]['memo'],
-        })
-
-        assert_equal(pt['outputs'][1]['type'], release)
-        if release == 'sapling':
-            assert_equal(pt['outputs'][1]['output'], 1)
-            assert_equal(pt['outputs'][1]['outgoing'], False)
-        outputs.append({
-            'address': pt['outputs'][1]['address'],
-            'value': pt['outputs'][1]['value'],
-            'valueZat': pt['outputs'][1]['valueZat'],
-            'memo': pt['outputs'][1]['memo'],
-        })
-
-        assert({
-            'address': zaddr2,
-            'value': Decimal('0.6'),
-            'valueZat': 60000000,
-            'memo': no_memo,
-        } in outputs)
-        assert({
-            'address': zaddr1,
-            'value': Decimal('0.4') - DEFAULT_FEE,
-            'valueZat': 40000000 - DEFAULT_FEE_ZATS,
-            'memo': no_memo,
-        } in outputs)
+        # Outputs are not returned in a defined order but the amounts are deterministic
+        outputs = sorted(pt['outputs'], key=lambda x: x['valueZat'])
+        assert_equal(outputs[0]['type'], 'sapling')
+        assert_equal(outputs[0]['address'], zaddr1)
+        assert_equal(outputs[0]['value'], Decimal('0.4') - DEFAULT_FEE)
+        assert_equal(outputs[0]['valueZat'], 40000000 - DEFAULT_FEE_ZATS)
+        assert_equal(outputs[0]['output'], 1)
+        assert_equal(outputs[0]['outgoing'], False)
+        assert_equal(outputs[0]['memo'], no_memo)
+        assert 'memoStr' not in outputs[0]
+
+        assert_equal(outputs[1]['type'], 'sapling')
+        assert_equal(outputs[1]['address'], zaddr2)
+        assert_equal(outputs[1]['value'], Decimal('0.6'))
+        assert_equal(outputs[1]['valueZat'], 60000000)
+        assert_equal(outputs[1]['output'], 0)
+        assert_equal(outputs[1]['outgoing'], False)
+        assert_equal(outputs[1]['memo'], no_memo)
+        assert 'memoStr' not in outputs[1]
 
         # zaddr1 should have a note with change
         r = self.nodes[1].z_listreceivedbyaddress(zaddr1, 0)
-        r = sorted(r, key = lambda received: received['amount'])
         assert_equal(2, len(r), "zaddr1 Should have received 2 notes")
-
+        r = sorted(r, key = lambda received: received['amount'])
         assert_equal(txid, r[0]['txid'])
         assert_equal(Decimal('0.4')-DEFAULT_FEE, r[0]['amount'])
         assert_equal(40000000-DEFAULT_FEE_ZATS, r[0]['amountZat'])
-        assert_true(r[0]['change'], "Note valued at (0.4-"+str(DEFAULT_FEE)+") should be change")
+        assert_equal(r[0]['change'], True, "Note valued at (0.4-"+str(DEFAULT_FEE)+") should be change")
         assert_equal(no_memo, r[0]['memo'])
 
         # The old note still exists (it's immutable), even though it is spent
         assert_equal(Decimal('1.0'), r[1]['amount'])
         assert_equal(100000000, r[1]['amountZat'])
-        assert_false(r[1]['change'], "Note valued at 1.0 should not be change")
+        assert_equal(r[1]['change'], False, "Note valued at 1.0 should not be change")
         assert_equal(my_memo, r[1]['memo'])
 
         # zaddr2 should not have change
         r = self.nodes[1].z_listreceivedbyaddress(zaddr2, 0)
+        assert_equal(len(r), 1, "zaddr2 Should have received 1 notes")
         r = sorted(r, key = lambda received: received['amount'])
-        assert_equal(1, len(r), "zaddr2 Should have received 1 notes")
-        assert_equal(txid, r[0]['txid'])
-        assert_equal(Decimal('0.6'), r[0]['amount'])
-        assert_equal(60000000, r[0]['amountZat'])
-        assert_false(r[0]['change'], "Note valued at 0.6 should not be change")
-        assert_equal(no_memo, r[0]['memo'])
+        assert_equal(r[0]['txid'], txid)
+        assert_equal(r[0]['amount'], Decimal('0.6'))
+        assert_equal(r[0]['amountZat'], 60000000)
+        assert_equal(r[0]['change'], False, "Note valued at 0.6 should not be change")
+        assert_equal(r[0]['memo'], no_memo)
+        assert 0 <= r[0]['outindex'] < 2
 
         c = self.nodes[1].z_getnotescount(0)
-        assert_equal(3, c[release], "Count of unconfirmed notes should be 3(2 in zaddr1 + 1 in zaddr2)")
+        assert_equal(c['sapling'], 3, "Count of unconfirmed notes should be 3(2 in zaddr1 + 1 in zaddr2)")
+
+        # As part of UA support, a transparent address is now accepted
+        r = self.nodes[1].z_listreceivedbyaddress(taddr, 0)
+        assert_equal(len(r), 1)
+        assert_equal(r[0]['pool'], 'transparent')
+        assert_equal(r[0]['txid'], txid_taddr)
+        assert_equal(r[0]['amount'], Decimal('4'))
+        assert_equal(r[0]['amountZat'], 400000000)
+        assert_equal(r[0]['confirmations'], 3)
+        assert 0 <= r[0]['outindex'] < 2
+
+        # Test unified address
+        node = self.nodes[1]
+
+        # Create a unified address on one node, try z_listreceivedbyaddress on another node
+        account = self.nodes[0].z_getnewaccount()['account']
+        r = self.nodes[0].z_getaddressforaccount(account)
+        unified_addr = r['unifiedaddress']
+        # this address isn't in node1's wallet
+        assert_raises_message(
+            JSONRPCException,
+            "From address does not belong to this node",
+            node.z_listreceivedbyaddress, unified_addr, 0)
+
+        # create a UA on node1
+        r = node.z_getnewaccount()
+        account = r['account']
+        r = node.z_getaddressforaccount(account)
+        unified_addr = r['unifiedaddress']
+        receivers = node.z_listunifiedreceivers(unified_addr)
+        assert_equal(len(receivers), 3)
+        assert 'transparent' in receivers
+        assert 'sapling' in receivers
+        assert 'orchard' in receivers
+        assert_raises_message(
+            JSONRPCException,
+            "The provided address is a bare receiver from a Unified Address in this wallet.",
+            node.z_listreceivedbyaddress, receivers['transparent'], 0)
+        assert_raises_message(
+            JSONRPCException,
+            "The provided address is a bare receiver from a Unified Address in this wallet.",
+            node.z_listreceivedbyaddress, receivers['sapling'], 0)
+
+        # Wallet contains no notes
+        r = node.z_listreceivedbyaddress(unified_addr, 0)
+        assert_equal(len(r), 0, "unified_addr should have received zero notes")
+
+        # Create a note in this UA on node1
+        opid = node.z_sendmany(zaddr1, [{'address': unified_addr, 'amount': 0.1}])
+        txid_sapling = wait_and_assert_operationid_status(node, opid)
+        self.generate_and_sync(height+5)
+
+        # Create a UTXO that unified_address's transparent component references, on node1
+        outputs = {receivers['transparent']: 0.2}
+        txid_taddr = node.sendmany("", outputs)
+
+        r = node.z_listreceivedbyaddress(unified_addr, 0)
+        assert_equal(len(r), 2, "unified_addr should have received 2 payments")
+        # The return list order isn't defined, so sort by pool name
+        r = sorted(r, key=lambda x: x['pool'])
+        assert_equal(r[0]['pool'], 'sapling')
+        assert_equal(r[0]['txid'], txid_sapling)
+        assert_equal(r[0]['amount'], Decimal('0.1'))
+        assert_equal(r[0]['amountZat'], 10000000)
+        assert_equal(r[0]['memo'], no_memo)
+        assert 0 <= r[0]['outindex'] < 2
+        assert_equal(r[0]['confirmations'], 1)
+        assert_equal(r[0]['change'], False)
+        assert_equal(r[0]['blockheight'], height+5)
+        assert_equal(r[0]['blockindex'], 1)
+        assert 'blocktime' in r[0]
+
+        assert_equal(r[1]['pool'], 'transparent')
+        assert_equal(r[1]['txid'], txid_taddr)
+        assert_equal(r[1]['amount'], Decimal('0.2'))
+        assert_equal(r[1]['amountZat'], 20000000)
+        assert 0 <= r[1]['outindex'] < 2
+        assert_equal(r[1]['confirmations'], 0)
+        assert_equal(r[1]['change'], False)
+        assert 'memo' not in r[1]
+        assert_equal(r[1]['blockheight'], 0) # not yet mined
+        assert_equal(r[1]['blockindex'], -1) # not yet mined
+        assert 'blocktime' in r[1]
+
+    def test_received_orchard(self, height):
+        self.generate_and_sync(height+1)
+        taddr = self.nodes[1].getnewaddress()
+        acct1 = self.nodes[1].z_getnewaccount()['account']
+        acct2 = self.nodes[1].z_getnewaccount()['account']
+
+        addrResO = self.nodes[1].z_getaddressforaccount(acct1, ['orchard'])
+        assert_equal(addrResO['pools'], ['orchard'])
+        uao = addrResO['unifiedaddress']
+
+        addrResSO = self.nodes[1].z_getaddressforaccount(acct2, ['sapling', 'orchard'])
+        assert_equal(addrResSO['pools'], ['sapling', 'orchard'])
+        uaso = addrResSO['unifiedaddress']
+
+        self.nodes[0].sendtoaddress(taddr, 4.0)
+        self.generate_and_sync(height+2)
+
+        acct_node0 = self.nodes[0].z_getnewaccount()['account']
+        ua_node0 = self.nodes[0].z_getaddressforaccount(acct_node0, ['sapling', 'orchard'])['unifiedaddress']
+
+        opid = self.nodes[1].z_sendmany(taddr, [
+            {'address': uao, 'amount': 1, 'memo': my_memo},
+            {'address': uaso, 'amount': 2},
+        ], 1, 0, 'AllowRevealedSenders')
+        txid0 = wait_and_assert_operationid_status(self.nodes[1], opid)
+        self.sync_all()
+
+        # Decrypted transaction details should be correct, even though
+        # the transaction is still just in the mempool
+        pt = self.nodes[1].z_viewtransaction(txid0)
+
+        assert_equal(pt['txid'], txid0)
+        assert_equal(len(pt['spends']), 0)
+        assert_equal(len(pt['outputs']), 2)
+
+        # Outputs are not returned in a defined order but the amounts are deterministic
+        outputs = sorted(pt['outputs'], key=lambda x: x['valueZat'])
+        assert_equal(outputs[0]['type'], 'orchard')
+        assert_equal(outputs[0]['address'], uao)
+        assert_equal(outputs[0]['value'], Decimal('1'))
+        assert_equal(outputs[0]['valueZat'], 100000000)
+        assert_equal(outputs[0]['action'], 0)
+        assert_equal(outputs[0]['outgoing'], False)
+        assert_equal(outputs[0]['memo'], my_memo)
+        assert_equal(outputs[0]['memoStr'], my_memo_str)
+
+        assert_equal(outputs[1]['type'], 'orchard')
+        assert_equal(outputs[1]['address'], uaso)
+        assert_equal(outputs[1]['value'], Decimal('2'))
+        assert_equal(outputs[1]['valueZat'], 200000000)
+        assert_equal(outputs[1]['action'], 1)
+        assert_equal(outputs[1]['outgoing'], False)
+        assert_equal(outputs[1]['memo'], no_memo)
+        assert 'memoStr' not in outputs[1]
+
+        self.generate_and_sync(height+3)
+
+        opid = self.nodes[1].z_sendmany(uao, [
+            {'address': uaso, 'amount': Decimal('0.3')},
+            {'address': ua_node0, 'amount': Decimal('0.2')}
+        ])
+        txid1 = wait_and_assert_operationid_status(self.nodes[1], opid)
+        self.sync_all()
+
+        pt = self.nodes[1].z_viewtransaction(txid1)
+
+        assert_equal(pt['txid'], txid1)
+        assert_equal(len(pt['spends']), 1) # one spend we can see
+        assert_equal(len(pt['outputs']), 3) # one output + one change output we can see
+
+        spends = pt['spends']
+        assert_equal(spends[0]['type'], 'orchard')
+        assert_equal(spends[0]['action'], 0)
+        assert_equal(spends[0]['txidPrev'], txid0)
+        assert_equal(spends[0]['actionPrev'], 0)
+        assert_equal(spends[0]['address'], uao)
+        assert_equal(spends[0]['value'], Decimal('1.0'))
+        assert_equal(spends[0]['valueZat'], 100000000)
+
+        outputs = sorted(pt['outputs'], key=lambda x: x['valueZat'])
+        assert_equal(outputs[0]['type'], 'orchard')
+        assert_equal(outputs[0]['address'], ua_node0)
+        assert_equal(outputs[0]['value'], Decimal('0.2'))
+        assert_equal(outputs[0]['valueZat'], 20000000)
+        assert_equal(outputs[0]['outgoing'], True)
+        assert_equal(outputs[0]['walletInternal'], False)
+        assert_equal(outputs[0]['memo'], no_memo)
+
+        assert_equal(outputs[1]['type'], 'orchard')
+        assert_equal(outputs[1]['address'], uaso)
+        assert_equal(outputs[1]['value'], Decimal('0.3'))
+        assert_equal(outputs[1]['valueZat'], 30000000)
+        assert_equal(outputs[1]['outgoing'], False)
+        assert_equal(outputs[1]['walletInternal'], False)
+        assert_equal(outputs[1]['memo'], no_memo)
+
+        # Verify that we observe the change output
+        print("###", uao, "###")
+        assert_equal(outputs[2]['type'], 'orchard')
+        assert_equal(outputs[2]['value'], Decimal('0.49999'))
+        assert_equal(outputs[2]['valueZat'], 49999000)
+        assert_equal(outputs[2]['outgoing'], False)
+        assert_equal(outputs[2]['walletInternal'], True)
+        assert_equal(outputs[2]['memo'], no_memo)
+        # The change address should have been erased
+        assert_true('address' not in outputs[2])
 
     def run_test(self):
-        self.run_test_release('sprout', 200)
-        self.run_test_release('sapling', 214)
+        self.test_received_sprout(200)
+        self.test_received_sapling(214)
+        self.test_received_orchard(230)
+
 
 if __name__ == '__main__':
     ListReceivedTest().main()
diff --git a/qa/rpc-tests/wallet_orchard.py b/qa/rpc-tests/wallet_orchard.py
new file mode 100755
index 00000000000..2a1ee85a697
--- /dev/null
+++ b/qa/rpc-tests/wallet_orchard.py
@@ -0,0 +1,181 @@
+#!/usr/bin/env python3
+# Copyright (c) 2022 The Zcash developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import (
+    NU5_BRANCH_ID,
+    assert_equal,
+    get_coinbase_address,
+    nuparams,
+    start_nodes,
+    wait_and_assert_operationid_status,
+)
+
+from decimal import Decimal
+
+# Test wallet behaviour with the Orchard protocol
+class WalletOrchardTest(BitcoinTestFramework):
+    def __init__(self):
+        super().__init__()
+        self.num_nodes = 4
+
+    def setup_nodes(self):
+        return start_nodes(self.num_nodes, self.options.tmpdir, [[
+            '-experimentalfeatures',
+            '-orchardwallet',
+            nuparams(NU5_BRANCH_ID, 210),
+        ]] * self.num_nodes)
+
+    def run_test(self):
+        # Sanity-check the test harness
+        assert_equal(self.nodes[0].getblockcount(), 200)
+
+        # Get a new orchard-only unified address
+        acct1 = self.nodes[1].z_getnewaccount()['account']
+        addrRes1 = self.nodes[1].z_getaddressforaccount(acct1, ['orchard'])
+        assert_equal(acct1, addrRes1['account'])
+        assert_equal(addrRes1['pools'], ['orchard'])
+        ua1 = addrRes1['unifiedaddress']
+
+        # Verify that we have only an Orchard component
+        receiver_types = self.nodes[0].z_listunifiedreceivers(ua1)
+        assert_equal(set(['orchard']), set(receiver_types))
+
+        # Verify balance
+        assert_equal({'pools': {}, 'minimum_confirmations': 1}, self.nodes[1].z_getbalanceforaccount(acct1))
+
+        # Send some sapling funds to node 2 for later spending after we split the network
+        acct2 = self.nodes[2].z_getnewaccount()['account']
+        addrRes2 = self.nodes[2].z_getaddressforaccount(acct2, ['sapling', 'orchard'])
+        assert_equal(acct2, addrRes2['account'])
+        ua2 = addrRes2['unifiedaddress']
+        saplingAddr2 = self.nodes[2].z_listunifiedreceivers(ua2)['sapling']
+
+        recipients = [{"address": saplingAddr2, "amount": Decimal('10')}]
+        myopid = self.nodes[0].z_sendmany(get_coinbase_address(self.nodes[0]), recipients, 1, 0, 'AllowRevealedSenders')
+        wait_and_assert_operationid_status(self.nodes[0], myopid)
+
+        # Mine the tx & activate NU5
+        self.sync_all()
+        self.nodes[0].generate(10)
+        self.sync_all()
+
+        # Check the value sent to saplingAddr2 was received in node 2's account
+        assert_equal(
+                {'pools': {'sapling': {'valueZat': Decimal('1000000000')}}, 'minimum_confirmations': 1},
+                self.nodes[2].z_getbalanceforaccount(acct2))
+
+        # Node 0 shields some funds
+        # t-coinbase -> Orchard
+        recipients = [{"address": ua1, "amount": Decimal('10')}]
+        myopid = self.nodes[0].z_sendmany(get_coinbase_address(self.nodes[0]), recipients, 1, 0, 'AllowRevealedSenders')
+        wait_and_assert_operationid_status(self.nodes[0], myopid)
+
+        self.sync_all()
+        self.nodes[0].generate(1)
+        self.sync_all()
+
+        assert_equal(
+                {'pools': {'orchard': {'valueZat': Decimal('1000000000')}}, 'minimum_confirmations': 1},
+                self.nodes[1].z_getbalanceforaccount(acct1))
+
+        # Split the network
+        self.split_network()
+
+        # Send another tx to ua1
+        recipients = [{"address": ua1, "amount": Decimal('10')}]
+        myopid = self.nodes[0].z_sendmany(get_coinbase_address(self.nodes[0]), recipients, 1, 0, 'AllowRevealedSenders')
+        wait_and_assert_operationid_status(self.nodes[0], myopid)
+
+        # Mine the tx & generate a majority chain on the 0/1 side of the split
+        self.sync_all()
+        self.nodes[0].generate(10)
+        self.sync_all()
+
+        assert_equal(
+                {'pools': {'orchard': {'valueZat': Decimal('2000000000')}}, 'minimum_confirmations': 1},
+                self.nodes[1].z_getbalanceforaccount(acct1))
+
+        # On the other side of the split, send some funds to node 3
+        acct3 = self.nodes[3].z_getnewaccount()['account']
+        addrRes3 = self.nodes[3].z_getaddressforaccount(acct3, ['sapling', 'orchard'])
+        assert_equal(acct3, addrRes3['account'])
+        ua3 = addrRes3['unifiedaddress']
+
+        recipients = [{"address": ua3, "amount": Decimal('1')}]
+        myopid = self.nodes[2].z_sendmany(ua2, recipients, 1, 0)
+        rollback_tx = wait_and_assert_operationid_status(self.nodes[2], myopid)
+
+        self.sync_all()
+        self.nodes[2].generate(1)
+        self.sync_all()
+
+        # The remaining change from ua2's Sapling note has been sent to the
+        # account's internal Orchard change address.
+        assert_equal(
+                {'pools': {'orchard': {'valueZat': Decimal('900000000')}}, 'minimum_confirmations': 1},
+                self.nodes[2].z_getbalanceforaccount(acct2))
+
+        assert_equal(
+                {'pools': {'orchard': {'valueZat': Decimal('100000000')}}, 'minimum_confirmations': 1},
+                self.nodes[3].z_getbalanceforaccount(acct3))
+
+        # Check that the mempools are empty
+        for i in range(self.num_nodes):
+            assert_equal(set([]), set(self.nodes[i].getrawmempool()))
+
+        # Reconnect the nodes; nodes 2 and 3 will re-org to node 0's chain.
+        print("Re-joining the network so that nodes 2 and 3 reorg")
+        self.join_network()
+
+        # split 0/1's chain should have won, so their wallet balance should be consistent
+        assert_equal(
+                {'pools': {'orchard': {'valueZat': Decimal('2000000000')}}, 'minimum_confirmations': 1},
+                self.nodes[1].z_getbalanceforaccount(acct1))
+
+        # split 2/3's chain should have been rolled back, so their txn should have been
+        # un-mined and returned to the mempool
+        assert_equal(set([rollback_tx]), set(self.nodes[2].getrawmempool()))
+
+        # acct2's sole Orchard note is spent by a transaction in the mempool, so our
+        # confirmed balance is currently 0
+        assert_equal(
+                {'pools': {}, 'minimum_confirmations': 1},
+                self.nodes[2].z_getbalanceforaccount(acct2))
+
+        # acct2's incoming change (unconfirmed, still in the mempool) is 9 zec
+        assert_equal(
+                {'pools': {'orchard': {'valueZat': Decimal('900000000')}}, 'minimum_confirmations': 0},
+                self.nodes[2].z_getbalanceforaccount(acct2, 0))
+
+        # The transaction was un-mined, so acct3 should have no confirmed balance
+        assert_equal(
+                {'pools': {}, 'minimum_confirmations': 1},
+                self.nodes[3].z_getbalanceforaccount(acct3))
+
+        # acct3's unconfirmed balance is 1 zec
+        assert_equal(
+                {'pools': {'orchard': {'valueZat': Decimal('100000000')}}, 'minimum_confirmations': 0},
+                self.nodes[3].z_getbalanceforaccount(acct3, 0))
+
+        # Manually resend the transaction in node 2's mempool
+        self.nodes[2].resendwallettransactions()
+
+        # Sync the network
+        self.sync_all()
+        self.nodes[0].generate(1)
+        self.sync_all()
+
+        # The un-mined transaction should now have been re-mined
+        assert_equal(
+                {'pools': {'orchard': {'valueZat': Decimal('900000000')}}, 'minimum_confirmations': 1},
+                self.nodes[2].z_getbalanceforaccount(acct2))
+
+        assert_equal(
+                {'pools': {'orchard': {'valueZat': Decimal('100000000')}}, 'minimum_confirmations': 1},
+                self.nodes[3].z_getbalanceforaccount(acct3))
+
+if __name__ == '__main__':
+    WalletOrchardTest().main()
diff --git a/qa/rpc-tests/wallet_overwintertx.py b/qa/rpc-tests/wallet_overwintertx.py
index fd2e3e069e7..5ccdd57b4e5 100755
--- a/qa/rpc-tests/wallet_overwintertx.py
+++ b/qa/rpc-tests/wallet_overwintertx.py
@@ -72,10 +72,8 @@ def run_test (self):
 
         # Node 0 shields to Node 2, a coinbase utxo of value 10.0 less default fee
         zsendamount = Decimal('10.0') - DEFAULT_FEE
-        recipients = []
-        recipients.append({"address":zaddr2, "amount": zsendamount})
-        myopid = self.nodes[0].z_sendmany(taddr0, recipients)
-        txid_shielded = wait_and_assert_operationid_status(self.nodes[0], myopid)
+        result = self.nodes[0].z_shieldcoinbase(taddr0, zaddr2, DEFAULT_FEE, 1)
+        txid_shielded = wait_and_assert_operationid_status(self.nodes[0], result['opid'])
 
         # Skip over the three blocks prior to activation; no transactions can be mined
         # in them due to the nearly-expiring restrictions.
@@ -143,10 +141,8 @@ def run_test (self):
 
         # Node 0 shields to Node 3, a coinbase utxo of value 10.0 less default fee
         zsendamount = Decimal('10.0') - DEFAULT_FEE
-        recipients = []
-        recipients.append({"address":zaddr3, "amount": zsendamount})
-        myopid = self.nodes[0].z_sendmany(taddr0, recipients)
-        txid_shielded = wait_and_assert_operationid_status(self.nodes[0], myopid)
+        result = self.nodes[0].z_shieldcoinbase(taddr0, zaddr3, DEFAULT_FEE, 1)
+        txid_shielded = wait_and_assert_operationid_status(self.nodes[0], result['opid'])
 
         # Mine the first Blossom block
         self.sync_all()
diff --git a/qa/rpc-tests/wallet_persistence.py b/qa/rpc-tests/wallet_persistence.py
index 171201be2e7..7c8c348388a 100755
--- a/qa/rpc-tests/wallet_persistence.py
+++ b/qa/rpc-tests/wallet_persistence.py
@@ -36,7 +36,7 @@ def run_test(self):
         # Verify Sapling address is persisted in wallet
         sapling_addr = self.nodes[0].z_getnewaddress('sapling')
 
-        # Make sure the node has the addresss
+        # Make sure the node has the address
         addresses = self.nodes[0].z_listaddresses()
         assert_true(sapling_addr in addresses, "Should contain address before restart")
 
diff --git a/qa/rpc-tests/wallet_sapling.py b/qa/rpc-tests/wallet_sapling.py
index ba9f17a91ee..19f88739d73 100755
--- a/qa/rpc-tests/wallet_sapling.py
+++ b/qa/rpc-tests/wallet_sapling.py
@@ -169,7 +169,7 @@ def run_test(self):
             )
             raise AssertionError("Should have thrown an exception")
         except JSONRPCException as e:
-            assert_equal("Cannot send to both Sprout and Sapling addresses using z_sendmany", e.error['message'])
+            assert_equal("Sending funds into the Sprout pool is not supported by z_sendmany", e.error['message'])
 
 if __name__ == '__main__':
     WalletSaplingTest().main()
diff --git a/qa/rpc-tests/wallet_sendmany_any_taddr.py b/qa/rpc-tests/wallet_sendmany_any_taddr.py
index d88b09e2f31..0b44c38775d 100755
--- a/qa/rpc-tests/wallet_sendmany_any_taddr.py
+++ b/qa/rpc-tests/wallet_sendmany_any_taddr.py
@@ -6,29 +6,35 @@
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_equal,
+    connect_nodes_bi,
+    start_nodes,
+    sync_blocks,
     wait_and_assert_operationid_status,
 )
 
+TX_EXPIRY_DELTA = 10
+TX_EXPIRING_SOON_THRESHOLD = 3
+
 # Test ANY_TADDR special string in z_sendmany
 class WalletSendManyAnyTaddr(BitcoinTestFramework):
+    def setup_nodes(self):
+        return start_nodes(self.num_nodes, self.options.tmpdir,
+            [[
+                "-txexpirydelta=%d" % TX_EXPIRY_DELTA,
+            ]] * self.num_nodes)
+
     def run_test(self):
         # Sanity-check the test harness
         assert_equal(self.nodes[0].getblockcount(), 200)
 
         # Create the addresses we will be using.
         recipient = self.nodes[1].z_getnewaddress()
+        node2zaddr = self.nodes[2].z_getnewaddress()
+        node2taddr1 = self.nodes[2].getnewaddress()
         node3zaddr = self.nodes[3].z_getnewaddress()
         node3taddr1 = self.nodes[3].getnewaddress()
         node3taddr2 = self.nodes[3].getnewaddress()
 
-        # We should not be able to spend multiple coinbase UTXOs at once.
-        wait_and_assert_operationid_status(
-            self.nodes[3],
-            self.nodes[3].z_sendmany('ANY_TADDR', [{'address': recipient, 'amount': 100}]),
-            'failed',
-            'Could not find any non-coinbase UTXOs to spend. Coinbase UTXOs can only be sent to a single zaddr recipient from a single taddr.',
-        )
-
         # Prepare some non-coinbase UTXOs
         wait_and_assert_operationid_status(
             self.nodes[3],
@@ -75,5 +81,48 @@ def run_test(self):
         assert_equal(self.nodes[3].z_getbalance(node3taddr1), 0)
         assert_equal(self.nodes[3].z_getbalance(node3taddr2), 0)
 
+        # Send from a change t-address.
+        wait_and_assert_operationid_status(
+            self.nodes[3],
+            self.nodes[3].z_sendmany('ANY_TADDR', [{'address': recipient, 'amount': 20}]),
+        )
+
+        self.sync_all()
+        self.nodes[0].generate(1)
+        self.sync_all()
+
+        # The recipient has their funds!
+        assert_equal(self.nodes[1].z_getbalance(recipient), 120)
+
+        # Check that ANY_TADDR note selection doesn't attempt a double-spend
+        myopid = self.nodes[3].z_sendmany('ANY_TADDR', [{'address': recipient, 'amount': 20}])
+        wait_and_assert_operationid_status(self.nodes[3], myopid, "failed", "Insufficient funds: have 14.99998, need 20.00001")
+
+        # Create an expired transaction on node 3.
+        self.split_network()
+        expire_transparent = self.nodes[3].sendtoaddress(node2taddr1, 14)
+        assert(expire_transparent in self.nodes[3].getrawmempool())
+        self.sync_all()
+        assert_equal('waiting', self.nodes[2].gettransaction(expire_transparent)['status'])
+
+        self.nodes[0].generate(TX_EXPIRY_DELTA + TX_EXPIRING_SOON_THRESHOLD)
+        self.sync_all()
+        connect_nodes_bi(self.nodes, 1, 2)
+        sync_blocks(self.nodes[1:3])
+        assert_equal('expired', self.nodes[2].gettransaction(expire_transparent)['status'])
+
+        # Ensure that node 2 has no transparent funds.
+        self.nodes[2].generate(100) # To ensure node 2's pending coinbase is spendable
+        self.sync_all()
+        wait_and_assert_operationid_status(
+            self.nodes[2],
+            self.nodes[2].z_shieldcoinbase("*", node2zaddr, 0)['opid'],
+        )
+        self.sync_all()
+        assert_equal(0, self.nodes[2].getbalance())
+
+        # Check that ANY_TADDR doesn't select an expired output.
+        wait_and_assert_operationid_status(self.nodes[2], self.nodes[2].z_sendmany('ANY_TADDR', [{'address': recipient, 'amount': 13}]), "failed", "Insufficient funds: have 0.00, need 13.00001")
+
 if __name__ == '__main__':
     WalletSendManyAnyTaddr().main()
diff --git a/qa/rpc-tests/wallet_shieldcoinbase.py b/qa/rpc-tests/wallet_shieldcoinbase.py
index ccb1e68a8e9..a7731751ac1 100755
--- a/qa/rpc-tests/wallet_shieldcoinbase.py
+++ b/qa/rpc-tests/wallet_shieldcoinbase.py
@@ -7,21 +7,24 @@
 from test_framework.authproxy import JSONRPCException
 from test_framework.util import assert_equal, initialize_chain_clean, \
     start_node, connect_nodes_bi, sync_blocks, sync_mempools, \
-    wait_and_assert_operationid_status, get_coinbase_address, DEFAULT_FEE
+    wait_and_assert_operationid_status, get_coinbase_address, DEFAULT_FEE, \
+    NU5_BRANCH_ID, nuparams
 
 from decimal import Decimal
 
 class WalletShieldCoinbaseTest (BitcoinTestFramework):
-    def __init__(self, addr_type):
-        super(WalletShieldCoinbaseTest, self).__init__()
-        self.addr_type = addr_type
-
     def setup_chain(self):
         print("Initializing test directory "+self.options.tmpdir)
         initialize_chain_clean(self.options.tmpdir, 4)
 
     def setup_network(self, split=False):
-        args = ['-regtestprotectcoinbase', '-debug=zrpcunsafe']
+        args = [
+            '-regtestprotectcoinbase',
+            '-debug=zrpcunsafe',
+            '-experimentalfeatures',
+            '-orchardwallet',
+            nuparams(NU5_BRANCH_ID, self.nu5_activation),
+        ]
         self.nodes = []
         self.nodes.append(start_node(0, self.options.tmpdir, args))
         self.nodes.append(start_node(1, self.options.tmpdir, args))
@@ -52,11 +55,13 @@ def run_test (self):
         assert_equal(self.nodes[1].getbalance(), 10)
         assert_equal(self.nodes[2].getbalance(), 30)
 
+        # create one zaddr that is the target of all shielding
+        myzaddr = self.test_init_zaddr(self.nodes[0])
+
         do_not_shield_taddr = get_coinbase_address(self.nodes[0], 1)
 
         # Prepare to send taddr->zaddr
         mytaddr = get_coinbase_address(self.nodes[0], 4)
-        myzaddr = self.nodes[0].z_getnewaddress(self.addr_type)
 
         # Shielding will fail when trying to spend from watch-only address
         self.nodes[2].importaddress(mytaddr)
@@ -111,7 +116,7 @@ def run_test (self):
         # Confirm balances and that do_not_shield_taddr containing funds of 10 was left alone
         assert_equal(self.nodes[0].getbalance(), 10)
         assert_equal(self.nodes[0].z_getbalance(do_not_shield_taddr), Decimal('10.0'))
-        assert_equal(self.nodes[0].z_getbalance(myzaddr), Decimal('40.0') - DEFAULT_FEE)
+        self.test_check_balance_zaddr(self.nodes[0], Decimal('40.0') - DEFAULT_FEE)
         assert_equal(self.nodes[1].getbalance(), 20)
         assert_equal(self.nodes[2].getbalance(), 30)
 
@@ -123,7 +128,7 @@ def run_test (self):
         self.sync_all()
 
         assert_equal(self.nodes[0].getbalance(), 10)
-        assert_equal(self.nodes[0].z_getbalance(myzaddr), Decimal('70.0') - DEFAULT_FEE)
+        self.test_check_balance_zaddr(self.nodes[0], Decimal('70.0') - DEFAULT_FEE)
         assert_equal(self.nodes[1].getbalance(), 30)
         assert_equal(self.nodes[2].getbalance(), 0)
 
@@ -151,7 +156,7 @@ def verify_locking(first, second, limit):
             assert_equal(result["remainingUTXOs"], Decimal('0'))
             opid2 = result['opid']
 
-            # wait for both aysnc operations to complete
+            # wait for both async operations to complete
             wait_and_assert_operationid_status(self.nodes[0], opid1)
             wait_and_assert_operationid_status(self.nodes[0], opid2)
 
@@ -185,3 +190,6 @@ def verify_locking(first, second, limit):
         sync_mempools(self.nodes[:2])
         self.nodes[1].generate(1)
         self.sync_all()
+
+# Note, no "if __name__ == '__main__" and call the test here; it's called from
+# pool-specific derived classes in wallet_shieldcoinbase_*.py
\ No newline at end of file
diff --git a/qa/rpc-tests/wallet_shieldcoinbase_sapling.py b/qa/rpc-tests/wallet_shieldcoinbase_sapling.py
index 2e533434952..5e3cc2a3911 100755
--- a/qa/rpc-tests/wallet_shieldcoinbase_sapling.py
+++ b/qa/rpc-tests/wallet_shieldcoinbase_sapling.py
@@ -1,10 +1,22 @@
 #!/usr/bin/env python3
 
-from wallet_shieldcoinbase import WalletShieldCoinbaseTest 
+from wallet_shieldcoinbase import WalletShieldCoinbaseTest
+from test_framework.util import assert_equal
 
 class WalletShieldCoinbaseSapling(WalletShieldCoinbaseTest):
     def __init__(self):
-        super(WalletShieldCoinbaseSapling, self).__init__('sapling')
+        super(WalletShieldCoinbaseSapling, self).__init__()
+        self.nu5_activation = 99999
+
+    def test_init_zaddr(self, node):
+        self.addr = node.z_getnewaddress('sapling')
+        return self.addr
+
+    def test_check_balance_zaddr(self, node, expected):
+        balance = node.z_getbalance(self.addr)
+        assert_equal(balance, expected)
+
 
 if __name__ == '__main__':
+    print("Test shielding to a sapling address")
     WalletShieldCoinbaseSapling().main()
diff --git a/qa/rpc-tests/wallet_shieldcoinbase_sprout.py b/qa/rpc-tests/wallet_shieldcoinbase_sprout.py
index d32201b404a..2e7fc7f7c99 100755
--- a/qa/rpc-tests/wallet_shieldcoinbase_sprout.py
+++ b/qa/rpc-tests/wallet_shieldcoinbase_sprout.py
@@ -1,10 +1,22 @@
 #!/usr/bin/env python3
 
-from wallet_shieldcoinbase import WalletShieldCoinbaseTest 
+from wallet_shieldcoinbase import WalletShieldCoinbaseTest
+from test_framework.util import assert_equal
 
 class WalletShieldCoinbaseSprout(WalletShieldCoinbaseTest):
     def __init__(self):
-        super(WalletShieldCoinbaseSprout, self).__init__('sprout')
+        super(WalletShieldCoinbaseSprout, self).__init__()
+        self.nu5_activation = 99999
+
+    def test_init_zaddr(self, node):
+        self.addr = node.z_getnewaddress('sprout')
+        return self.addr
+
+    def test_check_balance_zaddr(self, node, expected):
+        balance = node.z_getbalance(self.addr)
+        assert_equal(balance, expected)
+
 
 if __name__ == '__main__':
+    print("Test shielding to a sapling address")
     WalletShieldCoinbaseSprout().main()
diff --git a/qa/rpc-tests/wallet_shieldcoinbase_ua_nu5.py b/qa/rpc-tests/wallet_shieldcoinbase_ua_nu5.py
new file mode 100755
index 00000000000..30a7f22fba3
--- /dev/null
+++ b/qa/rpc-tests/wallet_shieldcoinbase_ua_nu5.py
@@ -0,0 +1,44 @@
+#!/usr/bin/env python3
+
+from wallet_shieldcoinbase import WalletShieldCoinbaseTest
+from test_framework.util import assert_equal
+from test_framework.mininode import COIN
+
+class WalletShieldCoinbaseUANU5(WalletShieldCoinbaseTest):
+    def __init__(self):
+        super(WalletShieldCoinbaseUANU5, self).__init__()
+        self.account = None
+        # activate after initial setup, before the first z_shieldcoinbase RPC
+        self.nu5_activation = 109
+
+    def test_init_zaddr(self, node):
+        # this function may be called no more than once
+        assert(self.account is None)
+        self.account = node.z_getnewaccount()['account']
+        self.addr = node.z_getaddressforaccount(self.account)['unifiedaddress']
+        return self.addr
+
+    def test_check_balance_zaddr(self, node, expected):
+        balances = node.z_getbalanceforaccount(self.account)
+        assert('transparent' not in balances['pools'])
+        assert('sprout' not in balances['pools'])
+        # assert('sapling' not in balances['pools'])
+        sapling_balance = balances['pools']['sapling']['valueZat']
+        assert_equal(sapling_balance, expected * COIN)
+        # assert_equal(balances['pools']['orchard']['valueZat'], expected * COIN)
+
+        # While we're at it, check that z_listunspent only shows outputs with
+        # the Unified Address (not the Orchard receiver), and of the expected
+        # type.
+        unspent = node.z_listunspent(1, 999999, False, [self.addr])
+        assert_equal(
+            [{'type': 'sapling', 'address': self.addr} for _ in unspent],
+            [{'type': x['type'], 'address': x['address']} for x in unspent],
+        )
+
+        total_balance = node.z_getbalance(self.addr) * COIN
+        assert_equal(total_balance, sapling_balance)
+
+if __name__ == '__main__':
+    print("Test shielding to a unified address with NU5 activated")
+    WalletShieldCoinbaseUANU5().main()
diff --git a/qa/rpc-tests/wallet_shieldcoinbase_ua_sapling.py b/qa/rpc-tests/wallet_shieldcoinbase_ua_sapling.py
new file mode 100755
index 00000000000..f07ef656ee3
--- /dev/null
+++ b/qa/rpc-tests/wallet_shieldcoinbase_ua_sapling.py
@@ -0,0 +1,42 @@
+#!/usr/bin/env python3
+
+from wallet_shieldcoinbase import WalletShieldCoinbaseTest
+from test_framework.util import assert_equal
+from test_framework.mininode import COIN
+
+class WalletShieldCoinbaseUASapling(WalletShieldCoinbaseTest):
+    def __init__(self):
+        super(WalletShieldCoinbaseUASapling, self).__init__()
+        self.account = None
+        self.nu5_activation = 99999
+
+    def test_init_zaddr(self, node):
+        # this function may be called no more than once
+        assert(self.account is None)
+        self.account = node.z_getnewaccount()['account']
+        self.addr = node.z_getaddressforaccount(self.account)['unifiedaddress']
+        return self.addr
+
+    def test_check_balance_zaddr(self, node, expected):
+        balances = node.z_getbalanceforaccount(self.account)
+        assert('transparent' not in balances['pools'])
+        assert('sprout' not in balances['pools'])
+        sapling_balance = balances['pools']['sapling']['valueZat']
+        assert_equal(sapling_balance, expected * COIN)
+        assert('orchard' not in balances['pools'])
+
+        # While we're at it, check that z_listunspent only shows outputs with
+        # the Unified Address (not the Sapling receiver), and of the expected
+        # type.
+        unspent = node.z_listunspent(1, 999999, False, [self.addr])
+        assert_equal(
+            [{'type': 'sapling', 'address': self.addr} for _ in unspent],
+            [{'type': x['type'], 'address': x['address']} for x in unspent],
+        )
+
+        total_balance = node.z_getbalance(self.addr) * COIN
+        assert_equal(total_balance, sapling_balance)
+
+if __name__ == '__main__':
+    print("Test shielding to a unified address with sapling activated (but not NU5)")
+    WalletShieldCoinbaseUASapling().main()
diff --git a/qa/rpc-tests/wallet_shieldingcoinbase.py b/qa/rpc-tests/wallet_shieldingcoinbase.py
index c6be8fdce53..f8a3b9ed74c 100755
--- a/qa/rpc-tests/wallet_shieldingcoinbase.py
+++ b/qa/rpc-tests/wallet_shieldingcoinbase.py
@@ -61,10 +61,10 @@ def run_test (self):
         assert_equal(self.nodes[2].getbalance(), 0)
         assert_equal(self.nodes[3].getbalance(), 0)
 
-        check_value_pool(self.nodes[0], 'sprout', 0)
-        check_value_pool(self.nodes[1], 'sprout', 0)
-        check_value_pool(self.nodes[2], 'sprout', 0)
-        check_value_pool(self.nodes[3], 'sprout', 0)
+        check_value_pool(self.nodes[0], 'sapling', 0)
+        check_value_pool(self.nodes[1], 'sapling', 0)
+        check_value_pool(self.nodes[2], 'sapling', 0)
+        check_value_pool(self.nodes[3], 'sapling', 0)
 
         # Send will fail because we are enforcing the consensus rule that
         # coinbase utxos can only be sent to a zaddr.
@@ -77,24 +77,31 @@ def run_test (self):
 
         # Prepare to send taddr->zaddr
         mytaddr = get_coinbase_address(self.nodes[0])
-        myzaddr = self.nodes[0].z_getnewaddress('sprout')
+        myzaddr = self.nodes[0].z_getnewaddress('sapling')
 
         # Node 3 will test that watch only address utxos are not selected
         self.nodes[3].importaddress(mytaddr)
         recipients= [{"address":myzaddr, "amount": Decimal('1')}]
-        myopid = self.nodes[3].z_sendmany(mytaddr, recipients)
-
-        wait_and_assert_operationid_status(self.nodes[3], myopid, "failed", "Insufficient transparent funds, no UTXOs found for taddr from address.", 10)
+        try:
+            myopid = self.nodes[3].z_sendmany(mytaddr, recipients)
+        except JSONRPCException as e:
+            errorString = e.error['message']
+        assert_equal("Invalid from address, no payment source found for address.", errorString);
 
-        # This send will fail because our wallet does not allow any change when shielding a coinbase utxo,
-        # as it's currently not possible to specify a change address in z_sendmany.
+        # This send will fail because our consensus does not allow transparent change when 
+        # shielding a coinbase utxo. 
+        # TODO: After upgrading to unified address support, change will be sent to the most
+        # recent shielded spend authority corresponding to the account of the source address
+        # and this send will succeed, causing this test to fail.
         recipients = []
         recipients.append({"address":myzaddr, "amount":Decimal('1.23456789')})
 
         myopid = self.nodes[0].z_sendmany(mytaddr, recipients)
-        error_result = wait_and_assert_operationid_status_result(self.nodes[0], myopid, "failed", ("Change 8.76542211 not allowed. "
-            "When shielding coinbase funds, the wallet does not allow any change "
-            "as there is currently no way to specify a change address in z_sendmany."), 10)
+        error_result = wait_and_assert_operationid_status_result(
+                self.nodes[0], 
+                myopid, "failed", 
+                "When shielding coinbase funds, the wallet does not allow any change. The proposed transaction would result in 8.76542211 in change.", 
+                10)
 
         # Test that the returned status object contains a params field with the operation's input parameters
         assert_equal(error_result["method"], "z_sendmany")
@@ -122,6 +129,7 @@ def run_test (self):
         assert(len(results) == 0)
         results = self.nodes[0].z_listunspent(0) # set minconf to zero
         assert(len(results) == 1)
+        assert_equal(results[0]["type"], "sapling")
         assert_equal(results[0]["address"], myzaddr)
         assert_equal(results[0]["amount"], shieldvalue)
         assert_equal(results[0]["confirmations"], 0)
@@ -133,6 +141,7 @@ def run_test (self):
         # Verify that z_listunspent returns one note which has been confirmed
         results = self.nodes[0].z_listunspent()
         assert(len(results) == 1)
+        assert_equal(results[0]["type"], "sapling")
         assert_equal(results[0]["address"], myzaddr)
         assert_equal(results[0]["amount"], shieldvalue)
         assert_equal(results[0]["confirmations"], 1)
@@ -141,6 +150,7 @@ def run_test (self):
         # Verify that z_listunspent returns note for watchonly address on node 3.
         results = self.nodes[3].z_listunspent(1, 999, True)
         assert(len(results) == 1)
+        assert_equal(results[0]["type"], "sapling")
         assert_equal(results[0]["address"], myzaddr)
         assert_equal(results[0]["amount"], shieldvalue)
         assert_equal(results[0]["confirmations"], 1)
@@ -151,7 +161,7 @@ def run_test (self):
             results = self.nodes[1].z_listunspent(1, 999, False, [myzaddr])
         except JSONRPCException as e:
             errorString = e.error['message']
-        assert_equal("Invalid parameter, spending key for address does not belong to wallet" in errorString, True)
+        assert_equal("Invalid parameter, spending key for an address does not belong to the wallet.", errorString)
 
         # Verify that debug=zrpcunsafe logs params, and that full txid is associated with opid
         initialized_line = check_node_log(self, 0, myopid + ": z_sendmany initialized", False)
@@ -165,8 +175,8 @@ def run_test (self):
         assert_equal(Decimal(resp["total"]), Decimal('40.0') - DEFAULT_FEE)
 
         # The Sprout value pool should reflect the send
-        sproutvalue = shieldvalue
-        check_value_pool(self.nodes[0], 'sprout', sproutvalue)
+        saplingvalue = shieldvalue
+        check_value_pool(self.nodes[0], 'sapling', saplingvalue)
 
         # A custom fee of 0 is okay.  Here the node will send the note value back to itself.
         recipients = []
@@ -181,8 +191,8 @@ def run_test (self):
         assert_equal(Decimal(resp["private"]), Decimal('20.0') - DEFAULT_FEE)
         assert_equal(Decimal(resp["total"]), Decimal('40.0') - DEFAULT_FEE)
 
-        # The Sprout value pool should be unchanged
-        check_value_pool(self.nodes[0], 'sprout', sproutvalue)
+        # The Sapling value pool should be unchanged
+        check_value_pool(self.nodes[0], 'sapling', saplingvalue)
 
         # convert note to transparent funds
         unshieldvalue = Decimal('10.0')
@@ -201,12 +211,12 @@ def run_test (self):
         self.sync_all()
 
         # check balances
-        sproutvalue -= unshieldvalue + DEFAULT_FEE
+        saplingvalue -= unshieldvalue + DEFAULT_FEE
         resp = self.nodes[0].z_gettotalbalance()
         assert_equal(Decimal(resp["transparent"]), Decimal('30.0'))
         assert_equal(Decimal(resp["private"]), Decimal('10.0') - 2*DEFAULT_FEE)
         assert_equal(Decimal(resp["total"]), Decimal('40.0') - 2*DEFAULT_FEE)
-        check_value_pool(self.nodes[0], 'sprout', sproutvalue)
+        check_value_pool(self.nodes[0], 'sapling', saplingvalue)
 
         # z_sendmany will return an error if there is transparent change output considered dust.
         # UTXO selection in z_sendmany sorts in ascending order, so smallest utxos are consumed first.
@@ -215,7 +225,7 @@ def run_test (self):
         amount = Decimal('10.0') - DEFAULT_FEE - Decimal('0.00000001')    # this leaves change at 1 zatoshi less than dust threshold
         recipients.append({"address":self.nodes[0].getnewaddress(), "amount":amount })
         myopid = self.nodes[0].z_sendmany(mytaddr, recipients)
-        wait_and_assert_operationid_status(self.nodes[0], myopid, "failed", "Insufficient transparent funds, have 10.00, need 0.00000053 more to avoid creating invalid change output 0.00000001 (dust threshold is 0.00000054)")
+        wait_and_assert_operationid_status(self.nodes[0], myopid, "failed", "Insufficient funds: have 10.00, need 0.00000053 more to avoid creating invalid change output 0.00000001 (dust threshold is 0.00000054)")
 
         # Send will fail because send amount is too big, even when including coinbase utxos
         errorString = ""
@@ -229,9 +239,9 @@ def run_test (self):
         recipients = []
         recipients.append({"address":self.nodes[1].getnewaddress(), "amount":Decimal('10000.0')})
         myopid = self.nodes[0].z_sendmany(mytaddr, recipients)
-        wait_and_assert_operationid_status(self.nodes[0], myopid, "failed", "Insufficient transparent funds, have 10.00, need 10000.00001")
+        wait_and_assert_operationid_status(self.nodes[0], myopid, "failed", "Insufficient funds: have 10.00, need 10000.00001; note that coinbase outputs will not be selected if you specify ANY_TADDR or if any transparent recipients are included.")
         myopid = self.nodes[0].z_sendmany(myzaddr, recipients)
-        wait_and_assert_operationid_status(self.nodes[0], myopid, "failed", "Insufficient shielded funds, have 9.99998, need 10000.00001")
+        wait_and_assert_operationid_status(self.nodes[0], myopid, "failed", "Insufficient funds: have 9.99998, need 10000.00001; note that coinbase outputs will not be selected if you specify ANY_TADDR or if any transparent recipients are included.")
 
         # Send will fail because of insufficient funds unless sender uses coinbase utxos
         try:
@@ -282,9 +292,9 @@ def run_test (self):
 
         # check balance
         node2balance = amount_per_recipient * num_t_recipients
-        sproutvalue -= node2balance + DEFAULT_FEE
+        saplingvalue -= node2balance + DEFAULT_FEE
         assert_equal(self.nodes[2].getbalance(), node2balance)
-        check_value_pool(self.nodes[0], 'sprout', sproutvalue)
+        check_value_pool(self.nodes[0], 'sapling', saplingvalue)
 
         # Send will fail because fee is negative
         try:
@@ -330,7 +340,7 @@ def run_test (self):
         custom_fee = Decimal('0.00012345')
         zbalance = self.nodes[0].z_getbalance(myzaddr)
         for i in range(0,num_recipients):
-            newzaddr = self.nodes[2].z_getnewaddress('sprout')
+            newzaddr = self.nodes[2].z_getnewaddress('sapling')
             recipients.append({"address":newzaddr, "amount":amount_per_recipient})
         myopid = self.nodes[0].z_sendmany(myzaddr, recipients, minconf, custom_fee)
         wait_and_assert_operationid_status(self.nodes[0], myopid)
@@ -348,8 +358,8 @@ def run_test (self):
 
         resp = self.nodes[0].z_getbalance(myzaddr)
         assert_equal(Decimal(resp), zbalance - custom_fee - send_amount)
-        sproutvalue -= custom_fee
-        check_value_pool(self.nodes[0], 'sprout', sproutvalue)
+        saplingvalue -= custom_fee
+        check_value_pool(self.nodes[0], 'sapling', saplingvalue)
 
         notes = self.nodes[0].z_listunspent(1, 99999, False, [myzaddr])
         sum_of_notes = sum([note["amount"] for note in notes])
diff --git a/qa/rpc-tests/wallet_z_sendmany.py b/qa/rpc-tests/wallet_z_sendmany.py
index 6afc1fe2a16..dd1559305b8 100755
--- a/qa/rpc-tests/wallet_z_sendmany.py
+++ b/qa/rpc-tests/wallet_z_sendmany.py
@@ -4,21 +4,52 @@
 # file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import assert_equal, assert_greater_than, connect_nodes_bi, \
-    DEFAULT_FEE, start_nodes, wait_and_assert_operationid_status
+from test_framework.util import (
+    assert_equal,
+    assert_greater_than,
+    assert_raises_message,
+    connect_nodes_bi,
+    DEFAULT_FEE,
+    start_nodes,
+    wait_and_assert_operationid_status,
+)
 from test_framework.authproxy import JSONRPCException
+from test_framework.mininode import COIN
 from decimal import Decimal
 
 # Test wallet address behaviour across network upgrades
 class WalletZSendmanyTest(BitcoinTestFramework):
     def setup_network(self, split=False):
-        self.nodes = start_nodes(3, self.options.tmpdir)
+        self.nodes = start_nodes(3, self.options.tmpdir, [[
+            '-experimentalfeatures',
+            '-orchardwallet',
+        ]] * self.num_nodes)
         connect_nodes_bi(self.nodes,0,1)
         connect_nodes_bi(self.nodes,1,2)
         connect_nodes_bi(self.nodes,0,2)
         self.is_network_split=False
         self.sync_all()
 
+    # Check we only have balances in the expected pools.
+    # Remember that empty pools are omitted from the output.
+    def _check_balance_for_rpc(self, rpcmethod, node, account, expected, minconf):
+        rpc = getattr(self.nodes[node], rpcmethod)
+        actual = rpc(account, minconf)
+        assert_equal(set(expected), set(actual['pools']))
+        total_balance = 0
+        for pool in expected:
+            assert_equal(expected[pool] * COIN, actual['pools'][pool]['valueZat'])
+            total_balance += expected[pool]
+        assert_equal(actual['minimum_confirmations'], minconf)
+        return total_balance
+
+    def check_balance(self, node, account, address, expected, minconf=1):
+        acct_balance = self._check_balance_for_rpc('z_getbalanceforaccount', node, account, expected, minconf)
+        z_getbalance = self.nodes[node].z_getbalance(address, minconf)
+        assert_equal(acct_balance, z_getbalance)
+        fvk = self.nodes[node].z_exportviewingkey(address)
+        self._check_balance_for_rpc('z_getbalanceforviewingkey', node, fvk, expected, minconf)
+
     def run_test(self):
         # z_sendmany is expected to fail if tx size breaks limit
         myzaddr = self.nodes[0].z_getnewaddress()
@@ -65,8 +96,8 @@ def run_test(self):
         # send node 2 taddr to zaddr
         recipients = []
         recipients.append({"address":myzaddr, "amount":7})
-
-        mytxid = wait_and_assert_operationid_status(self.nodes[2], self.nodes[2].z_sendmany(mytaddr, recipients))
+        opid = self.nodes[2].z_sendmany(mytaddr, recipients)
+        mytxid = wait_and_assert_operationid_status(self.nodes[2], opid)
 
         self.sync_all()
 
@@ -87,13 +118,14 @@ def run_test(self):
         assert_equal(self.nodes[2].getbalance("*"), node2utxobalance)
 
         # check zaddr balance with z_getbalance
-        assert_equal(self.nodes[2].z_getbalance(myzaddr), zsendmanynotevalue)
+        zbalance = zsendmanynotevalue
+        assert_equal(self.nodes[2].z_getbalance(myzaddr), zbalance)
 
         # check via z_gettotalbalance
         resp = self.nodes[2].z_gettotalbalance()
         assert_equal(Decimal(resp["transparent"]), node2utxobalance)
-        assert_equal(Decimal(resp["private"]), zsendmanynotevalue)
-        assert_equal(Decimal(resp["total"]), node2utxobalance + zsendmanynotevalue)
+        assert_equal(Decimal(resp["private"]), zbalance)
+        assert_equal(Decimal(resp["total"]), node2utxobalance + zbalance)
 
         # check confirmed shielded balance with getwalletinfo
         wallet_info = self.nodes[2].getwalletinfo()
@@ -118,7 +150,9 @@ def run_test(self):
         recipients.append({"address":self.nodes[0].getnewaddress(), "amount":1})
         recipients.append({"address":self.nodes[2].getnewaddress(), "amount":1.0})
 
-        wait_and_assert_operationid_status(self.nodes[2], self.nodes[2].z_sendmany(myzaddr, recipients))
+        opid = self.nodes[2].z_sendmany(myzaddr, recipients)
+        wait_and_assert_operationid_status(self.nodes[2], opid)
+        zbalance -= Decimal('2.0') + zsendmanyfee
 
         self.sync_all()
         self.nodes[2].generate(1)
@@ -131,5 +165,225 @@ def run_test(self):
         assert_equal(Decimal(self.nodes[2].getbalance()), node2balance)
         assert_equal(Decimal(self.nodes[2].getbalance("*")), node2balance)
 
+        # Get a new unified account on node 2 & generate a UA
+        n0account0 = self.nodes[0].z_getnewaccount()['account']
+        n0ua0 = self.nodes[0].z_getaddressforaccount(n0account0)['unifiedaddress']
+
+        # Change went to a fresh address, so use `ANY_TADDR` which
+        # should hold the rest of our transparent funds.
+        source = 'ANY_TADDR'
+        recipients = []
+        recipients.append({"address":n0ua0, "amount":10})
+
+        # If we attempt to spend with the default privacy policy, z_sendmany
+        # fails because it needs to spend transparent coins in a transaction
+        # involving a Unified Address.
+        revealed_senders_msg = 'This transaction requires selecting transparent coins, which is not enabled by default because it will publicly reveal transaction senders and amounts. THIS MAY AFFECT YOUR PRIVACY. Resubmit with the `privacyPolicy` parameter set to `AllowRevealedSenders` or weaker if you wish to allow this transaction to proceed anyway.'
+        opid = self.nodes[2].z_sendmany(source, recipients, 1, 0)
+        wait_and_assert_operationid_status(self.nodes[2], opid, 'failed', revealed_senders_msg)
+
+        # We can't create a transaction with an unknown privacy policy.
+        assert_raises_message(
+            JSONRPCException,
+            'Unknown privacy policy name \'ZcashIsAwesome\'',
+            self.nodes[2].z_sendmany,
+            source, recipients, 1, 0, 'ZcashIsAwesome')
+
+        # If we set any policy that does not include AllowRevealedSenders,
+        # z_sendmany also fails.
+        for policy in [
+            'FullPrivacy',
+            'AllowRevealedAmounts',
+            'AllowRevealedRecipients',
+        ]:
+            opid = self.nodes[2].z_sendmany(source, recipients, 1, 0, policy)
+            wait_and_assert_operationid_status(self.nodes[2], opid, 'failed', revealed_senders_msg)
+
+        # By setting the correct policy, we can create the transaction.
+        opid = self.nodes[2].z_sendmany(source, recipients, 1, 0, 'AllowRevealedSenders')
+        wait_and_assert_operationid_status(self.nodes[2], opid)
+
+        self.nodes[2].generate(1)
+        self.sync_all()
+
+        node2balance -= Decimal('10.0')
+        node0balance += Decimal('10.0')
+        assert_equal(Decimal(self.nodes[2].getbalance()), node2balance)
+        assert_equal(Decimal(self.nodes[0].getbalance()), node0balance)
+        self.check_balance(0, 0, n0ua0, {'sapling': 10})
+
+        # Send some funds to a specific legacy taddr that we can spend from
+        recipients = []
+        recipients.append({"address":mytaddr, "amount":5})
+
+        # If we attempt to spend with the default privacy policy, z_sendmany
+        # returns an error because it needs to create a transparent recipient in
+        # a transaction involving a Unified Address.
+        assert_raises_message(
+            JSONRPCException,
+            'AllowRevealedRecipients',
+            self.nodes[0].z_sendmany,
+            n0ua0, recipients, 1, 0)
+
+        # If we set any policy that does not include AllowRevealedRecipients,
+        # z_sendmany also returns an error.
+        for policy in [
+            'FullPrivacy',
+            'AllowRevealedAmounts',
+            'AllowRevealedSenders',
+            'AllowLinkingAccountAddresses',
+        ]:
+            assert_raises_message(
+                JSONRPCException,
+                'AllowRevealedRecipients',
+                self.nodes[0].z_sendmany,
+                n0ua0, recipients, 1, 0, policy)
+
+        # By setting the correct policy, we can create the transaction.
+        opid = self.nodes[0].z_sendmany(n0ua0, recipients, 1, 0, 'AllowRevealedRecipients')
+        wait_and_assert_operationid_status(self.nodes[0], opid)
+
+        self.nodes[0].generate(1)
+        self.sync_all()
+
+        node2balance += Decimal('5.0')
+        self.check_balance(0, 0, n0ua0, {'sapling': 5})
+        assert_equal(Decimal(self.nodes[2].getbalance()), node2balance)
+
+        # Send some funds to a legacy sapling address that we can spend from
+        recipients = []
+        recipients.append({"address":myzaddr, "amount":3})
+        opid = self.nodes[0].z_sendmany(n0ua0, recipients, 1, 0)
+        wait_and_assert_operationid_status(self.nodes[0], opid)
+
+        self.nodes[0].generate(1)
+        self.sync_all()
+
+        zbalance += Decimal('3.0')
+        self.check_balance(0, 0, n0ua0, {'sapling': 2})
+        assert_equal(Decimal(self.nodes[2].z_getbalance(myzaddr)), zbalance)
+
+        # Send funds back from the legacy taddr to the UA. This requires
+        # AllowRevealedSenders, but we can also use any weaker policy that
+        # includes it.
+        recipients = []
+        recipients.append({"address":n0ua0, "amount":4})
+        opid = self.nodes[2].z_sendmany(mytaddr, recipients, 1, 0, 'AllowFullyTransparent')
+        wait_and_assert_operationid_status(self.nodes[2], opid)
+
+        self.nodes[2].generate(1)
+        self.sync_all()
+
+        node2balance -= Decimal('4.0')
+        self.check_balance(0, 0, n0ua0, {'sapling': 6})
+        assert_equal(Decimal(self.nodes[2].getbalance()), node2balance)
+
+        # Send funds back from the legacy zaddr to the UA
+        recipients = []
+        recipients.append({"address":n0ua0, "amount":2})
+        opid = self.nodes[2].z_sendmany(myzaddr, recipients, 1, 0)
+        wait_and_assert_operationid_status(self.nodes[2], opid)
+
+        self.nodes[2].generate(1)
+        self.sync_all()
+
+        zbalance -= Decimal('2.0')
+        self.check_balance(0, 0, n0ua0, {'sapling': 8})
+        assert_equal(Decimal(self.nodes[2].z_getbalance(myzaddr)), zbalance)
+
+        #
+        # Test that z_sendmany avoids UA linkability unless we allow it.
+        #
+
+        # Generate a new account with two new addresses.
+        n1account = self.nodes[1].z_getnewaccount()['account']
+        n1ua0 = self.nodes[1].z_getaddressforaccount(n1account)['unifiedaddress']
+        n1ua1 = self.nodes[1].z_getaddressforaccount(n1account)['unifiedaddress']
+
+        # Send funds to the transparent receivers of both addresses.
+        for ua in [n1ua0, n1ua1]:
+            taddr = self.nodes[1].z_listunifiedreceivers(ua)['transparent']
+            self.nodes[0].sendtoaddress(taddr, 2)
+
+        self.sync_all()
+        self.nodes[2].generate(1)
+        self.sync_all()
+
+        # The account should see all funds.
+        assert_equal(
+            self.nodes[1].z_getbalanceforaccount(n1account)['pools'],
+            {'transparent': {'valueZat': 4 * COIN}},
+        )
+
+        # The addresses should see only the transparent funds sent to them.
+        assert_equal(self.nodes[1].z_getbalance(n1ua0), 2)
+        assert_equal(self.nodes[1].z_getbalance(n1ua1), 2)
+
+        # If we try to send 3 ZEC from n1ua0, it will fail with too-few funds.
+        recipients = [{"address":n0ua0, "amount":3}]
+        linked_addrs_msg = 'Insufficient funds: have 2.00, need 3.00 (This transaction may require selecting transparent coins that were sent to multiple Unified Addresses, which is not enabled by default because it would create a public link between the transparent receivers of these addresses. THIS MAY AFFECT YOUR PRIVACY. Resubmit with the `privacyPolicy` parameter set to `AllowLinkingAccountAddresses` or weaker if you wish to allow this transaction to proceed anyway.)'
+        opid = self.nodes[1].z_sendmany(n1ua0, recipients, 1, 0)
+        wait_and_assert_operationid_status(self.nodes[1], opid, 'failed', linked_addrs_msg)
+
+        # If we try it again with any policy that is too strong, it also fails.
+        for policy in [
+            'FullPrivacy',
+            'AllowRevealedAmounts',
+            'AllowRevealedRecipients',
+            'AllowRevealedSenders',
+            'AllowFullyTransparent',
+        ]:
+            opid = self.nodes[1].z_sendmany(n1ua0, recipients, 1, 0, policy)
+            wait_and_assert_operationid_status(self.nodes[1], opid, 'failed', linked_addrs_msg)
+
+        # Once we provide a sufficiently-weak policy, the transaction succeeds.
+        opid = self.nodes[1].z_sendmany(n1ua0, recipients, 1, 0, 'AllowLinkingAccountAddresses')
+        wait_and_assert_operationid_status(self.nodes[1], opid)
+
+        self.sync_all()
+        self.nodes[2].generate(1)
+        self.sync_all()
+
+        # The account should see the remaining funds, and they should have been
+        # sent to the Sapling change address (because NU5 is not active).
+        assert_equal(
+            self.nodes[1].z_getbalanceforaccount(n1account)['pools'],
+            {'sapling': {'valueZat': 1 * COIN}},
+        )
+
+        # The addresses should both show the same balance, as they both show the
+        # Sapling balance.
+        assert_equal(self.nodes[1].z_getbalance(n1ua0), 1)
+        assert_equal(self.nodes[1].z_getbalance(n1ua1), 1)
+
+        #
+        # Test NoPrivacy policy
+        #
+
+        # Send some legacy transparent funds to n1ua0, creating Sapling outputs.
+        recipients = [{"address":n1ua0, "amount":10}]
+        # This requires the AllowRevealedSenders policy...
+        opid = self.nodes[2].z_sendmany('ANY_TADDR', recipients, 1, 0)
+        wait_and_assert_operationid_status(self.nodes[2], opid, 'failed', revealed_senders_msg)
+        # ... which we can always override with the NoPrivacy policy.
+        opid = self.nodes[2].z_sendmany('ANY_TADDR', recipients, 1, 0, 'NoPrivacy')
+        wait_and_assert_operationid_status(self.nodes[2], opid)
+
+        self.sync_all()
+        self.nodes[2].generate(1)
+        self.sync_all()
+
+        # Send some funds from node 1's account to a transparent address.
+        recipients = [{"address":mytaddr, "amount":5}]
+        # This requires the AllowRevealedRecipients policy...
+        assert_raises_message(
+            JSONRPCException,
+            'AllowRevealedRecipients',
+            self.nodes[1].z_sendmany,
+            n1ua0, recipients, 1, 0)
+        # ... which we can always override with the NoPrivacy policy.
+        opid = self.nodes[1].z_sendmany(n1ua0, recipients, 1, 0, 'NoPrivacy')
+        wait_and_assert_operationid_status(self.nodes[1], opid)
+
 if __name__ == '__main__':
     WalletZSendmanyTest().main()
diff --git a/qa/rpc-tests/walletbackup.py b/qa/rpc-tests/walletbackup.py
index 463fe63b05e..ee2f8846052 100755
--- a/qa/rpc-tests/walletbackup.py
+++ b/qa/rpc-tests/walletbackup.py
@@ -96,10 +96,10 @@ def do_one_round(self):
         self.sync_all()
 
     # As above, this mirrors the original bash test.
-    def start_three(self):
-        self.nodes[0] = start_node(0, self.options.tmpdir)
-        self.nodes[1] = start_node(1, self.options.tmpdir)
-        self.nodes[2] = start_node(2, self.options.tmpdir)
+    def start_three(self, extra_args=None):
+        self.nodes[0] = start_node(0, self.options.tmpdir, extra_args)
+        self.nodes[1] = start_node(1, self.options.tmpdir, extra_args)
+        self.nodes[2] = start_node(2, self.options.tmpdir, extra_args)
         connect_nodes(self.nodes[0], 3)
         connect_nodes(self.nodes[1], 3)
         connect_nodes(self.nodes[2], 3)
@@ -191,6 +191,29 @@ def run_test(self):
         self.start_three()
         sync_blocks(self.nodes)
 
+        # We made extra transactions that involved addresses generated after the
+        # backups were taken, and external addresses do not use the keypool, so
+        # the balances shouldn't line up.
+        balance0backup = self.nodes[0].getbalance()
+        balance1backup = self.nodes[1].getbalance()
+        balance2backup = self.nodes[2].getbalance()
+        assert(balance0backup != balance0)
+        assert(balance1backup != balance1)
+        assert(balance2backup != balance2)
+
+        # However, because addresses are derived deterministically, we can
+        # recover the balances by generating the extra addresses and then
+        # rescanning.
+        for i in range(5):
+            self.nodes[0].getnewaddress()
+            self.nodes[1].getnewaddress()
+            self.nodes[2].getnewaddress()
+
+        logging.info("Re-starting nodes with -rescan")
+        self.stop_three()
+        self.start_three(['-rescan'])
+        sync_blocks(self.nodes)
+
         assert_equal(self.nodes[0].getbalance(), balance0)
         assert_equal(self.nodes[1].getbalance(), balance1)
         assert_equal(self.nodes[2].getbalance(), balance2)
@@ -215,9 +238,9 @@ def run_test(self):
 
         sync_blocks(self.nodes)
 
-        assert_equal(self.nodes[0].getbalance(), balance0)
-        assert_equal(self.nodes[1].getbalance(), balance1)
-        assert_equal(self.nodes[2].getbalance(), balance2)
+        assert_equal(self.nodes[0].getbalance(), balance0backup)
+        assert_equal(self.nodes[1].getbalance(), balance1backup)
+        assert_equal(self.nodes[2].getbalance(), balance2backup)
 
 
 if __name__ == '__main__':
diff --git a/qa/rpc-tests/zapwallettxes.py b/qa/rpc-tests/zapwallettxes.py
index 9985eb89b44..1f02234dbf8 100755
--- a/qa/rpc-tests/zapwallettxes.py
+++ b/qa/rpc-tests/zapwallettxes.py
@@ -75,7 +75,7 @@ def run_test (self):
             print(e)
             aException = True
 
-        assert_equal(aException, True) # there must be a expection because the unconfirmed wallettx0 must be gone by now
+        assert_equal(aException, True) # there must be an exception because the unconfirmed wallet tx0 must be gone by now
 
         tx0 = self.nodes[0].gettransaction(txid0)
         assert_equal(tx0['txid'], txid0) # tx0 (confirmed) must still be available because it was confirmed
diff --git a/qa/zcash/checksec.sh b/qa/zcash/checksec.sh
index ba382062724..be594ea6193 100755
--- a/qa/zcash/checksec.sh
+++ b/qa/zcash/checksec.sh
@@ -39,7 +39,7 @@
 # Name    : checksec.sh
 # Version : 1.7.0
 # Author  : Brian Davis
-# Date    : Feburary 2014
+# Date    : February 2014
 # Download: https://github.com/slimm609/checksec.sh
 #
 # --- Modified Version ---
@@ -298,9 +298,9 @@ echo_message() {
 # check selinux status
 getsestatus() {
   local status
-  ${debug} && echo -e "\n***fuction getsestatus"
+  ${debug} && echo -e "\n***function getsestatus"
   if (command_exists getenforce); then
-    ${debug} && echo "***fuction getsestatus->getenforce"
+    ${debug} && echo "***function getsestatus->getenforce"
     sestatus=$(getenforce)
     if [[ "${sestatus}" == "Disabled" ]]; then
       status=0
@@ -310,7 +310,7 @@ getsestatus() {
       status=2
     fi
   elif (command_exists sestatus); then
-    ${debug} && echo "***fuction getsestatus->sestatus"
+    ${debug} && echo "***function getsestatus->sestatus"
     sestatus=$(sestatus | grep "SELinux status" | awk '{ print $3}')
     if [[ "${sestatus}" == "disabled" ]]; then
       status=0
@@ -328,7 +328,7 @@ return ${status}
 
 # check if directory exists
 dir_exists () {
-  ${debug} && echo "fuction dir_exists"
+  ${debug} && echo "function dir_exists"
   if [[ -d "${1}" ]] ; then
     return 0
   else
@@ -842,7 +842,7 @@ kernelcheck() {
   fi
 
   echo_message "  Kernel heap randomization:              " "" "" ""
-  # NOTE: y means it turns off kernel heap randomization for backwards compatability (libc5)
+  # NOTE: y means it turns off kernel heap randomization for backwards compatibility (libc5)
   if ${kconfig} | grep -qi 'CONFIG_COMPAT_BRK=y'; then
     echo_message "\033[31mDisabled\033[m\n" "Disabled," " kernel_heap_randomization='no'" ', "kernel_heap_randomization":"no"'
   else
@@ -1123,7 +1123,7 @@ kernelcheck() {
   sestatus=$?
   if [[ ${sestatus} == 0 ]]; then
       echo_message "\033[31mDisabled\033[m\n" "Disabled,," "    <selinux enabled='no'" '"selinux":{ "enabled":"no"'
-      echo_message "\n  SELinux infomation available here: \n" "" "" ""
+      echo_message "\n  SELinux information available here: \n" "" "" ""
       echo_message "    https://selinuxproject.org/\n" "" "" ""
   elif [[ ${sestatus} == 1 ]]; then
       echo_message "\033[33mPermissive\033[m\n" "Permissive," "    <selinux enabled='yes' mode='permissive'" '"selinux":{ "enabled":"yes", "mode":"permissive"'
@@ -1132,7 +1132,7 @@ kernelcheck() {
   fi
   else
     echo_message "\033[31mNo SELinux\033[m\n" "Disabled,," "    <selinux enabled='no'" '"selinux":{ "enabled":"no"'
-    echo_message "\n  SELinux infomation available here: \n" "" "" ""
+    echo_message "\n  SELinux information available here: \n" "" "" ""
     echo_message "    https://selinuxproject.org/\n" "" "" ""
   fi
 
diff --git a/qa/zcash/full_test_suite.py b/qa/zcash/full_test_suite.py
index 173e07f0928..fd67a694593 100755
--- a/qa/zcash/full_test_suite.py
+++ b/qa/zcash/full_test_suite.py
@@ -46,6 +46,17 @@ def get_arch_dir():
 RE_FORTIFY_AVAILABLE = re.compile('FORTIFY_SOURCE support available.*Yes')
 RE_FORTIFY_USED = re.compile('Binary compiled with FORTIFY_SOURCE support.*Yes')
 
+CXX_BINARIES = [
+    'src/zcashd',
+    'src/zcash-cli',
+    'src/zcash-gtest',
+    'src/zcash-tx',
+    'src/test/test_bitcoin',
+]
+RUST_BINARIES = [
+    'src/zcashd-wallet-tool',
+]
+
 def test_rpath_runpath(filename):
     output = subprocess.check_output(
         [repofile('qa/zcash/checksec.sh'), '--file=' + repofile(filename)]
@@ -86,21 +97,14 @@ def check_security_hardening():
         if not magic.startswith(b'\x7fELF'):
             return ret
 
-    ret &= test_rpath_runpath('src/zcashd')
-    ret &= test_rpath_runpath('src/zcash-cli')
-    ret &= test_rpath_runpath('src/zcash-gtest')
-    ret &= test_rpath_runpath('src/zcash-tx')
-    ret &= test_rpath_runpath('src/test/test_bitcoin')
+    for bin in CXX_BINARIES + RUST_BINARIES:
+        ret &= test_rpath_runpath(bin)
 
     # NOTE: checksec.sh does not reliably determine whether FORTIFY_SOURCE
     # is enabled for the entire binary. See issue #915.
-    # FORTIFY_SOURCE does mostly nothing for Clang before 10, which we don't
-    # pin yet, so we disable these tests.
-    # ret &= test_fortify_source('src/zcashd')
-    # ret &= test_fortify_source('src/zcash-cli')
-    # ret &= test_fortify_source('src/zcash-gtest')
-    # ret &= test_fortify_source('src/zcash-tx')
-    # ret &= test_fortify_source('src/test/test_bitcoin')
+    # FORTIFY_SOURCE is not applicable to Rust binaries.
+    for bin in CXX_BINARIES:
+        ret &= test_fortify_source(bin)
 
     return ret
 
diff --git a/qa/zcash/postponed-updates.txt b/qa/zcash/postponed-updates.txt
index b3878d21213..c4732b96a81 100644
--- a/qa/zcash/postponed-updates.txt
+++ b/qa/zcash/postponed-updates.txt
@@ -5,27 +5,25 @@
 #
 
 # Ccache 4.0 requires adding CMake to the depends system.
-native_ccache 4.0 2021-09-01
-native_ccache 4.1 2021-09-01
-native_ccache 4.2 2021-09-01
-native_ccache 4.2.1 2021-09-01
-native_ccache 4.3 2021-09-01
+native_ccache 4.0 2022-05-01
+native_ccache 4.1 2022-05-01
+native_ccache 4.2 2022-05-01
+native_ccache 4.2.1 2022-05-01
+native_ccache 4.3 2022-05-01
+native_ccache 4.4 2022-05-01
+native_ccache 4.4.1 2022-05-01
+native_ccache 4.4.2 2022-05-01
+native_ccache 4.5 2022-05-01
+native_ccache 4.5.1 2022-05-01
+native_ccache 4.6 2022-05-01
 
-# Clang is currently pinned to LLVM 12
+# Clang is currently pinned to LLVM 13
 
-# Rust is currently pinned to 1.54.0
+# Rust is currently pinned to 1.59.0
 
-bdb 18.1.40 2022-02-01
-
-# Boost 1.75 starts using the statx syscall where available, which causes
-# permission errors in some environments.
-# https://github.com/zcash/zcash/issues/4945
-# native_b2 is pinned to the same version as Boost.
-boost 1.75.0 2021-09-01
-boost 1.76.0 2021-09-01
-native_b2 1.75.0 2021-09-01
-native_b2 1.76.0 2021-09-01
+# We're never updating to this version
+bdb 18.1.40 2024-02-01
 
 # Google Test 1.10.0 requires adding CMake to the depends system.
-googletest 1.10.0 2021-09-01
-googletest 1.11.0 2021-09-01
+googletest 1.10.0 2022-05-01
+googletest 1.11.0 2022-05-01
diff --git a/qa/zcash/smoke_tests.py b/qa/zcash/smoke_tests.py
index 9298873a719..6d3749ab403 100755
--- a/qa/zcash/smoke_tests.py
+++ b/qa/zcash/smoke_tests.py
@@ -2,6 +2,12 @@
 #
 # Execute the standard smoke tests for Zcash releases.
 #
+# Usage:
+#
+# ZCASHD=./src/zcashd ZCASHCLI=./src/zcash-cli ./qa/zcash/smoke_tests.py --wallet=wallet.smoketest.dat "$HOME/.zcash"
+# 
+# ZCASHD=./src/zcashd ZCASHCLI=./src/zcash-cli ./qa/zcash/smoke_tests.py --wallet=wallet.smoketest.dat "$HOME/.zcash" --automate --use-faucet
+#
 
 import argparse
 import datetime
@@ -36,49 +42,49 @@
     ('2a', True, True), # Run getinfo
     ('2b', True, True), # Run help
     # Address generation
-    ('3a', True, True), # Generate a Sprout z-addr
-    ('3b', True, True), # Generate multiple Sprout z-addrs
+    #('3a', True, True), # Generate a Sprout z-addr
+    #('3b', True, True), # Generate multiple Sprout z-addrs
     ('3c', True, True), # Generate a t-addr
     ('3d', True, True), # Generate multiple t-addrs
     ('3e', True, True), # Generate a Sapling z-addr
     ('3f', True, True), # Generate multiple Sapling z-addrs
     # Transactions
-    ('4a', True,  True ), # Send funds from Sprout z-addr to same Sprout z-addr
-    ('4b', True,  True ), # Send funds from Sprout z-addr to a different Sprout z-addr
-    ('4c', True,  True ), # Send funds from Sprout z-addr to a t-addr
-    ('4d', False,  False ), # Send funds from t-addr to Sprout z-addr(expected fail as of Canopy)
+    #('4a', True,  True ), # Send funds from Sprout z-addr to same Sprout z-addr
+    #('4b', True,  True ), # Send funds from Sprout z-addr to a different Sprout z-addr
+    #('4c', True,  True ), # Send funds from Sprout z-addr to a t-addr
+    #('4d', False,  False ), # Send funds from t-addr to Sprout z-addr(expected fail as of Canopy)
     ('4e', True,  True ), # Send funds from t-addr to t-addr
     ('4f', True,  True ), # Send funds from t-addr to Sapling z-addr
     ('4g', True,  True ), # Send funds from Sapling z-addr to same Sapling z-addr
     ('4h', True,  True ), # Send funds from Sapling z-addr to a different Sapling z-addr
     ('4i', True,  True ), # Send funds from Sapling z-addr to a t-addr
-    ('4j', False, False), # Send funds from Sprout z-addr to Sapling z-addr
-    ('4k', True,  True ), # Send funds from Sprout z-addr to multiple Sprout z-addrs
-    ('4l', True,  True ), # Send funds from Sprout z-addr to multiple t-addrs
-    ('4m', True,  True ), # Send funds from Sprout z-addr to t-addr and Sprout z-addrs
-    ('4n', False, False), # Send funds from Sprout z-addr to t-addr and Sapling z-addr
-    ('4o', False, False), # Send funds from Sprout z-addr to multiple Sapling z-addrs
+    #('4j', False, False), # Send funds from Sprout z-addr to Sapling z-addr
+    #('4k', True,  True ), # Send funds from Sprout z-addr to multiple Sprout z-addrs
+    #('4l', True,  True ), # Send funds from Sprout z-addr to multiple t-addrs
+    #('4m', True,  True ), # Send funds from Sprout z-addr to t-addr and Sprout z-addrs
+    #('4n', False, False), # Send funds from Sprout z-addr to t-addr and Sapling z-addr
+    #('4o', False, False), # Send funds from Sprout z-addr to multiple Sapling z-addrs
     ('4p', True,  True ), # Send funds from t-addr to multiple t-addrs
-    ('4q', False,  False ), # Send funds from t-addr to multiple Sprout z-addrs(expected fail as of Canopy)
+    #('4q', False,  False ), # Send funds from t-addr to multiple Sprout z-addrs(expected fail as of Canopy)
     ('4r', True,  True ), # Send funds from t-addr to multiple Sapling z-addrs
-    ('4s', False, False), # Send funds from t-addr to Sprout z-addr and Sapling z-addr
+    #('4s', False, False), # Send funds from t-addr to Sprout z-addr and Sapling z-addr
     ('4t', True,  True ), # Send funds from Sapling z-addr to multiple Sapling z-addrs
-    ('4u', False, False), # Send funds from Sapling z-addr to multiple Sprout z-addrs
+    #('4u', False, False), # Send funds from Sapling z-addr to multiple Sprout z-addrs
     ('4v', True,  True ), # Send funds from Sapling z-addr to multiple t-addrs
     ('4w', True,  True ), # Send funds from Sapling z-addr to t-addr and Sapling z-addr
-    ('4x', False, False), # Send funds from Sapling z-addr to Sapling z-addr and Sprout z-addr
-    ('4y', False,  False ), # Send funds from t-addr to Sprout z-addr using z_mergetoaddress(expected fail as of Canopy)
-    ('4z', False,  False ), # Send funds from 2 different t-addrs to Sprout z-addr using z_mergetoaddress(expected fail as of Canopy)
-    ('4aa', False, False), # Send funds from the same 2 t-addrs to Sprout z-addr using z_mergetoaddress
+    #('4x', False, False), # Send funds from Sapling z-addr to Sapling z-addr and Sprout z-addr
+    #('4y', False,  False ), # Send funds from t-addr to Sprout z-addr using z_mergetoaddress(expected fail as of Canopy)
+    #('4z', False,  False ), # Send funds from 2 different t-addrs to Sprout z-addr using z_mergetoaddress(expected fail as of Canopy)
+    #('4aa', False, False), # Send funds from the same 2 t-addrs to Sprout z-addr using z_mergetoaddress
     ('4bb', True,  True ), # Send funds from 2 different t-addrs to Sapling z-addr using z_mergetoaddress
     ('4cc', True,  True ), # Send funds from t-addr to Sapling z-addr using z_mergetoaddress
-    ('4dd', False,  False ), # Send funds from t-addr and Sprout z-addr to Sprout z-addr using z_mergetoaddress(expected fail as of Canopy)
+    #('4dd', False,  False ), # Send funds from t-addr and Sprout z-addr to Sprout z-addr using z_mergetoaddress(expected fail as of Canopy)
     ('4ee', True,  True ), # Send funds from t-addr and Sapling z-addr to Sapling z-addr using z_mergetoaddress
-    ('4ff', True,  True ), # Send funds from Sprout z-addr and Sprout z-addr to Sprout z-addr using z_mergetoaddress
+    #('4ff', True,  True ), # Send funds from Sprout z-addr and Sprout z-addr to Sprout z-addr using z_mergetoaddress
     ('4gg', True,  True ), # Send funds from  Sapling z-addr and Sapling z-addr to Sapling z-addr using z_mergetoaddress
     # Wallet
     ('5a', True, True), # After generating multiple z-addrs, run z_listaddresses
-    ('5b', True, True), # Run z_validateaddress with a Sprout z-addr
+    #('5b', True, True), # Run z_validateaddress with a Sprout z-addr
     ('5c', True, True), # Run z_validateaddress with a Sapling z-addr
     ('5d', True, True), # After a transaction, run z_listunspent
     ('5e', True, True), # After a transaction, run z_listreceivedbyaddress
@@ -166,6 +172,8 @@ def wait_for_balance(zcash, zaddr, expected=None):
                     ttl = 300
 
 def wait_and_check_balance(results, case, zcash, addr, expected):
+    #Wait for async call to finish and persist completely to caller
+    time.sleep(5)
     balance = wait_for_balance(zcash, addr, expected)
     if balance != expected and results is not None and len(case) > 0:
         results[case] = False
@@ -308,9 +316,6 @@ def transaction_chain(zcash):
     results = {}
 
     # Generate the various addresses we will use
-    sprout_zaddr_1 = run_cmd(results, '3a', zcash, 'z_getnewaddress', ['sprout'])
-    sprout_zaddr_2 = run_cmd(results, '3b', zcash, 'z_getnewaddress', ['sprout'])
-    sprout_zaddr_3 = run_cmd(results, '3b', zcash, 'z_getnewaddress', ['sprout'])
     taddr_1 = run_cmd(results, '3c', zcash, 'getnewaddress')
     taddr_2 = run_cmd(results, '3d', zcash, 'getnewaddress')
     taddr_3 = run_cmd(results, '3d', zcash, 'getnewaddress')
@@ -322,17 +327,11 @@ def transaction_chain(zcash):
 
     # Check that the zaddrs are all listed
     zaddrs = run_cmd(results, '5a', zcash, 'z_listaddresses')
-    if (sprout_zaddr_1 not in zaddrs or
-            sprout_zaddr_2 not in zaddrs or
-            sapling_zaddr_1 not in zaddrs or
+    if ( sapling_zaddr_1 not in zaddrs or
             sapling_zaddr_2 not in zaddrs):
         results['5a'] = False
 
     # Validate the addresses
-    ret = run_cmd(results, '5b', zcash, 'z_validateaddress', [sprout_zaddr_1])
-    if not ret['isvalid'] or ret['type'] != 'sprout':
-        results['5b'] = False
-
     ret = run_cmd(results, '5c', zcash, 'z_validateaddress', [sapling_zaddr_1])
     if not ret['isvalid'] or ret['type'] != 'sapling':
         results['5c'] = False
@@ -345,7 +344,7 @@ def transaction_chain(zcash):
     if zcash.use_faucet:
         print('Tapping the testnet faucet for testing funds...')
         chain_end = get_zfaucet_taddr()
-        tap_zfaucet(sprout_zaddr_1)
+        tap_zfaucet(taddr_1)
         print('Done! Leftover funds will be sent back to the faucet.')
     else:
         chain_end = input('Type or paste transparent address where leftover funds should be sent: ')
@@ -354,14 +353,14 @@ def transaction_chain(zcash):
             return results
         print()
         print('Please send at least 0.01 ZEC/TAZ to the following address:')
-        print(sprout_zaddr_1)
+        print(taddr_1)
         print()
         input('Press Enter once the funds have been sent.')
     print()
 
     # Wait to receive starting balance
-    sprout_balance = wait_for_balance(zcash, sprout_zaddr_1)
-    starting_balance = sprout_balance
+    taddr_balance = wait_for_balance(zcash, taddr_1)
+    starting_balance = taddr_balance
 
     #
     # Start the transaction chain!
@@ -372,19 +371,6 @@ def transaction_chain(zcash):
     print('#')
     print()
     try:
-        #
-        # First, split the funds across all three pools
-        #
-
-        # Sprout -> taddr
-        taddr_balance = check_z_sendmany(
-            results, '4c', zcash, sprout_zaddr_1, [(taddr_1, (starting_balance / Decimal('10')) * Decimal('6'))])[0]
-        sprout_balance -= taddr_balance + DEFAULT_FEE
-
-        balance = Decimal(run_cmd(results, '5f', zcash, 'z_getbalance', [sprout_zaddr_1])).quantize(Decimal('1.00000000'))
-        if balance != sprout_balance:
-            results['5f'] = False
-
         # taddr -> Sapling
         # Send it all here because z_sendmany pick a new t-addr for change
         sapling_balance = check_z_sendmany(
@@ -400,30 +386,20 @@ def transaction_chain(zcash):
         # Intra-pool tests
         #
 
-        # Sprout -> same Sprout
         # Sapling -> same Sapling
-        (sprout_balance, sapling_balance) = check_z_sendmany_parallel(results, zcash, [
-            ('4a', sprout_zaddr_1, [(sprout_zaddr_1, sprout_balance - DEFAULT_FEE)]),
-            ('4g', sapling_zaddr_1, [(sapling_zaddr_1, sapling_balance - DEFAULT_FEE)]),
-        ])
+        sapling_balance = check_z_sendmany(
+            results, '4g',zcash, sapling_zaddr_1, [(sapling_zaddr_1, sapling_balance - DEFAULT_FEE)])[0]
 
-        # Sprout -> different Sprout
         # taddr -> different taddr
         # Sapling -> different Sapling
-        (sprout_balance, taddr_balance, sapling_balance) = check_z_sendmany_parallel(results, zcash, [
-            ('4b', sprout_zaddr_1, [(sprout_zaddr_2, sprout_balance - DEFAULT_FEE)]),
+        (taddr_balance, sapling_balance) = check_z_sendmany_parallel(results, zcash, [
             ('4e', taddr_1, [(taddr_2, taddr_balance - DEFAULT_FEE)]),
             ('4h', sapling_zaddr_1, [(sapling_zaddr_2, sapling_balance - DEFAULT_FEE)]),
         ])
 
-        # Sprout -> multiple Sprout
         # taddr -> multiple taddr
         # Sapling -> multiple Sapling
         check_z_sendmany_parallel(results, zcash, [
-            ('4k', sprout_zaddr_2, [
-                (sprout_zaddr_1, starting_balance / Decimal('10')),
-                (sprout_zaddr_3, starting_balance / Decimal('10')),
-            ]),
             ('4p', taddr_2, [
                 (taddr_1, starting_balance / Decimal('10')),
                 (taddr_3, taddr_balance - (starting_balance / Decimal('10')) - DEFAULT_FEE),
@@ -433,195 +409,75 @@ def transaction_chain(zcash):
                 (sapling_zaddr_3, starting_balance / Decimal('10')),
             ]),
         ])
-        sprout_balance -= DEFAULT_FEE
+
         taddr_balance -= DEFAULT_FEE
         sapling_balance -= DEFAULT_FEE
 
-        # multiple Sprout -> Sprout
         # multiple Sapling -> Sapling
         # multiple taddr -> taddr
         check_z_mergetoaddress_parallel(results, zcash, [
-            ('4ff', [sprout_zaddr_1, sprout_zaddr_3], sprout_zaddr_2, sprout_balance - DEFAULT_FEE),
             ('4gg', [sapling_zaddr_1, sapling_zaddr_3], sapling_zaddr_2, sapling_balance - DEFAULT_FEE),
             ('', [taddr_1, taddr_3], taddr_2, taddr_balance - DEFAULT_FEE),
         ])
-        sprout_balance -= DEFAULT_FEE
         sapling_balance -= DEFAULT_FEE
         taddr_balance -= DEFAULT_FEE
 
-        #
-        # Now test a bunch of failing cases
-        #
-
-        # Sprout -> Sapling
-        txid = z_sendmany(results, '4j', zcash, sprout_zaddr_2, [(sapling_zaddr_1, sprout_balance - DEFAULT_FEE)])
-        if txid is not None:
-            print('Should have failed')
-            return results
-
-        # Sprout -> taddr and Sapling
-        txid = z_sendmany(results, '4n', zcash, sprout_zaddr_2, [
-            (taddr_2, starting_balance / Decimal('10')),
-            (sapling_zaddr_1, starting_balance / Decimal('10')),
-        ])
-        if txid is not None:
-            print('Should have failed')
-            return results
-
-        # Sprout -> multiple Sapling
-        txid = z_sendmany(results, '4o', zcash, sprout_zaddr_2, [
-            (sapling_zaddr_1, starting_balance / Decimal('10')),
-            (sapling_zaddr_2, starting_balance / Decimal('10')),
-        ])
-        if txid is not None:
-            print('Should have failed')
-            return results
-
-        # taddr -> Sprout and Sapling
-        txid = z_sendmany(results, '4s', zcash, taddr_2, [
-            (sprout_zaddr_1, starting_balance / Decimal('10')),
-            (sapling_zaddr_1, starting_balance / Decimal('10')),
-        ])
-        if txid is not None:
-            print('Should have failed')
-            return results
-
-        # Sapling -> multiple Sprout
-        txid = z_sendmany(results, '4u', zcash, sapling_zaddr_2, [
-            (sprout_zaddr_1, starting_balance / Decimal('10')),
-            (sprout_zaddr_2, starting_balance / Decimal('10')),
-        ])
-        if txid is not None:
-            print('Should have failed')
-            return results
-
-        # Sapling -> Sapling and Sprout
-        txid = z_sendmany(results, '4x', zcash, sapling_zaddr_2, [
-            (sapling_zaddr_1, starting_balance / Decimal('10')),
-            (sprout_zaddr_1, starting_balance / Decimal('10')),
-        ])
-        if txid is not None:
-            print('Should have failed')
-            return results
-
-        # multiple same taddr -> Sprout
-        txid = z_mergetoaddress(results, '4aa', zcash, [taddr_2, taddr_2], sprout_zaddr_2)
-        if txid is not None:
-            print('Should have failed')
-            return results
-
         #
         # Inter-pool tests
         #
 
-        # Sprout -> taddr and Sprout
         # Sapling -> taddr and Sapling
-        check_z_sendmany_parallel(results, zcash, [
-            ('4m', sprout_zaddr_2, [
-                (taddr_1, starting_balance / Decimal('10')),
-                (sprout_zaddr_1, starting_balance / Decimal('10')),
-            ]),
-            ('4w', sapling_zaddr_2, [
+        check_z_sendmany(
+            results, '4w', zcash,  sapling_zaddr_2,[
                 (taddr_3, starting_balance / Decimal('10')),
-                (sapling_zaddr_1, starting_balance / Decimal('10')),
-            ]),
-        ])
-        sprout_balance -= (starting_balance / Decimal('10')) + DEFAULT_FEE
+                (sapling_zaddr_1, starting_balance / Decimal('10'))])[0]
+        
         sapling_balance -= (starting_balance / Decimal('10')) + DEFAULT_FEE
-        taddr_balance += (starting_balance / Decimal('10')) * Decimal('2')
+        taddr_balance += starting_balance / Decimal('10')
 
-        # taddr and Sprout -> Sprout
         # taddr and Sapling -> Sapling
-        check_z_mergetoaddress_parallel(results, zcash, [
-            ('4dd', [taddr_1, sprout_zaddr_1], sprout_zaddr_2, sprout_balance + (starting_balance / Decimal('10')) - DEFAULT_FEE),
-            ('4ee', [taddr_3, sapling_zaddr_1], sapling_zaddr_2, sapling_balance + (starting_balance / Decimal('10')) - DEFAULT_FEE),
-        ])
-        sprout_balance += (starting_balance / Decimal('10')) - DEFAULT_FEE
+        check_z_mergetoaddress(results, '4ee', zcash, [taddr_3, sapling_zaddr_1], sapling_zaddr_2, sapling_balance + (starting_balance / Decimal('10')) - DEFAULT_FEE)
+    
         sapling_balance += (starting_balance / Decimal('10')) - DEFAULT_FEE
-        taddr_balance -= (starting_balance / Decimal('10')) * Decimal('2')
+        taddr_balance -= starting_balance / Decimal('10')
 
-        # Sprout -> multiple taddr
         # Sapling -> multiple taddr
-        check_z_sendmany_parallel(results, zcash, [
-            ('4l', sprout_zaddr_2, [
-                (taddr_1, (starting_balance / Decimal('10'))),
-                (taddr_3, (starting_balance / Decimal('10'))),
-            ]),
-            ('4v', sapling_zaddr_2, [
+        check_z_sendmany(results, '4v', zcash, sapling_zaddr_2, [
                 (taddr_4, (starting_balance / Decimal('10'))),
-                (taddr_5, (starting_balance / Decimal('10'))),
-            ]),
-        ])
-        sprout_balance -= ((starting_balance / Decimal('10')) * Decimal('2')) + DEFAULT_FEE
+                (taddr_5, (starting_balance / Decimal('10')))])[0]
+            
         sapling_balance -= ((starting_balance / Decimal('10')) * Decimal('2')) + DEFAULT_FEE
-        taddr_balance += (starting_balance / Decimal('10')) * Decimal('4')
+        taddr_balance += (starting_balance / Decimal('10')) * Decimal('2')
 
-        # multiple taddr -> Sprout
         # multiple taddr -> Sapling
-        check_z_mergetoaddress_parallel(results, zcash, [
-            ('4z', [taddr_1, taddr_3], sprout_zaddr_2, sprout_balance + ((starting_balance / Decimal('10')) * Decimal('2')) - DEFAULT_FEE),
-            ('4bb', [taddr_4, taddr_5], sapling_zaddr_2, sapling_balance + ((starting_balance / Decimal('10')) * Decimal('2')) - DEFAULT_FEE),
-        ])
-        sprout_balance += ((starting_balance / Decimal('10')) * Decimal('2')) - DEFAULT_FEE
+        check_z_mergetoaddress(results, '4bb',zcash, [taddr_4, taddr_5], sapling_zaddr_2, sapling_balance + ((starting_balance / Decimal('10')) * Decimal('2')) - DEFAULT_FEE)
         sapling_balance += ((starting_balance / Decimal('10')) * Decimal('2')) - DEFAULT_FEE
-        taddr_balance -= (starting_balance / Decimal('10')) * Decimal('4')
-
-        # taddr -> Sprout
-        check_z_sendmany_parallel(results, zcash, [
-            ('4d', taddr_2, [(sprout_zaddr_3, taddr_balance - DEFAULT_FEE)]),
-        ])
-        sprout_balance += taddr_balance - DEFAULT_FEE
-        taddr_balance = Decimal('0')
+        taddr_balance -= (starting_balance / Decimal('10')) * Decimal('2')
 
-        # multiple Sprout -> taddr
         # multiple Sapling -> taddr
-        check_z_mergetoaddress_parallel(None, zcash, [
-            ('', [sprout_zaddr_1, sprout_zaddr_2, sprout_zaddr_3], taddr_1, sprout_balance - DEFAULT_FEE),
-            ('', [sapling_zaddr_1, sapling_zaddr_2, sapling_zaddr_3], taddr_2, sapling_balance - DEFAULT_FEE),
-        ])
-        taddr_balance = sprout_balance + sapling_balance - (2 * DEFAULT_FEE)
-        sprout_balance = Decimal('0')
+        check_z_mergetoaddress(None, '', zcash, [sapling_zaddr_1, sapling_zaddr_2, sapling_zaddr_3], taddr_2, sapling_balance - DEFAULT_FEE)
+        taddr_balance += sapling_balance - DEFAULT_FEE
         sapling_balance = Decimal('0')
 
-        # taddr -> multiple Sprout
         # taddr -> multiple Sapling
-        taddr_1_balance = Decimal(zcash.z_getbalance(taddr_1)).quantize(Decimal('1.00000000'))
         taddr_2_balance = Decimal(zcash.z_getbalance(taddr_2)).quantize(Decimal('1.00000000'))
-        check_z_sendmany_parallel(results, zcash, [
-            ('4q', taddr_1, [
-                (sprout_zaddr_1, (starting_balance / Decimal('10'))),
-                (sprout_zaddr_2, taddr_1_balance - (starting_balance / Decimal('10')) - DEFAULT_FEE),
-            ]),
-            ('4r', taddr_2, [
+        check_z_sendmany(results, '4r', zcash, taddr_2, [
                 (sapling_zaddr_1, (starting_balance / Decimal('10'))),
-                (sapling_zaddr_2, taddr_2_balance - (starting_balance / Decimal('10')) - DEFAULT_FEE),
-            ]),
-        ])
-        sprout_balance = taddr_1_balance - DEFAULT_FEE
+                (sapling_zaddr_2, taddr_2_balance - (starting_balance / Decimal('10')) - DEFAULT_FEE)])[0]
+
         sapling_balance = taddr_2_balance - DEFAULT_FEE
-        taddr_balance = Decimal('0')
+        taddr_balance -= taddr_2_balance
 
-        # multiple Sprout -> taddr
         # multiple Sapling -> taddr
-        check_z_mergetoaddress_parallel(None, zcash, [
-            ('', [sprout_zaddr_1, sprout_zaddr_2], taddr_1, sprout_balance - DEFAULT_FEE),
-            ('', [sapling_zaddr_1, sapling_zaddr_2], taddr_2, sapling_balance - DEFAULT_FEE),
-        ])
-        taddr_balance = sprout_balance + sapling_balance - (Decimal('2') * DEFAULT_FEE)
-        sprout_balance = Decimal('0')
+        check_z_mergetoaddress(None, '', zcash, [sapling_zaddr_1, sapling_zaddr_2], taddr_2, sapling_balance - DEFAULT_FEE)
+        taddr_balance += sapling_balance -  DEFAULT_FEE
         sapling_balance = Decimal('0')
 
-        # z_mergetoaddress taddr -> Sprout
         # z_mergetoaddress taddr -> Sapling
-        taddr_1_balance = Decimal(zcash.z_getbalance(taddr_1)).quantize(Decimal('1.00000000'))
         taddr_2_balance = Decimal(zcash.z_getbalance(taddr_2)).quantize(Decimal('1.00000000'))
-        check_z_mergetoaddress_parallel(results, zcash, [
-            ('4y', [taddr_1], sprout_zaddr_1, taddr_1_balance - DEFAULT_FEE),
-            ('4cc', [taddr_2], sapling_zaddr_1, taddr_2_balance - DEFAULT_FEE),
-        ])
-        sprout_balance = taddr_1_balance - DEFAULT_FEE
+        check_z_mergetoaddress(results, '4cc', zcash,  [taddr_2], sapling_zaddr_1, taddr_2_balance - DEFAULT_FEE)
         sapling_balance = taddr_2_balance - DEFAULT_FEE
-        taddr_balance = Decimal('0')
+        taddr_balance -= taddr_2_balance
     except Exception as e:
         print('Error: %s' % e)
         traceback.print_exc()
@@ -634,7 +490,6 @@ def transaction_chain(zcash):
         print('# Finishing transaction chain')
         print('#')
         all_addrs = [
-            sprout_zaddr_1, sprout_zaddr_2, sprout_zaddr_3,
             taddr_1, taddr_2, taddr_3, taddr_4, taddr_5,
             sapling_zaddr_1, sapling_zaddr_2, sapling_zaddr_3,
         ]
diff --git a/rust-toolchain b/rust-toolchain
index b7921ae87bc..bb120e876c6 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-1.54.0
+1.59.0
diff --git a/src/Makefile.am b/src/Makefile.am
index 5f4ee7270c4..a8824b4e8d0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,6 +29,9 @@ LIBSECP256K1=secp256k1/libsecp256k1.la
 LIBUNIVALUE=univalue/libunivalue.la
 LIBZCASH=libzcash.a
 
+WALLET_TOOL_BIN=zcashd-wallet-tool$(EXEEXT)
+WALLET_TOOL_BUILD=$(top_builddir)/target/$(RUST_TARGET)/release/zcashd-wallet-tool$(EXEEXT)
+
 if ENABLE_ZMQ
 LIBBITCOIN_ZMQ=libbitcoin_zmq.a
 endif
@@ -39,8 +42,15 @@ if ENABLE_WALLET
 LIBBITCOIN_WALLET=libbitcoin_wallet.a
 endif
 
-RUST_ENV_VARS = RUSTC="$(RUSTC)" TERM=dumb
-RUST_BUILD_OPTS = --lib --release --target $(RUST_TARGET)
+# We depend on the secp256k1 crate for some logic on the Rust side of the FFI. This crate
+# is a wrapper around libsecp256k1, which we already vendor in our code; the crate vendors
+# its own copy with non-colliding symbols. To ensure that we only use a single version of
+# libsecp256k1, we disable symbol renaming in the secp256k1-sys crate  so it links to the
+# same library as the C++ code.
+# - Note that this does not prevent the secp256k1-sys vendored code from being built; this
+#   requires https://github.com/rust-bitcoin/rust-secp256k1/issues/380 to be addressed.
+RUST_ENV_VARS = RUSTC="$(RUSTC)" TERM=dumb RUSTFLAGS="--cfg=rust_secp_no_symbol_renaming"
+RUST_BUILD_OPTS = --release --target $(RUST_TARGET) --manifest-path $(top_srcdir)/Cargo.toml
 
 rust_verbose = $(rust_verbose_@AM_V@)
 rust_verbose_ = $(rust_verbose_@AM_DEFAULT_V@)
@@ -65,10 +75,16 @@ $(CARGO_CONFIGURED): $(top_srcdir)/.cargo/config.offline
 	$(AM_V_at)touch $@
 endif
 
-cargo-build: $(CARGO_CONFIGURED)
-	$(RUST_ENV_VARS) $(CARGO) build $(RUST_BUILD_OPTS) $(rust_verbose) --manifest-path $(top_srcdir)/Cargo.toml
+cargo-build-lib: $(CARGO_CONFIGURED)
+	$(RUST_ENV_VARS) $(CARGO) build --lib $(RUST_BUILD_OPTS) $(rust_verbose)
+
+cargo-build-bins: $(CARGO_CONFIGURED)
+	$(RUST_ENV_VARS) $(CARGO) build --bins $(RUST_BUILD_OPTS) $(rust_verbose)
 
-$(LIBRUSTZCASH): cargo-build
+$(WALLET_TOOL_BIN): cargo-build-bins
+	$(AM_V_at)cp $(WALLET_TOOL_BUILD) $@
+
+$(LIBRUSTZCASH): cargo-build-lib
 
 $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)
 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
@@ -92,6 +108,7 @@ lib_LTLIBRARIES = $(LIBZCASH_SCRIPT)
 
 bin_PROGRAMS =
 noinst_PROGRAMS =
+bin_SCRIPTS =
 TESTS =
 BENCHMARKS =
 
@@ -101,14 +118,19 @@ endif
 
 if BUILD_BITCOIN_UTILS
   bin_PROGRAMS += zcash-cli zcash-tx
+  bin_SCRIPTS += $(WALLET_TOOL_BIN)
 endif
 
 LIBZCASH_H = \
   zcash/IncrementalMerkleTree.hpp \
   zcash/NoteEncryption.hpp \
   zcash/Address.hpp \
+  zcash/address/transparent.h \
+  zcash/address/mnemonic.h \
+  zcash/address/orchard.hpp \
   zcash/address/sapling.hpp \
   zcash/address/sprout.hpp \
+  zcash/address/unified.h \
   zcash/address/zip32.h \
   zcash/History.hpp \
   zcash/JoinSplit.hpp \
@@ -118,7 +140,7 @@ LIBZCASH_H = \
   zcash/util.h \
   zcash/Zcash.h
 
-.PHONY: FORCE cargo-build check-symbols check-security
+.PHONY: FORCE cargo-build-lib cargo-build-bins check-symbols check-security
 # bitcoin core #
 BITCOIN_CORE_H = \
   addrdb.h \
@@ -180,6 +202,7 @@ BITCOIN_CORE_H = \
   pow.h \
   prevector.h \
   primitives/block.h \
+  primitives/orchard.h \
   primitives/transaction.h \
   proof_verifier.h \
   protocol.h \
@@ -222,6 +245,7 @@ BITCOIN_CORE_H = \
   uint252.h \
   undo.h \
   util.h \
+  util/match.h \
   utilmoneystr.h \
   utilstrencodings.h \
   utiltest.h \
@@ -322,6 +346,7 @@ libbitcoin_wallet_a_SOURCES = \
   wallet/asyncrpcoperation_shieldcoinbase.cpp \
   wallet/crypter.cpp \
   wallet/db.cpp \
+  wallet/orchard.cpp \
   wallet/paymentdisclosure.cpp \
   wallet/paymentdisclosuredb.cpp \
   wallet/rpcdisclosure.cpp \
@@ -392,6 +417,7 @@ libbitcoin_common_a_SOURCES = \
   netbase.cpp \
   primitives/block.cpp \
   primitives/transaction.cpp \
+  primitives/tx_version_info.cpp \
   proof_verifier.cpp \
   protocol.cpp \
   pubkey.cpp \
@@ -501,6 +527,7 @@ zcash_cli_LDADD = \
   $(LIBZCASH) \
   $(LIBRUSTZCASH) \
   $(LIBBITCOIN_CRYPTO) \
+  $(LIBSECP256K1) \
   $(LIBZCASH_LIBS)
 #
 
@@ -533,8 +560,12 @@ libzcash_a_SOURCES = \
   zcash/IncrementalMerkleTree.cpp \
   zcash/NoteEncryption.cpp \
   zcash/Address.cpp \
+  zcash/address/transparent.cpp \
+  zcash/address/mnemonic.cpp \
+  zcash/address/orchard.cpp \
   zcash/address/sapling.cpp \
   zcash/address/sprout.cpp \
+  zcash/address/unified.cpp \
   zcash/address/zip32.cpp \
   zcash/History.cpp \
   zcash/JoinSplit.cpp \
@@ -557,6 +588,7 @@ libzcash_script_la_SOURCES = \
   crypto/sha512.cpp \
   hash.cpp \
   primitives/transaction.cpp \
+  primitives/tx_version_info.cpp \
   pubkey.cpp \
   script/zcash_script.cpp \
   script/interpreter.cpp \
@@ -582,7 +614,7 @@ CTAES_DIST += crypto/ctaes/ctaes.h
 CTAES_DIST += crypto/ctaes/README.md
 CTAES_DIST += crypto/ctaes/test.c
 
-CLEANFILES = *.gcda *.gcno */*.gcno wallet/*/*.gcno
+CLEANFILES = *.gcda *.gcno */*.gcno wallet/*/*.gcno $(bin_SCRIPTS)
 
 DISTCLEANFILES = obj/build.h
 
@@ -606,16 +638,17 @@ clean-local:
 	$(AM_V_CXX) $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	  $(CPPFLAGS) $(AM_CXXFLAGS) $(AM_CXXFLAGS) $(PIE_FLAGS) $(CXXFLAGS) -c -o $@ $<
 
-check-symbols: $(bin_PROGRAMS)
+check-symbols: $(bin_PROGRAMS) $(bin_SCRIPTS)
 if GLIBC_BACK_COMPAT
-	@echo "Checking glibc back compat of [$(bin_PROGRAMS)]..."
-	$(AM_V_at) READELF=$(READELF) CPPFILT=$(CPPFILT) $(top_srcdir)/contrib/devtools/symbol-check.py $(bin_PROGRAMS)
+	@echo "Checking glibc back compat of [$(bin_PROGRAMS) $(bin_SCRIPTS)]..."
+	$(AM_V_at) READELF=$(READELF) CPPFILT=$(CPPFILT) $(top_srcdir)/contrib/devtools/symbol-check.py $(bin_PROGRAMS) $(bin_SCRIPTS)
 endif
 
-check-security: $(bin_PROGRAMS)
+check-security: $(bin_PROGRAMS) $(bin_SCRIPTS)
 if HARDEN
-	@echo "Checking binary security of [$(bin_PROGRAMS)]..."
+	@echo "Checking binary security of [$(bin_PROGRAMS) $(bin_SCRIPTS)]..."
 	$(AM_V_at) READELF=$(READELF) OBJDUMP=$(OBJDUMP) $(top_srcdir)/contrib/devtools/security-check.py $(bin_PROGRAMS)
+	$(AM_V_at) READELF=$(READELF) OBJDUMP=$(OBJDUMP) $(top_srcdir)/contrib/devtools/security-check.py --allow-no-canary $(bin_SCRIPTS)
 endif
 
 %.pb.cc %.pb.h: %.proto
diff --git a/src/Makefile.gtest.include b/src/Makefile.gtest.include
index 1cda367e22b..4db48496078 100644
--- a/src/Makefile.gtest.include
+++ b/src/Makefile.gtest.include
@@ -21,9 +21,11 @@ zcash_gtest_SOURCES = \
 # depend on global state (see #1539)
 if ENABLE_WALLET
 zcash_gtest_SOURCES += \
-	wallet/gtest/test_wallet_zkeys.cpp
+	wallet/gtest/test_wallet_zkeys.cpp \
+	wallet/gtest/test_orchard_zkeys.cpp
 endif
 zcash_gtest_SOURCES += \
+	test/data/merkle_roots_orchard.h \
 	gtest/test_tautology.cpp \
 	gtest/test_allocator.cpp \
 	gtest/test_checkblock.cpp \
@@ -57,6 +59,8 @@ zcash_gtest_SOURCES += \
 	gtest/test_zip32.cpp
 if ENABLE_WALLET
 zcash_gtest_SOURCES += \
+	wallet/gtest/test_note_selection.cpp \
+	wallet/gtest/test_orchard_wallet.cpp \
 	wallet/gtest/test_paymentdisclosure.cpp \
 	wallet/gtest/test_wallet.cpp
 endif
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 8f86ec3bae1..a21b7e403ab 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -44,6 +44,7 @@ JSON_TEST_FILES = \
   test/data/merkle_commitments_sapling.json \
   test/data/sapling_key_components.json \
   test/data/unified_addrs.json \
+  test/data/unified_full_viewing_keys.json \
   test/data/zip0244.json
 
 RAW_TEST_FILES = test/data/alertTests.raw
diff --git a/src/bench/perf.cpp b/src/bench/perf.cpp
index 61b9d5be713..fdc2cb6926d 100644
--- a/src/bench/perf.cpp
+++ b/src/bench/perf.cpp
@@ -6,7 +6,7 @@
 
 #if defined(__i386__) || defined(__x86_64__)
 
-/* These architectures support quering the cycle counter
+/* These architectures support querying the cycle counter
  * from user space, no need for any syscall overhead.
  */
 void perf_init(void) { }
diff --git a/src/bench/verification.cpp b/src/bench/verification.cpp
index ba7aea1c2e1..19c0b27d996 100644
--- a/src/bench/verification.cpp
+++ b/src/bench/verification.cpp
@@ -25,8 +25,7 @@ static void ECDSA(benchmark::State& state)
     mtx.nVersion = SAPLING_TX_VERSION;
     mtx.nVersionGroupId = SAPLING_VERSION_GROUP_ID;
 
-    CKey key;
-    key.MakeNewKey(false);
+    CKey key = CKey::TestOnlyRandomKey(false);
     CBasicKeyStore keystore;
     keystore.AddKeyPubKey(key, key.GetPubKey());
     CKeyID hash = key.GetPubKey().GetID();
diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
index 0d9492c52fb..b78fb5461c4 100644
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -39,7 +39,7 @@ std::string HelpMessageCli()
     strUsage += HelpMessageGroup(_("Options:"));
     strUsage += HelpMessageOpt("-?", _("This help message"));
     strUsage += HelpMessageOpt("-conf=<file>", strprintf(_("Specify configuration file (default: %s)"), BITCOIN_CONF_FILENAME));
-    strUsage += HelpMessageOpt("-datadir=<dir>", _("Specify data directory"));
+    strUsage += HelpMessageOpt("-datadir=<dir>", _("Specify data directory (this path cannot use '~')"));
     strUsage += HelpMessageOpt("-stdin", _("Read extra arguments from standard input, one per line until EOF/Ctrl-D (recommended for sensitive information such as passphrases). If first extra argument is `walletpassphrase` then the first line(password) will not be echoed."));
     AppendParamsHelpMessages(strUsage);
     strUsage += HelpMessageOpt("-rpcconnect=<ip>", strprintf(_("Send commands to node running on <ip> (default: %s)"), DEFAULT_RPCCONNECT));
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 17ce1ebd548..7eccc84bf44 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -52,7 +52,7 @@ static CBlock CreateGenesisBlock(const char* pszTimestamp, const CScript& genesi
  * transaction cannot be spent since it did not originally exist in the
  * database (and is in any case of zero value).
  *
- * >>> from pyblake2 import blake2s
+ * >>> from hashlib import blake2s
  * >>> 'Zcash' + blake2s(b'The Economist 2016-10-29 Known unknown: Another crypto-currency is born. BTC#436254 0000000000000000044f321997f336d2908cf8c8d6893e88dbf067e2d949487d ETH#2521903 483039a6b6bd8bd05f0584f9a078d075e454925eb71c1f13eaff59b405a721bb DJIA close on 27 Oct 2016: 18,169.68').hexdigest()
  *
  * CBlock(hash=00040fe8, ver=4, hashPrevBlock=00000000000000, hashMerkleRoot=c4eaa5, nTime=1477641360, nBits=1f07ffff, nNonce=4695, vtx=1)
@@ -86,7 +86,7 @@ class CMainParams : public CChainParams {
     CMainParams() {
         keyConstants.strNetworkID = "main";
         strCurrencyUnits = "ZEC";
-        bip44CoinType = 133; // As registered in https://github.com/satoshilabs/slips/blob/master/slip-0044.md
+        keyConstants.bip44CoinType = 133; // As registered in https://github.com/satoshilabs/slips/blob/master/slip-0044.md
         consensus.fCoinbaseMustBeShielded = true;
         consensus.nSubsidySlowStartInterval = 20000;
         consensus.nPreBlossomSubsidyHalvingInterval = Consensus::PRE_BLOSSOM_HALVING_INTERVAL;
@@ -133,7 +133,7 @@ class CMainParams : public CChainParams {
         consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight = 1046400;
         consensus.vUpgrades[Consensus::UPGRADE_CANOPY].hashActivationBlock =
             uint256S("00000000002038016f976744c369dce7419fca30e7171dfac703af5e5f7ad1d4");
-        consensus.vUpgrades[Consensus::UPGRADE_NU5].nProtocolVersion = 170015;
+        consensus.vUpgrades[Consensus::UPGRADE_NU5].nProtocolVersion = 170017;
         consensus.vUpgrades[Consensus::UPGRADE_NU5].nActivationHeight =
             Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
         consensus.vUpgrades[Consensus::UPGRADE_ZFUTURE].nProtocolVersion = 0x7FFFFFFF;
@@ -370,7 +370,7 @@ class CTestNetParams : public CChainParams {
     CTestNetParams() {
         keyConstants.strNetworkID = "test";
         strCurrencyUnits = "TAZ";
-        bip44CoinType = 1;
+        keyConstants.bip44CoinType = 1;
         consensus.fCoinbaseMustBeShielded = true;
         consensus.nSubsidySlowStartInterval = 20000;
         consensus.nPreBlossomSubsidyHalvingInterval = Consensus::PRE_BLOSSOM_HALVING_INTERVAL;
@@ -417,9 +417,8 @@ class CTestNetParams : public CChainParams {
         consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight = 1028500;
         consensus.vUpgrades[Consensus::UPGRADE_CANOPY].hashActivationBlock =
             uint256S("01a4d7c6aada30c87762c1bf33fff5df7266b1fd7616bfdb5227fa59bd79e7a2");
-        consensus.vUpgrades[Consensus::UPGRADE_NU5].nProtocolVersion = 170014;
-        consensus.vUpgrades[Consensus::UPGRADE_NU5].nActivationHeight =
-            Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
+        consensus.vUpgrades[Consensus::UPGRADE_NU5].nProtocolVersion = 170015;
+        consensus.vUpgrades[Consensus::UPGRADE_NU5].nActivationHeight = 1599200;
         consensus.vUpgrades[Consensus::UPGRADE_ZFUTURE].nProtocolVersion = 0x7FFFFFFF;
         consensus.vUpgrades[Consensus::UPGRADE_ZFUTURE].nActivationHeight =
             Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
@@ -622,7 +621,7 @@ class CRegTestParams : public CChainParams {
     CRegTestParams() {
         keyConstants.strNetworkID = "regtest";
         strCurrencyUnits = "REG";
-        bip44CoinType = 1;
+        keyConstants.bip44CoinType = 1;
         consensus.fCoinbaseMustBeShielded = false;
         consensus.nSubsidySlowStartInterval = 0;
         consensus.nPreBlossomSubsidyHalvingInterval = Consensus::PRE_BLOSSOM_REGTEST_HALVING_INTERVAL;
@@ -634,7 +633,7 @@ class CRegTestParams : public CChainParams {
         static_assert(equihash_parameters_acceptable(N, K));
         consensus.nEquihashN = N;
         consensus.nEquihashK = K;
-        consensus.powLimit = uint256S("0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f");
+        consensus.powLimit = uint256S("0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f"); // if this is any larger, the for loop in GetNextWorkRequired can overflow bnTot
         consensus.nPowAveragingWindow = 17;
         assert(maxUint/UintToArith256(consensus.powLimit) >= consensus.nPowAveragingWindow);
         consensus.nPowMaxAdjustDown = 0; // Turn off adjustment down
@@ -664,7 +663,7 @@ class CRegTestParams : public CChainParams {
         consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nProtocolVersion = 170012;
         consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight =
             Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
-        consensus.vUpgrades[Consensus::UPGRADE_NU5].nProtocolVersion = 170014;
+        consensus.vUpgrades[Consensus::UPGRADE_NU5].nProtocolVersion = 170015;
         consensus.vUpgrades[Consensus::UPGRADE_NU5].nActivationHeight =
             Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
         consensus.vUpgrades[Consensus::UPGRADE_ZFUTURE].nProtocolVersion = 0x7FFFFFFF;
@@ -730,6 +729,9 @@ class CRegTestParams : public CChainParams {
         // Founders reward script expects a vector of 2-of-3 multisig addresses
         vFoundersRewardAddress = { "t2FwcEhFdNXuFMv1tcYwaBJtYVtMj8b1uTg" };
         assert(vFoundersRewardAddress.size() <= consensus.GetLastFoundersRewardBlockHeight(0));
+
+        // do not require the wallet backup to be confirmed in regtest mode
+        fRequireWalletBackup = false;
     }
 
     void UpdateNetworkUpgradeParameters(Consensus::UpgradeIndex idx, int nActivationHeight)
@@ -823,10 +825,10 @@ CScript CChainParams::GetFoundersRewardScriptAtHeight(int nHeight) const {
     assert(nHeight > 0 && nHeight <= consensus.GetLastFoundersRewardBlockHeight(nHeight));
 
     KeyIO keyIO(*this);
-    CTxDestination address = keyIO.DecodeDestination(GetFoundersRewardAddressAtHeight(nHeight).c_str());
-    assert(IsValidDestination(address));
-    assert(IsScriptDestination(address));
-    CScriptID scriptID = std::get<CScriptID>(address); // address is a variant
+    auto address = keyIO.DecodePaymentAddress(GetFoundersRewardAddressAtHeight(nHeight).c_str());
+    assert(address.has_value());
+    assert(std::holds_alternative<CScriptID>(address.value()));
+    CScriptID scriptID = std::get<CScriptID>(address.value());
     CScript script = CScript() << OP_HASH160 << ToByteVector(scriptID) << OP_EQUAL;
     return script;
 }
diff --git a/src/chainparams.h b/src/chainparams.h
index cf106277852..4b04ac967dc 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -32,17 +32,6 @@ struct CCheckpointData {
     double fTransactionsPerDay;
 };
 
-class CBaseKeyConstants : public KeyConstants {
-public:
-    std::string NetworkIDString() const { return strNetworkID; }
-    const std::vector<unsigned char>& Base58Prefix(Base58Type type) const { return base58Prefixes[type]; }
-    const std::string& Bech32HRP(Bech32Type type) const { return bech32HRPs[type]; }
-
-    std::string strNetworkID;
-    std::vector<unsigned char> base58Prefixes[KeyConstants::MAX_BASE58_TYPES];
-    std::string bech32HRPs[KeyConstants::MAX_BECH32_TYPES];
-};
-
 /**
  * CChainParams defines various tweakable parameters of a given instance of the
  * Bitcoin system. There are three: the main network on which people trade goods
@@ -50,7 +39,7 @@ class CBaseKeyConstants : public KeyConstants {
  * a regression test mode which is intended for private networks only. It has
  * minimal difficulty to ensure that blocks can be found instantly.
  */
-class CChainParams: public KeyConstants 
+class CChainParams: public KeyConstants
 {
 public:
     const Consensus::Params& GetConsensus() const { return consensus; }
@@ -62,6 +51,7 @@ class CChainParams: public KeyConstants
     CAmount SproutValuePoolCheckpointBalance() const { return nSproutValuePoolCheckpointBalance; }
     uint256 SproutValuePoolCheckpointBlockHash() const { return hashSproutValuePoolCheckpointBlock; }
     bool ZIP209Enabled() const { return fZIP209Enabled; }
+    bool RequireWalletBackup() const { return fRequireWalletBackup; }
 
     const CBlock& GenesisBlock() const { return genesis; }
     /** Make miner wait to have peers to avoid wasting work */
@@ -72,19 +62,24 @@ class CChainParams: public KeyConstants
     bool RequireStandard() const { return fRequireStandard; }
     int64_t PruneAfterHeight() const { return nPruneAfterHeight; }
     std::string CurrencyUnits() const { return strCurrencyUnits; }
-    uint32_t BIP44CoinType() const { return bip44CoinType; }
     /** Make miner stop after a block is found. In RPC, don't return until nGenProcLimit blocks are generated */
     bool MineBlocksOnDemand() const { return fMineBlocksOnDemand; }
     /** In the future use NetworkIDString() for RPC fields */
     bool TestnetToBeDeprecatedFieldRPC() const { return fTestnetToBeDeprecatedFieldRPC; }
-    /** Return the BIP70 network string (main, test or regtest) */
-    std::string NetworkIDString() const { return keyConstants.NetworkIDString(); }
     const std::vector<CDNSSeedData>& DNSSeeds() const { return vSeeds; }
-    const std::vector<unsigned char>& Base58Prefix(Base58Type type) const { 
-        return keyConstants.Base58Prefix(type); 
+    /** Return the BIP70 network string (main, test or regtest) */
+    std::string NetworkIDString() const {
+        return keyConstants.NetworkIDString();
+    }
+    /** Return the BIP44 coin type for addresses created by the zcashd embedded wallet. */
+    uint32_t BIP44CoinType() const {
+        return keyConstants.BIP44CoinType();
+    }
+    const std::vector<unsigned char>& Base58Prefix(Base58Type type) const {
+        return keyConstants.Base58Prefix(type);
     }
-    const std::string& Bech32HRP(Bech32Type type) const { 
-        return keyConstants.Bech32HRP(type); 
+    const std::string& Bech32HRP(Bech32Type type) const {
+        return keyConstants.Bech32HRP(type);
     }
     const std::vector<SeedSpec6>& FixedSeeds() const { return vFixedSeeds; }
     const CCheckpointData& Checkpoints() const { return checkpointData; }
@@ -106,7 +101,6 @@ class CChainParams: public KeyConstants
     std::vector<CDNSSeedData> vSeeds;
     CBaseKeyConstants keyConstants;
     std::string strCurrencyUnits;
-    uint32_t bip44CoinType;
     CBlock genesis;
     std::vector<SeedSpec6> vFixedSeeds;
     bool fMiningRequiresPeers = false;
@@ -121,6 +115,7 @@ class CChainParams: public KeyConstants
     CAmount nSproutValuePoolCheckpointBalance = 0;
     uint256 hashSproutValuePoolCheckpointBlock;
     bool fZIP209Enabled = false;
+    bool fRequireWalletBackup = true;
 };
 
 /**
diff --git a/src/clientversion.h b/src/clientversion.h
index 7a8e56902cb..ccb4acdd659 100644
--- a/src/clientversion.h
+++ b/src/clientversion.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2009-2014 The Bitcoin Core developers
-// Copyright (c) 2016-2021 The Zcash developers
+// Copyright (c) 2016-2022 The Zcash developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
@@ -16,9 +16,9 @@
 
 //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 4
-#define CLIENT_VERSION_MINOR 4
-#define CLIENT_VERSION_REVISION 1
-#define CLIENT_VERSION_BUILD 50
+#define CLIENT_VERSION_MINOR 6
+#define CLIENT_VERSION_REVISION 0
+#define CLIENT_VERSION_BUILD 51
 
 //! Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE true
@@ -27,7 +27,7 @@
  * Copyright year (2009-this)
  * Todo: update this when changing our copyright comments in the source
  */
-#define COPYRIGHT_YEAR 2021
+#define COPYRIGHT_YEAR 2022
 
 #endif //HAVE_CONFIG_H
 
diff --git a/src/coins.cpp b/src/coins.cpp
index 0ea164cdcd3..4ed2907afca 100644
--- a/src/coins.cpp
+++ b/src/coins.cpp
@@ -46,7 +46,7 @@ bool CCoins::Spend(uint32_t nPos)
 }
 bool CCoinsView::GetSproutAnchorAt(const uint256 &rt, SproutMerkleTree &tree) const { return false; }
 bool CCoinsView::GetSaplingAnchorAt(const uint256 &rt, SaplingMerkleTree &tree) const { return false; }
-bool CCoinsView::GetOrchardAnchorAt(const uint256 &rt, OrchardMerkleTree &tree) const { return false; }
+bool CCoinsView::GetOrchardAnchorAt(const uint256 &rt, OrchardMerkleFrontier &tree) const { return false; }
 bool CCoinsView::GetNullifier(const uint256 &nullifier, ShieldedType type) const { return false; }
 bool CCoinsView::GetCoins(const uint256 &txid, CCoins &coins) const { return false; }
 bool CCoinsView::HaveCoins(const uint256 &txid) const { return false; }
@@ -75,7 +75,7 @@ CCoinsViewBacked::CCoinsViewBacked(CCoinsView *viewIn) : base(viewIn) { }
 
 bool CCoinsViewBacked::GetSproutAnchorAt(const uint256 &rt, SproutMerkleTree &tree) const { return base->GetSproutAnchorAt(rt, tree); }
 bool CCoinsViewBacked::GetSaplingAnchorAt(const uint256 &rt, SaplingMerkleTree &tree) const { return base->GetSaplingAnchorAt(rt, tree); }
-bool CCoinsViewBacked::GetOrchardAnchorAt(const uint256 &rt, OrchardMerkleTree &tree) const { return base->GetOrchardAnchorAt(rt, tree); }
+bool CCoinsViewBacked::GetOrchardAnchorAt(const uint256 &rt, OrchardMerkleFrontier &tree) const { return base->GetOrchardAnchorAt(rt, tree); }
 bool CCoinsViewBacked::GetNullifier(const uint256 &nullifier, ShieldedType type) const { return base->GetNullifier(nullifier, type); }
 bool CCoinsViewBacked::GetCoins(const uint256 &txid, CCoins &coins) const { return base->GetCoins(txid, coins); }
 bool CCoinsViewBacked::HaveCoins(const uint256 &txid) const { return base->HaveCoins(txid); }
@@ -191,7 +191,7 @@ bool CCoinsViewCache::GetSaplingAnchorAt(const uint256 &rt, SaplingMerkleTree &t
     return true;
 }
 
-bool CCoinsViewCache::GetOrchardAnchorAt(const uint256 &rt, OrchardMerkleTree &tree) const {
+bool CCoinsViewCache::GetOrchardAnchorAt(const uint256 &rt, OrchardMerkleFrontier &tree) const {
     CAnchorsOrchardMap::const_iterator it = cacheOrchardAnchors.find(rt);
     if (it != cacheOrchardAnchors.end()) {
         if (it->second.entered) {
@@ -321,9 +321,9 @@ template<> void CCoinsViewCache::PushAnchor(const SaplingMerkleTree &tree)
     );
 }
 
-template<> void CCoinsViewCache::PushAnchor(const OrchardMerkleTree &tree)
+template<> void CCoinsViewCache::PushAnchor(const OrchardMerkleFrontier &tree)
 {
-    AbstractPushAnchor<OrchardMerkleTree, CAnchorsOrchardMap, CAnchorsOrchardMap::iterator, CAnchorsOrchardCacheEntry>(
+    AbstractPushAnchor<OrchardMerkleFrontier, CAnchorsOrchardMap, CAnchorsOrchardMap::iterator, CAnchorsOrchardCacheEntry>(
         tree,
         ORCHARD,
         cacheOrchardAnchors,
@@ -352,7 +352,7 @@ void CCoinsViewCache::BringBestAnchorIntoCache(
 template<>
 void CCoinsViewCache::BringBestAnchorIntoCache(
     const uint256 &currentRoot,
-    OrchardMerkleTree &tree
+    OrchardMerkleFrontier &tree
 )
 {
     assert(GetOrchardAnchorAt(currentRoot, tree));
@@ -683,6 +683,14 @@ void CCoinsViewCache::PopAnchor(const uint256 &newrt, ShieldedType type) {
                 hashSaplingAnchor
             );
             break;
+        case ORCHARD:
+            AbstractPopAnchor<OrchardMerkleFrontier, CAnchorsOrchardMap, CAnchorsOrchardCacheEntry>(
+                newrt,
+                ORCHARD,
+                cacheOrchardAnchors,
+                hashOrchardAnchor
+            );
+            break;
         default:
             throw std::runtime_error("Unknown shielded type");
     }
@@ -1069,7 +1077,7 @@ std::optional<UnsatisfiedShieldedReq> CCoinsViewCache::HaveShieldedRequirements(
 
     std::optional<uint256> root = tx.GetOrchardBundle().GetAnchor();
     if (root) {
-        OrchardMerkleTree tree;
+        OrchardMerkleFrontier tree;
         if (!GetOrchardAnchorAt(root.value(), tree)) {
             auto txid = tx.GetHash().ToString();
             auto anchor = root.value().ToString();
diff --git a/src/coins.h b/src/coins.h
index ddfe08103c3..c318d65d3b5 100644
--- a/src/coins.h
+++ b/src/coins.h
@@ -304,7 +304,7 @@ struct CAnchorsSaplingCacheEntry
 struct CAnchorsOrchardCacheEntry
 {
     bool entered; // This will be false if the anchor is removed from the cache
-    OrchardMerkleTree tree; // The tree itself
+    OrchardMerkleFrontier tree; // The tree itself
     unsigned char flags;
 
     enum Flags {
@@ -368,7 +368,7 @@ class CCoinsView
     virtual bool GetSaplingAnchorAt(const uint256 &rt, SaplingMerkleTree &tree) const;
 
     //! Retrieve the tree (Orchard) at a particular anchored root in the chain
-    virtual bool GetOrchardAnchorAt(const uint256 &rt, OrchardMerkleTree &tree) const;
+    virtual bool GetOrchardAnchorAt(const uint256 &rt, OrchardMerkleFrontier &tree) const;
 
     //! Determine whether a nullifier is spent or not
     virtual bool GetNullifier(const uint256 &nullifier, ShieldedType type) const;
@@ -428,7 +428,7 @@ class CCoinsViewBacked : public CCoinsView
     CCoinsViewBacked(CCoinsView *viewIn);
     bool GetSproutAnchorAt(const uint256 &rt, SproutMerkleTree &tree) const;
     bool GetSaplingAnchorAt(const uint256 &rt, SaplingMerkleTree &tree) const;
-    bool GetOrchardAnchorAt(const uint256 &rt, OrchardMerkleTree &tree) const;
+    bool GetOrchardAnchorAt(const uint256 &rt, OrchardMerkleFrontier &tree) const;
     bool GetNullifier(const uint256 &nullifier, ShieldedType type) const;
     bool GetCoins(const uint256 &txid, CCoins &coins) const;
     bool HaveCoins(const uint256 &txid) const;
@@ -521,7 +521,7 @@ class CCoinsViewCache : public CCoinsViewBacked
     // Standard CCoinsView methods
     bool GetSproutAnchorAt(const uint256 &rt, SproutMerkleTree &tree) const;
     bool GetSaplingAnchorAt(const uint256 &rt, SaplingMerkleTree &tree) const;
-    bool GetOrchardAnchorAt(const uint256 &rt, OrchardMerkleTree &tree) const;
+    bool GetOrchardAnchorAt(const uint256 &rt, OrchardMerkleFrontier &tree) const;
     bool GetNullifier(const uint256 &nullifier, ShieldedType type) const;
     bool GetCoins(const uint256 &txid, CCoins &coins) const;
     bool HaveCoins(const uint256 &txid) const;
diff --git a/src/consensus/params.cpp b/src/consensus/params.cpp
index 2ced730e82c..7d348da4a4d 100644
--- a/src/consensus/params.cpp
+++ b/src/consensus/params.cpp
@@ -9,8 +9,18 @@
 #include <script/standard.h>
 #include "upgrades.h"
 #include "util.h"
+#include "util/match.h"
 
 namespace Consensus {
+    std::optional<int> Params::GetActivationHeight(Consensus::UpgradeIndex idx) const {
+        auto nActivationHeight = vUpgrades[idx].nActivationHeight;
+        if (nActivationHeight == Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT) {
+            return std::nullopt;
+        } else {
+            return nActivationHeight;
+        }
+    }
+
     bool Params::NetworkUpgradeActive(int nHeight, Consensus::UpgradeIndex idx) const {
         return NetworkUpgradeState(nHeight, *this, idx) == UPGRADE_ACTIVE;
     }
@@ -163,17 +173,26 @@ namespace Consensus {
 
         // Parse the address strings into concrete types.
         std::vector<FundingStreamAddress> addresses;
-        for (auto addr : strAddresses) {
-            auto taddr = keyIO.DecodeDestination(addr);
-            if (IsValidDestination(taddr)) {
-                addresses.push_back(GetScriptForDestination(taddr));
-            } else {
-                auto zaddr = keyIO.DecodePaymentAddress(addr);
-                // If the string is not a valid transparent or Sapling address, we will
-                // throw here.
-
-                addresses.push_back(std::get<libzcash::SaplingPaymentAddress>(zaddr));
+        for (const auto& strAddr : strAddresses) {
+            auto addr = keyIO.DecodePaymentAddress(strAddr);
+            if (!addr.has_value()) {
+                throw std::runtime_error("Funding stream address was not a valid " PACKAGE_NAME " address.");
             }
+
+            std::visit(match {
+                [&](const CKeyID& keyId) {
+                    addresses.push_back(GetScriptForDestination(keyId));
+                },
+                [&](const CScriptID& scriptId) {
+                    addresses.push_back(GetScriptForDestination(scriptId));
+                },
+                [&](const libzcash::SaplingPaymentAddress& zaddr) {
+                    addresses.push_back(zaddr);
+                },
+                [&](const auto& zaddr) {
+                    throw std::runtime_error("Funding stream address was not a valid transparent P2SH or Sapling address.");
+                }
+            }, addr.value());
         }
 
         auto validationResult = FundingStream::ValidateFundingStream(params, startHeight, endHeight, addresses);
diff --git a/src/consensus/params.h b/src/consensus/params.h
index 3411768d58d..a24f7520c7b 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -225,6 +225,11 @@ static const unsigned int PRE_BLOSSOM_REGTEST_HALVING_INTERVAL = 144;
  * Parameters that influence chain consensus.
  */
 struct Params {
+    /**
+     * Returns the activation height for the specified network upgrade, if any.
+     */
+    std::optional<int> GetActivationHeight(Consensus::UpgradeIndex idx) const;
+
     /**
      * Returns true if the given network upgrade is active as of the given block
      * height. Caller must check that the height is >= 0 (and handle unknown
diff --git a/src/consensus/upgrades.cpp b/src/consensus/upgrades.cpp
index c4f7c708751..1af82ab9adc 100644
--- a/src/consensus/upgrades.cpp
+++ b/src/consensus/upgrades.cpp
@@ -45,7 +45,7 @@ const struct NUInfo NetworkUpgradeInfo[Consensus::MAX_NETWORK_UPGRADES] = {
         .strInfo = "See https://z.cash/upgrade/canopy/ for details.",
     },
     {
-        .nBranchId = 0xf919a198,
+        .nBranchId = 0x37519621,
         .strName = "NU5",
         .strInfo = "See https://z.cash/upgrade/nu5/ for details.",
     },
diff --git a/src/deprecation.h b/src/deprecation.h
index e96630d6ebf..baece644225 100644
--- a/src/deprecation.h
+++ b/src/deprecation.h
@@ -10,7 +10,7 @@
 // Per https://zips.z.cash/zip-0200
 // Shut down nodes running this version of code, 16 weeks' worth of blocks after the estimated
 // release block height. A warning is shown during the 14 days' worth of blocks prior to shut down.
-static const int APPROX_RELEASE_HEIGHT = 1279420;
+static const int APPROX_RELEASE_HEIGHT = 1504042;
 static const int RELEASE_TO_DEPRECATION_WEEKS = 16;
 static const int EXPECTED_BLOCKS_PER_HOUR = 3600 / Consensus::POST_BLOSSOM_POW_TARGET_SPACING;
 static_assert(EXPECTED_BLOCKS_PER_HOUR == 48, "The value of Consensus::POST_BLOSSOM_POW_TARGET_SPACING was chosen such that this assertion holds.");
diff --git a/src/experimental_features.cpp b/src/experimental_features.cpp
index 67afbf7fcc2..bd1f3c3a5dc 100644
--- a/src/experimental_features.cpp
+++ b/src/experimental_features.cpp
@@ -11,6 +11,7 @@ bool fExperimentalDeveloperSetPoolSizeZero = false;
 bool fExperimentalPaymentDisclosure = false;
 bool fExperimentalInsightExplorer = false;
 bool fExperimentalLightWalletd = false;
+bool fExperimentalOrchardWallet = false;
 
 std::optional<std::string> InitExperimentalMode()
 {
@@ -20,6 +21,7 @@ std::optional<std::string> InitExperimentalMode()
     fExperimentalPaymentDisclosure = GetBoolArg("-paymentdisclosure", false);
     fExperimentalInsightExplorer = GetBoolArg("-insightexplorer", false);
     fExperimentalLightWalletd  = GetBoolArg("-lightwalletd", false);
+    fExperimentalOrchardWallet = GetBoolArg("-orchardwallet", false);
 
     // Fail if user has set experimental options without the global flag
     if (!fExperimentalMode) {
@@ -33,6 +35,8 @@ std::optional<std::string> InitExperimentalMode()
             return _("Insight explorer requires -experimentalfeatures.");
         } else if (fExperimentalLightWalletd) {
             return _("Light Walletd requires -experimentalfeatures.");
+        } else if (fExperimentalOrchardWallet) {
+            return _("Orchard-enabled wallet requires -experimentalfeatures.");
         }
     }
     return std::nullopt;
@@ -51,6 +55,8 @@ std::vector<std::string> GetExperimentalFeatures()
         experimentalfeatures.push_back("insightexplorer");
     if (fExperimentalLightWalletd)
         experimentalfeatures.push_back("lightwalletd");
+    if (fExperimentalOrchardWallet)
+        experimentalfeatures.push_back("orchardwallet");
 
     return experimentalfeatures;
 }
diff --git a/src/experimental_features.h b/src/experimental_features.h
index d607f1d5313..d2197be4871 100644
--- a/src/experimental_features.h
+++ b/src/experimental_features.h
@@ -14,6 +14,7 @@ extern bool fExperimentalDeveloperSetPoolSizeZero;
 extern bool fExperimentalPaymentDisclosure;
 extern bool fExperimentalInsightExplorer;
 extern bool fExperimentalLightWalletd;
+extern bool fExperimentalOrchardWallet;
 
 std::optional<std::string> InitExperimentalMode();
 std::vector<std::string> GetExperimentalFeatures();
diff --git a/src/gtest/main.cpp b/src/gtest/main.cpp
index ecf92283c5a..3caecf851b6 100644
--- a/src/gtest/main.cpp
+++ b/src/gtest/main.cpp
@@ -2,6 +2,7 @@
 #include "key.h"
 #include "pubkey.h"
 #include "util.h"
+#include "utiltest.h"
 
 #include "librustzcash.h"
 #include <sodium.h>
@@ -19,26 +20,6 @@ int main(int argc, char **argv) {
   assert(sodium_init() != -1);
   ECC_Start();
 
-  fs::path sapling_spend = ZC_GetParamsDir() / "sapling-spend.params";
-  fs::path sapling_output = ZC_GetParamsDir() / "sapling-output.params";
-  fs::path sprout_groth16 = ZC_GetParamsDir() / "sprout-groth16.params";
-
-    static_assert(
-        sizeof(fs::path::value_type) == sizeof(codeunit),
-        "librustzcash not configured correctly");
-    auto sapling_spend_str = sapling_spend.native();
-    auto sapling_output_str = sapling_output.native();
-    auto sprout_groth16_str = sprout_groth16.native();
-
-    librustzcash_init_zksnark_params(
-        reinterpret_cast<const codeunit*>(sapling_spend_str.c_str()),
-        sapling_spend_str.length(),
-        reinterpret_cast<const codeunit*>(sapling_output_str.c_str()),
-        sapling_output_str.length(),
-        reinterpret_cast<const codeunit*>(sprout_groth16_str.c_str()),
-        sprout_groth16_str.length()
-    );
-
   testing::InitGoogleMock(&argc, argv);
 
   // The "threadsafe" style is necessary for correct operation of death/exit
diff --git a/src/gtest/test_checkblock.cpp b/src/gtest/test_checkblock.cpp
index 3a61e594530..7d94c1b1602 100644
--- a/src/gtest/test_checkblock.cpp
+++ b/src/gtest/test_checkblock.cpp
@@ -37,6 +37,9 @@ TEST(CheckBlock, VersionTooLow) {
     block.nVersion = 1;
 
     MockCValidationState state;
+
+    SelectParams(CBaseChainParams::MAIN);
+
     EXPECT_CALL(state, DoS(100, false, REJECT_INVALID, "version-too-low", false, "")).Times(1);
     EXPECT_FALSE(CheckBlock(block, state, Params(), verifier, orchardAuth, false, false, true));
 }
@@ -93,7 +96,7 @@ class ContextualCheckBlockTest : public ::testing::Test {
 
     void TearDown() override {
         // Revert to test default. No-op on mainnet params.
-        RegtestDeactivateSapling();
+        RegtestDeactivateBlossom();
     }
 
     // Returns a valid but empty mutable transaction at block height 1.
diff --git a/src/gtest/test_checktransaction.cpp b/src/gtest/test_checktransaction.cpp
index 82b05e42eec..822f4cfde27 100644
--- a/src/gtest/test_checktransaction.cpp
+++ b/src/gtest/test_checktransaction.cpp
@@ -668,7 +668,7 @@ TEST(ChecktransactionTests, OverwinterConstructors) {
     EXPECT_EQ(tx2.fOverwintered, mtx.fOverwintered);
     EXPECT_EQ(tx2.nVersionGroupId, mtx.nVersionGroupId);
     EXPECT_EQ(tx2.nExpiryHeight, mtx.nExpiryHeight);
-    EXPECT_TRUE(tx2 == tx);
+    EXPECT_TRUE(tx2.GetHash() == tx.GetHash());
 }
 
 TEST(ChecktransactionTests, OverwinterSerialization) {
@@ -1141,6 +1141,8 @@ TEST(ChecktransactionTests, InvalidShieldedCoinbase) {
 }
 
 TEST(ChecktransactionTests, HeartwoodAcceptsShieldedCoinbase) {
+    LoadProofParameters();
+
     RegtestActivateHeartwood(false, Consensus::NetworkUpgrade::ALWAYS_ACTIVE);
     auto chainparams = Params();
 
@@ -1224,6 +1226,8 @@ TEST(ChecktransactionTests, HeartwoodAcceptsShieldedCoinbase) {
 // bindingSig from https://zips.z.cash/protocol/protocol.pdf#txnencoding are
 // applied to coinbase transactions.
 TEST(ChecktransactionTests, HeartwoodEnforcesSaplingRulesOnShieldedCoinbase) {
+    LoadProofParameters();
+
     RegtestActivateHeartwood(false, Consensus::NetworkUpgrade::ALWAYS_ACTIVE);
     auto chainparams = Params();
 
diff --git a/src/gtest/test_dynamicusage.cpp b/src/gtest/test_dynamicusage.cpp
index 0c8410b8fb1..b80d9732132 100644
--- a/src/gtest/test_dynamicusage.cpp
+++ b/src/gtest/test_dynamicusage.cpp
@@ -11,6 +11,8 @@
 #include "transaction_builder.h"
 #include "utiltest.h"
 
+#include <optional>
+
 TEST(RecursiveDynamicUsageTests, TestTransactionTransparent)
 {
     auto consensusParams = RegtestActivateSapling();
@@ -20,7 +22,7 @@ TEST(RecursiveDynamicUsageTests, TestTransactionTransparent)
     auto scriptPubKey = GetScriptForDestination(tsk.GetPubKey().GetID());
     CTxDestination taddr = tsk.GetPubKey().GetID();
     
-    auto builder = TransactionBuilder(consensusParams, 1, &keystore);
+    auto builder = TransactionBuilder(consensusParams, 1, std::nullopt, &keystore);
     builder.AddTransparentInput(COutPoint(), scriptPubKey, 50000);
     builder.AddTransparentOutput(taddr, 40000);
 
@@ -48,12 +50,14 @@ TEST(RecursiveDynamicUsageTests, TestTransactionJoinSplit)
 
 TEST(RecursiveDynamicUsageTests, TestTransactionSaplingToSapling)
 {
+    LoadProofParameters();
+
     auto consensusParams = RegtestActivateSapling();
     
     auto sk = libzcash::SaplingSpendingKey::random();
     auto testNote = GetTestSaplingNote(sk.default_address(), 50000);
 
-    auto builder = TransactionBuilder(consensusParams, 1);
+    auto builder = TransactionBuilder(consensusParams, 1, std::nullopt);
     builder.AddSaplingSpend(sk.expanded_spending_key(), testNote.note, testNote.tree.root(), testNote.tree.witness());
     builder.AddSaplingOutput(sk.full_viewing_key().ovk, sk.default_address(), 5000, {});
     
@@ -67,6 +71,8 @@ TEST(RecursiveDynamicUsageTests, TestTransactionSaplingToSapling)
 
 TEST(RecursiveDynamicUsageTests, TestTransactionTransparentToSapling)
 {
+    LoadProofParameters();
+
     auto consensusParams = RegtestActivateSapling();
     
     CBasicKeyStore keystore;
@@ -74,7 +80,7 @@ TEST(RecursiveDynamicUsageTests, TestTransactionTransparentToSapling)
     auto scriptPubKey = GetScriptForDestination(tsk.GetPubKey().GetID());
     auto sk = libzcash::SaplingSpendingKey::random();
 
-    auto builder = TransactionBuilder(consensusParams, 1, &keystore);
+    auto builder = TransactionBuilder(consensusParams, 1, std::nullopt, &keystore);
     builder.AddTransparentInput(COutPoint(), scriptPubKey, 50000);
     builder.AddSaplingOutput(sk.full_viewing_key().ovk, sk.default_address(), 40000, {});
     
@@ -88,6 +94,8 @@ TEST(RecursiveDynamicUsageTests, TestTransactionTransparentToSapling)
 
 TEST(RecursiveDynamicUsageTests, TestTransactionSaplingToTransparent)
 {
+    LoadProofParameters();
+
     auto consensusParams = RegtestActivateSapling();
     
     CBasicKeyStore keystore;
@@ -96,7 +104,7 @@ TEST(RecursiveDynamicUsageTests, TestTransactionSaplingToTransparent)
     auto sk = libzcash::SaplingSpendingKey::random();
     auto testNote = GetTestSaplingNote(sk.default_address(), 50000);
 
-    auto builder = TransactionBuilder(consensusParams, 1, &keystore);
+    auto builder = TransactionBuilder(consensusParams, 1, std::nullopt, &keystore);
     builder.AddSaplingSpend(sk.expanded_spending_key(), testNote.note, testNote.tree.root(), testNote.tree.witness());
     builder.AddTransparentOutput(taddr, 40000);
 
diff --git a/src/gtest/test_joinsplit.cpp b/src/gtest/test_joinsplit.cpp
index 5cd910ffe11..4f71a6c59d9 100644
--- a/src/gtest/test_joinsplit.cpp
+++ b/src/gtest/test_joinsplit.cpp
@@ -11,6 +11,7 @@
 #include "primitives/transaction.h"
 #include "proof_verifier.h"
 #include "transaction_builder.h"
+#include "utiltest.h"
 #include "zcash/JoinSplit.hpp"
 #include "zcash/Note.hpp"
 #include "zcash/NoteEncryption.hpp"
@@ -221,11 +222,11 @@ TEST(Joinsplit, HSig)
 /*
 // by Taylor Hornby
 
-import pyblake2
+import hashlib
 import binascii
 
 def hSig(randomSeed, nf1, nf2, joinSplitPubKey):
-    return pyblake2.blake2b(
+    return hashlib.blake2b(
         data=(randomSeed + nf1 + nf2 + joinSplitPubKey),
         digest_size=32,
         person=b"ZcashComputehSig"
@@ -309,6 +310,8 @@ void increment_note_witnesses(
 
 TEST(Joinsplit, FullApiTest)
 {
+    LoadProofParameters();
+
     {
         std::vector<SproutWitness> witnesses;
         SproutMerkleTree tree;
diff --git a/src/gtest/test_keys.cpp b/src/gtest/test_keys.cpp
index b7aef27bbf2..6c247ef7f2a 100644
--- a/src/gtest/test_keys.cpp
+++ b/src/gtest/test_keys.cpp
@@ -10,6 +10,7 @@
 
 #include "json_test_vectors.h"
 #include "test/data/unified_addrs.json.h"
+#include "test/data/unified_full_viewing_keys.json.h"
 
 TEST(Keys, EncodeAndDecodeSapling)
 {
@@ -27,11 +28,11 @@ TEST(Keys, EncodeAndDecodeSapling)
                 Params().Bech32HRP(CChainParams::SAPLING_EXTENDED_SPEND_KEY));
 
             auto spendingkey2 = keyIO.DecodeSpendingKey(sk_string);
-            EXPECT_TRUE(IsValidSpendingKey(spendingkey2));
+            EXPECT_TRUE(spendingkey2.has_value());
 
-            ASSERT_TRUE(std::get_if<libzcash::SaplingExtendedSpendingKey>(&spendingkey2) != nullptr);
-            auto sk2 = std::get<libzcash::SaplingExtendedSpendingKey>(spendingkey2);
-            EXPECT_EQ(sk, sk2);
+            auto sk2 = std::get_if<libzcash::SaplingExtendedSpendingKey>(&spendingkey2.value());
+            EXPECT_NE(sk2, nullptr);
+            EXPECT_EQ(sk, *sk2);
         }
         {
             auto extfvk = sk.ToXFVK();
@@ -41,14 +42,14 @@ TEST(Keys, EncodeAndDecodeSapling)
                 Params().Bech32HRP(CChainParams::SAPLING_EXTENDED_FVK));
 
             auto viewingkey2 = keyIO.DecodeViewingKey(vk_string);
-            EXPECT_TRUE(IsValidViewingKey(viewingkey2));
+            EXPECT_TRUE(viewingkey2.has_value());
 
-            ASSERT_TRUE(std::get_if<libzcash::SaplingExtendedFullViewingKey>(&viewingkey2) != nullptr);
-            auto extfvk2 = std::get<libzcash::SaplingExtendedFullViewingKey>(viewingkey2);
-            EXPECT_EQ(extfvk, extfvk2);
+            auto extfvk2 = std::get_if<libzcash::SaplingExtendedFullViewingKey>(&viewingkey2.value());
+            EXPECT_NE(extfvk2, nullptr);
+            EXPECT_EQ(extfvk, *extfvk2);
         }
         {
-            auto addr = sk.DefaultAddress();
+            auto addr = sk.ToXFVK().DefaultAddress();
 
             std::string addr_string = keyIO.EncodePaymentAddress(addr);
             EXPECT_EQ(
@@ -56,11 +57,11 @@ TEST(Keys, EncodeAndDecodeSapling)
                 Params().Bech32HRP(CChainParams::SAPLING_PAYMENT_ADDRESS));
 
             auto paymentaddr2 = keyIO.DecodePaymentAddress(addr_string);
-            EXPECT_TRUE(IsValidPaymentAddress(paymentaddr2));
+            EXPECT_TRUE(paymentaddr2.has_value());
 
-            ASSERT_TRUE(std::get_if<libzcash::SaplingPaymentAddress>(&paymentaddr2) != nullptr);
-            auto addr2 = std::get<libzcash::SaplingPaymentAddress>(paymentaddr2);
-            EXPECT_EQ(addr, addr2);
+            auto addr2 = std::get_if<libzcash::SaplingPaymentAddress>(&paymentaddr2.value());
+            EXPECT_NE(addr2, nullptr);
+            EXPECT_EQ(addr, *addr2);
         }
     }
 }
@@ -68,41 +69,15 @@ TEST(Keys, EncodeAndDecodeSapling)
 #define MAKE_STRING(x) std::string((x), (x) + sizeof(x))
 
 namespace libzcash {
-    class ReceiverToString {
-    public:
-        ReceiverToString() {}
-
-        std::string operator()(const SaplingPaymentAddress &zaddr) const {
-            CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
-            ss << zaddr;
-            return tfm::format("Sapling(%s)", HexStr(ss.begin(), ss.end()));
-        }
-
-        std::string operator()(const P2SHAddress &p2sh) const {
-            return tfm::format("P2SH(%s)", p2sh.GetHex());
-        }
-
-        std::string operator()(const P2PKHAddress &p2pkh) const {
-            return tfm::format("P2PKH(%s)", p2pkh.GetHex());
-        }
-
-        std::string operator()(const UnknownReceiver &unknown) const {
-            return tfm::format(
-                "Unknown(%x, %s)",
-                unknown.typecode,
-                HexStr(unknown.data.begin(), unknown.data.end()));
-        }
-    };
-
     void PrintTo(const Receiver& receiver, std::ostream* os) {
-        *os << std::visit(ReceiverToString(), receiver);
+        *os << DebugPrintReceiver(receiver);
     }
     void PrintTo(const UnifiedAddress& ua, std::ostream* os) {
         *os << "UnifiedAddress(" << testing::PrintToString(ua.GetReceiversAsParsed()) << ")";
     }
 }
 
-TEST(Keys, EncodeAndDecodeUnified)
+TEST(Keys, EncodeAndDecodeUnifiedAddresses)
 {
     SelectParams(CBaseChainParams::MAIN);
     KeyIO keyIO(Params());
@@ -121,18 +96,20 @@ TEST(Keys, EncodeAndDecodeUnified)
 
         try {
             libzcash::UnifiedAddress ua;
-            // ["p2pkh_bytes, p2sh_bytes, sapling_raw_addr, orchard_raw_addr, unified_addr"]
+            // ["p2pkh_bytes, p2sh_bytes, sapling_raw_addr, orchard_raw_addr, unknown_typecode, unknown_bytes, unified_addr, root_seed, account, diversifier_index"],
             // These were added to the UA in preference order by the Python test vectors.
             if (!test[3].isNull()) {
                 auto data = ParseHex(test[3].get_str());
-                libzcash::UnknownReceiver r(0x03, data);
-                ua.AddReceiver(r);
+                CDataStream ss(
+                    data,
+                    SER_NETWORK,
+                    PROTOCOL_VERSION);
+                ua.AddReceiver(libzcash::OrchardRawAddress::Read(ss));
             }
             if (!test[2].isNull()) {
                 auto data = ParseHex(test[2].get_str());
                 CDataStream ss(
-                    reinterpret_cast<const char*>(data.data()),
-                    reinterpret_cast<const char*>(data.data() + data.size()),
+                    data,
                     SER_NETWORK,
                     PROTOCOL_VERSION);
                 libzcash::SaplingPaymentAddress r;
@@ -140,20 +117,22 @@ TEST(Keys, EncodeAndDecodeUnified)
                 ua.AddReceiver(r);
             }
             if (!test[1].isNull()) {
-                libzcash::P2SHAddress r(ParseHex(test[1].get_str()));
+                CScriptID r(ParseHex(test[1].get_str()));
                 ua.AddReceiver(r);
             }
             if (!test[0].isNull()) {
-                libzcash::P2PKHAddress r(ParseHex(test[0].get_str()));
+                CKeyID r(ParseHex(test[0].get_str()));
                 ua.AddReceiver(r);
             }
 
-            auto expectedBytes = ParseHex(test[4].get_str());
+            auto expectedBytes = ParseHex(test[6].get_str());
             std::string expected(expectedBytes.begin(), expectedBytes.end());
 
             auto decoded = keyIO.DecodePaymentAddress(expected);
-            ASSERT_TRUE(std::holds_alternative<libzcash::UnifiedAddress>(decoded));
-            EXPECT_EQ(std::get<libzcash::UnifiedAddress>(decoded), ua);
+            EXPECT_TRUE(decoded.has_value());
+            auto ua_ptr = std::get_if<libzcash::UnifiedAddress>(&decoded.value());
+            EXPECT_NE(ua_ptr, nullptr);
+            EXPECT_EQ(*ua_ptr, ua);
 
             auto encoded = keyIO.EncodePaymentAddress(ua);
             EXPECT_EQ(encoded, expected);
@@ -164,3 +143,171 @@ TEST(Keys, EncodeAndDecodeUnified)
         }
     }
 }
+
+TEST(Keys, DeriveUnifiedFullViewingKeys)
+{
+    SelectParams(CBaseChainParams::MAIN);
+    KeyIO keyIO(Params());
+
+    UniValue ua_tests = read_json(MAKE_STRING(json_tests::unified_full_viewing_keys));
+
+    for (size_t idx = 0; idx < ua_tests.size(); idx++) {
+        UniValue test = ua_tests[idx];
+
+        std::string strTest = test.write();
+        if (test.size() < 1) // Allow for extra stuff (useful for comments)
+        {
+            FAIL() << "Bad test: " << strTest;
+            continue;
+        }
+        if (test.size() == 1) continue; // comment
+
+        try {
+            // [
+            //     t_key_bytes,
+            //     sapling_fvk_bytes,
+            //     orchard_fvk_bytes,
+            //     unknown_fvk_typecode,
+            //     unknown_fvk_bytes,
+            //     unified_fvk,
+            //     root_seed,
+            //     account,
+            // ],
+            auto seed_hex = test[6].get_str();
+            auto seed_data = ParseHex(seed_hex);
+            RawHDSeed raw_seed(seed_data.begin(), seed_data.end());
+            ASSERT_EQ(HexStr(raw_seed), seed_hex);
+
+            HDSeed hdseed(raw_seed);
+            auto usk = libzcash::ZcashdUnifiedSpendingKey::ForAccount(
+                    hdseed,
+                    133, //ZCASH_MAIN_COINTYPE
+                    test[7].get_int());
+            ASSERT_TRUE(usk.has_value());
+            auto ufvk = usk->ToFullViewingKey();
+
+            if (!test[0].isNull()) {
+                auto expectedHex = test[0].get_str();
+
+                // Ensure that the serialized transparent account key matches the test data.
+                auto tkey = ufvk.GetTransparentKey().value();
+                CDataStream ssEncode(SER_NETWORK, PROTOCOL_VERSION);
+                ssEncode << tkey.GetChainablePubKey();
+                EXPECT_EQ(ssEncode.size(), 65);
+                auto tkeyHex = HexStr(ssEncode.begin(), ssEncode.end());
+                EXPECT_EQ(expectedHex, tkeyHex);
+
+                // Ensure that parsing the test data derives the correct account pubkey.
+                auto data = ParseHex(expectedHex);
+                ASSERT_EQ(data.size(), 65);
+                CDataStream ss(data, SER_NETWORK, PROTOCOL_VERSION);
+                auto expected = libzcash::transparent::AccountPubKey(CChainablePubKey::Read(ss));
+                EXPECT_EQ(expected, tkey);
+            }
+            if (!test[1].isNull()) {
+                auto expectedHex = test[1].get_str();
+
+                // Ensure that the serialized Sapling dfvk matches the test data.
+                auto saplingKey = ufvk.GetSaplingKey().value();
+                CDataStream ssEncode(SER_NETWORK, PROTOCOL_VERSION);
+                ssEncode << saplingKey;
+                EXPECT_EQ(ssEncode.size(), 128);
+                auto skeyHex = HexStr(ssEncode.begin(), ssEncode.end());
+                EXPECT_EQ(expectedHex, skeyHex);
+
+                // Ensure that parsing the test data derives the correct dfvk
+                auto data = ParseHex(expectedHex);
+                ASSERT_EQ(data.size(), 128);
+                CDataStream ss(data, SER_NETWORK, PROTOCOL_VERSION);
+                auto key = libzcash::SaplingDiversifiableFullViewingKey::Read(ss);
+                EXPECT_EQ(key, saplingKey);
+            }
+            if (!test[2].isNull()) {
+                auto expectedHex = test[2].get_str();
+
+                // Ensure that the serialized Orchard fvk matches the test data.
+                auto orchardKey = ufvk.GetOrchardKey().value();
+                CDataStream ssEncode(SER_NETWORK, PROTOCOL_VERSION);
+                ssEncode << orchardKey;
+                EXPECT_EQ(ssEncode.size(), 96);
+                auto skeyHex = HexStr(ssEncode.begin(), ssEncode.end());
+                EXPECT_EQ(expectedHex, skeyHex);
+
+                // Ensure that parsing the test data derives the correct dfvk
+                auto data = ParseHex(expectedHex);
+                ASSERT_EQ(data.size(), 96);
+                CDataStream ss(data, SER_NETWORK, PROTOCOL_VERSION);
+                auto key = libzcash::OrchardFullViewingKey::Read(ss);
+                EXPECT_EQ(key, orchardKey);
+            }
+            // Enable the following after Orchard keys are supported.
+            //{
+            //    auto fvk_data = ParseHex(test[5].get_str());
+            //    std::string expected(fvk_data.begin(), fvk_data.end());
+            //    EXPECT_EQ(expected, ufvk.Encode(Params(CBaseChainParams::MAIN)));
+            //}
+        } catch (const std::exception& ex) {
+            FAIL() << "Bad test, couldn't deserialize data: " << strTest << ": " << ex.what();
+        } catch (...) {
+            FAIL() << "Bad test, couldn't deserialize data: " << strTest;
+        }
+    }
+}
+
+
+TEST(Keys, EncodeAndDecodeUnifiedFullViewingKeys)
+{
+    SelectParams(CBaseChainParams::MAIN);
+    KeyIO keyIO(Params());
+
+    UniValue ua_tests = read_json(MAKE_STRING(json_tests::unified_full_viewing_keys));
+
+    for (size_t idx = 0; idx < ua_tests.size(); idx++) {
+        UniValue test = ua_tests[idx];
+        std::string strTest = test.write();
+        if (test.size() < 1) // Allow for extra stuff (useful for comments)
+        {
+            FAIL() << "Bad test: " << strTest;
+            continue;
+        }
+        if (test.size() == 1) continue; // comment
+
+        libzcash::UnifiedFullViewingKeyBuilder builder;
+        // ["t_key_bytes, sapling_fvk_bytes, orchard_fvk_bytes, unknown_fvk_typecode, unknown_fvk_bytes, unified_fvk"]
+        // These were added to the UA in preference order by the Python test vectors.
+        if (!test[0].isNull()) {
+            auto data = ParseHex(test[0].get_str());
+            ASSERT_EQ(data.size(), 65);
+            CDataStream ss(data, SER_NETWORK, PROTOCOL_VERSION);
+            auto decoded = CChainablePubKey::Read(ss);
+            ASSERT_TRUE(builder.AddTransparentKey(decoded));
+        }
+        if (!test[1].isNull()) {
+            auto data = ParseHex(test[1].get_str());
+            ASSERT_EQ(data.size(), 128);
+            CDataStream ss(data, SER_NETWORK, PROTOCOL_VERSION);
+            auto key = libzcash::SaplingDiversifiableFullViewingKey::Read(ss);
+            ASSERT_TRUE(builder.AddSaplingKey(key));
+        }
+        if (!test[2].isNull()) {
+            auto data = ParseHex(test[2].get_str());
+            ASSERT_EQ(data.size(), 96);
+            CDataStream ss(data, SER_NETWORK, PROTOCOL_VERSION);
+            auto key = libzcash::OrchardFullViewingKey::Read(ss);
+            ASSERT_TRUE(builder.AddOrchardKey(key));
+        }
+
+        auto built = builder.build();
+        ASSERT_TRUE(built.has_value());
+
+        auto keystrBytes = ParseHex(test[5].get_str());
+        std::string keystr(keystrBytes.begin(), keystrBytes.end());
+
+        auto decoded = libzcash::UnifiedFullViewingKey::Decode(keystr, Params());
+        ASSERT_TRUE(decoded.has_value());
+
+        EXPECT_EQ(decoded.value().GetTransparentKey(), built.value().GetTransparentKey());
+        EXPECT_EQ(decoded.value().GetSaplingKey(), built.value().GetSaplingKey());
+        EXPECT_EQ(decoded.value().GetOrchardKey(), built.value().GetOrchardKey());
+    }
+}
diff --git a/src/gtest/test_keystore.cpp b/src/gtest/test_keystore.cpp
index b61ba909ac9..6cdc8023de5 100644
--- a/src/gtest/test_keystore.cpp
+++ b/src/gtest/test_keystore.cpp
@@ -14,37 +14,88 @@
 
 #define MAKE_STRING(x) std::string((x), (x)+sizeof(x))
 
-TEST(KeystoreTests, StoreAndRetrieveHDSeed) {
+using namespace libzcash;
+
+const uint32_t SLIP44_TESTNET_TYPE = 1;
+
+TEST(KeystoreTests, StoreAndRetrieveMnemonicSeed) {
     CBasicKeyStore keyStore;
-    HDSeed seedOut;
 
     // When we haven't set a seed, we shouldn't get one
-    EXPECT_FALSE(keyStore.HaveHDSeed());
-    EXPECT_FALSE(keyStore.GetHDSeed(seedOut));
+    EXPECT_FALSE(keyStore.HaveMnemonicSeed());
+    auto seedOut = keyStore.GetMnemonicSeed();
+    EXPECT_FALSE(seedOut.has_value());
 
     // Generate a random seed
-    auto seed = HDSeed::Random();
+    auto seed = MnemonicSeed::Random(SLIP44_TESTNET_TYPE);
 
     // We should be able to set and retrieve the seed
-    ASSERT_TRUE(keyStore.SetHDSeed(seed));
-    EXPECT_TRUE(keyStore.HaveHDSeed());
-    ASSERT_TRUE(keyStore.GetHDSeed(seedOut));
-    EXPECT_EQ(seed, seedOut);
+    ASSERT_TRUE(keyStore.SetMnemonicSeed(seed));
+    EXPECT_TRUE(keyStore.HaveMnemonicSeed());
+    seedOut = keyStore.GetMnemonicSeed();
+    ASSERT_TRUE(seedOut.has_value());
+    EXPECT_EQ(seed, seedOut.value());
 
     // Generate another random seed
-    auto seed2 = HDSeed::Random();
+    auto seed2 = MnemonicSeed::Random(SLIP44_TESTNET_TYPE);
     EXPECT_NE(seed, seed2);
 
     // We should not be able to set and retrieve a different seed
-    EXPECT_FALSE(keyStore.SetHDSeed(seed2));
-    ASSERT_TRUE(keyStore.GetHDSeed(seedOut));
-    EXPECT_EQ(seed, seedOut);
+    EXPECT_FALSE(keyStore.SetMnemonicSeed(seed2));
+    seedOut = keyStore.GetMnemonicSeed();
+    ASSERT_TRUE(seedOut.has_value());
+    EXPECT_EQ(seed, seedOut.value());
+}
+
+TEST(KeystoreTests, DecodeInvalidMnemonic) {
+    SecureString mnemonic("\xff");
+    EXPECT_FALSE(MnemonicSeed::ForPhrase(Language::English, mnemonic).has_value());
+}
+
+TEST(KeystoreTests, DeserializeMnemonic) {
+    CDataStream ss0(SER_NETWORK, CLIENT_VERSION);
+    ss0 << (uint32_t)English;
+    ss0 << SecureString("abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon art");
+    EXPECT_NO_THROW(MnemonicSeed::Read(ss0));
+
+    CDataStream ss(SER_NETWORK, CLIENT_VERSION);
+    ss << (uint32_t)English;
+    ss << SecureString("\xff");
+    EXPECT_THROW(MnemonicSeed::Read(ss), std::ios_base::failure);
+}
+
+TEST(KeystoreTests, StoreAndRetrieveLegacyHDSeed) {
+    CBasicKeyStore keyStore;
+
+    // When we haven't set a seed, we shouldn't get one
+    std::optional<HDSeed> seedOut = keyStore.GetLegacyHDSeed();
+    EXPECT_FALSE(seedOut.has_value());
+
+    // Generate a random seed
+    // (We use MnemonicSeed purely to generate a seed, and then drop the mnemonic part.)
+    HDSeed seed = MnemonicSeed::Random(SLIP44_TESTNET_TYPE);
+
+    // We should be able to set and retrieve the seed
+    ASSERT_TRUE(keyStore.SetLegacyHDSeed(seed));
+    seedOut = keyStore.GetLegacyHDSeed();
+    ASSERT_TRUE(seedOut.has_value());
+    EXPECT_EQ(seed, seedOut.value());
+
+    // Generate another random seed
+    HDSeed seed2 = MnemonicSeed::Random(SLIP44_TESTNET_TYPE);
+    EXPECT_NE(seed, seed2);
+
+    // We should not be able to set and retrieve a different seed
+    EXPECT_FALSE(keyStore.SetLegacyHDSeed(seed2));
+    seedOut = keyStore.GetLegacyHDSeed();
+    ASSERT_TRUE(seedOut.has_value());
+    EXPECT_EQ(seed, seedOut.value());
 }
 
 TEST(KeystoreTests, SaplingKeys) {
     // ["sk, ask, nsk, ovk, ak, nk, ivk, default_d, default_pk_d, note_v, note_r, note_cm, note_pos, note_nf"],
     UniValue sapling_keys = read_json(MAKE_STRING(json_tests::sapling_key_components));
-    
+
     // Skipping over comments in sapling_key_components.json file
     for (size_t i = 2; i < 12; i++) {
         uint256 skSeed, ask, nsk, ovk, ak, nk, ivk;
@@ -55,40 +106,40 @@ TEST(KeystoreTests, SaplingKeys) {
         ak.SetHex(sapling_keys[i][4].getValStr());
         nk.SetHex(sapling_keys[i][5].getValStr());
         ivk.SetHex(sapling_keys[i][6].getValStr());
-        
+
         libzcash::diversifier_t default_d;
         std::copy_n(ParseHex(sapling_keys[i][7].getValStr()).begin(), 11, default_d.begin());
-        
+
         uint256 default_pk_d;
         default_pk_d.SetHex(sapling_keys[i][8].getValStr());
-        
+
         auto sk = libzcash::SaplingSpendingKey(skSeed);
-        
+
         // Check that expanded spending key from primitives and from sk are the same
         auto exp_sk_2 = libzcash::SaplingExpandedSpendingKey(ask, nsk, ovk);
         auto exp_sk = sk.expanded_spending_key();
         EXPECT_EQ(exp_sk, exp_sk_2);
-            
+
         // Check that full viewing key derived from sk and expanded sk are the same
         auto full_viewing_key = sk.full_viewing_key();
         EXPECT_EQ(full_viewing_key, exp_sk.full_viewing_key());
-        
+
         // Check that full viewing key from primitives and from sk are the same
         auto full_viewing_key_2 = libzcash::SaplingFullViewingKey(ak, nk, ovk);
         EXPECT_EQ(full_viewing_key, full_viewing_key_2);
-            
+
         // Check that incoming viewing key from primitives and from sk are the same
         auto in_viewing_key = full_viewing_key.in_viewing_key();
         auto in_viewing_key_2 = libzcash::SaplingIncomingViewingKey(ivk);
         EXPECT_EQ(in_viewing_key, in_viewing_key_2);
-        
+
         // Check that the default address from primitives and from sk method are the same
         auto default_addr = sk.default_address();
         auto addrOpt2 = in_viewing_key.address(default_d);
         EXPECT_TRUE(addrOpt2);
         auto default_addr_2 = addrOpt2.value();
         EXPECT_EQ(default_addr, default_addr_2);
-        
+
         auto default_addr_3 = libzcash::SaplingPaymentAddress(default_d, default_pk_d);
         EXPECT_EQ(default_addr_2, default_addr_3);
         EXPECT_EQ(default_addr, default_addr_3);
@@ -200,8 +251,8 @@ TEST(KeystoreTests, StoreAndRetrieveSaplingSpendingKey) {
 
     auto sk = GetTestMasterSaplingSpendingKey();
     auto extfvk = sk.ToXFVK();
-    auto ivk = extfvk.fvk.in_viewing_key();
-    auto addr = sk.DefaultAddress();
+    auto ivk = extfvk.ToIncomingViewingKey();
+    auto addr = sk.ToXFVK().DefaultAddress();
 
     // Sanity-check: we can't get a key we haven't added
     EXPECT_FALSE(keyStore.HaveSaplingSpendingKey(extfvk));
@@ -209,9 +260,6 @@ TEST(KeystoreTests, StoreAndRetrieveSaplingSpendingKey) {
     // Sanity-check: we can't get a full viewing key we haven't added
     EXPECT_FALSE(keyStore.HaveSaplingFullViewingKey(ivk));
     EXPECT_FALSE(keyStore.GetSaplingFullViewingKey(ivk, extfvkOut));
-    // Sanity-check: we can't get an incoming viewing key we haven't added
-    EXPECT_FALSE(keyStore.HaveSaplingIncomingViewingKey(addr));
-    EXPECT_FALSE(keyStore.GetSaplingIncomingViewingKey(addr, ivkOut));
 
     // When we specify the default address, we get the full mapping
     keyStore.AddSaplingSpendingKey(sk);
@@ -219,6 +267,12 @@ TEST(KeystoreTests, StoreAndRetrieveSaplingSpendingKey) {
     EXPECT_TRUE(keyStore.GetSaplingSpendingKey(extfvk, skOut));
     EXPECT_TRUE(keyStore.HaveSaplingFullViewingKey(ivk));
     EXPECT_TRUE(keyStore.GetSaplingFullViewingKey(ivk, extfvkOut));
+
+    // We can't get an incoming viewing key for an address we haven't added
+    EXPECT_FALSE(keyStore.HaveSaplingIncomingViewingKey(addr));
+    EXPECT_FALSE(keyStore.GetSaplingIncomingViewingKey(addr, ivkOut));
+
+    keyStore.AddSaplingPaymentAddress(ivk, addr);
     EXPECT_TRUE(keyStore.HaveSaplingIncomingViewingKey(addr));
     EXPECT_TRUE(keyStore.GetSaplingIncomingViewingKey(addr, ivkOut));
     EXPECT_EQ(sk, skOut);
@@ -234,8 +288,8 @@ TEST(KeystoreTests, StoreAndRetrieveSaplingFullViewingKey) {
 
     auto sk = GetTestMasterSaplingSpendingKey();
     auto extfvk = sk.ToXFVK();
-    auto ivk = extfvk.fvk.in_viewing_key();
-    auto addr = sk.DefaultAddress();
+    auto ivk = extfvk.ToIncomingViewingKey();
+    auto addr = sk.ToXFVK().DefaultAddress();
 
     // Sanity-check: we can't get a full viewing key we haven't added
     EXPECT_FALSE(keyStore.HaveSaplingFullViewingKey(ivk));
@@ -258,11 +312,14 @@ TEST(KeystoreTests, StoreAndRetrieveSaplingFullViewingKey) {
     EXPECT_TRUE(keyStore.GetSaplingFullViewingKey(ivk, extfvkOut));
     EXPECT_EQ(extfvk, extfvkOut);
 
-    // We should still not have the spending key...
+    // We should still not have the spending key or
+    // be able to retrieve the IVK by the default address...
     EXPECT_FALSE(keyStore.HaveSaplingSpendingKey(extfvk));
     EXPECT_FALSE(keyStore.GetSaplingSpendingKey(extfvk, skOut));
+    EXPECT_FALSE(keyStore.HaveSaplingIncomingViewingKey(addr));
 
-    // ... but we should have an incoming viewing key
+    // The IVK must be manually associated with the address...
+    keyStore.AddSaplingPaymentAddress(ivk, addr);
     EXPECT_TRUE(keyStore.HaveSaplingIncomingViewingKey(addr));
     EXPECT_TRUE(keyStore.GetSaplingIncomingViewingKey(addr, ivkOut));
     EXPECT_EQ(ivk, ivkOut);
@@ -281,24 +338,90 @@ class TestCCryptoKeyStore : public CCryptoKeyStore
     bool Unlock(const CKeyingMaterial& vMasterKeyIn) { return CCryptoKeyStore::Unlock(vMasterKeyIn); }
 };
 
-TEST(KeystoreTests, StoreAndRetrieveHDSeedInEncryptedStore) {
+TEST(KeystoreTests, StoreAndRetrieveMnemonicSeedInEncryptedStore) {
+    TestCCryptoKeyStore keyStore;
+    CKeyingMaterial vMasterKey(32, 0);
+    GetRandBytes(vMasterKey.data(), 32);
+
+    // 1) Test adding a seed to an unencrypted key store, then encrypting it
+    auto seed = MnemonicSeed::Random(SLIP44_TESTNET_TYPE);
+    EXPECT_FALSE(keyStore.HaveMnemonicSeed());
+    auto seedOut = keyStore.GetMnemonicSeed();
+    EXPECT_FALSE(seedOut.has_value());
+
+    ASSERT_TRUE(keyStore.SetMnemonicSeed(seed));
+    EXPECT_TRUE(keyStore.HaveMnemonicSeed());
+    seedOut = keyStore.GetMnemonicSeed();
+    ASSERT_TRUE(seedOut.has_value());
+    EXPECT_EQ(seed, seedOut.value());
+
+    ASSERT_TRUE(keyStore.EncryptKeys(vMasterKey));
+    seedOut = keyStore.GetMnemonicSeed();
+    EXPECT_FALSE(seedOut.has_value());
+
+    // Unlocking with a random key should fail
+    CKeyingMaterial vRandomKey(32, 0);
+    GetRandBytes(vRandomKey.data(), 32);
+    EXPECT_FALSE(keyStore.Unlock(vRandomKey));
+
+    // Unlocking with a slightly-modified vMasterKey should fail
+    CKeyingMaterial vModifiedKey(vMasterKey);
+    vModifiedKey[0] += 1;
+    EXPECT_FALSE(keyStore.Unlock(vModifiedKey));
+
+    // Unlocking with vMasterKey should succeed
+    ASSERT_TRUE(keyStore.Unlock(vMasterKey));
+    seedOut = keyStore.GetMnemonicSeed();
+    ASSERT_TRUE(seedOut.has_value());
+    EXPECT_EQ(seed, seedOut.value());
+
+    // 2) Test replacing the seed in an already-encrypted key store fails
+    auto seed2 = MnemonicSeed::Random(SLIP44_TESTNET_TYPE);
+    EXPECT_FALSE(keyStore.SetMnemonicSeed(seed2));
+    EXPECT_TRUE(keyStore.HaveMnemonicSeed());
+    seedOut = keyStore.GetMnemonicSeed();
+    ASSERT_TRUE(seedOut.has_value());
+    EXPECT_EQ(seed, seedOut.value());
+
+    // 3) Test adding a new seed to an already-encrypted key store
+    TestCCryptoKeyStore keyStore2;
+
+    // Add a Sprout address so the wallet has something to test when decrypting
+    ASSERT_TRUE(keyStore2.AddSproutSpendingKey(libzcash::SproutSpendingKey::random()));
+
+    ASSERT_TRUE(keyStore2.EncryptKeys(vMasterKey));
+    ASSERT_TRUE(keyStore2.Unlock(vMasterKey));
+
+    EXPECT_FALSE(keyStore2.HaveMnemonicSeed());
+    seedOut = keyStore2.GetMnemonicSeed();
+    EXPECT_FALSE(seedOut.has_value());
+
+    auto seed3 = MnemonicSeed::Random(SLIP44_TESTNET_TYPE);
+    ASSERT_TRUE(keyStore2.SetMnemonicSeed(seed3));
+    EXPECT_TRUE(keyStore2.HaveMnemonicSeed());
+    seedOut = keyStore2.GetMnemonicSeed();
+    ASSERT_TRUE(seedOut.has_value());
+    EXPECT_EQ(seed3, seedOut.value());
+}
+
+TEST(KeystoreTests, StoreAndRetrieveLegacyHDSeedInEncryptedStore) {
     TestCCryptoKeyStore keyStore;
     CKeyingMaterial vMasterKey(32, 0);
     GetRandBytes(vMasterKey.data(), 32);
-    HDSeed seedOut;
 
     // 1) Test adding a seed to an unencrypted key store, then encrypting it
-    auto seed = HDSeed::Random();
-    EXPECT_FALSE(keyStore.HaveHDSeed());
-    EXPECT_FALSE(keyStore.GetHDSeed(seedOut));
+    // We use a mnemonic seed, then disregard the mnemonic itself.
+    auto seed = MnemonicSeed::Random(SLIP44_TESTNET_TYPE);
+    auto seedOut = keyStore.GetLegacyHDSeed();
+    EXPECT_FALSE(seedOut.has_value());
 
-    ASSERT_TRUE(keyStore.SetHDSeed(seed));
-    EXPECT_TRUE(keyStore.HaveHDSeed());
-    ASSERT_TRUE(keyStore.GetHDSeed(seedOut));
-    EXPECT_EQ(seed, seedOut);
+    ASSERT_TRUE(keyStore.SetLegacyHDSeed(seed));
+    seedOut = keyStore.GetLegacyHDSeed();
+    ASSERT_TRUE(seedOut.has_value());
 
     ASSERT_TRUE(keyStore.EncryptKeys(vMasterKey));
-    EXPECT_FALSE(keyStore.GetHDSeed(seedOut));
+    seedOut = keyStore.GetLegacyHDSeed();
+    EXPECT_FALSE(seedOut.has_value());
 
     // Unlocking with a random key should fail
     CKeyingMaterial vRandomKey(32, 0);
@@ -312,15 +435,16 @@ TEST(KeystoreTests, StoreAndRetrieveHDSeedInEncryptedStore) {
 
     // Unlocking with vMasterKey should succeed
     ASSERT_TRUE(keyStore.Unlock(vMasterKey));
-    ASSERT_TRUE(keyStore.GetHDSeed(seedOut));
-    EXPECT_EQ(seed, seedOut);
+    seedOut = keyStore.GetLegacyHDSeed();
+    ASSERT_TRUE(seedOut.has_value());
+    EXPECT_EQ(seed, seedOut.value());
 
     // 2) Test replacing the seed in an already-encrypted key store fails
-    auto seed2 = HDSeed::Random();
-    EXPECT_FALSE(keyStore.SetHDSeed(seed2));
-    EXPECT_TRUE(keyStore.HaveHDSeed());
-    ASSERT_TRUE(keyStore.GetHDSeed(seedOut));
-    EXPECT_EQ(seed, seedOut);
+    auto seed2 = MnemonicSeed::Random(SLIP44_TESTNET_TYPE);
+    EXPECT_FALSE(keyStore.SetLegacyHDSeed(seed2));
+    seedOut = keyStore.GetLegacyHDSeed();
+    ASSERT_TRUE(seedOut.has_value());
+    EXPECT_EQ(seed, seedOut.value());
 
     // 3) Test adding a new seed to an already-encrypted key store
     TestCCryptoKeyStore keyStore2;
@@ -331,14 +455,14 @@ TEST(KeystoreTests, StoreAndRetrieveHDSeedInEncryptedStore) {
     ASSERT_TRUE(keyStore2.EncryptKeys(vMasterKey));
     ASSERT_TRUE(keyStore2.Unlock(vMasterKey));
 
-    EXPECT_FALSE(keyStore2.HaveHDSeed());
-    EXPECT_FALSE(keyStore2.GetHDSeed(seedOut));
+    seedOut = keyStore2.GetLegacyHDSeed();
+    EXPECT_FALSE(seedOut.has_value());
 
-    auto seed3 = HDSeed::Random();
-    ASSERT_TRUE(keyStore2.SetHDSeed(seed3));
-    EXPECT_TRUE(keyStore2.HaveHDSeed());
-    ASSERT_TRUE(keyStore2.GetHDSeed(seedOut));
-    EXPECT_EQ(seed3, seedOut);
+    auto seed3 = MnemonicSeed::Random(SLIP44_TESTNET_TYPE);
+    ASSERT_TRUE(keyStore2.SetLegacyHDSeed(seed3));
+    seedOut = keyStore2.GetLegacyHDSeed();
+    ASSERT_TRUE(seedOut.has_value());
+    EXPECT_EQ(seed3, seedOut.value());
 }
 
 TEST(KeystoreTests, StoreAndRetrieveSpendingKeyInEncryptedStore) {
@@ -415,4 +539,96 @@ TEST(KeystoreTests, StoreAndRetrieveSpendingKeyInEncryptedStore) {
     ASSERT_EQ(1, addrs.count(addr));
     ASSERT_EQ(1, addrs.count(addr2));
 }
+
+TEST(KeystoreTests, StoreAndRetrieveUFVK) {
+    SelectParams(CBaseChainParams::TESTNET);
+    CBasicKeyStore keyStore;
+
+    auto seed = MnemonicSeed::Random(SLIP44_TESTNET_TYPE);
+    auto usk = ZcashdUnifiedSpendingKey::ForAccount(seed, SLIP44_TESTNET_TYPE, 0);
+    EXPECT_TRUE(usk.has_value());
+
+    auto ufvk = usk.value().ToFullViewingKey();
+    auto zufvk = ZcashdUnifiedFullViewingKey::FromUnifiedFullViewingKey(Params(), ufvk);
+    auto ufvkid = zufvk.GetKeyID();
+    EXPECT_FALSE(keyStore.GetUnifiedFullViewingKey(ufvkid).has_value());
+
+    EXPECT_TRUE(keyStore.AddUnifiedFullViewingKey(zufvk));
+    EXPECT_EQ(keyStore.GetUnifiedFullViewingKey(ufvkid).value(), zufvk);
+
+    auto addrPair = std::get<std::pair<UnifiedAddress, diversifier_index_t>>(zufvk.FindAddress(diversifier_index_t(0), {ReceiverType::Sapling}));
+    EXPECT_TRUE(addrPair.first.GetSaplingReceiver().has_value());
+    auto saplingReceiver = addrPair.first.GetSaplingReceiver().value();
+
+    // We detect this even though we haven't added the Sapling address, because
+    // we trial-decrypt diversifiers (which also means we learn the index).
+    auto ufvkmetaUnadded = keyStore.GetUFVKMetadataForReceiver(saplingReceiver);
+    EXPECT_TRUE(ufvkmetaUnadded.has_value());
+    EXPECT_EQ(ufvkmetaUnadded.value().GetUFVKId(), ufvkid);
+    EXPECT_EQ(ufvkmetaUnadded.value().GetDiversifierIndex().value(), addrPair.second);
+
+    // Adding the Sapling addr -> ivk map entry causes us to find the same UFVK,
+    // but as we're no longer trial-decrypting we don't learn the index.
+    auto saplingIvk = zufvk.GetSaplingKey().value().ToIncomingViewingKey();
+    keyStore.AddSaplingPaymentAddress(saplingIvk, saplingReceiver);
+
+    auto ufvkmeta = keyStore.GetUFVKMetadataForReceiver(saplingReceiver);
+    EXPECT_TRUE(ufvkmeta.has_value());
+    EXPECT_EQ(ufvkmeta.value().GetUFVKId(), ufvkid);
+    EXPECT_FALSE(ufvkmeta.value().GetDiversifierIndex().has_value());
+}
+
+TEST(KeystoreTests, StoreAndRetrieveUFVKByOrchard) {
+    SelectParams(CBaseChainParams::TESTNET);
+    CBasicKeyStore keyStore;
+
+    auto seed = MnemonicSeed::Random(SLIP44_TESTNET_TYPE);
+    auto usk = ZcashdUnifiedSpendingKey::ForAccount(seed, SLIP44_TESTNET_TYPE, 0);
+    EXPECT_TRUE(usk.has_value());
+
+    auto ufvk = usk.value().ToFullViewingKey();
+    auto zufvk = ZcashdUnifiedFullViewingKey::FromUnifiedFullViewingKey(Params(), ufvk);
+    auto ufvkid = zufvk.GetKeyID();
+    EXPECT_FALSE(keyStore.GetUnifiedFullViewingKey(ufvkid).has_value());
+
+    EXPECT_TRUE(keyStore.AddUnifiedFullViewingKey(zufvk));
+    EXPECT_EQ(keyStore.GetUnifiedFullViewingKey(ufvkid).value(), zufvk);
+
+    auto addrPair = std::get<std::pair<UnifiedAddress, diversifier_index_t>>(zufvk.FindAddress(diversifier_index_t(0), {ReceiverType::Orchard}));
+    EXPECT_TRUE(addrPair.first.GetOrchardReceiver().has_value());
+    auto orchardReceiver = addrPair.first.GetOrchardReceiver().value();
+
+    // We don't store Orchard addresses in CBasicKeyStore (the addr -> ivk
+    // mapping is stored in the Rust wallet), but we still detect this because
+    // we trial-decrypt diversifiers (which also means we learn the index).
+    auto ufvkmetaUnadded = keyStore.GetUFVKMetadataForReceiver(orchardReceiver);
+    EXPECT_TRUE(ufvkmetaUnadded.has_value());
+    EXPECT_EQ(ufvkmetaUnadded.value().GetUFVKId(), ufvkid);
+    EXPECT_EQ(ufvkmetaUnadded.value().GetDiversifierIndex().value(), addrPair.second);
+}
+
+TEST(KeystoreTests, AddTransparentReceiverForUnifiedAddress) {
+    SelectParams(CBaseChainParams::TESTNET);
+    CBasicKeyStore keyStore;
+
+    auto seed = MnemonicSeed::Random(SLIP44_TESTNET_TYPE);
+    auto usk = ZcashdUnifiedSpendingKey::ForAccount(seed, SLIP44_TESTNET_TYPE, 0);
+    EXPECT_TRUE(usk.has_value());
+
+    auto ufvk = usk.value().ToFullViewingKey();
+    auto zufvk = ZcashdUnifiedFullViewingKey::FromUnifiedFullViewingKey(Params(), ufvk);
+    auto ufvkid = zufvk.GetKeyID();
+    auto addrPair = std::get<std::pair<UnifiedAddress, diversifier_index_t>>(zufvk.FindAddress(diversifier_index_t(0), {ReceiverType::P2PKH, ReceiverType::Sapling}));
+    EXPECT_TRUE(addrPair.first.GetP2PKHReceiver().has_value());
+    auto ufvkmeta = keyStore.GetUFVKMetadataForReceiver(addrPair.first.GetP2PKHReceiver().value());
+    EXPECT_FALSE(ufvkmeta.has_value());
+
+    keyStore.AddTransparentReceiverForUnifiedAddress(ufvkid, addrPair.second, addrPair.first);
+
+    ufvkmeta = keyStore.GetUFVKMetadataForReceiver(addrPair.first.GetP2PKHReceiver().value());
+    EXPECT_TRUE(ufvkmeta.has_value());
+    EXPECT_EQ(ufvkmeta.value().GetUFVKId(), ufvkid);
+}
+
+
 #endif
diff --git a/src/gtest/test_mempoollimit.cpp b/src/gtest/test_mempoollimit.cpp
index 0f38aaaebe6..25dae6c94cb 100644
--- a/src/gtest/test_mempoollimit.cpp
+++ b/src/gtest/test_mempoollimit.cpp
@@ -110,6 +110,8 @@ TEST(MempoolLimitTests, WeightedTxTreeCheckSizeAfterDropping)
 
 TEST(MempoolLimitTests, WeightedTxInfoFromTx)
 {
+    LoadProofParameters();
+
     // The transaction creation is based on the test:
     // test_transaction_builder.cpp/TEST(TransactionBuilder, SetFee)
     auto consensusParams = RegtestActivateSapling();
@@ -119,7 +121,7 @@ TEST(MempoolLimitTests, WeightedTxInfoFromTx)
 
     // Default fee
     {
-        auto builder = TransactionBuilder(consensusParams, 1);
+        auto builder = TransactionBuilder(consensusParams, 1, std::nullopt);
         builder.AddSaplingSpend(sk.expanded_spending_key(), testNote.note, testNote.tree.root(), testNote.tree.witness());
         builder.AddSaplingOutput(sk.full_viewing_key().ovk, sk.default_address(), 25000, {});
 
@@ -130,7 +132,7 @@ TEST(MempoolLimitTests, WeightedTxInfoFromTx)
 
     // Lower than standard fee
     {
-        auto builder = TransactionBuilder(consensusParams, 1);
+        auto builder = TransactionBuilder(consensusParams, 1, std::nullopt);
         builder.AddSaplingSpend(sk.expanded_spending_key(), testNote.note, testNote.tree.root(), testNote.tree.witness());
         builder.AddSaplingOutput(sk.full_viewing_key().ovk, sk.default_address(), 25000, {});
         static_assert(DEFAULT_FEE == 1000);
@@ -143,7 +145,7 @@ TEST(MempoolLimitTests, WeightedTxInfoFromTx)
 
     // Larger Tx
     {
-        auto builder = TransactionBuilder(consensusParams, 1);
+        auto builder = TransactionBuilder(consensusParams, 1, std::nullopt);
         builder.AddSaplingSpend(sk.expanded_spending_key(), testNote.note, testNote.tree.root(), testNote.tree.witness());
         builder.AddSaplingOutput(sk.full_viewing_key().ovk, sk.default_address(), 5000, {});
         builder.AddSaplingOutput(sk.full_viewing_key().ovk, sk.default_address(), 5000, {});
diff --git a/src/gtest/test_merkletree.cpp b/src/gtest/test_merkletree.cpp
index b761670ac76..1898d8c0feb 100644
--- a/src/gtest/test_merkletree.cpp
+++ b/src/gtest/test_merkletree.cpp
@@ -293,13 +293,13 @@ TEST(orchardMerkleTree, emptyroot) {
     // an integer, which is converted to little-endian internally.
     uint256 expected = uint256S("2fd8e51a03d9bbe2dd809831b1497aeb68a6e37ddf707ced4aa2d8dff13529ae");
 
-    ASSERT_EQ(OrchardMerkleTree::empty_root(), expected);
+    ASSERT_EQ(OrchardMerkleFrontier::empty_root(), expected);
 }
 
 TEST(orchardMerkleTree, appendBundle) {
-    OrchardMerkleTree newTree;
+    OrchardMerkleFrontier newTree;
 
-    ASSERT_EQ(newTree.root(), OrchardMerkleTree::empty_root());
+    ASSERT_EQ(newTree.root(), OrchardMerkleFrontier::empty_root());
 
     for (int i = 0; i < 1; i++) {
         CDataStream ssBundleData(merkle_roots_orchard[i].bundle, SER_NETWORK, PROTOCOL_VERSION);
@@ -310,5 +310,15 @@ TEST(orchardMerkleTree, appendBundle) {
         uint256 anchor(merkle_roots_orchard[i].anchor);
 
         ASSERT_EQ(newTree.root(), anchor);
+
+        // Sanity check roundtrip serialization of the updated tree
+        CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
+        ss << newTree;
+
+        OrchardMerkleFrontier readBack;
+        ss >> readBack;
+
+        EXPECT_NE(newTree.root(), OrchardMerkleFrontier::empty_root());
+        EXPECT_EQ(newTree.root(), readBack.root());
     }
 }
diff --git a/src/gtest/test_metrics.cpp b/src/gtest/test_metrics.cpp
index 5ecefe530b6..adeb857d06e 100644
--- a/src/gtest/test_metrics.cpp
+++ b/src/gtest/test_metrics.cpp
@@ -92,6 +92,12 @@ TEST(Metrics, GetLocalSolPS) {
     // Increment time
     SetMockTime(104);
     EXPECT_EQ(1, GetLocalSolPS());
+
+    miningTimer.stop();
+    miningTimer.zeroize();
+    solutionTargetChecks.decrement();
+    solutionTargetChecks.decrement();
+    solutionTargetChecks.decrement();
 }
 
 TEST(Metrics, EstimateNetHeight) {
diff --git a/src/gtest/test_rpc.cpp b/src/gtest/test_rpc.cpp
index 405855c856b..bf2f0f09018 100644
--- a/src/gtest/test_rpc.cpp
+++ b/src/gtest/test_rpc.cpp
@@ -4,6 +4,7 @@
 #include "chain.h"
 #include "chainparams.h"
 #include "clientversion.h"
+#include "main.h"
 #include "primitives/block.h"
 #include "rpc/server.h"
 #include "streams.h"
@@ -23,6 +24,7 @@ TEST(rpc, CheckBlockToJSONReturnsMinifiedSolution) {
     CBlockIndex index {block};
     index.nHeight = 1391;
 
+    LOCK(cs_main);
     UniValue obj = blockToJSON(block, &index);
     EXPECT_EQ("009f44ff7505d789b964d6817734b8ce1377d456255994370d06e59ac99bd5791b6ad174a66fd71c70e60cfc7fd88243ffe06f80b1ad181625f210779c745524629448e25348a5fce4f346a1735e60fdf53e144c0157dbc47c700a21a236f1efb7ee75f65b8d9d9e29026cfd09048233175202b211b9a49de4ab46f1cac71b6ea57a686377bd612378746e70c61a659c9cd683269e9c2a5cbc1d19f1149345302bbd0a1e62bf4bab01e9caeea789a1519441a61b146de35a4cc75dbdf01029127e311ad5073e7e96397f47226a7df9df66b2086b70756db013bbaeb068260157014b2602fc7dc71336e1439c887d2742d9730b4e79b08ec7839c3e2a037ae1565d04e05e351bb3531e5ef42cf7b71ca1482a9205245dd41f4db0f71644f8bdb88e845558537c03834c06ac83f336651e54e2edfc12e15ea9b7ea2c074e6155654d44c4d3bd90d9511050e9ad87d170db01448e5be6f45419cd86008978db5e3ceab79890234f992648d69bf1053855387db646ccdee5575c65f81dd0f670b016d9f9a84707d91f77b862f697b8bb08365ba71fbe6bfa47af39155a75ebdcb1e5d69f59c40c9e3a64988c1ec26f7f5159eef5c244d504a9e46125948ecc389c2ec3028ac4ff39ffd66e7743970819272b21e0c2df75b308bc62896873952147e57ed79446db4cdb5a563e76ec4c25899d41128afb9a5f8fc8063621efb7a58b9dd666d30c73e318cdcf3393bfec200e160f500e645f7baac263db99fa4a7c1cb4fea219fc512193102034d379f244c21a81821301b8d47c90247713a3e902c762d7bafa6cdb744eeb6d3b50dd175599d02b6e9f5bbda59366e04862aa765135968426e7ac0116de7351940dc57c0ae451d63f667e39891bc81e09e6c76f6f8a7582f7447c6f5945f717b0e52a7e3dd0c6db4061362123cc53fd8ede4abed4865201dc4d8eb4e5d48baa565183b69a5304a44c0600bb24dcaeee9d95ceebd27c1b0a33e0b46f23797d7d7907300b2bb7d62ef2fc5aa139250c73930c621bb5f41fc235534ee8014dfaddd5245aeb01198420ba7b5c076545329c94d54fa725a8e807579f5f0cc9d98170598023268f5930893620190275e6b3c6f5181e36310a9a475208316911d78f917d724c5946c553b7ec042c563c540114b6b78bd4c6e808ee391a4a9d93e127032983c5b3708037b14aa604cfb034e7c8b0ffdd6936446fe80216178506a87402653a373926eeff66e704daf992a0a9a5c3ad80566c0339be9e5b8e35b3b3226b2f7767e20d992ea6c3d6e322eca37b0c7f7e60060802f5abcc1975841365cadbdc3867063addfc803766ae525375ecddee61f9df9ffcd20343c83ab82b0e91de039c59cb435c8d3159cc338b4901f40c9b5c27043bcf2bd5fa9b685b65c9ba5a1e11a51dd3f773051560341f9ec81d05bf259e2d4b7161f896fbb6812cfc924a32120b7367d5e40439e267adda6a1315bb0d6200ce6a503174c8d2a638ea6fd6b1f486d68db11bdca63c4f4a725d1ab6231ea875484e70b27d293c05803386924f283d4c12bb953474d92b7dd43d2d97193bd96281ebb63fa075d2f9ecd310c70ee1d97b5330bd8fb5791c5943ecf084e5f2c83915acac57519c46b166136068d6f9ec0dd598616e32c591128ce13705a283ca39d5b211409600e07b3713113374d9700207a45394eac5b3b7afc9b1b2bad7d89fd3f35f6b2413ce615ee7869b3569009403b96fdacdb32ef0a7e5229e2b666d51e95bdfb009b892e88bde70621a9b6509f068781392df4bdbc5723bb15071993f0d9a11575af5ff6ef85eaea39bc86805b35d8beee91b779354147f2d85304b8b49d053e7444fdd3deb9d16de331f2552af5b3be7766bb8f3f6a78c62148efb231f2268", find_value(obj, "solution").get_str());
 }
diff --git a/src/gtest/test_transaction_builder.cpp b/src/gtest/test_transaction_builder.cpp
index ad8c3465ad3..c61bdfbe233 100644
--- a/src/gtest/test_transaction_builder.cpp
+++ b/src/gtest/test_transaction_builder.cpp
@@ -7,73 +7,20 @@
 #include "pubkey.h"
 #include "rpc/protocol.h"
 #include "transaction_builder.h"
+#include "gtest/test_transaction_builder.h"
 #include "utiltest.h"
 #include "zcash/Address.hpp"
+#include "zcash/address/mnemonic.h"
+
+#include <optional>
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-// Fake an empty view
-class TransactionBuilderCoinsViewDB : public CCoinsView {
-public:
-    std::map<uint256, SproutMerkleTree> sproutTrees;
-
-    TransactionBuilderCoinsViewDB() {}
-
-    bool GetSproutAnchorAt(const uint256 &rt, SproutMerkleTree &tree) const {
-        auto it = sproutTrees.find(rt);
-        if (it != sproutTrees.end()) {
-            tree = it->second;
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    bool GetSaplingAnchorAt(const uint256 &rt, SaplingMerkleTree &tree) const {
-        return false;
-    }
-
-    bool GetNullifier(const uint256 &nf, ShieldedType type) const {
-        return false;
-    }
-
-    bool GetCoins(const uint256 &txid, CCoins &coins) const {
-        return false;
-    }
-
-    bool HaveCoins(const uint256 &txid) const {
-        return false;
-    }
-
-    uint256 GetBestBlock() const {
-        uint256 a;
-        return a;
-    }
-
-    uint256 GetBestAnchor(ShieldedType type) const {
-        uint256 a;
-        return a;
-    }
-
-    bool BatchWrite(CCoinsMap &mapCoins,
-                    const uint256 &hashBlock,
-                    const uint256 &hashSproutAnchor,
-                    const uint256 &hashSaplingAnchor,
-                    CAnchorsSproutMap &mapSproutAnchors,
-                    CAnchorsSaplingMap &mapSaplingAnchors,
-                    CNullifiersMap &mapSproutNullifiers,
-                    CNullifiersMap saplingNullifiersMap) {
-        return false;
-    }
-
-    bool GetStats(CCoinsStats &stats) const {
-        return false;
-    }
-};
-
 TEST(TransactionBuilder, TransparentToSapling)
 {
+    LoadProofParameters();
+
     auto consensusParams = RegtestActivateSapling();
 
     CBasicKeyStore keystore;
@@ -92,7 +39,7 @@ TEST(TransactionBuilder, TransparentToSapling)
 
     // Create a shielding transaction from transparent to Sapling
     // 0.0005 t-ZEC in, 0.0004 z-ZEC out, default fee
-    auto builder = TransactionBuilder(consensusParams, 1, &keystore);
+    auto builder = TransactionBuilder(consensusParams, 1, std::nullopt, &keystore);
     builder.AddTransparentInput(COutPoint(uint256S("1234"), 0), scriptPubKey, 50000);
     builder.AddSaplingOutput(fvk_from.ovk, pk, 40000, {});
     auto tx = builder.Build().GetTxOrThrow();
@@ -113,6 +60,8 @@ TEST(TransactionBuilder, TransparentToSapling)
 }
 
 TEST(TransactionBuilder, SaplingToSapling) {
+    LoadProofParameters();
+
     auto consensusParams = RegtestActivateSapling();
 
     auto sk = libzcash::SaplingSpendingKey::random();
@@ -124,7 +73,7 @@ TEST(TransactionBuilder, SaplingToSapling) {
 
     // Create a Sapling-only transaction
     // 0.0004 z-ZEC in, 0.00025 z-ZEC out, default fee, 0.00005 z-ZEC change
-    auto builder = TransactionBuilder(consensusParams, 2);
+    auto builder = TransactionBuilder(consensusParams, 2, std::nullopt);
     builder.AddSaplingSpend(expsk, testNote.note, testNote.tree.root(), testNote.tree.witness());
 
     // Check that trying to add a different anchor fails
@@ -150,6 +99,8 @@ TEST(TransactionBuilder, SaplingToSapling) {
 }
 
 TEST(TransactionBuilder, SaplingToSprout) {
+    LoadProofParameters();
+
     auto consensusParams = RegtestActivateSapling();
 
     auto sk = libzcash::SaplingSpendingKey::random();
@@ -165,7 +116,7 @@ TEST(TransactionBuilder, SaplingToSprout) {
     // - 0.0004 Sapling-ZEC in      - 0.00025 Sprout-ZEC out
     //                              - 0.00005 Sapling-ZEC change
     //                              - default t-ZEC fee
-    auto builder = TransactionBuilder(consensusParams, 2, nullptr);
+    auto builder = TransactionBuilder(consensusParams, 2, std::nullopt, nullptr);
     builder.AddSaplingSpend(expsk, testNote.note, testNote.tree.root(), testNote.tree.witness());
     builder.AddSproutOutput(sproutAddr, 25000);
     auto tx = builder.Build().GetTxOrThrow();
@@ -188,6 +139,8 @@ TEST(TransactionBuilder, SaplingToSprout) {
 }
 
 TEST(TransactionBuilder, SproutToSproutAndSapling) {
+    LoadProofParameters();
+
     auto consensusParams = RegtestActivateSapling();
 
     auto sk = libzcash::SaplingSpendingKey::random();
@@ -217,7 +170,7 @@ TEST(TransactionBuilder, SproutToSproutAndSapling) {
     //                              - 0.00005 Sprout-ZEC change
     //                              - 0.00005 Sapling-ZEC out
     //                              - 0.00005 t-ZEC fee
-    auto builder = TransactionBuilder(consensusParams, 2, nullptr, &view);
+    auto builder = TransactionBuilder(consensusParams, 2, std::nullopt, nullptr, &view);
     builder.SetFee(5000);
     builder.AddSproutInput(sproutSk, sproutNote, sproutWitness);
     builder.AddSproutOutput(sproutAddr, 6000);
@@ -248,39 +201,78 @@ TEST(TransactionBuilder, SproutToSproutAndSapling) {
     RegtestDeactivateSapling();
 }
 
-TEST(TransactionBuilder, ThrowsOnTransparentInputWithoutKeyStore)
+TEST(TransactionBuilder, TransparentToOrchard)
 {
-    SelectParams(CBaseChainParams::REGTEST);
-    const Consensus::Params& consensusParams = Params().GetConsensus();
+    auto consensusParams = RegtestActivateNU5();
 
-    auto builder = TransactionBuilder(consensusParams, 1);
-    ASSERT_THROW(builder.AddTransparentInput(COutPoint(), CScript(), 1), std::runtime_error);
+    CBasicKeyStore keystore;
+    CKey tsk = AddTestCKeyToKeyStore(keystore);
+    auto scriptPubKey = GetScriptForDestination(tsk.GetPubKey().GetID());
+
+    auto coinType = Params().BIP44CoinType();
+    auto seed = MnemonicSeed::Random(coinType);
+    auto sk = libzcash::OrchardSpendingKey::ForAccount(seed, coinType, 0);
+    auto fvk = sk.ToFullViewingKey();
+    auto ivk = fvk.ToIncomingViewingKey();
+    libzcash::diversifier_index_t j(0);
+    auto recipient = ivk.Address(j);
+
+    TransactionBuilderCoinsViewDB fakeDB;
+    auto orchardAnchor = fakeDB.GetBestAnchor(ShieldedType::ORCHARD);
+
+    // Create a shielding transaction from transparent to Orchard
+    // 0.0005 t-ZEC in, 0.0004 z-ZEC out, default fee
+    auto builder = TransactionBuilder(consensusParams, 1, orchardAnchor, &keystore);
+    builder.AddTransparentInput(COutPoint(uint256S("1234"), 0), scriptPubKey, 50000);
+    builder.AddOrchardOutput(std::nullopt, recipient, 40000, std::nullopt);
+    auto maybeTx = builder.Build();
+    EXPECT_TRUE(maybeTx.IsTx());
+    if (maybeTx.IsError()) {
+        std::cerr << "Failed to build transaction: " << maybeTx.GetError() << std::endl;
+        GTEST_FAIL();
+    }
+    auto tx = maybeTx.GetTxOrThrow();
+
+    EXPECT_EQ(tx.vin.size(), 1);
+    EXPECT_EQ(tx.vout.size(), 0);
+    EXPECT_EQ(tx.vJoinSplit.size(), 0);
+    EXPECT_EQ(tx.vShieldedSpend.size(), 0);
+    EXPECT_EQ(tx.vShieldedOutput.size(), 0);
+    EXPECT_TRUE(tx.GetOrchardBundle().IsPresent());
+    EXPECT_EQ(tx.GetOrchardBundle().GetValueBalance(), -40000);
+
+    CValidationState state;
+    EXPECT_TRUE(ContextualCheckTransaction(tx, state, Params(), 2, true));
+    EXPECT_EQ(state.GetRejectReason(), "");
+
+    // Revert to default
+    RegtestDeactivateNU5();
 }
 
-TEST(TransactionBuilder, RejectsInvalidTransparentOutput)
+TEST(TransactionBuilder, ThrowsOnTransparentInputWithoutKeyStore)
 {
     SelectParams(CBaseChainParams::REGTEST);
     const Consensus::Params& consensusParams = Params().GetConsensus();
 
-    // Default CTxDestination type is an invalid address
-    CTxDestination taddr;
-    auto builder = TransactionBuilder(consensusParams, 1);
-    ASSERT_THROW(builder.AddTransparentOutput(taddr, 50), UniValue);
+    auto builder = TransactionBuilder(consensusParams, 1, std::nullopt);
+    ASSERT_THROW(builder.AddTransparentInput(COutPoint(), CScript(), 1), std::runtime_error);
 }
 
-TEST(TransactionBuilder, RejectsInvalidTransparentChangeAddress)
+TEST(TransactionBuilder, RejectsInvalidTransparentOutput)
 {
     SelectParams(CBaseChainParams::REGTEST);
     const Consensus::Params& consensusParams = Params().GetConsensus();
 
     // Default CTxDestination type is an invalid address
     CTxDestination taddr;
-    auto builder = TransactionBuilder(consensusParams, 1);
-    ASSERT_THROW(builder.SendChangeTo(taddr), UniValue);
+    auto builder = TransactionBuilder(consensusParams, 1, std::nullopt);
+    ASSERT_THROW(builder.AddTransparentOutput(taddr, 50), UniValue);
 }
 
 TEST(TransactionBuilder, FailsWithNegativeChange)
 {
+    LoadProofParameters();
+
     auto consensusParams = RegtestActivateSapling();
 
     // Generate dummy Sapling address
@@ -300,13 +292,13 @@ TEST(TransactionBuilder, FailsWithNegativeChange)
 
     // Fail if there is only a Sapling output
     // 0.0005 z-ZEC out, default fee
-    auto builder = TransactionBuilder(consensusParams, 1);
+    auto builder = TransactionBuilder(consensusParams, 1, std::nullopt);
     builder.AddSaplingOutput(fvk.ovk, pa, 50000, {});
     EXPECT_EQ("Change cannot be negative", builder.Build().GetError());
 
     // Fail if there is only a transparent output
     // 0.0005 t-ZEC out, default fee
-    builder = TransactionBuilder(consensusParams, 1, &keystore);
+    builder = TransactionBuilder(consensusParams, 1, std::nullopt, &keystore);
     builder.AddTransparentOutput(taddr, 50000);
     EXPECT_EQ("Change cannot be negative", builder.Build().GetError());
 
@@ -325,6 +317,8 @@ TEST(TransactionBuilder, FailsWithNegativeChange)
 
 TEST(TransactionBuilder, ChangeOutput)
 {
+    LoadProofParameters();
+
     auto consensusParams = RegtestActivateSapling();
 
     // Generate dummy Sapling address
@@ -344,18 +338,17 @@ TEST(TransactionBuilder, ChangeOutput)
     CKey tsk = AddTestCKeyToKeyStore(keystore);
     auto tkeyid = tsk.GetPubKey().GetID();
     auto scriptPubKey = GetScriptForDestination(tkeyid);
-    CTxDestination taddr = tkeyid;
 
     // No change address and no Sapling spends
     {
-        auto builder = TransactionBuilder(consensusParams, 1, &keystore);
+        auto builder = TransactionBuilder(consensusParams, 1, std::nullopt, &keystore);
         builder.AddTransparentInput(COutPoint(), scriptPubKey, 25000);
         EXPECT_EQ("Could not determine change address", builder.Build().GetError());
     }
 
     // Change to the same address as the first Sapling spend
     {
-        auto builder = TransactionBuilder(consensusParams, 1, &keystore);
+        auto builder = TransactionBuilder(consensusParams, 1, std::nullopt, &keystore);
         builder.AddTransparentInput(COutPoint(), scriptPubKey, 25000);
         builder.AddSaplingSpend(expsk, testNote.note, testNote.tree.root(), testNote.tree.witness());
         auto tx = builder.Build().GetTxOrThrow();
@@ -370,7 +363,7 @@ TEST(TransactionBuilder, ChangeOutput)
 
     // Change to a Sapling address
     {
-        auto builder = TransactionBuilder(consensusParams, 1, &keystore);
+        auto builder = TransactionBuilder(consensusParams, 1, std::nullopt, &keystore);
         builder.AddTransparentInput(COutPoint(), scriptPubKey, 25000);
         builder.SendChangeTo(zChangeAddr, fvkOut.ovk);
         auto tx = builder.Build().GetTxOrThrow();
@@ -385,9 +378,9 @@ TEST(TransactionBuilder, ChangeOutput)
 
     // Change to a transparent address
     {
-        auto builder = TransactionBuilder(consensusParams, 1, &keystore);
+        auto builder = TransactionBuilder(consensusParams, 1, std::nullopt, &keystore);
         builder.AddTransparentInput(COutPoint(), scriptPubKey, 25000);
-        builder.SendChangeTo(taddr);
+        builder.SendChangeTo(tkeyid, {});
         auto tx = builder.Build().GetTxOrThrow();
 
         EXPECT_EQ(tx.vin.size(), 1);
@@ -405,6 +398,8 @@ TEST(TransactionBuilder, ChangeOutput)
 
 TEST(TransactionBuilder, SetFee)
 {
+    LoadProofParameters();
+
     auto consensusParams = RegtestActivateSapling();
 
     // Generate dummy Sapling address
@@ -417,7 +412,7 @@ TEST(TransactionBuilder, SetFee)
 
     // Default fee
     {
-        auto builder = TransactionBuilder(consensusParams, 1);
+        auto builder = TransactionBuilder(consensusParams, 1, std::nullopt);
         builder.AddSaplingSpend(expsk, testNote.note, testNote.tree.root(), testNote.tree.witness());
         builder.AddSaplingOutput(fvk.ovk, pa, 25000, {});
         auto tx = builder.Build().GetTxOrThrow();
@@ -432,7 +427,7 @@ TEST(TransactionBuilder, SetFee)
 
     // Configured fee
     {
-        auto builder = TransactionBuilder(consensusParams, 1);
+        auto builder = TransactionBuilder(consensusParams, 1, std::nullopt);
         builder.AddSaplingSpend(expsk, testNote.note, testNote.tree.root(), testNote.tree.witness());
         builder.AddSaplingOutput(fvk.ovk, pa, 25000, {});
         builder.SetFee(20000);
@@ -461,7 +456,7 @@ TEST(TransactionBuilder, CheckSaplingTxVersion)
     auto pk = sk.default_address();
 
     // Cannot add Sapling outputs to a non-Sapling transaction
-    auto builder = TransactionBuilder(consensusParams, 1);
+    auto builder = TransactionBuilder(consensusParams, 1, std::nullopt);
     try {
         builder.AddSaplingOutput(uint256(), pk, 12345, {});
     } catch (std::runtime_error const & err) {
diff --git a/src/gtest/test_transaction_builder.h b/src/gtest/test_transaction_builder.h
new file mode 100644
index 00000000000..fcb4ba6649f
--- /dev/null
+++ b/src/gtest/test_transaction_builder.h
@@ -0,0 +1,73 @@
+// Copyright (c) 2022 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+#ifndef ZCASH_GTEST_TEST_TRANSACTION_BUILDER_H
+#define ZCASH_GTEST_TEST_TRANSACTION_BUILDER_H
+
+#include "coins.h"
+
+// Fake an empty view
+class TransactionBuilderCoinsViewDB : public CCoinsView {
+public:
+    std::map<uint256, SproutMerkleTree> sproutTrees;
+
+    TransactionBuilderCoinsViewDB() {}
+
+    bool GetSproutAnchorAt(const uint256 &rt, SproutMerkleTree &tree) const {
+        auto it = sproutTrees.find(rt);
+        if (it != sproutTrees.end()) {
+            tree = it->second;
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    bool GetSaplingAnchorAt(const uint256 &rt, SaplingMerkleTree &tree) const {
+        return false;
+    }
+
+    bool GetOrchardAnchorAt(const uint256 &rt, OrchardMerkleFrontier &tree) const {
+        return false;
+    }
+
+    bool GetNullifier(const uint256 &nf, ShieldedType type) const {
+        return false;
+    }
+
+    bool GetCoins(const uint256 &txid, CCoins &coins) const {
+        return false;
+    }
+
+    bool HaveCoins(const uint256 &txid) const {
+        return false;
+    }
+
+    uint256 GetBestBlock() const {
+        uint256 a;
+        return a;
+    }
+
+    uint256 GetBestAnchor(ShieldedType type) const {
+        uint256 a;
+        return a;
+    }
+
+    bool BatchWrite(CCoinsMap &mapCoins,
+                    const uint256 &hashBlock,
+                    const uint256 &hashSproutAnchor,
+                    const uint256 &hashSaplingAnchor,
+                    CAnchorsSproutMap &mapSproutAnchors,
+                    CAnchorsSaplingMap &mapSaplingAnchors,
+                    CNullifiersMap &mapSproutNullifiers,
+                    CNullifiersMap saplingNullifiersMap) {
+        return false;
+    }
+
+    bool GetStats(CCoinsStats &stats) const {
+        return false;
+    }
+};
+
+#endif
diff --git a/src/gtest/test_validation.cpp b/src/gtest/test_validation.cpp
index 21833fb63e6..4f028e6f73d 100644
--- a/src/gtest/test_validation.cpp
+++ b/src/gtest/test_validation.cpp
@@ -172,7 +172,7 @@ TEST(Validation, ContextualCheckInputsDetectsOldBranchId) {
 
     // Create a transparent transaction that spends the coin, targeting
     // a height during the Overwinter epoch.
-    auto builder = TransactionBuilder(consensusParams, 15, &keystore);
+    auto builder = TransactionBuilder(consensusParams, 15, std::nullopt, &keystore);
     builder.AddTransparentInput(utxo, scriptPubKey, coinValue);
     builder.AddTransparentOutput(destination, 40000);
     auto tx = builder.Build().GetTxOrThrow();
diff --git a/src/gtest/test_zip32.cpp b/src/gtest/test_zip32.cpp
index c8ee5a3350d..9361ccb7286 100644
--- a/src/gtest/test_zip32.cpp
+++ b/src/gtest/test_zip32.cpp
@@ -58,10 +58,10 @@ TEST(ZIP32, TestVectors) {
         m_1.ToXFVK().DefaultAddress().d,
         testing::ElementsAreArray({ 0x8b, 0x41, 0x38, 0x32, 0x0d, 0xfa, 0xfd, 0x7b, 0x39, 0x97, 0x81 }));
 
-    auto m_1_2h = m_1.Derive(2 | ZIP32_HARDENED_KEY_LIMIT);
+    auto m_1_2h = m_1.Derive(2 | HARDENED_KEY_LIMIT);
     EXPECT_EQ(m_1_2h.depth, 2);
     EXPECT_EQ(m_1_2h.parentFVKTag, 0x079e99db);
-    EXPECT_EQ(m_1_2h.childIndex, 2 | ZIP32_HARDENED_KEY_LIMIT);
+    EXPECT_EQ(m_1_2h.childIndex, 2 | HARDENED_KEY_LIMIT);
     EXPECT_EQ(
         m_1_2h.chaincode,
         uint256S("35d4a883737742ca41a4baa92323bdb3c93dcb3b462a26b039971bedf415ce97"));
@@ -84,7 +84,7 @@ TEST(ZIP32, TestVectors) {
     auto m_1_2hv = m_1_2h.ToXFVK();
     EXPECT_EQ(m_1_2hv.depth, 2);
     EXPECT_EQ(m_1_2hv.parentFVKTag, 0x079e99db);
-    EXPECT_EQ(m_1_2hv.childIndex, 2 | ZIP32_HARDENED_KEY_LIMIT);
+    EXPECT_EQ(m_1_2hv.childIndex, 2 | HARDENED_KEY_LIMIT);
     EXPECT_EQ(
         m_1_2hv.chaincode,
         uint256S("35d4a883737742ca41a4baa92323bdb3c93dcb3b462a26b039971bedf415ce97"));
@@ -103,7 +103,7 @@ TEST(ZIP32, TestVectors) {
     EXPECT_EQ(m_1_2hv.DefaultAddress(), m_1_2h.ToXFVK().DefaultAddress());
 
     // Hardened derivation from an xfvk fails
-    EXPECT_FALSE(m_1_2hv.Derive(3 | ZIP32_HARDENED_KEY_LIMIT));
+    EXPECT_FALSE(m_1_2hv.Derive(3 | HARDENED_KEY_LIMIT));
 
     // Non-hardened derivation succeeds
     auto maybe_m_1_2hv_3 = m_1_2hv.Derive(3);
@@ -132,3 +132,57 @@ TEST(ZIP32, TestVectors) {
         m_1_2hv_3.DefaultAddress().d,
         testing::ElementsAreArray({ 0x03, 0x0f, 0xfb, 0x26, 0x3a, 0x93, 0x9e, 0x23, 0x0e, 0x96, 0xdd }));
 }
+
+TEST(ZIP32, ParseHDKeypathAccount) {
+    auto expect_account = [](std::string sAccount, uint32_t coinType, long expected) {
+        auto result = libzcash::ParseHDKeypathAccount(32, coinType, sAccount);
+        EXPECT_TRUE(result.has_value());
+        EXPECT_EQ(result.value(), expected);
+    };
+
+    std::string sAccount = "m/32'/1234'/5'";
+    expect_account(sAccount, 1234, 5);
+
+    sAccount = "m/32'/1234'/50'";
+    expect_account(sAccount, 1234, 50);
+
+    sAccount = "m/32'/1234'/5'/0";
+    expect_account(sAccount, 1234, 5);
+
+    sAccount = "m/32'/133'/2147483646'/1";
+    expect_account(sAccount, 133, 2147483646);
+}
+
+TEST(ZIP32, diversifier_index_t_increment)
+{
+    libzcash::diversifier_index_t d_zero(0);
+    libzcash::diversifier_index_t d_one(1);
+    EXPECT_TRUE(d_zero.increment());
+    EXPECT_EQ(d_zero, d_one);
+}
+
+TEST(ZIP32, diversifier_index_t_lt)
+{
+    EXPECT_TRUE(libzcash::diversifier_index_t(0) < libzcash::diversifier_index_t(1));
+    EXPECT_FALSE(libzcash::diversifier_index_t(1) < libzcash::diversifier_index_t(0));
+    EXPECT_FALSE(libzcash::diversifier_index_t(0) < libzcash::diversifier_index_t(0));
+    EXPECT_TRUE(libzcash::diversifier_index_t(0xfffffffe) < libzcash::diversifier_index_t(0xffffffff));
+    EXPECT_FALSE(libzcash::diversifier_index_t(0xffffffff) < libzcash::diversifier_index_t(0xfffffffe));
+    EXPECT_TRUE(libzcash::diversifier_index_t(0x01) < libzcash::diversifier_index_t(0xffffffff));
+    EXPECT_FALSE(libzcash::diversifier_index_t(0xffffffff) < libzcash::diversifier_index_t(0x01));
+}
+
+TEST(ZIP32, DeriveChangeAddress)
+{
+    std::vector<unsigned char, secure_allocator<unsigned char>> rawSeed {
+        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+        17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31};
+    HDSeed seed(rawSeed);
+
+    auto accountSk = libzcash::SaplingExtendedSpendingKey::ForAccount(seed, 1, 0);
+    auto extfvk = accountSk.first.ToXFVK();
+    auto changeSk = accountSk.first.DeriveInternalKey();
+
+    EXPECT_EQ(changeSk.ToXFVK().DefaultAddress(), extfvk.GetChangeAddress());
+}
+
diff --git a/src/init.cpp b/src/init.cpp
index cd93d290f43..fe72073cbfb 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -305,7 +305,7 @@ bool static Bind(const CService &addr, unsigned int flags) {
 
 void OnRPCStopped()
 {
-    cvBlockChange.notify_all();
+    g_best_block_cv.notify_all();
     LogPrint("rpc", "RPC stopped.\n");
 }
 
@@ -341,7 +341,7 @@ std::string HelpMessage(HelpMessageMode mode)
         strUsage += HelpMessageOpt("-daemon", _("Run in the background as a daemon and accept commands"));
 #endif
     }
-    strUsage += HelpMessageOpt("-datadir=<dir>", _("Specify data directory"));
+    strUsage += HelpMessageOpt("-datadir=<dir>", _("Specify data directory (this path cannot use '~')"));
     strUsage += HelpMessageOpt("-paramsdir=<dir>", _("Specify Zcash network parameters directory"));
     strUsage += HelpMessageOpt("-dbcache=<n>", strprintf(_("Set database cache size in megabytes (%d to %d, default: %d)"), nMinDbCache, nMaxDbCache, nDefaultDbCache));
     strUsage += HelpMessageOpt("-debuglogfile=<file>", strprintf(_("Specify location of debug log file: this can be an absolute path or a path relative to the data directory (default: %s)"), DEFAULT_DEBUGLOGFILE));
@@ -684,7 +684,7 @@ void ThreadImport(std::vector<fs::path> vImportFiles, const CChainParams& chainp
  */
 bool InitSanityCheck(void)
 {
-    if(!ECC_InitSanityCheck()) {
+    if(!CKey::ECC_InitSanityCheck()) {
         InitError("Elliptic curve cryptography sanity check failure. Aborting.");
         return false;
     }
@@ -947,6 +947,12 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         return InitError(err.value());
     }
 
+    // Just temporarily (until fully functional), don't allow the Orchard wallet
+    // extensions if we're on mainnet
+    if (fExperimentalOrchardWallet && chainparams.NetworkIDString() == "main") {
+        return InitError(_("The -orchardwallet setting is not yet available on mainnet."));
+    }
+
     // if using block pruning, then disable txindex
     if (GetArg("-prune", 0)) {
         if (GetBoolArg("-txindex", DEFAULT_TXINDEX))
@@ -1077,7 +1083,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     }
 
 #ifdef ENABLE_WALLET
-    if (!CWallet::ParameterInteraction())
+    if (!CWallet::ParameterInteraction(chainparams))
         return false;
 #endif // ENABLE_WALLET
 
@@ -1098,16 +1104,11 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     KeyIO keyIO(chainparams);
 #ifdef ENABLE_MINING
     if (mapArgs.count("-mineraddress")) {
-        CTxDestination addr = keyIO.DecodeDestination(mapArgs["-mineraddress"]);
-        if (!IsValidDestination(addr)) {
-            // Try a payment address
-            auto zaddr = keyIO.DecodePaymentAddress(mapArgs["-mineraddress"]);
-            if (!std::visit(IsValidMinerAddress(), std::visit(ExtractMinerAddress(), zaddr)))
-            {
-                return InitError(strprintf(
-                    _("Invalid address for -mineraddress=<addr>: '%s' (must be a Sapling or transparent address)"),
-                    mapArgs["-mineraddress"]));
-            }
+        auto addr = keyIO.DecodePaymentAddress(mapArgs["-mineraddress"]);
+        if (!(addr.has_value() && std::visit(ExtractMinerAddress(chainparams.GetConsensus(), 0), addr.value()).has_value())) {
+            return InitError(strprintf(
+                _("Invalid address for -mineraddress=<addr>: '%s' (must be a Sapling or transparent P2PKH address)"),
+                mapArgs["-mineraddress"]));
         }
     }
 #endif
@@ -1143,6 +1144,29 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
                 return InitError(strprintf("Invalid network upgrade (%s)", vDeploymentParams[0]));
             }
         }
+
+        // To make testing easier (this code path is active only for regtest), activate missing network versions,
+        // so for example, if a Python (RPC) test does:
+        // extra_args = [
+        //    nuparams(BLOSSOM_BRANCH_ID, 205),
+        //    nuparams(HEARTWOOD_BRANCH_ID, 205),
+        //    nuparams(CANOPY_BRANCH_ID, 205),
+        //    nuparams(NU5_BRANCH_ID, 210),
+        // ]
+        //
+        // This can be simplified to:
+        // extra_args = [
+        //    nuparams(CANOPY_BRANCH_ID, 205),
+        //    nuparams(NU5_BRANCH_ID, 210),
+        // ]
+        const auto& consensus = chainparams.GetConsensus();
+        int nActivationHeight = Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
+        for (auto i = Consensus::MAX_NETWORK_UPGRADES-1; i >= Consensus::BASE_SPROUT + 1; --i) {
+            if (consensus.vUpgrades[i].nActivationHeight == Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT) {
+                UpdateNetworkUpgradeParameters(Consensus::UpgradeIndex(i), nActivationHeight);
+            }
+            nActivationHeight = consensus.vUpgrades[i].nActivationHeight;
+        }
     }
 
     if (mapArgs.count("-nurejectoldversions")) {
@@ -1453,7 +1477,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     // cache size calculations
     int64_t nTotalCache = (GetArg("-dbcache", nDefaultDbCache) << 20);
     nTotalCache = std::max(nTotalCache, nMinDbCache << 20); // total cache cannot be less than nMinDbCache
-    nTotalCache = std::min(nTotalCache, nMaxDbCache << 20); // total cache cannot be greated than nMaxDbcache
+    nTotalCache = std::min(nTotalCache, nMaxDbCache << 20); // total cache cannot be greater than nMaxDbcache
     int64_t nBlockTreeDBCache = nTotalCache / 8;
     if (nBlockTreeDBCache > (1 << 21) && !GetBoolArg("-txindex", DEFAULT_TXINDEX))
         nBlockTreeDBCache = (1 << 21); // block tree db cache shouldn't be larger than 2 MiB
@@ -1633,7 +1657,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         pwalletMain = NULL;
         LogPrintf("Wallet disabled!\n");
     } else {
-        CWallet::InitLoadWallet(clearWitnessCaches);
+        CWallet::InitLoadWallet(chainparams, clearWitnessCaches);
         if (!pwalletMain)
             return false;
     }
@@ -1655,15 +1679,12 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
  #ifdef ENABLE_WALLET
         bool minerAddressInLocalWallet = false;
         if (pwalletMain) {
-            CTxDestination addr = keyIO.DecodeDestination(mapArgs["-mineraddress"]);
-            if (IsValidDestination(addr)) {
-                CKeyID keyID = std::get<CKeyID>(addr);
-                minerAddressInLocalWallet = pwalletMain->HaveKey(keyID);
-            } else {
-                auto zaddr = keyIO.DecodePaymentAddress(mapArgs["-mineraddress"]);
-                minerAddressInLocalWallet = std::visit(
-                    HaveSpendingKeyForPaymentAddress(pwalletMain), zaddr);
+            auto zaddr = keyIO.DecodePaymentAddress(mapArgs["-mineraddress"]);
+            if (!zaddr.has_value()) {
+                return InitError(_("-mineraddress is not a valid " PACKAGE_NAME " address."));
             }
+            auto ztxoSelector = pwalletMain->ZTXOSelectorForAddress(zaddr.value(), true, false);
+            minerAddressInLocalWallet = ztxoSelector.has_value();
         }
         if (GetBoolArg("-minetolocalwallet", true) && !minerAddressInLocalWallet) {
             return InitError(_("-mineraddress is not in the local wallet. Either use a local address, or set -minetolocalwallet=0"));
diff --git a/src/key.cpp b/src/key.cpp
index 9f03cf0c2cc..cb4aa834371 100644
--- a/src/key.cpp
+++ b/src/key.cpp
@@ -156,20 +156,23 @@ bool CKey::Check(const unsigned char *vch) {
     return secp256k1_ec_seckey_verify(secp256k1_context_sign, vch);
 }
 
-void CKey::MakeNewKey(bool fCompressedIn) {
+CKey CKey::TestOnlyRandomKey(bool fCompressedIn) {
+    CKey key;
     do {
-        GetRandBytes(keydata.data(), keydata.size());
-    } while (!Check(keydata.data()));
-    fValid = true;
-    fCompressed = fCompressedIn;
+        GetRandBytes(key.keydata.data(), key.keydata.size());
+    } while (!Check(key.keydata.data()));
+    key.fValid = true;
+    key.fCompressed = fCompressedIn;
+    return key;
 }
 
-bool CKey::SetPrivKey(const CPrivKey &privkey, bool fCompressedIn) {
-    if (!ec_privkey_import_der(secp256k1_context_sign, (unsigned char*)begin(), &privkey[0], privkey.size()))
-        return false;
-    fCompressed = fCompressedIn;
-    fValid = true;
-    return true;
+std::optional<CKey> CKey::FromPrivKey(const CPrivKey &privkey, bool fCompressedIn) {
+    CKey key;
+    if (!ec_privkey_import_der(secp256k1_context_sign, (unsigned char*)key.begin(), &privkey[0], privkey.size()))
+        return std::nullopt;
+    key.fCompressed = fCompressedIn;
+    key.fValid = true;
+    return key;
 }
 
 CPrivKey CKey::GetPrivKey() const {
@@ -274,23 +277,35 @@ bool CKey::Derive(CKey& keyChild, ChainCode &ccChild, unsigned int nChild, const
     return ret;
 }
 
-bool CExtKey::Derive(CExtKey &out, unsigned int _nChild) const {
+std::optional<CExtKey> CExtKey::Derive(unsigned int _nChild) const {
+    CExtKey out;
     out.nDepth = nDepth + 1;
     CKeyID id = key.GetPubKey().GetID();
     memcpy(&out.vchFingerprint[0], &id, 4);
     out.nChild = _nChild;
-    return key.Derive(out.key, out.chaincode, _nChild, chaincode);
+    if (key.Derive(out.key, out.chaincode, _nChild, chaincode)) {
+        return out;
+    } else {
+        return std::nullopt;
+    }
 }
 
-void CExtKey::SetMaster(const unsigned char *seed, unsigned int nSeedLen) {
+std::optional<CExtKey> CExtKey::Master(const unsigned char *seed, unsigned int nSeedLen) {
+    CExtKey xk;
     static const unsigned char hashkey[] = {'B','i','t','c','o','i','n',' ','s','e','e','d'};
     std::vector<unsigned char, secure_allocator<unsigned char>> vout(64);
     CHMAC_SHA512(hashkey, sizeof(hashkey)).Write(seed, nSeedLen).Finalize(vout.data());
-    key.Set(vout.data(), vout.data() + 32, true);
-    memcpy(chaincode.begin(), vout.data() + 32, 32);
-    nDepth = 0;
-    nChild = 0;
-    memset(vchFingerprint, 0, sizeof(vchFingerprint));
+    xk.key.Set(vout.data(), vout.data() + 32, true);
+    memcpy(xk.chaincode.begin(), vout.data() + 32, 32);
+    xk.nDepth = 0;
+    xk.nChild = 0;
+    memset(xk.vchFingerprint, 0, sizeof(xk.vchFingerprint));
+
+    if (xk.key.IsValid()) {
+        return xk;
+    } else {
+        return std::nullopt;
+    }
 }
 
 CExtPubKey CExtKey::Neuter() const {
@@ -322,9 +337,8 @@ void CExtKey::Decode(const unsigned char code[BIP32_EXTKEY_SIZE]) {
     key.Set(code+42, code+BIP32_EXTKEY_SIZE, true);
 }
 
-bool ECC_InitSanityCheck() {
-    CKey key;
-    key.MakeNewKey(true);
+bool CKey::ECC_InitSanityCheck() {
+    CKey key = CKey::TestOnlyRandomKey(true);
     CPubKey pubkey = key.GetPubKey();
     return key.VerifyPubKey(pubkey);
 }
diff --git a/src/key.h b/src/key.h
index c61f1dd0228..0122ec9fa46 100644
--- a/src/key.h
+++ b/src/key.h
@@ -15,7 +15,6 @@
 #include <stdexcept>
 #include <vector>
 
-
 /**
  * secure_allocator is defined in allocators.h
  * CPrivKey is a serialized private key, with all parameters included
@@ -62,6 +61,19 @@ class CKey
         keydata.resize(32);
     }
 
+    /**
+     * Construct a random key. This is used only for internal sanity checks;
+     * all keys that actually control live funds should be derived from the
+     * wallet's mnemonic seed.
+     */
+    static CKey TestOnlyRandomKey(bool fCompressedIn);
+
+    //! Initialize from a CPrivKey (serialized OpenSSL-format private key data).
+    static std::optional<CKey> FromPrivKey(const CPrivKey& vchPrivKey, bool fCompressed);
+
+    /** Check that required EC support is available at runtime. */
+    static bool ECC_InitSanityCheck();
+
     friend bool operator==(const CKey& a, const CKey& b)
     {
         return a.fCompressed == b.fCompressed &&
@@ -95,12 +107,6 @@ class CKey
     //! Check whether the public key corresponding to this private key is (to be) compressed.
     bool IsCompressed() const { return fCompressed; }
 
-    //! Initialize from a CPrivKey (serialized OpenSSL-format private key data).
-    bool SetPrivKey(const CPrivKey& vchPrivKey, bool fCompressed);
-
-    //! Generate a new private key using a cryptographic PRNG.
-    void MakeNewKey(bool fCompressed);
-
     /**
      * Convert the private key to a CPrivKey (serialized OpenSSL-format private key data).
      * This is expensive.
@@ -160,11 +166,12 @@ struct CExtKey {
             a.key == b.key;
     }
 
+    static std::optional<CExtKey> Master(const unsigned char* seed, unsigned int nSeedLen);
+
     void Encode(unsigned char code[BIP32_EXTKEY_SIZE]) const;
     void Decode(const unsigned char code[BIP32_EXTKEY_SIZE]);
-    bool Derive(CExtKey& out, unsigned int nChild) const;
+    std::optional<CExtKey> Derive(unsigned int nChild) const;
     CExtPubKey Neuter() const;
-    void SetMaster(const unsigned char* seed, unsigned int nSeedLen);
     template <typename Stream>
     void Serialize(Stream& s) const
     {
@@ -190,7 +197,5 @@ void ECC_Start(void);
 /** Deinitialize the elliptic curve support. No-op if ECC_Start wasn't called first. */
 void ECC_Stop(void);
 
-/** Check that required EC support is available at runtime. */
-bool ECC_InitSanityCheck(void);
 
 #endif // BITCOIN_KEY_H
diff --git a/src/key_constants.h b/src/key_constants.h
index 58ac61e4b25..62a795c24f1 100644
--- a/src/key_constants.h
+++ b/src/key_constants.h
@@ -5,7 +5,10 @@
 #ifndef ZCASH_KEY_CONSTANTS_H
 #define ZCASH_KEY_CONSTANTS_H
 
-class KeyConstants 
+#include <string>
+#include <vector>
+
+class KeyConstants
 {
 public:
     enum Base58Type {
@@ -33,8 +36,22 @@ class KeyConstants
     };
 
     virtual std::string NetworkIDString() const =0;
+    virtual uint32_t BIP44CoinType() const =0;
     virtual const std::vector<unsigned char>& Base58Prefix(Base58Type type) const =0;
     virtual const std::string& Bech32HRP(Bech32Type type) const =0;
 };
 
+class CBaseKeyConstants : public KeyConstants {
+public:
+    std::string strNetworkID;
+    uint32_t bip44CoinType;
+    std::vector<unsigned char> base58Prefixes[KeyConstants::MAX_BASE58_TYPES];
+    std::string bech32HRPs[KeyConstants::MAX_BECH32_TYPES];
+
+    std::string NetworkIDString() const { return strNetworkID; }
+    uint32_t BIP44CoinType() const { return bip44CoinType; }
+    const std::vector<unsigned char>& Base58Prefix(Base58Type type) const { return base58Prefixes[type]; }
+    const std::string& Bech32HRP(Bech32Type type) const { return bech32HRPs[type]; }
+};
+
 #endif // ZCASH_KEY_CONSTANTS_H
diff --git a/src/key_io.cpp b/src/key_io.cpp
index 86bec602e65..7793b283505 100644
--- a/src/key_io.cpp
+++ b/src/key_io.cpp
@@ -16,6 +16,7 @@
 #include <string.h>
 #include <algorithm>
 #include <variant>
+#include "util/match.h"
 
 namespace
 {
@@ -44,7 +45,7 @@ class DestinationEncoder
     std::string operator()(const CNoDestination& no) const { return {}; }
 };
 
-static uint8_t GetTypecode(const void* ua, size_t index)
+static uint32_t GetTypecode(const void* ua, size_t index)
 {
     return std::visit(
         TypecodeForReceiver(),
@@ -55,9 +56,10 @@ class DataLenForReceiver {
 public:
     DataLenForReceiver() {}
 
+    size_t operator()(const libzcash::OrchardRawAddress &zaddr) const { return 43; }
     size_t operator()(const libzcash::SaplingPaymentAddress &zaddr) const { return 43; }
-    size_t operator()(const libzcash::P2SHAddress &p2sh) const { return 20; }
-    size_t operator()(const libzcash::P2PKHAddress &p2pkh) const { return 20; }
+    size_t operator()(const CScriptID &p2sh) const { return 20; }
+    size_t operator()(const CKeyID &p2pkh) const { return 20; }
     size_t operator()(const libzcash::UnknownReceiver &unknown) const { return unknown.data.size(); }
 };
 
@@ -75,6 +77,13 @@ class CopyDataForReceiver {
 public:
     CopyDataForReceiver(unsigned char* data, size_t length) : data(data), length(length) {}
 
+    void operator()(const libzcash::OrchardRawAddress &zaddr) const {
+        CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
+        ss << zaddr;
+        assert(length == ss.size());
+        memcpy(data, ss.data(), ss.size());
+    }
+
     void operator()(const libzcash::SaplingPaymentAddress &zaddr) const {
         CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
         ss << zaddr;
@@ -82,11 +91,11 @@ class CopyDataForReceiver {
         memcpy(data, ss.data(), ss.size());
     }
 
-    void operator()(const libzcash::P2SHAddress &p2sh) const {
+    void operator()(const CScriptID &p2sh) const {
         memcpy(data, p2sh.begin(), p2sh.size());
     }
 
-    void operator()(const libzcash::P2PKHAddress &p2pkh) const {
+    void operator()(const CKeyID &p2pkh) const {
         memcpy(data, p2pkh.begin(), p2pkh.size());
     }
 
@@ -113,6 +122,14 @@ class PaymentAddressEncoder
 public:
     PaymentAddressEncoder(const KeyConstants& keyConstants) : keyConstants(keyConstants) {}
 
+    std::string operator()(const CKeyID& id) const
+    {
+        return DestinationEncoder(keyConstants)(id);
+    }
+    std::string operator()(const CScriptID& id) const
+    {
+        return DestinationEncoder(keyConstants)(id);
+    }
     std::string operator()(const libzcash::SproutPaymentAddress& zaddr) const
     {
         CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
@@ -151,8 +168,6 @@ class PaymentAddressEncoder
         zcash_address_string_free(encoded);
         return res;
     }
-
-    std::string operator()(const libzcash::InvalidEncoding& no) const { return {}; }
 };
 
 class ViewingKeyEncoder
@@ -190,7 +205,9 @@ class ViewingKeyEncoder
         return ret;
     }
 
-    std::string operator()(const libzcash::InvalidEncoding& no) const { return {}; }
+    std::string operator()(const libzcash::UnifiedFullViewingKey& ufvk) const {
+        return ufvk.Encode(keyConstants);
+    }
 };
 
 class SpendingKeyEncoder
@@ -227,8 +244,6 @@ class SpendingKeyEncoder
         memory_cleanse(data.data(), data.size());
         return ret;
     }
-
-    std::string operator()(const libzcash::InvalidEncoding& no) const { return {}; }
 };
 
 // Sizes of SaplingPaymentAddress, SaplingExtendedFullViewingKey, and
@@ -240,7 +255,7 @@ const size_t ConvertedSaplingExtendedFullViewingKeySize = (ZIP32_XFVK_SIZE * 8 +
 const size_t ConvertedSaplingExtendedSpendingKeySize = (ZIP32_XSK_SIZE * 8 + 4) / 5;
 } // namespace
 
-CTxDestination KeyIO::DecodeDestination(const std::string& str)
+CTxDestination KeyIO::DecodeDestination(const std::string& str) const
 {
     std::vector<unsigned char> data;
     uint160 hash;
@@ -264,7 +279,7 @@ CTxDestination KeyIO::DecodeDestination(const std::string& str)
     return CNoDestination();
 };
 
-CKey KeyIO::DecodeSecret(const std::string& str)
+CKey KeyIO::DecodeSecret(const std::string& str) const
 {
     CKey key;
     std::vector<unsigned char> data;
@@ -280,7 +295,7 @@ CKey KeyIO::DecodeSecret(const std::string& str)
     return key;
 }
 
-std::string KeyIO::EncodeSecret(const CKey& key)
+std::string KeyIO::EncodeSecret(const CKey& key) const
 {
     assert(key.IsValid());
     std::vector<unsigned char> data = keyConstants.Base58Prefix(KeyConstants::SECRET_KEY);
@@ -293,7 +308,7 @@ std::string KeyIO::EncodeSecret(const CKey& key)
     return ret;
 }
 
-CExtPubKey KeyIO::DecodeExtPubKey(const std::string& str)
+CExtPubKey KeyIO::DecodeExtPubKey(const std::string& str) const
 {
     CExtPubKey key;
     std::vector<unsigned char> data;
@@ -306,7 +321,7 @@ CExtPubKey KeyIO::DecodeExtPubKey(const std::string& str)
     return key;
 }
 
-std::string KeyIO::EncodeExtPubKey(const CExtPubKey& key)
+std::string KeyIO::EncodeExtPubKey(const CExtPubKey& key) const
 {
     std::vector<unsigned char> data = keyConstants.Base58Prefix(KeyConstants::EXT_PUBLIC_KEY);
     size_t size = data.size();
@@ -316,7 +331,7 @@ std::string KeyIO::EncodeExtPubKey(const CExtPubKey& key)
     return ret;
 }
 
-CExtKey KeyIO::DecodeExtKey(const std::string& str)
+CExtKey KeyIO::DecodeExtKey(const std::string& str) const
 {
     CExtKey key;
     std::vector<unsigned char> data;
@@ -329,7 +344,7 @@ CExtKey KeyIO::DecodeExtKey(const std::string& str)
     return key;
 }
 
-std::string KeyIO::EncodeExtKey(const CExtKey& key)
+std::string KeyIO::EncodeExtKey(const CExtKey& key) const
 {
     std::vector<unsigned char> data = keyConstants.Base58Prefix(KeyConstants::EXT_SECRET_KEY);
     size_t size = data.size();
@@ -340,32 +355,31 @@ std::string KeyIO::EncodeExtKey(const CExtKey& key)
     return ret;
 }
 
-std::string KeyIO::EncodeDestination(const CTxDestination& dest)
+std::string KeyIO::EncodeDestination(const CTxDestination& dest) const
 {
     return std::visit(DestinationEncoder(keyConstants), dest);
 }
 
-bool KeyIO::IsValidDestinationString(const std::string& str)
+bool KeyIO::IsValidDestinationString(const std::string& str) const
 {
     return IsValidDestination(DecodeDestination(str));
 }
 
-std::string KeyIO::EncodePaymentAddress(const libzcash::PaymentAddress& zaddr)
+std::string KeyIO::EncodePaymentAddress(const libzcash::PaymentAddress& zaddr) const
 {
     return std::visit(PaymentAddressEncoder(keyConstants), zaddr);
 }
 
-template<typename T1, typename T2, typename T3>
-T1 DecodeAny(
-    const KeyConstants& keyConstants,
-    const std::string& str,
-    std::pair<KeyConstants::Base58Type, size_t> sprout,
-    std::pair<KeyConstants::Bech32Type, size_t> sapling)
+template<typename T1, typename T2>
+std::optional<T1> DecodeSprout(
+        const KeyConstants& keyConstants,
+        const std::string& str,
+        const std::pair<KeyConstants::Base58Type, size_t>& keyMeta)
 {
     std::vector<unsigned char> data;
     if (DecodeBase58Check(str, data)) {
-        const std::vector<unsigned char>& prefix = keyConstants.Base58Prefix(sprout.first);
-        if ((data.size() == sprout.second + prefix.size()) &&
+        const std::vector<unsigned char>& prefix = keyConstants.Base58Prefix(keyMeta.first);
+        if ((data.size() == keyMeta.second + prefix.size()) &&
             std::equal(prefix.begin(), prefix.end(), data.begin())) {
             CSerializeData serialized(data.begin() + prefix.size(), data.end());
             CDataStream ss(serialized, SER_NETWORK, PROTOCOL_VERSION);
@@ -377,15 +391,26 @@ T1 DecodeAny(
         }
     }
 
-    data.clear();
+    memory_cleanse(data.data(), data.size());
+    return std::nullopt;
+}
+
+template<typename T1, typename T2>
+std::optional<T1> DecodeSapling(
+        const KeyConstants& keyConstants,
+        const std::string& str,
+        const std::pair<KeyConstants::Bech32Type, size_t>& keyMeta)
+{
+    std::vector<unsigned char> data;
+
     auto bech = bech32::Decode(str);
-    if (bech.first == keyConstants.Bech32HRP(sapling.first) &&
-        bech.second.size() == sapling.second) {
+    if (bech.first == keyConstants.Bech32HRP(keyMeta.first) &&
+        bech.second.size() == keyMeta.second) {
         // Bech32 decoding
         data.reserve((bech.second.size() * 5) / 8);
         if (ConvertBits<5, 8, false>([&](unsigned char c) { data.push_back(c); }, bech.second.begin(), bech.second.end())) {
             CDataStream ss(data, SER_NETWORK, PROTOCOL_VERSION);
-            T3 ret;
+            T2 ret;
             ss >> ret;
             memory_cleanse(data.data(), data.size());
             return ret;
@@ -393,98 +418,91 @@ T1 DecodeAny(
     }
 
     memory_cleanse(data.data(), data.size());
-    return libzcash::InvalidEncoding();
-}
-
-/**
- * `raw` MUST be 43 bytes.
- */
-static bool AddSaplingReceiver(void* ua, const unsigned char* raw)
-{
-    CDataStream ss(
-        reinterpret_cast<const char*>(raw),
-        reinterpret_cast<const char*>(raw + 43),
-        SER_NETWORK,
-        PROTOCOL_VERSION);
-    libzcash::SaplingPaymentAddress receiver;
-    ss >> receiver;
-    return reinterpret_cast<libzcash::UnifiedAddress*>(ua)->AddReceiver(receiver);
+    return std::nullopt;
 }
 
-/**
- * `raw` MUST be 20 bytes.
- */
-static bool AddP2SHReceiver(void* ua, const unsigned char* raw)
+template<typename T1, typename T2, typename T3>
+std::optional<T1> DecodeAny(
+    const KeyConstants& keyConstants,
+    const std::string& str,
+    const std::pair<KeyConstants::Base58Type, size_t>& sproutKeyMeta,
+    const std::pair<KeyConstants::Bech32Type, size_t>& saplingKeyMeta)
 {
-    CDataStream ss(
-        reinterpret_cast<const char*>(raw),
-        reinterpret_cast<const char*>(raw + 20),
-        SER_NETWORK,
-        PROTOCOL_VERSION);
-    libzcash::P2SHAddress receiver;
-    ss >> receiver;
-    return reinterpret_cast<libzcash::UnifiedAddress*>(ua)->AddReceiver(receiver);
-}
+    auto sprout = DecodeSprout<T1, T2>(keyConstants, str, sproutKeyMeta);
+    if (sprout.has_value()) {
+        return sprout.value();
+    }
 
-/**
- * `raw` MUST be 20 bytes.
- */
-static bool AddP2PKHReceiver(void* ua, const unsigned char* raw)
-{
-    CDataStream ss(
-        reinterpret_cast<const char*>(raw),
-        reinterpret_cast<const char*>(raw + 20),
-        SER_NETWORK,
-        PROTOCOL_VERSION);
-    libzcash::P2PKHAddress receiver;
-    ss >> receiver;
-    return reinterpret_cast<libzcash::UnifiedAddress*>(ua)->AddReceiver(receiver);
-}
+    auto sapling = DecodeSapling<T1, T3>(keyConstants, str, saplingKeyMeta);
+    if (sapling.has_value()) {
+        return sapling.value();
+    }
 
-static bool AddUnknownReceiver(void* ua, uint8_t typecode, const unsigned char* data, size_t len)
-{
-    libzcash::UnknownReceiver receiver(typecode, std::vector(data, data + len));
-    return reinterpret_cast<libzcash::UnifiedAddress*>(ua)->AddReceiver(receiver);
+    return std::nullopt;
 }
 
-libzcash::PaymentAddress KeyIO::DecodePaymentAddress(const std::string& str)
+std::optional<libzcash::PaymentAddress> KeyIO::DecodePaymentAddress(const std::string& str) const
 {
     // Try parsing as a Unified Address.
-    libzcash::UnifiedAddress ua;
-    if (zcash_address_parse_unified(
-        str.c_str(),
-        keyConstants.NetworkIDString().c_str(),
-        &ua,
-        AddSaplingReceiver,
-        AddP2SHReceiver,
-        AddP2PKHReceiver,
-        AddUnknownReceiver)
-    ) {
-        return ua;
+    auto ua = libzcash::UnifiedAddress::Parse(keyConstants, str);
+    if (ua.has_value()) {
+        return ua.value();
     }
 
-    // Fall back on trying Sprout or Sapling.
-    return DecodeAny<libzcash::PaymentAddress,
-        libzcash::SproutPaymentAddress,
-        libzcash::SaplingPaymentAddress>(
+    // Try parsing as a Sapling address
+    auto sapling = DecodeSapling<libzcash::SaplingPaymentAddress, libzcash::SaplingPaymentAddress>(
             keyConstants,
             str,
-            std::make_pair(KeyConstants::ZCPAYMENT_ADDRESS, libzcash::SerializedSproutPaymentAddressSize),
-            std::make_pair(KeyConstants::SAPLING_PAYMENT_ADDRESS, ConvertedSaplingPaymentAddressSize)
-        );
+            std::make_pair(KeyConstants::SAPLING_PAYMENT_ADDRESS, ConvertedSaplingPaymentAddressSize));
+    if (sapling.has_value()) {
+        return sapling.value();
+    }
+
+    // Try parsing as a Sprout address
+    auto sprout = DecodeSprout<libzcash::SproutPaymentAddress, libzcash::SproutPaymentAddress>(
+            keyConstants,
+            str,
+            std::make_pair(KeyConstants::ZCPAYMENT_ADDRESS, libzcash::SerializedSproutPaymentAddressSize));
+    if (sprout.has_value()) {
+        return sprout.value();
+    }
+
+    // Finally, try parsing as transparent
+    return std::visit(match {
+        [](const CKeyID& keyIdIn) {
+            std::optional<libzcash::PaymentAddress> keyId = keyIdIn;
+            return keyId;
+        },
+        [](const CScriptID& scriptIdIn) {
+            std::optional<libzcash::PaymentAddress> scriptId = scriptIdIn;
+            return scriptId;
+        },
+        [](const CNoDestination& d) {
+            std::optional<libzcash::PaymentAddress> result = std::nullopt;
+            return result;
+        }
+    }, DecodeDestination(str));
 }
 
-bool KeyIO::IsValidPaymentAddressString(const std::string& str) {
-    return IsValidPaymentAddress(DecodePaymentAddress(str));
+bool KeyIO::IsValidPaymentAddressString(const std::string& str) const
+{
+    return DecodePaymentAddress(str).has_value();
 }
 
-std::string KeyIO::EncodeViewingKey(const libzcash::ViewingKey& vk)
+std::string KeyIO::EncodeViewingKey(const libzcash::ViewingKey& vk) const
 {
     return std::visit(ViewingKeyEncoder(keyConstants), vk);
 }
 
-libzcash::ViewingKey KeyIO::DecodeViewingKey(const std::string& str)
+std::optional<libzcash::ViewingKey> KeyIO::DecodeViewingKey(const std::string& str) const
 {
+    // Try parsing as a Unified full viewing key
+    auto ufvk = libzcash::UnifiedFullViewingKey::Decode(str, keyConstants);
+    if (ufvk.has_value()) {
+        return ufvk.value();
+    }
+
+    // Fall back on trying Sprout or Sapling.
     return DecodeAny<libzcash::ViewingKey,
         libzcash::SproutViewingKey,
         libzcash::SaplingExtendedFullViewingKey>(
@@ -495,12 +513,12 @@ libzcash::ViewingKey KeyIO::DecodeViewingKey(const std::string& str)
         );
 }
 
-std::string KeyIO::EncodeSpendingKey(const libzcash::SpendingKey& zkey)
+std::string KeyIO::EncodeSpendingKey(const libzcash::SpendingKey& zkey) const
 {
     return std::visit(SpendingKeyEncoder(keyConstants), zkey);
 }
 
-libzcash::SpendingKey KeyIO::DecodeSpendingKey(const std::string& str)
+std::optional<libzcash::SpendingKey> KeyIO::DecodeSpendingKey(const std::string& str) const
 {
 
     return DecodeAny<libzcash::SpendingKey,
diff --git a/src/key_io.h b/src/key_io.h
index 21bffb9c891..80e932758af 100644
--- a/src/key_io.h
+++ b/src/key_io.h
@@ -23,28 +23,28 @@ class KeyIO {
 public:
     KeyIO(const KeyConstants& keyConstants): keyConstants(keyConstants) { }
 
-    CKey DecodeSecret(const std::string& str);
-    std::string EncodeSecret(const CKey& key);
+    CKey DecodeSecret(const std::string& str) const;
+    std::string EncodeSecret(const CKey& key) const;
 
-    CExtKey DecodeExtKey(const std::string& str);
-    std::string EncodeExtKey(const CExtKey& extkey);
-    CExtPubKey DecodeExtPubKey(const std::string& str);
-    std::string EncodeExtPubKey(const CExtPubKey& extpubkey);
+    CExtKey DecodeExtKey(const std::string& str) const;
+    std::string EncodeExtKey(const CExtKey& extkey) const;
+    CExtPubKey DecodeExtPubKey(const std::string& str) const;
+    std::string EncodeExtPubKey(const CExtPubKey& extpubkey) const;
 
-    std::string EncodeDestination(const CTxDestination& dest);
-    CTxDestination DecodeDestination(const std::string& str);
+    std::string EncodeDestination(const CTxDestination& dest) const;
+    CTxDestination DecodeDestination(const std::string& str) const;
 
-    bool IsValidDestinationString(const std::string& str);
+    bool IsValidDestinationString(const std::string& str) const;
 
-    std::string EncodePaymentAddress(const libzcash::PaymentAddress& zaddr);
-    libzcash::PaymentAddress DecodePaymentAddress(const std::string& str);
-    bool IsValidPaymentAddressString(const std::string& str);
+    std::string EncodePaymentAddress(const libzcash::PaymentAddress& zaddr) const;
+    std::optional<libzcash::PaymentAddress> DecodePaymentAddress(const std::string& str) const;
+    bool IsValidPaymentAddressString(const std::string& str) const;
 
-    std::string EncodeViewingKey(const libzcash::ViewingKey& vk);
-    libzcash::ViewingKey DecodeViewingKey(const std::string& str);
+    std::string EncodeViewingKey(const libzcash::ViewingKey& vk) const;
+    std::optional<libzcash::ViewingKey> DecodeViewingKey(const std::string& str) const;
 
-    std::string EncodeSpendingKey(const libzcash::SpendingKey& zkey);
-    libzcash::SpendingKey DecodeSpendingKey(const std::string& str);
+    std::string EncodeSpendingKey(const libzcash::SpendingKey& zkey) const;
+    std::optional<libzcash::SpendingKey> DecodeSpendingKey(const std::string& str) const;
 };
 
 #endif // BITCOIN_KEY_IO_H
diff --git a/src/keystore.cpp b/src/keystore.cpp
index e39a0d6dbf5..30a8ede83b0 100644
--- a/src/keystore.cpp
+++ b/src/keystore.cpp
@@ -30,33 +30,45 @@ bool CBasicKeyStore::GetPubKey(const CKeyID &address, CPubKey &vchPubKeyOut) con
     return true;
 }
 
-bool CBasicKeyStore::SetHDSeed(const HDSeed& seed)
+bool CBasicKeyStore::SetMnemonicSeed(const MnemonicSeed& seed)
 {
     LOCK(cs_KeyStore);
-    if (!hdSeed.IsNull()) {
+    if (mnemonicSeed.has_value()) {
         // Don't allow an existing seed to be changed. We can maybe relax this
         // restriction later once we have worked out the UX implications.
         return false;
     }
-    hdSeed = seed;
+    mnemonicSeed = seed;
     return true;
 }
 
-bool CBasicKeyStore::HaveHDSeed() const
+bool CBasicKeyStore::HaveMnemonicSeed() const
 {
     LOCK(cs_KeyStore);
-    return !hdSeed.IsNull();
+    return mnemonicSeed.has_value();
 }
 
-bool CBasicKeyStore::GetHDSeed(HDSeed& seedOut) const
+std::optional<MnemonicSeed> CBasicKeyStore::GetMnemonicSeed() const
 {
     LOCK(cs_KeyStore);
-    if (hdSeed.IsNull()) {
+    return mnemonicSeed;
+}
+
+bool CBasicKeyStore::SetLegacyHDSeed(const HDSeed& seed)
+{
+    LOCK(cs_KeyStore);
+    if (legacySeed.has_value()) {
+        // Don't allow an existing seed to be changed.
         return false;
-    } else {
-        seedOut = hdSeed;
-        return true;
     }
+    legacySeed = seed;
+    return true;
+}
+
+std::optional<HDSeed> CBasicKeyStore::GetLegacyHDSeed() const
+{
+    LOCK(cs_KeyStore);
+    return legacySeed;
 }
 
 bool CBasicKeyStore::AddKeyPubKey(const CKey& key, const CPubKey &pubkey)
@@ -151,7 +163,7 @@ bool CBasicKeyStore::AddSproutSpendingKey(const libzcash::SproutSpendingKey &sk)
     return true;
 }
 
-//! Sapling 
+//! Sapling
 bool CBasicKeyStore::AddSaplingSpendingKey(
     const libzcash::SaplingExtendedSpendingKey &sk)
 {
@@ -181,16 +193,16 @@ bool CBasicKeyStore::AddSaplingFullViewingKey(
     const libzcash::SaplingExtendedFullViewingKey &extfvk)
 {
     LOCK(cs_KeyStore);
-    auto ivk = extfvk.fvk.in_viewing_key();
+    auto ivk = extfvk.ToIncomingViewingKey();
     mapSaplingFullViewingKeys[ivk] = extfvk;
 
-    return CBasicKeyStore::AddSaplingIncomingViewingKey(ivk, extfvk.DefaultAddress());
+    return true;
 }
 
-// This function updates the wallet's internal address->ivk map. 
+// This function updates the wallet's internal address->ivk map.
 // If we add an address that is already in the map, the map will
 // remain unchanged as each address only has one ivk.
-bool CBasicKeyStore::AddSaplingIncomingViewingKey(
+bool CBasicKeyStore::AddSaplingPaymentAddress(
     const libzcash::SaplingIncomingViewingKey &ivk,
     const libzcash::SaplingPaymentAddress &addr)
 {
@@ -240,6 +252,10 @@ bool CBasicKeyStore::GetSproutViewingKey(
     return false;
 }
 
+//
+// Sapling Keys
+//
+
 bool CBasicKeyStore::GetSaplingFullViewingKey(
     const libzcash::SaplingIncomingViewingKey &ivk,
     libzcash::SaplingExtendedFullViewingKey &extfvkOut) const
@@ -265,8 +281,9 @@ bool CBasicKeyStore::GetSaplingIncomingViewingKey(const libzcash::SaplingPayment
     return false;
 }
 
-bool CBasicKeyStore::GetSaplingExtendedSpendingKey(const libzcash::SaplingPaymentAddress &addr, 
-                                    libzcash::SaplingExtendedSpendingKey &extskOut) const {
+bool CBasicKeyStore::GetSaplingExtendedSpendingKey(
+        const libzcash::SaplingPaymentAddress &addr,
+        libzcash::SaplingExtendedSpendingKey &extskOut) const {
     libzcash::SaplingIncomingViewingKey ivk;
     libzcash::SaplingExtendedFullViewingKey extfvk;
 
@@ -275,3 +292,262 @@ bool CBasicKeyStore::GetSaplingExtendedSpendingKey(const libzcash::SaplingPaymen
             GetSaplingFullViewingKey(ivk, extfvk) &&
             GetSaplingSpendingKey(extfvk, extskOut);
 }
+
+bool CBasicKeyStore::HaveSaplingSpendingKeyForAddress(
+        const libzcash::SaplingPaymentAddress &addr) const {
+    libzcash::SaplingIncomingViewingKey ivk;
+    libzcash::SaplingExtendedFullViewingKey extfvk;
+
+    return GetSaplingIncomingViewingKey(addr, ivk) &&
+        GetSaplingFullViewingKey(ivk, extfvk) &&
+        HaveSaplingSpendingKey(extfvk);
+}
+
+//
+// Unified Keys
+//
+
+bool CBasicKeyStore::AddUnifiedFullViewingKey(
+        const libzcash::ZcashdUnifiedFullViewingKey &ufvk)
+{
+    LOCK(cs_KeyStore);
+
+    auto ufvkId = ufvk.GetKeyID();
+
+    // Add the Orchard component of the UFVK to the wallet.
+    auto orchardKey = ufvk.GetOrchardKey();
+    if (orchardKey.has_value()) {
+        auto ivk = orchardKey.value().ToIncomingViewingKey();
+        mapOrchardKeyUnified.insert(std::make_pair(ivk, ufvkId));
+
+        auto ivkInternal = orchardKey.value().ToInternalIncomingViewingKey();
+        mapOrchardKeyUnified.insert(std::make_pair(ivkInternal, ufvkId));
+    }
+
+    // Add the Sapling component of the UFVK to the wallet.
+    auto saplingKey = ufvk.GetSaplingKey();
+    if (saplingKey.has_value()) {
+        auto ivk = saplingKey.value().ToIncomingViewingKey();
+        mapSaplingKeyUnified.insert(std::make_pair(ivk, ufvkId));
+
+        auto changeIvk = saplingKey.value().GetChangeIVK();
+        mapSaplingKeyUnified.insert(std::make_pair(changeIvk, ufvkId));
+    }
+
+    // We can't reasonably add the transparent component here, because
+    // of the way that transparent addresses are generated from the
+    // P2PKH part of the unified address. Instead, whenever a new
+    // unified address is generated, the keys associated with the
+    // transparent part of the address must be added to the keystore.
+
+    // Add the UFVK by key identifier.
+    mapUnifiedFullViewingKeys.insert({ufvkId, ufvk});
+
+    return true;
+}
+
+bool CBasicKeyStore::AddTransparentReceiverForUnifiedAddress(
+        const libzcash::UFVKId& keyId,
+        const libzcash::diversifier_index_t& diversifierIndex,
+        const libzcash::UnifiedAddress& ua)
+{
+    LOCK(cs_KeyStore);
+
+    // It's only necessary to add p2pkh and p2sh components of
+    // the UA; all other lookups of the associated UFVK will be
+    // made via the protocol-specific viewing key that is used
+    // to trial-decrypt a transaction.
+    auto addrEntry = std::make_pair(keyId, diversifierIndex);
+
+    auto p2pkhReceiver = ua.GetP2PKHReceiver();
+    if (p2pkhReceiver.has_value()) {
+        mapP2PKHUnified.insert(std::make_pair(p2pkhReceiver.value(), addrEntry));
+    }
+
+    auto p2shReceiver = ua.GetP2SHReceiver();
+    if (p2shReceiver.has_value()) {
+        mapP2SHUnified.insert(std::make_pair(p2shReceiver.value(), addrEntry));
+    }
+
+    return true;
+}
+
+std::optional<libzcash::ZcashdUnifiedFullViewingKey> CBasicKeyStore::GetUnifiedFullViewingKey(
+        const libzcash::UFVKId& keyId) const
+{
+    auto mi = mapUnifiedFullViewingKeys.find(keyId);
+    if (mi != mapUnifiedFullViewingKeys.end()) {
+        return mi->second;
+    } else {
+        return std::nullopt;
+    }
+}
+
+std::optional<AddressUFVKMetadata>
+CBasicKeyStore::GetUFVKMetadataForReceiver(const libzcash::Receiver& receiver) const
+{
+    return std::visit(FindUFVKId(*this), receiver);
+}
+
+std::optional<AddressUFVKMetadata>
+CBasicKeyStore::GetUFVKMetadataForAddress(const libzcash::UnifiedAddress& addr) const
+{
+    std::optional<libzcash::UFVKId> ufvkId;
+    std::optional<libzcash::diversifier_index_t> j;
+    bool jConflict = false;
+    for (const auto& receiver : addr) {
+        // skip unknown receivers
+        if (libzcash::HasKnownReceiverType(receiver)) {
+            auto rmeta = GetUFVKMetadataForReceiver(receiver);
+            // We should never generate unified addresses with internal receivers
+            assert(!(rmeta.has_value() && rmeta.value().IsInternalAddress()));
+
+            if (ufvkId.has_value() && rmeta.has_value()) {
+                // If the unified address contains receivers that are associated with
+                // different UFVKs, we cannot return a singular value.
+                if (rmeta.value().GetUFVKId() != ufvkId.value()) {
+                    return std::nullopt;
+                }
+
+                if (rmeta.value().GetDiversifierIndex().has_value()) {
+                    if (j.has_value()) {
+                        if (rmeta.value().GetDiversifierIndex().value() != j.value()) {
+                            jConflict = true;
+                            j = std::nullopt;
+                        }
+                    } else if (!jConflict) {
+                        j = rmeta.value().GetDiversifierIndex().value();
+                    }
+                }
+            } else if (rmeta.has_value()) {
+                ufvkId = rmeta.value().GetUFVKId();
+                j = rmeta.value().GetDiversifierIndex();
+            }
+        }
+    }
+
+    if (ufvkId.has_value()) {
+        return AddressUFVKMetadata(ufvkId.value(), j, false);
+    } else {
+        return std::nullopt;
+    }
+}
+
+std::optional<libzcash::UFVKId> CBasicKeyStore::GetUFVKIdForViewingKey(const libzcash::ViewingKey& vk) const
+{
+    std::optional<libzcash::UFVKId> result;
+    std::visit(match {
+        [&](const libzcash::SproutViewingKey& vk) {},
+        [&](const libzcash::SaplingExtendedFullViewingKey& extfvk) {
+            const auto saplingIvk = extfvk.ToIncomingViewingKey();
+            const auto ufvkId = mapSaplingKeyUnified.find(saplingIvk);
+            if (ufvkId != mapSaplingKeyUnified.end()) {
+                result = ufvkId->second;
+            }
+        },
+        [&](const libzcash::UnifiedFullViewingKey& ufvk) {
+            const auto orchardFvk = ufvk.GetOrchardKey();
+            if (orchardFvk.has_value()) {
+                const auto orchardIvk = orchardFvk.value().ToIncomingViewingKey();
+                const auto ufvkId = mapOrchardKeyUnified.find(orchardIvk);
+                if (ufvkId != mapOrchardKeyUnified.end()) {
+                    result = ufvkId->second;
+                    return;
+                }
+            }
+            const auto saplingDfvk = ufvk.GetSaplingKey();
+            if (saplingDfvk.has_value()) {
+                const auto saplingIvk = saplingDfvk.value().ToIncomingViewingKey();
+                const auto ufvkId = mapSaplingKeyUnified.find(saplingIvk);
+                if (ufvkId != mapSaplingKeyUnified.end()) {
+                    result = ufvkId->second;
+                }
+            }
+        }
+    }, vk);
+    return result;
+}
+
+//
+// FindUFVKId :: (KeyStore, Receiver) -> std::optional<AddressUFVKMetadata>
+//
+
+std::optional<AddressUFVKMetadata> FindUFVKId::operator()(const libzcash::OrchardRawAddress& orchardAddr) const {
+    for (const auto& [k, v] : keystore.mapUnifiedFullViewingKeys) {
+        auto fvk = v.GetOrchardKey();
+        if (fvk.has_value()) {
+            auto d_idx = fvk.value().ToIncomingViewingKey().DecryptDiversifier(orchardAddr);
+            if (d_idx.has_value()) {
+                return AddressUFVKMetadata(k, d_idx, false);
+            }
+            auto internal_d_idx = fvk.value().ToInternalIncomingViewingKey().DecryptDiversifier(orchardAddr);
+            if (internal_d_idx.has_value()) {
+                return AddressUFVKMetadata(k, internal_d_idx, true);
+            }
+        }
+    }
+    return std::nullopt;
+}
+std::optional<AddressUFVKMetadata> FindUFVKId::operator()(const libzcash::SaplingPaymentAddress& saplingAddr) const {
+    const auto saplingIvk = keystore.mapSaplingIncomingViewingKeys.find(saplingAddr);
+    if (saplingIvk != keystore.mapSaplingIncomingViewingKeys.end()) {
+        // We have either generated this as a receiver via `z_getaddressforaccount` or a
+        // legacy Sapling address via `z_getnewaddress`, or we have previously detected
+        // this via trial-decryption of a note.
+        const auto ufvkId = keystore.mapSaplingKeyUnified.find(saplingIvk->second);
+        if (ufvkId != keystore.mapSaplingKeyUnified.end()) {
+            return AddressUFVKMetadata(ufvkId->second, std::nullopt, false);
+        } else {
+            // If we have the addr -> ivk map entry but not the ivk -> UFVK map entry,
+            // then this is definitely a legacy Sapling address.
+            return std::nullopt;
+        }
+    }
+
+    // We haven't generated this receiver via `z_getaddressforaccount` (or this is a
+    // recovery from a backed-up mnemonic which doesn't store receiver types selected by
+    // users). Trial-decrypt the diversifier of the Sapling address with every UFVK in the
+    // wallet, to check directly if it belongs to any of them.
+    for (const auto& [k, v] : keystore.mapUnifiedFullViewingKeys) {
+        auto dfvk = v.GetSaplingKey();
+        if (dfvk.has_value()) {
+            auto d_idx = dfvk.value().DecryptDiversifier(saplingAddr.d);
+            auto derived_addr = dfvk.value().Address(d_idx);
+            if (derived_addr.has_value() && derived_addr.value() == saplingAddr) {
+                return AddressUFVKMetadata(k, d_idx, false);
+            }
+
+            auto internal_d_idx = dfvk.value().DecryptInternalDiversifier(saplingAddr.d);
+            auto derived_internal_addr = dfvk.value().InternalAddress(internal_d_idx);
+            if (derived_internal_addr.has_value() && derived_internal_addr.value() == saplingAddr) {
+                return AddressUFVKMetadata(k, internal_d_idx, true);
+            }
+        }
+    }
+
+    // We definitely don't know of any UFVK linked to this Sapling address.
+    return std::nullopt;
+}
+std::optional<AddressUFVKMetadata> FindUFVKId::operator()(const CScriptID& scriptId) const {
+    const auto metadata = keystore.mapP2SHUnified.find(scriptId);
+    if (metadata != keystore.mapP2SHUnified.end()) {
+        // At present we never generate transparent internal addresses, so this
+        // must be an external address
+        return AddressUFVKMetadata(metadata->second.first, metadata->second.second, false);
+    } else {
+        return std::nullopt;
+    }
+}
+std::optional<AddressUFVKMetadata> FindUFVKId::operator()(const CKeyID& keyId) const {
+    const auto metadata = keystore.mapP2PKHUnified.find(keyId);
+    if (metadata != keystore.mapP2PKHUnified.end()) {
+        // At present we never generate transparent internal addresses, so this
+        // must be an external address
+        return AddressUFVKMetadata(metadata->second.first, metadata->second.second, false);
+    } else {
+        return std::nullopt;
+    }
+}
+std::optional<AddressUFVKMetadata> FindUFVKId::operator()(const libzcash::UnknownReceiver& receiver) const {
+    return std::nullopt;
+}
diff --git a/src/keystore.h b/src/keystore.h
index 8246461aaed..34184299e0a 100644
--- a/src/keystore.h
+++ b/src/keystore.h
@@ -11,11 +11,27 @@
 #include "script/script.h"
 #include "script/standard.h"
 #include "sync.h"
+#include "zcash/address/mnemonic.h"
+#include "zcash/address/unified.h"
 #include "zcash/Address.hpp"
 #include "zcash/NoteEncryption.hpp"
 
 #include <boost/signals2/signal.hpp>
 
+class AddressUFVKMetadata {
+private:
+    libzcash::UFVKId ufvkId;
+    std::optional<libzcash::diversifier_index_t> j;
+    bool internalAddress;
+public:
+    AddressUFVKMetadata(libzcash::UFVKId ufvkId, std::optional<libzcash::diversifier_index_t> j, bool internalAddress)
+        : ufvkId(ufvkId), j(j), internalAddress(internalAddress) {}
+
+    libzcash::UFVKId GetUFVKId() const { return ufvkId; }
+    std::optional<libzcash::diversifier_index_t> GetDiversifierIndex() const { return j; }
+    bool IsInternalAddress() const { return internalAddress; }
+};
+
 /** A virtual base class for key stores */
 class CKeyStore
 {
@@ -25,11 +41,16 @@ class CKeyStore
 public:
     virtual ~CKeyStore() {}
 
-    //! Set the HD seed for this keystore
-    virtual bool SetHDSeed(const HDSeed& seed) =0;
-    virtual bool HaveHDSeed() const =0;
-    //! Get the HD seed for this keystore
-    virtual bool GetHDSeed(HDSeed& seedOut) const =0;
+    //! Set the mnemonic HD seed for this keystore
+    virtual bool SetMnemonicSeed(const MnemonicSeed& seed) =0;
+    virtual bool HaveMnemonicSeed() const =0;
+    //! Get the mnemonic HD seed for this keystore
+    virtual std::optional<MnemonicSeed> GetMnemonicSeed() const =0;
+
+    //! Set the legacy HD seed for this keystore
+    virtual bool SetLegacyHDSeed(const HDSeed& seed) =0;
+    //! Get the legacy HD seed for this keystore
+    virtual std::optional<HDSeed> GetLegacyHDSeed() const =0;
 
     //! Add a key to the store.
     virtual bool AddKeyPubKey(const CKey &key, const CPubKey &pubkey) =0;
@@ -59,13 +80,15 @@ class CKeyStore
     virtual bool HaveSproutSpendingKey(const libzcash::SproutPaymentAddress &address) const =0;
     virtual bool GetSproutSpendingKey(const libzcash::SproutPaymentAddress &address, libzcash::SproutSpendingKey& skOut) const =0;
     virtual void GetSproutPaymentAddresses(std::set<libzcash::SproutPaymentAddress> &setAddress) const =0;
-    
+
     //! Add a Sapling spending key to the store.
     virtual bool AddSaplingSpendingKey(const libzcash::SaplingExtendedSpendingKey &sk) =0;
-    
+
     //! Check whether a Sapling spending key corresponding to a given Sapling viewing key is present in the store.
     virtual bool HaveSaplingSpendingKey(
         const libzcash::SaplingExtendedFullViewingKey &extfvk) const =0;
+    virtual bool HaveSaplingSpendingKeyForAddress(
+        const libzcash::SaplingPaymentAddress &addr) const =0;
     virtual bool GetSaplingSpendingKey(
         const libzcash::SaplingExtendedFullViewingKey &extfvk,
         libzcash::SaplingExtendedSpendingKey& skOut) const =0;
@@ -74,16 +97,16 @@ class CKeyStore
     virtual bool AddSaplingFullViewingKey(const libzcash::SaplingExtendedFullViewingKey &extfvk) =0;
     virtual bool HaveSaplingFullViewingKey(const libzcash::SaplingIncomingViewingKey &ivk) const =0;
     virtual bool GetSaplingFullViewingKey(
-        const libzcash::SaplingIncomingViewingKey &ivk, 
+        const libzcash::SaplingIncomingViewingKey &ivk,
         libzcash::SaplingExtendedFullViewingKey& extfvkOut) const =0;
 
-    //! Sapling incoming viewing keys 
-    virtual bool AddSaplingIncomingViewingKey(
+    //! Sapling payment addresses & incoming viewing keys
+    virtual bool AddSaplingPaymentAddress(
         const libzcash::SaplingIncomingViewingKey &ivk,
         const libzcash::SaplingPaymentAddress &addr) =0;
     virtual bool HaveSaplingIncomingViewingKey(const libzcash::SaplingPaymentAddress &addr) const =0;
     virtual bool GetSaplingIncomingViewingKey(
-        const libzcash::SaplingPaymentAddress &addr, 
+        const libzcash::SaplingPaymentAddress &addr,
         libzcash::SaplingIncomingViewingKey& ivkOut) const =0;
     virtual void GetSaplingPaymentAddresses(std::set<libzcash::SaplingPaymentAddress> &setAddress) const =0;
 
@@ -94,6 +117,43 @@ class CKeyStore
     virtual bool GetSproutViewingKey(
         const libzcash::SproutPaymentAddress &address,
         libzcash::SproutViewingKey& vkOut) const =0;
+
+    //! Unified addresses and keys
+    virtual bool AddUnifiedFullViewingKey(
+            const libzcash::ZcashdUnifiedFullViewingKey &ufvk
+            ) = 0;
+
+    /**
+     * Add the transparent component of the unified address, if any,
+     * to the keystore to make it possible to identify the unified
+     * full viewing key from which a transparent address was derived.
+     * It is not necessary for implementations to add shielded address
+     * components to the keystore because those will be automatically
+     * reconstructed when scanning the chain with a shielded incoming
+     * viewing key upon discovery of the address as having received
+     * funds.
+     */
+    virtual bool AddTransparentReceiverForUnifiedAddress(
+        const libzcash::UFVKId& keyId,
+        const libzcash::diversifier_index_t& diversifierIndex,
+        const libzcash::UnifiedAddress& ua) = 0;
+
+    virtual std::optional<libzcash::ZcashdUnifiedFullViewingKey> GetUnifiedFullViewingKey(
+            const libzcash::UFVKId& keyId) const = 0;
+
+    virtual std::optional<AddressUFVKMetadata> GetUFVKMetadataForReceiver(
+            const libzcash::Receiver& receiver) const = 0;
+
+    /**
+     * If all the receivers of the specified address correspond to a single
+     * UFVK, return that key's metadata. If all the receivers correspond to
+     * the same diversifier index, that diversifier index is also returned.
+     */
+    virtual std::optional<AddressUFVKMetadata> GetUFVKMetadataForAddress(
+            const libzcash::UnifiedAddress& addr) const = 0;
+
+    virtual std::optional<libzcash::UFVKId> GetUFVKIdForViewingKey(
+            const libzcash::ViewingKey& vk) const = 0;
 };
 
 typedef std::map<CKeyID, CKey> KeyMap;
@@ -112,14 +172,20 @@ typedef std::map<
 typedef std::map<
     libzcash::SaplingIncomingViewingKey,
     libzcash::SaplingExtendedFullViewingKey> SaplingFullViewingKeyMap;
-// Only maps from default addresses to ivk, may need to be reworked when adding diversified addresses. 
+// Only maps from default addresses to ivk, may need to be reworked when adding diversified addresses.
 typedef std::map<libzcash::SaplingPaymentAddress, libzcash::SaplingIncomingViewingKey> SaplingIncomingViewingKeyMap;
 
+class FindUFVKId;
+
 /** Basic key store, that keeps keys in an address->secret map */
 class CBasicKeyStore : public CKeyStore
 {
 protected:
-    HDSeed hdSeed;
+    // All wallets will have a mnemonic seed, but this field must be declared
+    // as optional to avoid the need to construct or hold an invalid seed before the
+    // wallet's contents have been loaded from the database.
+    std::optional<MnemonicSeed> mnemonicSeed;
+    std::optional<HDSeed> legacySeed;
     KeyMap mapKeys;
     WatchKeyMap mapWatchKeys;
     ScriptMap mapScripts;
@@ -132,10 +198,21 @@ class CBasicKeyStore : public CKeyStore
     SaplingFullViewingKeyMap mapSaplingFullViewingKeys;
     SaplingIncomingViewingKeyMap mapSaplingIncomingViewingKeys;
 
+    // Unified key support
+    std::map<CKeyID, std::pair<libzcash::UFVKId, libzcash::diversifier_index_t>> mapP2PKHUnified;
+    std::map<CScriptID, std::pair<libzcash::UFVKId, libzcash::diversifier_index_t>> mapP2SHUnified;
+    std::map<libzcash::SaplingIncomingViewingKey, libzcash::UFVKId> mapSaplingKeyUnified;
+    std::map<libzcash::OrchardIncomingViewingKey, libzcash::UFVKId> mapOrchardKeyUnified;
+    std::map<libzcash::UFVKId, libzcash::ZcashdUnifiedFullViewingKey> mapUnifiedFullViewingKeys;
+
+    friend class FindUFVKId;
 public:
-    bool SetHDSeed(const HDSeed& seed);
-    bool HaveHDSeed() const;
-    bool GetHDSeed(HDSeed& seedOut) const;
+    bool SetMnemonicSeed(const MnemonicSeed& seed);
+    bool HaveMnemonicSeed() const;
+    std::optional<MnemonicSeed> GetMnemonicSeed() const;
+
+    bool SetLegacyHDSeed(const HDSeed& seed);
+    std::optional<HDSeed> GetLegacyHDSeed() const;
 
     bool AddKeyPubKey(const CKey& key, const CPubKey &pubkey);
     bool GetPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const;
@@ -235,7 +312,7 @@ class CBasicKeyStore : public CKeyStore
         }
     }
 
-    //! Sapling 
+    //! Sapling
     bool AddSaplingSpendingKey(const libzcash::SaplingExtendedSpendingKey &sk);
     bool HaveSaplingSpendingKey(const libzcash::SaplingExtendedFullViewingKey &extfvk) const
     {
@@ -246,6 +323,7 @@ class CBasicKeyStore : public CKeyStore
         }
         return result;
     }
+    bool HaveSaplingSpendingKeyForAddress(const libzcash::SaplingPaymentAddress &addr) const;
     bool GetSaplingSpendingKey(
         const libzcash::SaplingExtendedFullViewingKey &extfvk,
         libzcash::SaplingExtendedSpendingKey &skOut) const
@@ -269,18 +347,18 @@ class CBasicKeyStore : public CKeyStore
         const libzcash::SaplingIncomingViewingKey &ivk,
         libzcash::SaplingExtendedFullViewingKey& extfvkOut) const;
 
-    virtual bool AddSaplingIncomingViewingKey(
+    virtual bool AddSaplingPaymentAddress(
         const libzcash::SaplingIncomingViewingKey &ivk,
         const libzcash::SaplingPaymentAddress &addr);
     virtual bool HaveSaplingIncomingViewingKey(const libzcash::SaplingPaymentAddress &addr) const;
     virtual bool GetSaplingIncomingViewingKey(
-        const libzcash::SaplingPaymentAddress &addr, 
+        const libzcash::SaplingPaymentAddress &addr,
         libzcash::SaplingIncomingViewingKey& ivkOut) const;
 
     bool GetSaplingExtendedSpendingKey(
-        const libzcash::SaplingPaymentAddress &addr, 
+        const libzcash::SaplingPaymentAddress &addr,
         libzcash::SaplingExtendedSpendingKey &extskOut) const;
-    
+
     void GetSaplingPaymentAddresses(std::set<libzcash::SaplingPaymentAddress> &setAddress) const
     {
         setAddress.clear();
@@ -301,13 +379,67 @@ class CBasicKeyStore : public CKeyStore
     virtual bool GetSproutViewingKey(
         const libzcash::SproutPaymentAddress &address,
         libzcash::SproutViewingKey& vkOut) const;
+
+    virtual bool AddUnifiedFullViewingKey(
+            const libzcash::ZcashdUnifiedFullViewingKey &ufvk);
+
+    virtual bool AddTransparentReceiverForUnifiedAddress(
+        const libzcash::UFVKId& keyId,
+        const libzcash::diversifier_index_t& diversifierIndex,
+        const libzcash::UnifiedAddress& ua);
+
+    virtual std::optional<libzcash::ZcashdUnifiedFullViewingKey> GetUnifiedFullViewingKey(
+            const libzcash::UFVKId& keyId) const;
+
+    virtual std::optional<AddressUFVKMetadata> GetUFVKMetadataForReceiver(
+            const libzcash::Receiver& receiver) const;
+
+    std::optional<libzcash::ZcashdUnifiedFullViewingKey> GetUFVKForReceiver(
+            const libzcash::Receiver& receiver) const {
+        auto ufvkMeta = GetUFVKMetadataForReceiver(receiver);
+        if (ufvkMeta.has_value()) {
+            return GetUnifiedFullViewingKey(ufvkMeta.value().GetUFVKId());
+        } else {
+            return std::nullopt;
+        }
+    }
+
+    virtual std::optional<AddressUFVKMetadata> GetUFVKMetadataForAddress(
+            const libzcash::UnifiedAddress& addr) const;
+
+    std::optional<libzcash::ZcashdUnifiedFullViewingKey> GetUFVKForAddress(
+            const libzcash::UnifiedAddress& addr) const {
+        auto ufvkMeta = GetUFVKMetadataForAddress(addr);
+        if (ufvkMeta.has_value()) {
+            return GetUnifiedFullViewingKey(ufvkMeta.value().GetUFVKId());
+        } else {
+            return std::nullopt;
+        }
+    }
+
+    virtual std::optional<libzcash::UFVKId> GetUFVKIdForViewingKey(
+            const libzcash::ViewingKey& vk) const;
 };
 
 typedef std::vector<unsigned char, secure_allocator<unsigned char> > CKeyingMaterial;
 typedef std::map<CKeyID, std::pair<CPubKey, std::vector<unsigned char> > > CryptedKeyMap;
 typedef std::map<libzcash::SproutPaymentAddress, std::vector<unsigned char> > CryptedSproutSpendingKeyMap;
 
-//! Sapling 
+//! Sapling
 typedef std::map<libzcash::SaplingExtendedFullViewingKey, std::vector<unsigned char> > CryptedSaplingSpendingKeyMap;
 
+class FindUFVKId {
+private:
+    const CBasicKeyStore& keystore;
+
+public:
+    FindUFVKId(const CBasicKeyStore& keystore): keystore(keystore) {}
+
+    std::optional<AddressUFVKMetadata> operator()(const libzcash::OrchardRawAddress& orchardAddr) const;
+    std::optional<AddressUFVKMetadata> operator()(const libzcash::SaplingPaymentAddress& saplingAddr) const;
+    std::optional<AddressUFVKMetadata> operator()(const CScriptID& scriptId) const;
+    std::optional<AddressUFVKMetadata> operator()(const CKeyID& keyId) const;
+    std::optional<AddressUFVKMetadata> operator()(const libzcash::UnknownReceiver& receiver) const;
+};
+
 #endif // BITCOIN_KEYSTORE_H
diff --git a/src/main.cpp b/src/main.cpp
index c011a90eebb..aabd26d2ea3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -66,8 +66,10 @@ BlockMap mapBlockIndex;
 CChain chainActive;
 CBlockIndex *pindexBestHeader = NULL;
 static std::atomic<int64_t> nTimeBestReceived(0); // Used only to inform the wallet of when we last received a block
-CWaitableCriticalSection csBestBlock;
-CConditionVariable cvBlockChange;
+CWaitableCriticalSection g_best_block_mutex;
+CConditionVariable g_best_block_cv;
+uint256 g_best_block;
+int g_best_block_height;
 int nScriptCheckThreads = 0;
 std::atomic_bool fImporting(false);
 std::atomic_bool fReindex(false);
@@ -1787,7 +1789,7 @@ bool AcceptToMemoryPool(
     if (tx.IsCoinBase())
         return state.DoS(100, false, REJECT_INVALID, "coinbase");
 
-    // Rather not work on nonstandard transactions (unless -testnet/-regtest)
+    // Rather not work on nonstandard transactions (unless -regtest)
     string reason;
     if (chainparams.RequireStandard() && !IsStandardTx(tx, reason, chainparams, nextBlockHeight))
         return state.DoS(0, false, REJECT_NONSTANDARD, reason);
@@ -2019,27 +2021,31 @@ bool AcceptToMemoryPool(
 bool GetTimestampIndex(unsigned int high, unsigned int low, bool fActiveOnly,
     std::vector<std::pair<uint256, unsigned int> > &hashes)
 {
-    if (!fTimestampIndex)
-        return error("Timestamp index not enabled");
-
-    if (!pblocktree->ReadTimestampIndex(high, low, fActiveOnly, hashes))
-        return error("Unable to get hashes for timestamps");
-
+    if (!fTimestampIndex) {
+        LogPrint("rpc", "Timestamp index not enabled");
+        return false;
+    }
+    if (!pblocktree->ReadTimestampIndex(high, low, fActiveOnly, hashes)) {
+        LogPrint("rpc", "Unable to get hashes for timestamps");
+        return false;
+    }
     return true;
 }
 
 bool GetSpentIndex(CSpentIndexKey &key, CSpentIndexValue &value)
 {
     AssertLockHeld(cs_main);
-    if (!fSpentIndex)
-        return error("Spent index not enabled");
-
+    if (!fSpentIndex) {
+        LogPrint("rpc", "Spent index not enabled");
+        return false;
+    }
     if (mempool.getSpentIndex(key, value))
         return true;
 
-    if (!pblocktree->ReadSpentIndex(key, value))
-        return error("Unable to get spent index information");
-
+    if (!pblocktree->ReadSpentIndex(key, value)) {
+        LogPrint("rpc", "Unable to get spent index information");
+        return false;
+    }
     return true;
 }
 
@@ -2047,24 +2053,28 @@ bool GetAddressIndex(const uint160& addressHash, int type,
                      std::vector<CAddressIndexDbEntry>& addressIndex,
                      int start, int end)
 {
-    if (!fAddressIndex)
-        return error("address index not enabled");
-
-    if (!pblocktree->ReadAddressIndex(addressHash, type, addressIndex, start, end))
-        return error("unable to get txids for address");
-
+    if (!fAddressIndex) {
+        LogPrint("rpc", "address index not enabled");
+        return false;
+    }
+    if (!pblocktree->ReadAddressIndex(addressHash, type, addressIndex, start, end)) {
+        LogPrint("rpc", "unable to get txids for address");
+        return false;
+    }
     return true;
 }
 
 bool GetAddressUnspent(const uint160& addressHash, int type,
                        std::vector<CAddressUnspentDbEntry>& unspentOutputs)
 {
-    if (!fAddressIndex)
-        return error("address index not enabled");
-
-    if (!pblocktree->ReadAddressUnspentIndex(addressHash, type, unspentOutputs))
-        return error("unable to get txids for address");
-
+    if (!fAddressIndex) {
+        LogPrint("rpc", "address index not enabled");
+        return false;
+    }
+    if (!pblocktree->ReadAddressUnspentIndex(addressHash, type, unspentOutputs)) {
+        LogPrint("rpc", "unable to get txids for address");
+        return false;
+    }
     return true;
 }
 
@@ -2239,16 +2249,23 @@ CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams)
     }
 }
 
+static std::atomic<bool> IBDLatchToFalse{false};
+// testing-only, allow initial block down state to be set or reset
+bool TestSetIBD(bool ibd) {
+    bool ret = !IBDLatchToFalse;
+    IBDLatchToFalse.store(!ibd, std::memory_order_relaxed);
+    return ret;
+}
+
 bool IsInitialBlockDownload(const Consensus::Params& params)
 {
     // Once this function has returned false, it must remain false.
-    static std::atomic<bool> latchToFalse{false};
     // Optimization: pre-test latch before taking the lock.
-    if (latchToFalse.load(std::memory_order_relaxed))
+    if (IBDLatchToFalse.load(std::memory_order_relaxed))
         return false;
 
     LOCK(cs_main);
-    if (latchToFalse.load(std::memory_order_relaxed))
+    if (IBDLatchToFalse.load(std::memory_order_relaxed))
         return false;
     if (fImporting || fReindex)
         return true;
@@ -2310,7 +2327,7 @@ bool IsInitialBlockDownload(const Consensus::Params& params)
     if (chainActive.Tip()->GetBlockTime() < (GetTime() - nMaxTipAge))
         return true;
     LogPrintf("Leaving InitialBlockDownload (latching to false)\n");
-    latchToFalse.store(true, std::memory_order_relaxed);
+    IBDLatchToFalse.store(true, std::memory_order_relaxed);
     return false;
 }
 
@@ -2892,6 +2909,17 @@ static DisconnectResult DisconnectBlock(const CBlock& block, CValidationState& s
         view.PopAnchor(SaplingMerkleTree::empty_root(), SAPLING);
     }
 
+    // Set the old best Orchard anchor back. We can get this from the
+    // `hashFinalOrchardRoot` of the last block. However, if the last
+    // block was not on or after the Orchard activation height, this
+    // will be set to `null`. For logical consistency, in this case we
+    // set the last anchor to the empty root.
+    if (chainparams.GetConsensus().NetworkUpgradeActive(pindex->pprev->nHeight, Consensus::UPGRADE_NU5)) {
+        view.PopAnchor(pindex->pprev->hashFinalOrchardRoot, ORCHARD);
+    } else {
+        view.PopAnchor(OrchardMerkleFrontier::empty_root(), ORCHARD);
+    }
+
     // This is guaranteed to be filled by LoadBlockIndex.
     assert(pindex->nCachedBranchId);
     auto consensusBranchId = pindex->nCachedBranchId.value();
@@ -3118,8 +3146,20 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
     SaplingMerkleTree sapling_tree;
     assert(view.GetSaplingAnchorAt(view.GetBestAnchor(SAPLING), sapling_tree));
 
-    OrchardMerkleTree orchard_tree;
-    assert(view.GetOrchardAnchorAt(view.GetBestAnchor(ORCHARD), orchard_tree));
+    OrchardMerkleFrontier orchard_tree;
+    if (pindex->pprev && chainparams.GetConsensus().NetworkUpgradeActive(pindex->pprev->nHeight, Consensus::UPGRADE_NU5)) {
+        // Verify that the view's current state corresponds to the previous block.
+        assert(pindex->pprev->hashFinalOrchardRoot == view.GetBestAnchor(ORCHARD));
+        // We only call ConnectBlock() on top of the active chain's tip.
+        assert(!pindex->pprev->hashFinalOrchardRoot.IsNull());
+
+        assert(view.GetOrchardAnchorAt(pindex->pprev->hashFinalOrchardRoot, orchard_tree));
+    } else {
+        if (pindex->pprev) {
+            assert(pindex->pprev->hashFinalOrchardRoot.IsNull());
+        }
+        assert(view.GetOrchardAnchorAt(OrchardMerkleFrontier::empty_root(), orchard_tree));
+    }
 
     // Grab the consensus branch ID for this block and its parent
     auto consensusBranchId = CurrentEpochBranchId(pindex->nHeight, chainparams.GetConsensus());
@@ -3742,7 +3782,12 @@ void static UpdateTip(CBlockIndex *pindexNew, const CChainParams& chainParams) {
     RenderPoolMetrics("sapling", saplingPool);
     RenderPoolMetrics("transparent", transparentPool);
 
-    cvBlockChange.notify_all();
+    {
+        boost::unique_lock<boost::mutex> lock(g_best_block_mutex);
+        g_best_block = pindexNew->GetBlockHash();
+        g_best_block_height = pindexNew->nHeight;
+        g_best_block_cv.notify_all();
+    }
 }
 
 /**
@@ -3760,6 +3805,7 @@ bool static DisconnectTip(CValidationState &state, const CChainParams& chainpara
     // Apply the block atomically to the chain state.
     uint256 sproutAnchorBeforeDisconnect = pcoinsTip->GetBestAnchor(SPROUT);
     uint256 saplingAnchorBeforeDisconnect = pcoinsTip->GetBestAnchor(SAPLING);
+    uint256 orchardAnchorBeforeDisconnect = pcoinsTip->GetBestAnchor(ORCHARD);
     int64_t nStart = GetTimeMicros();
     {
         CCoinsViewCache view(pcoinsTip);
@@ -3771,6 +3817,7 @@ bool static DisconnectTip(CValidationState &state, const CChainParams& chainpara
     LogPrint("bench", "- Disconnect block: %.2fms\n", (GetTimeMicros() - nStart) * 0.001);
     uint256 sproutAnchorAfterDisconnect = pcoinsTip->GetBestAnchor(SPROUT);
     uint256 saplingAnchorAfterDisconnect = pcoinsTip->GetBestAnchor(SAPLING);
+    uint256 orchardAnchorAfterDisconnect = pcoinsTip->GetBestAnchor(ORCHARD);
     // Write the chain state to disk, if necessary.
     if (!FlushStateToDisk(chainparams, state, FLUSH_STATE_IF_NEEDED))
         return false;
@@ -3794,6 +3841,11 @@ bool static DisconnectTip(CValidationState &state, const CChainParams& chainpara
             // in which case we don't want to evict from the mempool yet!
             mempool.removeWithAnchor(saplingAnchorBeforeDisconnect, SAPLING);
         }
+        if (orchardAnchorBeforeDisconnect != orchardAnchorAfterDisconnect) {
+            // The anchor may not change between block disconnects,
+            // in which case we don't want to evict from the mempool yet!
+            mempool.removeWithAnchor(orchardAnchorBeforeDisconnect, ORCHARD);
+        }
     }
 
     // Update chainActive and related variables.
@@ -5367,12 +5419,13 @@ bool CVerifyDB::VerifyDB(const CChainParams& chainparams, CCoinsView *coinsview,
     // Flags used to permit skipping checks for efficiency
     auto verifier = ProofVerifier::Disabled(); // No need to verify JoinSplits twice
     bool fCheckTransactions = true;
-    // We may as well check Orchard authorizations if we are checking
-    // transactions, since we can batch-validate them.
-    auto orchardAuth = orchard::AuthValidator::Batch();
 
     for (CBlockIndex* pindex = chainActive.Tip(); pindex && pindex->pprev; pindex = pindex->pprev)
     {
+        // We may as well check Orchard authorizations if we are checking
+        // transactions, since we can batch-validate them.
+        auto orchardAuth = orchard::AuthValidator::Batch();
+
         boost::this_thread::interruption_point();
         uiInterface.ShowProgress(_("Verifying blocks..."), std::max(1, std::min(99, (int)(((double)(chainActive.Height() - pindex->nHeight)) / (double)nCheckDepth * (nCheckLevel >= 4 ? 50 : 100)))));
         if (pindex->nHeight < chainActive.Height()-nCheckDepth)
@@ -5414,6 +5467,10 @@ bool CVerifyDB::VerifyDB(const CChainParams& chainparams, CCoinsView *coinsview,
             }
         }
 
+        if (!orchardAuth.Validate()) {
+            return error("VerifyDB(): Orchard batch validation failed for block at height %d", pindex->nHeight);
+        }
+
         if (ShutdownRequested())
             return true;
     }
@@ -6174,7 +6231,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                     if ((mi->second->nVersion <= 4) != (inv.type == MSG_TX)) {
                         Misbehaving(pfrom->GetId(), 100);
                         LogPrint("net", "Wrong INV message type used for v%d tx", mi->second->nVersion);
-                        // Break so that this inv mesage will be erased from the queue
+                        // Break so that this inv message will be erased from the queue
                         // (otherwise the peer would repeatedly hit this case until its
                         // Misbehaving level rises above -banscore, no matter what the
                         // user set it to).
@@ -6195,7 +6252,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
                         if ((txinfo.tx->nVersion <= 4) != (inv.type == MSG_TX)) {
                             Misbehaving(pfrom->GetId(), 100);
                             LogPrint("net", "Wrong INV message type used for v%d tx", txinfo.tx->nVersion);
-                            // Break so that this inv mesage will be erased from the queue.
+                            // Break so that this inv message will be erased from the queue.
                             break;
                         }
                         // Ensure we only reply with a transaction if it is exactly what
@@ -7194,7 +7251,7 @@ bool static ProcessMessage(const CChainParams& chainparams, CNode* pfrom, string
                 LogPrint("net", "Reject %s\n", SanitizeString(ss.str()));
             } catch (const std::ios_base::failure&) {
                 // Avoid feedback loops by preventing reject messages from triggering a new reject message.
-                LogPrint("net", "Unparseable reject message received\n");
+                LogPrint("net", "Unparsable reject message received\n");
             }
         }
     }
@@ -7522,6 +7579,10 @@ bool SendMessages(const Consensus::Params& params, CNode* pto)
                     const uint256& hash = txinfo.tx->GetHash();
                     CInv inv = InvForTransaction(txinfo.tx);
                     pto->setInventoryTxToSend.erase(hash);
+                    // ZIP 239: We won't have v5 transactions in our mempool until after
+                    // NU5 activates, at which point we will only be connected to peers
+                    // that understand MSG_WTX.
+                    if (inv.type == MSG_WTX) assert(pto->nVersion >= CINV_WTX_VERSION);
                     if (IsExpiringSoonTx(*txinfo.tx, currentHeight + 1)) continue;
                     if (pto->pfilter) {
                         if (!pto->pfilter->IsRelevantAndUpdate(*txinfo.tx)) continue;
@@ -7570,6 +7631,10 @@ bool SendMessages(const Consensus::Params& params, CNode* pto)
                         continue;
                     }
                     CInv inv = InvForTransaction(txinfo.tx);
+                    // ZIP 239: We won't have v5 transactions in our mempool until after
+                    // NU5 activates, at which point we will only be connected to peers
+                    // that understand MSG_WTX.
+                    if (inv.type == MSG_WTX) assert(pto->nVersion >= CINV_WTX_VERSION);
                     if (IsExpiringSoonTx(*txinfo.tx, currentHeight + 1)) continue;
                     if (pto->pfilter && !pto->pfilter->IsRelevantAndUpdate(*txinfo.tx)) continue;
                     // Send
diff --git a/src/main.h b/src/main.h
index 85ca9af29d8..da065f63a07 100644
--- a/src/main.h
+++ b/src/main.h
@@ -157,11 +157,22 @@ extern CCriticalSection cs_main;
 extern CTxMemPool mempool;
 typedef boost::unordered_map<uint256, CBlockIndex*, BlockHasher> BlockMap;
 extern BlockMap mapBlockIndex;
-extern uint64_t nLastBlockTx;
-extern uint64_t nLastBlockSize;
+extern std::optional<uint64_t> last_block_num_txs;
+extern std::optional<uint64_t> last_block_size;
 extern const std::string strMessageMagic;
-extern CWaitableCriticalSection csBestBlock;
-extern CConditionVariable cvBlockChange;
+
+//! These four variables are used to notify getblocktemplate RPC of new tips.
+//! When UpdateTip() establishes a new tip (best block), it must awaken a
+//! waiting getblocktemplate RPC (if there is one) immediately. But upon waking
+//! up, getblocktemplate cannot call chainActive->Tip() because it does not
+//! (and cannot) hold cs_main. So the g_best_block_height and g_best_block variables
+//! (protected by g_best_block_mutex) provide the needed height and block
+//! hash respectively to getblocktemplate without it requiring cs_main.
+extern CWaitableCriticalSection g_best_block_mutex;
+extern CConditionVariable g_best_block_cv;
+extern int g_best_block_height;
+extern uint256 g_best_block;
+
 extern std::atomic_bool fImporting;
 extern std::atomic_bool fReindex;
 extern int nScriptCheckThreads;
@@ -273,6 +284,8 @@ bool SendMessages(const Consensus::Params& params, CNode* pto);
 void ThreadScriptCheck();
 /** Check whether we are doing an initial block download (synchronizing from disk or network) */
 bool IsInitialBlockDownload(const Consensus::Params& params);
+/** testing-only, set or reset initial block down (IBD) state, return previous */
+bool TestSetIBD(bool);
 /** Format a string that describes several potential problems detected by the core */
 std::pair<std::string, int64_t> GetWarnings(const std::string& strFor);
 /** Retrieve a transaction (from memory pool, or from disk, if possible) */
diff --git a/src/mempool_limit.cpp b/src/mempool_limit.cpp
index c2137e0e3e7..d4c1a0455bd 100644
--- a/src/mempool_limit.cpp
+++ b/src/mempool_limit.cpp
@@ -102,7 +102,7 @@ void WeightedTxTree::remove(const uint256& txId)
     size_t removeIndex = txIdToIndexMap[txId];
 
     // We reduce the size at the start of this method to avoid saying size - 1
-    // when refering to the last element of the array below
+    // when referring to the last element of the array below
     size -= 1;
 
     TxWeight lastChildWeight = txIdAndWeights[size].txWeight;
diff --git a/src/metrics.cpp b/src/metrics.cpp
index e243171ff4f..0dc6c88b9b8 100644
--- a/src/metrics.cpp
+++ b/src/metrics.cpp
@@ -50,6 +50,17 @@ void AtomicTimer::stop()
     }
 }
 
+
+void AtomicTimer::zeroize()
+{
+    std::unique_lock<std::mutex> lock(mtx);
+    // only zeroize it if there's no more threads (same semantics as start())
+    if (threads < 1) {
+        start_time = 0;
+        total_time = 0;
+    }
+}
+
 bool AtomicTimer::running()
 {
     std::unique_lock<std::mutex> lock(mtx);
diff --git a/src/metrics.h b/src/metrics.h
index e20473287f6..a29621f9a29 100644
--- a/src/metrics.h
+++ b/src/metrics.h
@@ -52,6 +52,8 @@ class AtomicTimer {
      */
     void stop();
 
+    void zeroize();
+
     bool running();
 
     uint64_t threadCount();
diff --git a/src/miner.cpp b/src/miner.cpp
index a1dc0fa3a11..500ab76366c 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -71,8 +71,8 @@ class COrphan
     }
 };
 
-uint64_t nLastBlockTx = 0;
-uint64_t nLastBlockSize = 0;
+std::optional<uint64_t> last_block_num_txs;
+std::optional<uint64_t> last_block_size;
 
 // We want to sort transactions by priority and fee rate, so:
 typedef boost::tuple<double, CFeeRate, const CTransaction*> TxPriority;
@@ -117,9 +117,7 @@ void UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParams,
 }
 
 bool IsShieldedMinerAddress(const MinerAddress& minerAddr) {
-    return !(
-        std::holds_alternative<InvalidMinerAddress>(minerAddr) ||
-        std::holds_alternative<boost::shared_ptr<CReserveScript>>(minerAddr));
+    return !std::holds_alternative<boost::shared_ptr<CReserveScript>>(minerAddr);
 }
 
 class AddFundingStreamValueToTx
@@ -216,32 +214,84 @@ class AddOutputsToCoinbaseTxAndSign
         return miner_reward + nFees;
     }
 
-    void ComputeBindingSig(void* ctx) const {
+    void ComputeBindingSig(void* saplingCtx, std::optional<orchard::UnauthorizedBundle> orchardBundle) const {
         // Empty output script.
         uint256 dataToBeSigned;
-        CScript scriptCode;
         try {
-            dataToBeSigned = SignatureHash(
-                scriptCode, mtx, NOT_AN_INPUT, SIGHASH_ALL, 0,
-                CurrentEpochBranchId(nHeight, chainparams.GetConsensus()));
+            if (orchardBundle.has_value()) {
+                // Orchard is only usable with v5+ transactions.
+                dataToBeSigned = ProduceZip244SignatureHash(mtx, orchardBundle.value());
+            } else {
+                CScript scriptCode;
+                dataToBeSigned = SignatureHash(
+                    scriptCode, mtx, NOT_AN_INPUT, SIGHASH_ALL, 0,
+                    CurrentEpochBranchId(nHeight, chainparams.GetConsensus()));
+            }
         } catch (std::logic_error ex) {
-            librustzcash_sapling_proving_ctx_free(ctx);
+            librustzcash_sapling_proving_ctx_free(saplingCtx);
             throw ex;
         }
 
+        if (orchardBundle.has_value()) {
+            auto authorizedBundle = orchardBundle.value().ProveAndSign({}, dataToBeSigned);
+            if (authorizedBundle.has_value()) {
+                mtx.orchardBundle = authorizedBundle.value();
+            } else {
+                librustzcash_sapling_proving_ctx_free(saplingCtx);
+                throw new std::runtime_error("Failed to create Orchard proof or signatures");
+            }
+        }
+
         bool success = librustzcash_sapling_binding_sig(
-            ctx,
+            saplingCtx,
             mtx.valueBalanceSapling,
             dataToBeSigned.begin(),
             mtx.bindingSig.data());
 
         if (!success) {
-            librustzcash_sapling_proving_ctx_free(ctx);
+            librustzcash_sapling_proving_ctx_free(saplingCtx);
             throw new std::runtime_error("An error occurred computing the binding signature.");
         }
     }
 
-    void operator()(const InvalidMinerAddress &invalid) const {}
+    // Create Orchard output
+    void operator()(const libzcash::OrchardRawAddress &to) const {
+        auto ctx = librustzcash_sapling_proving_ctx_init();
+
+        // `enableSpends` must be set to `false` for coinbase transactions. This
+        // means the Orchard anchor is unconstrained, so we set it to the empty
+        // tree root via a null (all zeroes) uint256.
+        uint256 orchardAnchor;
+        auto builder = orchard::Builder(false, true, orchardAnchor);
+
+        // Shielded coinbase outputs must be recoverable with an all-zeroes ovk.
+        uint256 ovk;
+        auto miner_reward = SetFoundersRewardAndGetMinerValue(ctx);
+        builder.AddOutput(ovk, to, miner_reward, std::nullopt);
+
+        // orchard::Builder pads to two Actions, but does so using a "no OVK" policy for
+        // dummy outputs, which violates coinbase rules requiring all shielded outputs to
+        // be recoverable. We manually add a dummy output to sidestep this issue.
+        // TODO: If/when we have funding streams going to Orchard recipients, this dummy
+        // output can be removed.
+        RawHDSeed rawSeed(32, 0);
+        GetRandBytes(rawSeed.data(), 32);
+        auto dummyTo = libzcash::OrchardSpendingKey::ForAccount(HDSeed(rawSeed), Params().BIP44CoinType(), 0)
+            .ToFullViewingKey()
+            .ToIncomingViewingKey()
+            .Address(0);
+        builder.AddOutput(ovk, dummyTo, 0, std::nullopt);
+
+        auto bundle = builder.Build();
+        if (!bundle.has_value()) {
+            librustzcash_sapling_proving_ctx_free(ctx);
+            throw new std::runtime_error("Failed to create shielded output for miner");
+        }
+
+        ComputeBindingSig(ctx, std::move(bundle));
+
+        librustzcash_sapling_proving_ctx_free(ctx);
+    }
 
     // Create shielded output
     void operator()(const libzcash::SaplingPaymentAddress &pa) const {
@@ -262,7 +312,7 @@ class AddOutputsToCoinbaseTxAndSign
         }
         mtx.vShieldedOutput.push_back(odesc.value());
 
-        ComputeBindingSig(ctx);
+        ComputeBindingSig(ctx, std::nullopt);
 
         librustzcash_sapling_proving_ctx_free(ctx);
     }
@@ -281,7 +331,7 @@ class AddOutputsToCoinbaseTxAndSign
         mtx.vout[0] = CTxOut(value, coinbaseScript->reserveScript);
 
         if (mtx.vShieldedOutput.size() > 0) {
-            ComputeBindingSig(ctx);
+            ComputeBindingSig(ctx, std::nullopt);
         }
 
         librustzcash_sapling_proving_ctx_free(ctx);
@@ -331,7 +381,7 @@ CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const MinerAddre
 
     // Largest block you're willing to create:
     unsigned int nBlockMaxSize = GetArg("-blockmaxsize", DEFAULT_BLOCK_MAX_SIZE);
-    // Limit to betweeen 1K and MAX_BLOCK_SIZE-1K for sanity:
+    // Limit to between 1K and MAX_BLOCK_SIZE-1K for sanity:
     nBlockMaxSize = std::max((unsigned int)1000, std::min((unsigned int)(MAX_BLOCK_SIZE-1000), nBlockMaxSize));
 
     // How much of the block should be dedicated to high-priority transactions,
@@ -610,8 +660,8 @@ CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const MinerAddre
             }
         }
 
-        nLastBlockTx = nBlockTx;
-        nLastBlockSize = nBlockSize;
+        last_block_num_txs = nBlockTx;
+        last_block_size = nBlockSize;
         LogPrintf("CreateNewBlock(): total size %u\n", nBlockSize);
 
         // Create coinbase tx
@@ -642,14 +692,38 @@ CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const MinerAddre
         pblock->hashPrevBlock  = pindexPrev->GetBlockHash();
         if (chainparams.GetConsensus().NetworkUpgradeActive(nHeight, Consensus::UPGRADE_NU5)) {
             // hashBlockCommitments depends on the block transactions, so we have to
-            // update it whenever the coinbase transaction changes. Leave it unset here,
-            // like hashMerkleRoot, and instead cache what we will need to calculate it.
+            // update it whenever the coinbase transaction changes.
+            //
+            // - For the internal miner (either directly or via the `generate` RPC), this
+            //   will occur in `IncrementExtraNonce()`, like for `hashMerkleRoot`.
+            // - For `getblocktemplate`, we have two sets of fields to handle:
+            //   - The `defaultroots` fields, which contain both the default value (if
+            //     nothing in the template is altered), and the roots that can be used to
+            //     recalculate it (if some or all of the template is altered).
+            //   - The legacy `finalsaplingroothash`, `lightclientroothash`, and
+            //     `blockcommitmentshash` fields, which had the semantics of "place this
+            //     value into the block header and things will work" (except for in
+            //     v4.6.0 where they were accidentally set to always be the NU5 value).
+            //
+            // To accommodate all use cases, we calculate the `hashBlockCommitments`
+            // default value here (unlike `hashMerkleRoot`), and additionally cache the
+            // values necessary to recalculate it.
             pblocktemplate->hashChainHistoryRoot = view.GetHistoryRoot(prevConsensusBranchId);
+            pblocktemplate->hashAuthDataRoot = pblock->BuildAuthDataMerkleTree();
+            pblock->hashBlockCommitments = DeriveBlockCommitmentsHash(
+                    pblocktemplate->hashChainHistoryRoot,
+                    pblocktemplate->hashAuthDataRoot);
         } else if (IsActivationHeight(nHeight, chainparams.GetConsensus(), Consensus::UPGRADE_HEARTWOOD)) {
+            pblocktemplate->hashChainHistoryRoot.SetNull();
+            pblocktemplate->hashAuthDataRoot.SetNull();
             pblock->hashBlockCommitments.SetNull();
         } else if (chainparams.GetConsensus().NetworkUpgradeActive(nHeight, Consensus::UPGRADE_HEARTWOOD)) {
-            pblock->hashBlockCommitments = view.GetHistoryRoot(prevConsensusBranchId);
+            pblocktemplate->hashChainHistoryRoot = view.GetHistoryRoot(prevConsensusBranchId);
+            pblocktemplate->hashAuthDataRoot.SetNull();
+            pblock->hashBlockCommitments = pblocktemplate->hashChainHistoryRoot;
         } else {
+            pblocktemplate->hashChainHistoryRoot.SetNull();
+            pblocktemplate->hashAuthDataRoot.SetNull();
             pblock->hashBlockCommitments = sapling_tree.root();
         }
         UpdateTime(pblock, chainparams.GetConsensus(), pindexPrev);
@@ -682,24 +756,55 @@ class MinerAddressScript : public CReserveScript
     void KeepScript() {}
 };
 
-void GetMinerAddress(MinerAddress &minerAddress)
+std::optional<MinerAddress> ExtractMinerAddress::operator()(const CKeyID &keyID) const {
+    boost::shared_ptr<MinerAddressScript> mAddr(new MinerAddressScript());
+    mAddr->reserveScript = CScript() << OP_DUP << OP_HASH160 << ToByteVector(keyID) << OP_EQUALVERIFY << OP_CHECKSIG;
+    return mAddr;
+}
+std::optional<MinerAddress> ExtractMinerAddress::operator()(const CScriptID &addr) const {
+    return std::nullopt;
+}
+std::optional<MinerAddress> ExtractMinerAddress::operator()(const libzcash::SproutPaymentAddress &addr) const {
+    return std::nullopt;
+}
+std::optional<MinerAddress> ExtractMinerAddress::operator()(const libzcash::SaplingPaymentAddress &addr) const {
+    return addr;
+}
+std::optional<MinerAddress> ExtractMinerAddress::operator()(const libzcash::UnifiedAddress &addr) const {
+    auto preferred = addr.GetPreferredRecipientAddress(consensus, height);
+    if (preferred.has_value()) {
+        std::optional<MinerAddress> ret;
+        std::visit(match {
+            [&](const libzcash::OrchardRawAddress addr) { ret = MinerAddress(addr); },
+            [&](const libzcash::SaplingPaymentAddress addr) { ret = MinerAddress(addr); },
+            [&](const CKeyID keyID) { ret = operator()(keyID); },
+            [&](const auto other) { ret = std::nullopt; }
+        }, preferred.value());
+        return ret;
+    } else {
+        return std::nullopt;
+    }
+}
+
+
+void GetMinerAddress(std::optional<MinerAddress> &minerAddress)
 {
     KeyIO keyIO(Params());
 
-    // Try a transparent address first
-    auto mAddrArg = GetArg("-mineraddress", "");
-    CTxDestination addr = keyIO.DecodeDestination(mAddrArg);
-    if (IsValidDestination(addr)) {
-        boost::shared_ptr<MinerAddressScript> mAddr(new MinerAddressScript());
-        CKeyID keyID = std::get<CKeyID>(addr);
+    // If the user sets a UA miner address with an Orchard component, we want to ensure we
+    // start using it once we reach that height.
+    int height;
+    {
+        LOCK(cs_main);
+        height = chainActive.Height() + 1;
+    }
 
-        mAddr->reserveScript = CScript() << OP_DUP << OP_HASH160 << ToByteVector(keyID) << OP_EQUALVERIFY << OP_CHECKSIG;
-        minerAddress = mAddr;
-    } else {
-        // Try a payment address
-        auto zaddr = std::visit(ExtractMinerAddress(), keyIO.DecodePaymentAddress(mAddrArg));
-        if (std::visit(IsValidMinerAddress(), zaddr)) {
-            minerAddress = zaddr;
+    auto mAddrArg = GetArg("-mineraddress", "");
+    auto zaddr0 = keyIO.DecodePaymentAddress(mAddrArg);
+    if (zaddr0.has_value()) {
+        auto zaddr = std::visit(ExtractMinerAddress(Params().GetConsensus(), height), zaddr0.value());
+        if (zaddr.has_value()) {
+            minerAddress = zaddr.value();
         }
     }
 }
@@ -727,9 +832,10 @@ void IncrementExtraNonce(
     pblock->vtx[0] = txCoinbase;
     pblock->hashMerkleRoot = pblock->BuildMerkleTree();
     if (consensusParams.NetworkUpgradeActive(nHeight, Consensus::UPGRADE_NU5)) {
+        pblocktemplate->hashAuthDataRoot = pblock->BuildAuthDataMerkleTree();
         pblock->hashBlockCommitments = DeriveBlockCommitmentsHash(
             pblocktemplate->hashChainHistoryRoot,
-            pblock->BuildAuthDataMerkleTree());
+            pblocktemplate->hashAuthDataRoot);
     }
 }
 
@@ -767,8 +873,8 @@ void static BitcoinMiner(const CChainParams& chainparams)
     // Each thread has its own counter
     unsigned int nExtraNonce = 0;
 
-    MinerAddress minerAddress;
-    GetMainSignals().AddressForMining(minerAddress);
+    std::optional<MinerAddress> maybeMinerAddress;
+    GetMainSignals().AddressForMining(maybeMinerAddress);
 
     unsigned int n = chainparams.GetConsensus().nEquihashN;
     unsigned int k = chainparams.GetConsensus().nEquihashK;
@@ -789,9 +895,10 @@ void static BitcoinMiner(const CChainParams& chainparams)
 
     try {
         // Throw an error if no address valid for mining was provided.
-        if (!std::visit(IsValidMinerAddress(), minerAddress)) {
+        if (!(maybeMinerAddress.has_value() && std::visit(IsValidMinerAddress(), maybeMinerAddress.value()))) {
             throw std::runtime_error("No miner address available (mining requires a wallet or -mineraddress)");
         }
+        auto minerAddress = maybeMinerAddress.value();
 
         while (true) {
             if (chainparams.MiningRequiresPeers()) {
diff --git a/src/miner.h b/src/miner.h
index 9b76ec6ba91..daa9689b672 100644
--- a/src/miner.h
+++ b/src/miner.h
@@ -23,52 +23,25 @@ static const int DEFAULT_GENERATE_THREADS = 1;
 
 static const bool DEFAULT_PRINTPRIORITY = false;
 
-class InvalidMinerAddress {
-public:
-    friend bool operator==(const InvalidMinerAddress &a, const InvalidMinerAddress &b) { return true; }
-    friend bool operator<(const InvalidMinerAddress &a, const InvalidMinerAddress &b) { return true; }
-};
-
 typedef std::variant<
-    InvalidMinerAddress,
+    libzcash::OrchardRawAddress,
     libzcash::SaplingPaymentAddress,
     boost::shared_ptr<CReserveScript>> MinerAddress;
 
 class ExtractMinerAddress
 {
-public:
-    ExtractMinerAddress() {}
+    const Consensus::Params& consensus;
+    int height;
 
-    MinerAddress operator()(const libzcash::InvalidEncoding &invalid) const {
-        return InvalidMinerAddress();
-    }
-    MinerAddress operator()(const libzcash::SproutPaymentAddress &addr) const {
-        return InvalidMinerAddress();
-    }
-    MinerAddress operator()(const libzcash::SaplingPaymentAddress &addr) const {
-        return addr;
-    }
-    MinerAddress operator()(const libzcash::UnifiedAddress &addr) const {
-        auto recipient = RecipientForPaymentAddress()(addr);
-        if (recipient) {
-            // This looks like a recursive call, but we are actually calling
-            // ExtractMinerAddress with a different type:
-            // - libzcash::PaymentAddress has a libzcash::UnifiedAddress
-            //   alternative, which invokes this method.
-            // - RecipientForPaymentAddress() returns libzcash::RawAddress,
-            //   which does not have a libzcash::UnifiedAddress alternative.
-            //
-            // This works because std::visit does not require the visitor to
-            // solely match the std::variant, only that it can handle all of
-            // the variant's alternatives.
-            return std::visit(ExtractMinerAddress(), *recipient);
-        } else {
-            // Either the UA only contains unknown shielded receivers (unlikely that we
-            // wouldn't know about them), or it only contains transparent receivers
-            // (which are invalid).
-            return InvalidMinerAddress();
-        }
-    }
+public:
+    ExtractMinerAddress(const Consensus::Params& consensus, int height) :
+        consensus(consensus), height(height) {}
+
+    std::optional<MinerAddress> operator()(const CKeyID &keyID) const;
+    std::optional<MinerAddress> operator()(const CScriptID &addr) const;
+    std::optional<MinerAddress> operator()(const libzcash::SproutPaymentAddress &addr) const;
+    std::optional<MinerAddress> operator()(const libzcash::SaplingPaymentAddress &addr) const;
+    std::optional<MinerAddress> operator()(const libzcash::UnifiedAddress &addr) const;
 };
 
 class KeepMinerAddress
@@ -76,7 +49,7 @@ class KeepMinerAddress
 public:
     KeepMinerAddress() {}
 
-    void operator()(const InvalidMinerAddress &invalid) const {}
+    void operator()(const libzcash::OrchardRawAddress &addr) const {}
     void operator()(const libzcash::SaplingPaymentAddress &pa) const {}
     void operator()(const boost::shared_ptr<CReserveScript> &coinbaseScript) const {
         coinbaseScript->KeepScript();
@@ -90,8 +63,8 @@ class IsValidMinerAddress
 public:
     IsValidMinerAddress() {}
 
-    bool operator()(const InvalidMinerAddress &invalid) const {
-        return false;
+    bool operator()(const libzcash::OrchardRawAddress &addr) const {
+        return true;
     }
     bool operator()(const libzcash::SaplingPaymentAddress &pa) const {
         return true;
@@ -110,6 +83,10 @@ struct CBlockTemplate
     // Cached whenever we update `block`, so we can update hashBlockCommitments
     // when we change the coinbase transaction.
     uint256 hashChainHistoryRoot;
+    // Cached whenever we update `block`, so we can return it from `getblocktemplate`
+    // (enabling the caller to update `hashBlockCommitments` when they change
+    // `hashPrevBlock`).
+    uint256 hashAuthDataRoot;
     std::vector<CAmount> vTxFees;
     std::vector<int64_t> vTxSigOps;
 };
@@ -121,7 +98,7 @@ CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const MinerAddre
 
 #ifdef ENABLE_MINING
 /** Get -mineraddress */
-void GetMinerAddress(MinerAddress &minerAddress);
+void GetMinerAddress(std::optional<MinerAddress> &minerAddress);
 /** Modify the extranonce in a block */
 void IncrementExtraNonce(
     CBlockTemplate* pblocktemplate,
diff --git a/src/net.h b/src/net.h
index 05152e6b803..6e9e27b7bd7 100644
--- a/src/net.h
+++ b/src/net.h
@@ -690,7 +690,7 @@ class CNode
     static bool BannedSetIsDirty();
     //!set the "dirty" flag for the banlist
     static void SetBannedSetDirty(bool dirty=true);
-    //!clean unused entires (if bantime has expired)
+    //!clean unused entries (if bantime has expired)
     static void SweepBanned();
 
     void copyStats(CNodeStats &stats);
diff --git a/src/policy/fees.h b/src/policy/fees.h
index 1389ae83382..383d629d1d3 100644
--- a/src/policy/fees.h
+++ b/src/policy/fees.h
@@ -93,13 +93,13 @@ class TxConfirmStats
     // Count the total # of txs in each bucket
     // Track the historical moving average of this total over blocks
     std::vector<double> txCtAvg;
-    // and calcuate the total for the current block to update the moving average
+    // and calculate the total for the current block to update the moving average
     std::vector<int> curBlockTxCt;
 
     // Count the total # of txs confirmed within Y blocks in each bucket
-    // Track the historical moving average of theses totals over blocks
+    // Track the historical moving average of these totals over blocks
     std::vector<std::vector<double> > confAvg; // confAvg[Y][X]
-    // and calcuate the totals for the current block to update the moving averages
+    // and calculate the totals for the current block to update the moving averages
     std::vector<std::vector<int> > curBlockConf; // curBlockConf[Y][X]
 
     // Sum the total priority/fee of all txs in each bucket
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
index 5f524895688..8c187292223 100644
--- a/src/policy/policy.cpp
+++ b/src/policy/policy.cpp
@@ -59,8 +59,15 @@ bool IsStandardTx(const CTransaction& tx, std::string& reason, const CChainParam
 {
     bool overwinterActive = chainparams.GetConsensus().NetworkUpgradeActive(nHeight,  Consensus::UPGRADE_OVERWINTER);
     bool saplingActive = chainparams.GetConsensus().NetworkUpgradeActive(nHeight, Consensus::UPGRADE_SAPLING);
+    bool nu5Active = chainparams.GetConsensus().NetworkUpgradeActive(nHeight, Consensus::UPGRADE_NU5);
 
-    if (saplingActive) {
+    if (nu5Active) {
+        // NU5 standard rules apply
+        if (tx.nVersion > CTransaction::NU5_MAX_CURRENT_VERSION || tx.nVersion < CTransaction::NU5_MIN_CURRENT_VERSION) {
+            reason = "nu5-version";
+            return false;
+        }
+    } else if (saplingActive) {
         // Sapling standard rules apply
         if (tx.nVersion > CTransaction::SAPLING_MAX_CURRENT_VERSION || tx.nVersion < CTransaction::SAPLING_MIN_CURRENT_VERSION) {
             reason = "sapling-version";
diff --git a/src/pow/tromp/equi_miner.h b/src/pow/tromp/equi_miner.h
index aeed8239dc5..5efbbaa6933 100644
--- a/src/pow/tromp/equi_miner.h
+++ b/src/pow/tromp/equi_miner.h
@@ -374,7 +374,7 @@ struct equi {
   struct collisiondata {
 #ifdef XBITMAP
 #if NSLOTS > 64
-#error cant use XBITMAP with more than 64 slots
+#error can't use XBITMAP with more than 64 slots
 #endif
     u64 xhashmap[NRESTS];
     u64 xmap;
diff --git a/src/primitives/orchard.h b/src/primitives/orchard.h
index c09b429634a..eb3be10b99d 100644
--- a/src/primitives/orchard.h
+++ b/src/primitives/orchard.h
@@ -9,11 +9,15 @@
 
 #include <amount.h>
 #include <rust/orchard.h>
+#include <rust/orchard/wallet.h>
+#include "zcash/address/orchard.hpp"
 
-class OrchardMerkleTree;
+class OrchardMerkleFrontier;
+class OrchardWallet;
+namespace orchard { class UnauthorizedBundle; }
 
 /**
- * The Orchard component of a transaction.
+ * The Orchard component of an authorized transaction.
  */
 class OrchardBundle
 {
@@ -22,7 +26,11 @@ class OrchardBundle
     /// Memory is allocated by Rust.
     std::unique_ptr<OrchardBundlePtr, decltype(&orchard_bundle_free)> inner;
 
-    friend class OrchardMerkleTree;
+    OrchardBundle(OrchardBundlePtr* bundle) : inner(bundle, orchard_bundle_free) {}
+
+    friend class OrchardMerkleFrontier;
+    friend class OrchardWallet;
+    friend class orchard::UnauthorizedBundle;
 public:
     OrchardBundle() : inner(nullptr, orchard_bundle_free) {}
 
diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
index 8239cfc982e..b8f3358c066 100644
--- a/src/primitives/transaction.cpp
+++ b/src/primitives/transaction.cpp
@@ -81,6 +81,11 @@ std::string SaplingOutPoint::ToString() const
     return strprintf("SaplingOutPoint(%s, %u)", hash.ToString().substr(0, 10), n);
 }
 
+std::string OrchardOutPoint::ToString() const
+{
+    return strprintf("OrchardOutPoint(%s, %u)", hash.ToString().substr(0, 10), n);
+}
+
 CTxIn::CTxIn(COutPoint prevoutIn, CScript scriptSigIn, uint32_t nSequenceIn)
 {
     prevout = prevoutIn;
@@ -425,45 +430,3 @@ std::string CTransaction::ToString() const
         str += "    " + vout[i].ToString() + "\n";
     return str;
 }
-
-/**
- * Returns the most recent supported transaction version and version group id,
- * as of the specified activation height and active features.
- */
-TxVersionInfo CurrentTxVersionInfo(
-    const Consensus::Params& consensus,
-    int nHeight,
-    bool requireSprout)
-{
-    if (consensus.NetworkUpgradeActive(nHeight, Consensus::UPGRADE_ZFUTURE)) {
-        return {
-            .fOverwintered =   true,
-            .nVersionGroupId = ZFUTURE_VERSION_GROUP_ID,
-            .nVersion =        ZFUTURE_TX_VERSION
-        };
-    } else if (consensus.NetworkUpgradeActive(nHeight, Consensus::UPGRADE_NU5) && !requireSprout) {
-        return {
-            .fOverwintered =   true,
-            .nVersionGroupId = ZIP225_VERSION_GROUP_ID,
-            .nVersion =        ZIP225_TX_VERSION
-        };
-    } else if (consensus.NetworkUpgradeActive(nHeight, Consensus::UPGRADE_SAPLING)) {
-        return {
-            .fOverwintered =   true,
-            .nVersionGroupId = SAPLING_VERSION_GROUP_ID,
-            .nVersion =        SAPLING_TX_VERSION
-        };
-    } else if (consensus.NetworkUpgradeActive(nHeight, Consensus::UPGRADE_OVERWINTER)) {
-        return {
-            .fOverwintered =   true,
-            .nVersionGroupId = OVERWINTER_VERSION_GROUP_ID,
-            .nVersion =        OVERWINTER_TX_VERSION
-        };
-    } else {
-        return {
-            .fOverwintered =   false,
-            .nVersionGroupId = 0,
-            .nVersion =        CTransaction::SPROUT_MIN_CURRENT_VERSION
-        };
-    }
-}
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index e005cd8279b..683023743d6 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -523,6 +523,16 @@ class SaplingOutPoint : public BaseOutPoint
     std::string ToString() const;
 };
 
+/** An outpoint - a combination of a txid and an index n into its orchard
+ * actions */
+class OrchardOutPoint : public BaseOutPoint
+{
+public:
+    OrchardOutPoint() : BaseOutPoint() {};
+    OrchardOutPoint(uint256 hashIn, uint32_t nIn) : BaseOutPoint(hashIn, nIn) {};
+    std::string ToString() const;
+};
+
 /** An input of a transaction.  It contains the location of the previous
  * transaction's output that it claims and a signature that matches the
  * output's public key.
@@ -719,6 +729,8 @@ class CTransaction
     static const int32_t OVERWINTER_MAX_CURRENT_VERSION = 3;
     static const int32_t SAPLING_MIN_CURRENT_VERSION = 4;
     static const int32_t SAPLING_MAX_CURRENT_VERSION = 4;
+    static const int32_t NU5_MIN_CURRENT_VERSION = 4;
+    static const int32_t NU5_MAX_CURRENT_VERSION = 5;
 
     static_assert(SPROUT_MIN_CURRENT_VERSION >= SPROUT_MIN_TX_VERSION,
                   "standard rule for tx version should be consistent with network rule");
@@ -737,6 +749,13 @@ class CTransaction
                     SAPLING_MAX_CURRENT_VERSION >= SAPLING_MIN_CURRENT_VERSION),
                   "standard rule for tx version should be consistent with network rule");
 
+    static_assert(NU5_MIN_CURRENT_VERSION >= SAPLING_MIN_TX_VERSION,
+                  "standard rule for tx version should be consistent with network rule");
+
+    static_assert( (NU5_MAX_CURRENT_VERSION <= ZIP225_MAX_TX_VERSION &&
+                    NU5_MAX_CURRENT_VERSION >= NU5_MIN_CURRENT_VERSION),
+                  "standard rule for tx version should be consistent with network rule");
+
     // The local variables are made const to prevent unintended modification
     // without updating the cached hash value. However, CTransaction is not
     // actually immutable; deserialization and assignment are implemented,
@@ -962,16 +981,6 @@ class CTransaction
         return (vin.size() == 1 && vin[0].prevout.IsNull());
     }
 
-    friend bool operator==(const CTransaction& a, const CTransaction& b)
-    {
-        return a.wtxid.hash == b.wtxid.hash;
-    }
-
-    friend bool operator!=(const CTransaction& a, const CTransaction& b)
-    {
-        return a.wtxid.hash != b.wtxid.hash;
-    }
-
     std::string ToString() const;
 };
 
diff --git a/src/primitives/tx_version_info.cpp b/src/primitives/tx_version_info.cpp
new file mode 100644
index 00000000000..bdcabcb1e87
--- /dev/null
+++ b/src/primitives/tx_version_info.cpp
@@ -0,0 +1,47 @@
+// Copyright (c) 2021 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+#include "primitives/transaction.h"
+
+/**
+ * Returns the most recent supported transaction version and version group id,
+ * as of the specified activation height and active features.
+ */
+TxVersionInfo CurrentTxVersionInfo(
+    const Consensus::Params& consensus,
+    int nHeight,
+    bool requireSprout)
+{
+    if (consensus.NetworkUpgradeActive(nHeight, Consensus::UPGRADE_ZFUTURE)) {
+        return {
+            .fOverwintered =   true,
+            .nVersionGroupId = ZFUTURE_VERSION_GROUP_ID,
+            .nVersion =        ZFUTURE_TX_VERSION
+        };
+    } else if (consensus.NetworkUpgradeActive(nHeight, Consensus::UPGRADE_NU5) && !requireSprout) {
+        return {
+            .fOverwintered =   true,
+            .nVersionGroupId = ZIP225_VERSION_GROUP_ID,
+            .nVersion =        ZIP225_TX_VERSION
+        };
+    } else if (consensus.NetworkUpgradeActive(nHeight, Consensus::UPGRADE_SAPLING)) {
+        return {
+            .fOverwintered =   true,
+            .nVersionGroupId = SAPLING_VERSION_GROUP_ID,
+            .nVersion =        SAPLING_TX_VERSION
+        };
+    } else if (consensus.NetworkUpgradeActive(nHeight, Consensus::UPGRADE_OVERWINTER)) {
+        return {
+            .fOverwintered =   true,
+            .nVersionGroupId = OVERWINTER_VERSION_GROUP_ID,
+            .nVersion =        OVERWINTER_TX_VERSION
+        };
+    } else {
+        return {
+            .fOverwintered =   false,
+            .nVersionGroupId = 0,
+            .nVersion =        CTransaction::SPROUT_MIN_CURRENT_VERSION
+        };
+    }
+}
diff --git a/src/protocol.h b/src/protocol.h
index 59be50ab620..f182d0f0606 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -145,8 +145,35 @@ class CInv
     {
         int nVersion = s.GetVersion();
         READWRITE(type);
+
+        // The implicit P2P network protocol inherited from Bitcoin Core has
+        // zcashd nodes sort-of ignoring unknown CInv message types in inv
+        // messages: they are added to the known transaction inventory, but
+        // AlreadyHave returns true, so we do nothing with them. Meanwhile for
+        // getdata messages, ProcessGetData ignores unknown message types
+        // entirely.
+        //
+        // As of v4.5.0, we change the implementation behaviour to reject
+        // undefined message types instead of ignoring them.
+        switch (type) {
+        case MSG_TX:
+        case MSG_BLOCK:
+        case MSG_FILTERED_BLOCK:
+            break;
+        case MSG_WTX:
+            if (nVersion < CINV_WTX_VERSION) {
+                throw std::ios_base::failure(
+                    "Negotiated protocol version does not support CInv message type MSG_WTX");
+            }
+            break;
+        default:
+            // This includes UNDEFINED, which should never be serialized.
+            throw std::ios_base::failure("Unknown CInv message type");
+        }
+
         READWRITE(hash);
-        if (type == MSG_WTX && nVersion >= CINV_WTX_VERSION) {
+        if (type == MSG_WTX) {
+            // We've already checked above that nVersion >= CINV_WTX_VERSION.
             READWRITE(hashAux);
         } else if (type == MSG_TX && ser_action.ForRead()) {
             // Ensure that this value is set consistently in memory for MSG_TX.
diff --git a/src/pubkey.cpp b/src/pubkey.cpp
index 32808a999b2..48dc94dc44b 100644
--- a/src/pubkey.cpp
+++ b/src/pubkey.cpp
@@ -98,6 +98,16 @@ bool CPubKey::Derive(CPubKey& pubkeyChild, ChainCode &ccChild, unsigned int nChi
     return true;
 }
 
+std::optional<CChainablePubKey> CChainablePubKey::Derive(unsigned int nChild) const {
+    CPubKey pubkeyChild;
+    ChainCode ccChild;
+    if (pubkey.Derive(pubkeyChild, ccChild, nChild, chaincode)) {
+        return CChainablePubKey::FromParts(ccChild, pubkeyChild);
+    } else {
+        return std::nullopt;
+    }
+}
+
 void CExtPubKey::Encode(unsigned char code[BIP32_EXTKEY_SIZE]) const {
     code[0] = nDepth;
     memcpy(code+1, vchFingerprint, 4);
@@ -134,6 +144,14 @@ bool CExtPubKey::Derive(CExtPubKey &out, unsigned int _nChild) const {
     return (!secp256k1_ecdsa_signature_normalize(secp256k1_context_verify, NULL, &sig));
 }
 
+/* static */ std::optional<CChainablePubKey> CChainablePubKey::FromParts(ChainCode chaincode, CPubKey pubkey) {
+    if (pubkey.IsCompressed()) {
+        return CChainablePubKey(chaincode, pubkey);
+    } else {
+        return std::nullopt;
+    }
+}
+
 /* static */ int ECCVerifyHandle::refcount = 0;
 
 ECCVerifyHandle::ECCVerifyHandle()
diff --git a/src/pubkey.h b/src/pubkey.h
index 4cdfbef3831..917423800dc 100644
--- a/src/pubkey.h
+++ b/src/pubkey.h
@@ -22,6 +22,7 @@ class CKeyID : public uint160
 public:
     CKeyID() : uint160() {}
     CKeyID(const uint160& in) : uint160(in) {}
+    explicit CKeyID(const std::vector<unsigned char>& vch) : uint160(vch) {}
 };
 
 typedef uint256 ChainCode;
@@ -202,6 +203,57 @@ class CPubKey
     bool Derive(CPubKey& pubkeyChild, ChainCode &ccChild, unsigned int nChild, const ChainCode& cc) const;
 };
 
+class CChainablePubKey {
+private:
+    ChainCode chaincode;
+    CPubKey pubkey;
+
+    CChainablePubKey() {}
+    CChainablePubKey(ChainCode chaincode, CPubKey pubkey): chaincode(chaincode), pubkey(pubkey) {}
+public:
+    static std::optional<CChainablePubKey> FromParts(ChainCode chaincode, CPubKey pubkey);
+
+    const ChainCode& GetChainCode() const {
+        return chaincode;
+    }
+
+    const CPubKey& GetPubKey() const {
+        return pubkey;
+    }
+
+    std::optional<CChainablePubKey> Derive(unsigned int nChild) const;
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action) {
+        READWRITE(chaincode);
+        if (ser_action.ForRead()) {
+            std::array<uint8_t, CPubKey::COMPRESSED_PUBLIC_KEY_SIZE> pubkeyBytes;
+            READWRITE(pubkeyBytes);
+            pubkey = CPubKey(pubkeyBytes.begin(), pubkeyBytes.end());
+            assert(pubkey.IsCompressed());
+        } else {
+            assert(pubkey.size() == CPubKey::COMPRESSED_PUBLIC_KEY_SIZE);
+            std::array<uint8_t, CPubKey::COMPRESSED_PUBLIC_KEY_SIZE> pubkeyBytes;
+            std::copy(pubkey.begin(), pubkey.end(), pubkeyBytes.begin());
+            READWRITE(pubkeyBytes);
+        }
+    }
+
+    template <typename Stream>
+    static CChainablePubKey Read(Stream& stream) {
+        CChainablePubKey key;
+        stream >> key;
+        return key;
+    }
+
+    friend bool operator==(const CChainablePubKey &a, const CChainablePubKey &b)
+    {
+        return a.chaincode == b.chaincode && a.pubkey == b.pubkey;
+    }
+};
+
 struct CExtPubKey {
     unsigned char nDepth;
     unsigned char vchFingerprint[4];
@@ -222,6 +274,10 @@ struct CExtPubKey {
     void Decode(const unsigned char code[BIP32_EXTKEY_SIZE]);
     bool Derive(CExtPubKey& out, unsigned int nChild) const;
 
+    std::optional<CChainablePubKey> ToChainablePubKey() const {
+        return CChainablePubKey::FromParts(chaincode, pubkey);
+    }
+
     void Serialize(CSizeComputer& s) const
     {
         // Optimized implementation for ::GetSerializeSize that avoids copying.
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 71b572a8956..c4b6a556df0 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -1247,6 +1247,13 @@ UniValue z_gettreestate(const UniValue& params, bool fHelp)
             "      \"finalRoot\": \"hex\", (string)\n"
             "      \"finalState\": \"hex\" (string)\n"
             "    }\n"
+            "  },\n"
+            "  \"orchard\": {\n"
+            "    \"skipHash\": \"hash\",   (string) hash of most recent block with more information\n"
+            "    \"commitments\": {\n"
+            "      \"finalRoot\": \"hex\", (string)\n"
+            "      \"finalState\": \"hex\" (string)\n"
+            "    }\n"
             "  }\n"
             "}\n"
             "\nExamples:\n"
@@ -1327,6 +1334,31 @@ UniValue z_gettreestate(const UniValue& params, bool fHelp)
         res.pushKV("sapling", sapling_result);
     }
 
+    // orchard
+    {
+        UniValue orchard_result(UniValue::VOBJ);
+        UniValue orchard_commitments(UniValue::VOBJ);
+        orchard_commitments.pushKV("finalRoot", pindex->hashFinalOrchardRoot.GetHex());
+        bool need_skiphash = false;
+        OrchardMerkleFrontier tree;
+        if (pcoinsTip->GetOrchardAnchorAt(pindex->hashFinalOrchardRoot, tree)) {
+            CDataStream s(SER_NETWORK, PROTOCOL_VERSION);
+            s << tree;
+            orchard_commitments.pushKV("finalState", HexStr(s.begin(), s.end()));
+        } else {
+            // Set skipHash to the most recent block that has a finalState.
+            const CBlockIndex* pindex_skip = pindex->pprev;
+            while (pindex_skip && !pcoinsTip->GetOrchardAnchorAt(pindex_skip->hashFinalOrchardRoot, tree)) {
+                pindex_skip = pindex_skip->pprev;
+            }
+            if (pindex_skip) {
+                orchard_result.pushKV("skipHash", pindex_skip->GetBlockHash().GetHex());
+            }
+        }
+        orchard_result.pushKV("commitments", orchard_commitments);
+        res.pushKV("orchard", orchard_result);
+    }
+
     return res;
 }
 
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index 85a68a5a718..67a6020619b 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -116,8 +116,14 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "z_listunspent", 1 },
     { "z_listunspent", 2 },
     { "z_listunspent", 3 },
+    { "z_getaddressforaccount", 0},
+    { "z_getaddressforaccount", 1},
+    { "z_getaddressforaccount", 2},
     { "z_getbalance", 1},
     { "z_getbalance", 2},
+    { "z_getbalanceforaccount", 0},
+    { "z_getbalanceforaccount", 1},
+    { "z_getbalanceforaddress", 1},
     { "z_gettotalbalance", 0},
     { "z_gettotalbalance", 1},
     { "z_gettotalbalance", 2},
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 76b6d35f8ef..03a65d59ecd 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -186,19 +186,25 @@ UniValue generate(const UniValue& params, bool fHelp)
     int nHeight = 0;
     int nGenerate = params[0].get_int();
 
-    MinerAddress minerAddress;
-    GetMainSignals().AddressForMining(minerAddress);
-
-    // If the keypool is exhausted, no script is returned at all.  Catch this.
-    auto resv = std::get_if<boost::shared_ptr<CReserveScript>>(&minerAddress);
-    if (resv && !resv->get()) {
-        throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first");
-    }
+    std::optional<MinerAddress> maybeMinerAddress;
+    GetMainSignals().AddressForMining(maybeMinerAddress);
 
     // Throw an error if no address valid for mining was provided.
-    if (!std::visit(IsValidMinerAddress(), minerAddress)) {
+    if (!maybeMinerAddress.has_value()) {
         throw JSONRPCError(RPC_INTERNAL_ERROR, "No miner address available (mining requires a wallet or -mineraddress)");
+    } else {
+        // Detect and handle keypool exhaustion separately from IsValidMinerAddress().
+        auto resv = std::get_if<boost::shared_ptr<CReserveScript>>(&maybeMinerAddress.value());
+        if (resv && !resv->get()) {
+            throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first");
+        }
+
+        // Catch any other invalid miner address issues.
+        if (!std::visit(IsValidMinerAddress(), maybeMinerAddress.value())) {
+            throw JSONRPCError(RPC_INTERNAL_ERROR, "Miner address is invalid");
+        }
     }
+    auto minerAddress = maybeMinerAddress.value();
 
     {   // Don't keep cs_main locked
         LOCK(cs_main);
@@ -322,8 +328,8 @@ UniValue getmininginfo(const UniValue& params, bool fHelp)
             "\nResult:\n"
             "{\n"
             "  \"blocks\": nnn,             (numeric) The current block\n"
-            "  \"currentblocksize\": nnn,   (numeric) The last block size\n"
-            "  \"currentblocktx\": nnn,     (numeric) The last block transaction\n"
+            "  \"currentblocksize\": nnn,   (numeric, optional) The block size of the last assembled block (only present if a block was ever assembled)\n"
+            "  \"currentblocktx\": nnn,     (numeric, optional) The number of block non-coinbase transactions of the last assembled block (only present if a block was ever assembled)\n"
             "  \"difficulty\": xxx.xxxxx    (numeric) The current difficulty\n"
             "  \"errors\": \"...\"          (string) Current errors\n"
             "  \"generate\": true|false     (boolean) If the generation is on or off (see getgenerate or setgenerate calls)\n"
@@ -344,8 +350,8 @@ UniValue getmininginfo(const UniValue& params, bool fHelp)
 
     UniValue obj(UniValue::VOBJ);
     obj.pushKV("blocks",           (int)chainActive.Height());
-    obj.pushKV("currentblocksize", (uint64_t)nLastBlockSize);
-    obj.pushKV("currentblocktx",   (uint64_t)nLastBlockTx);
+    if (last_block_size.has_value()) obj.pushKV("currentblocksize", last_block_size.value());
+    if (last_block_num_txs.has_value()) obj.pushKV("currentblocktx", last_block_num_txs.value());
     obj.pushKV("difficulty",       (double)GetNetworkDifficulty());
     auto warnings = GetWarnings("statusbar");
     obj.pushKV("errors",           warnings.first);
@@ -428,6 +434,11 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
             "amounts, use 'getblocksubsidy HEIGHT' passing in the height returned\n"
             "by this API.\n"
 
+            "\nThe roots returned in 'defaultroots' are only valid if the block template is\n"
+            "used unmodified. If any part of the block template marked as 'mutable' in the\n"
+            "output is mutated, these roots may need to be recomputed. For more information\n"
+            "on the derivation process, see ZIP 244.\n"
+
             "\nArguments:\n"
             "1. \"jsonrequestobject\"       (string, optional) A json object in the following spec\n"
             "     {\n"
@@ -444,9 +455,15 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
             "{\n"
             "  \"version\" : n,                     (numeric) The block version\n"
             "  \"previousblockhash\" : \"xxxx\",      (string) The hash of current highest block\n"
-            "  \"blockcommitmentshash\" : \"xxxx\",   (string) The hash of the block commitments field in the block header\n"
+            "  \"blockcommitmentshash\" : \"xxxx\",   (string) (DEPRECATED) The hash of the block commitments field in the block header\n"
             "  \"lightclientroothash\" : \"xxxx\",    (string) (DEPRECATED) The hash of the light client root field in the block header\n"
             "  \"finalsaplingroothash\" : \"xxxx\",   (string) (DEPRECATED) The hash of the light client root field in the block header\n"
+            "  \"defaultroots\" : {                 (json object) root hashes that need to be recomputed if the transaction set is modified\n"
+            "     \"merkleroot\" : \"xxxx\"           (string) The hash of the transactions in the block header\n"
+            "     \"chainhistoryroot\" : \"xxxx\"     (string) The hash of the chain history\n"
+            "     \"authdataroot\" : \"xxxx\"         (string) (From NU5) The hash of the authorizing data merkel tree\n"
+            "     \"blockcommitmentshash\" : \"xxxx\" (string) (From NU5) The hash of the block commitments field in the block header\n"
+            "  }\n"
             "  \"transactions\" : [                 (array) contents of non-coinbase transactions that should be included in the next block\n"
             "      {\n"
             "         \"data\" : \"xxxx\",            (string) transaction data encoded in hexadecimal (byte-for-byte)\n"
@@ -558,9 +575,14 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
     if (IsInitialBlockDownload(Params().GetConsensus()))
         throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Zcash is downloading blocks...");
 
+    std::optional<MinerAddress> maybeMinerAddress;
+    GetMainSignals().AddressForMining(maybeMinerAddress);
 
-    MinerAddress minerAddress;
-    GetMainSignals().AddressForMining(minerAddress);
+    // Throw an error if no address valid for mining was provided.
+    if (!(maybeMinerAddress.has_value() && std::visit(IsValidMinerAddress(), maybeMinerAddress.value()))) {
+        throw JSONRPCError(RPC_INTERNAL_ERROR, "No miner address available (getblocktemplate requires a wallet or -mineraddress)");
+    }
+    auto minerAddress = maybeMinerAddress.value();
 
     static unsigned int nTransactionsUpdatedLast;
     static std::optional<CMutableTransaction> cached_next_cb_mtx;
@@ -596,15 +618,15 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
             nTransactionsUpdatedLastLP = nTransactionsUpdatedLast;
         }
 
+        // Release the main lock while waiting
+        // Don't call chainActive->Tip() without holding cs_main
+        LEAVE_CRITICAL_SECTION(cs_main);
         {
             checktxtime = boost::get_system_time() + boost::posix_time::seconds(10);
 
-            boost::unique_lock<boost::mutex> lock(csBestBlock);
-            while (chainActive.Tip()->GetBlockHash() == hashWatchedChain && IsRPCRunning())
+            boost::unique_lock<boost::mutex> lock(g_best_block_mutex);
+            while (g_best_block == hashWatchedChain && IsRPCRunning())
             {
-                // Release the main lock while waiting
-                LEAVE_CRITICAL_SECTION(cs_main);
-
                 // Before waiting, generate the coinbase for the block following the next
                 // block (since this is cpu-intensive), so that when next block arrives,
                 // we can quickly respond with a template for following block.
@@ -617,12 +639,11 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
                         Params(), CAmount{0}, minerAddress, cached_next_cb_height);
                     next_cb_mtx = cached_next_cb_mtx;
                 }
-                bool timedout = !cvBlockChange.timed_wait(lock, checktxtime);
-                ENTER_CRITICAL_SECTION(cs_main);
+                bool timedout = !g_best_block_cv.timed_wait(lock, checktxtime);
 
                 // Optimization: even if timed out, a new block may have arrived
                 // while waiting for cs_main; if so, don't discard next_cb_mtx.
-                if (chainActive.Tip()->GetBlockHash() != hashWatchedChain) break;
+                if (g_best_block != hashWatchedChain) break;
 
                 // Timeout: Check transactions for update
                 if (timedout && mempool.GetTransactionsUpdated() != nTransactionsUpdatedLastLP) {
@@ -632,11 +653,12 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
                 }
                 checktxtime += boost::posix_time::seconds(10);
             }
-            if (chainActive.Tip()->nHeight != nHeight + 1) {
+            if (g_best_block_height != nHeight + 1) {
                 // Unexpected height (reorg or >1 blocks arrived while waiting) invalidates coinbase tx.
                 next_cb_mtx = nullopt;
             }
         }
+        ENTER_CRITICAL_SECTION(cs_main);
 
         if (!IsRPCRunning())
             throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Shutting down");
@@ -712,6 +734,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
         entry.pushKV("data", EncodeHexTx(tx));
 
         entry.pushKV("hash", txHash.GetHex());
+        entry.pushKV("authdigest", tx.GetAuthDigest().GetHex());
 
         UniValue deps(UniValue::VARR);
         for (const CTxIn &in : tx.vin)
@@ -757,11 +780,23 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
     result.pushKV("capabilities", aCaps);
     result.pushKV("version", pblock->nVersion);
     result.pushKV("previousblockhash", pblock->hashPrevBlock.GetHex());
+    // The following 3 are deprecated; remove in a future release.
     result.pushKV("blockcommitmentshash", pblock->hashBlockCommitments.GetHex());
-    // Deprecated; remove in a future release.
     result.pushKV("lightclientroothash", pblock->hashBlockCommitments.GetHex());
-    // Deprecated; remove in a future release.
     result.pushKV("finalsaplingroothash", pblock->hashBlockCommitments.GetHex());
+    {
+        // These are items in the result object that are valid only if the
+        // block template returned by this RPC is used unmodified. Otherwise,
+        // these values must be recomputed.
+        UniValue defaults(UniValue::VOBJ);
+        defaults.pushKV("merkleroot", pblock->BuildMerkleTree().GetHex());
+        defaults.pushKV("chainhistoryroot", pblocktemplate->hashChainHistoryRoot.GetHex());
+        if (consensus.NetworkUpgradeActive(pindexPrev->nHeight+1, Consensus::UPGRADE_NU5)) {
+            defaults.pushKV("authdataroot", pblocktemplate->hashAuthDataRoot.GetHex());
+            defaults.pushKV("blockcommitmentshash", pblock->hashBlockCommitments.GetHex());
+        }
+        result.pushKV("defaultroots", defaults);
+    }
     result.pushKV("transactions", transactions);
     if (coinbasetxn) {
         assert(txCoinbase.isObject());
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index dffee0b8b5f..754805dc32c 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -217,7 +217,27 @@ UniValue validateaddress(const UniValue& params, bool fHelp)
 class DescribePaymentAddressVisitor
 {
 public:
-    UniValue operator()(const libzcash::InvalidEncoding &zaddr) const { return UniValue(UniValue::VOBJ); }
+    UniValue operator()(const CKeyID &addr) const {
+        UniValue obj(UniValue::VOBJ);
+        obj.pushKV("type", "p2pkh");
+#ifdef ENABLE_WALLET
+        if (pwalletMain) {
+            obj.pushKV("ismine", pwalletMain->HaveKey(addr));
+        }
+#endif
+        return obj;
+    }
+
+    UniValue operator()(const CScriptID &addr) const {
+        UniValue obj(UniValue::VOBJ);
+        obj.pushKV("type", "p2sh");
+#ifdef ENABLE_WALLET
+        if (pwalletMain) {
+            obj.pushKV("ismine", pwalletMain->HaveCScript(addr));
+        }
+#endif
+        return obj;
+    }
 
     UniValue operator()(const libzcash::SproutPaymentAddress &zaddr) const {
         UniValue obj(UniValue::VOBJ);
@@ -226,7 +246,7 @@ class DescribePaymentAddressVisitor
         obj.pushKV("transmissionkey", zaddr.pk_enc.GetHex());
 #ifdef ENABLE_WALLET
         if (pwalletMain) {
-            obj.pushKV("ismine", HaveSpendingKeyForPaymentAddress(pwalletMain)(zaddr));
+            obj.pushKV("ismine", pwalletMain->HaveSproutSpendingKey(zaddr));
         }
 #endif
         return obj;
@@ -239,7 +259,7 @@ class DescribePaymentAddressVisitor
         obj.pushKV("diversifiedtransmissionkey", zaddr.pk_d.GetHex());
 #ifdef ENABLE_WALLET
         if (pwalletMain) {
-            obj.pushKV("ismine", HaveSpendingKeyForPaymentAddress(pwalletMain)(zaddr));
+            obj.pushKV("ismine", pwalletMain->HaveSaplingSpendingKeyForAddress(zaddr));
         }
 #endif
         return obj;
@@ -257,16 +277,16 @@ UniValue z_validateaddress(const UniValue& params, bool fHelp)
 {
     if (fHelp || params.size() != 1)
         throw runtime_error(
-            "z_validateaddress \"zaddr\"\n"
-            "\nReturn information about the given z address.\n"
+            "z_validateaddress \"address\"\n"
+            "\nReturn information about the given address.\n"
             "\nArguments:\n"
-            "1. \"zaddr\"     (string, required) The z address to validate\n"
+            "1. \"address\"   (string, required) The address to validate\n"
             "\nResult:\n"
             "{\n"
-            "  \"isvalid\" : true|false,      (boolean) If the address is valid or not. If not, this is the only property returned.\n"
-            "  \"address\" : \"zaddr\",         (string) The z address validated\n"
-            "  \"type\" : \"xxxx\",             (string) \"sprout\" or \"sapling\"\n"
-            "  \"ismine\" : true|false,       (boolean) If the address is yours or not\n"
+            "  \"isvalid\" : true|false,        (boolean) If the address is valid or not. If not, this is the only property returned.\n"
+            "  \"address\" : \"addr\",          (string) The address validated\n"
+            "  \"type\" : \"xxxx\",             (string) \"p2pkh\", \"p2sh\", \"sprout\" or \"sapling\"\n"
+            "  \"ismine\" : true|false,         (boolean) If the address is yours or not\n"
             "  \"payingkey\" : \"hex\",         (string) [sprout] The hex value of the paying key, a_pk\n"
             "  \"transmissionkey\" : \"hex\",   (string) [sprout] The hex value of the transmission key, pk_enc\n"
             "  \"diversifier\" : \"hex\",       (string) [sapling] The hex value of the diversifier, d\n"
@@ -288,14 +308,14 @@ UniValue z_validateaddress(const UniValue& params, bool fHelp)
     KeyIO keyIO(Params());
     string strAddress = params[0].get_str();
     auto address = keyIO.DecodePaymentAddress(strAddress);
-    bool isValid = IsValidPaymentAddress(address);
+    bool isValid = address.has_value();
 
     UniValue ret(UniValue::VOBJ);
     ret.pushKV("isvalid", isValid);
     if (isValid)
     {
         ret.pushKV("address", strAddress);
-        UniValue detail = std::visit(DescribePaymentAddressVisitor(), address);
+        UniValue detail = std::visit(DescribePaymentAddressVisitor(), address.value());
         ret.pushKVs(detail);
     }
     return ret;
diff --git a/src/rpc/protocol.h b/src/rpc/protocol.h
index 0557975fcc9..83c1ef79c70 100644
--- a/src/rpc/protocol.h
+++ b/src/rpc/protocol.h
@@ -75,6 +75,7 @@ enum RPCErrorCode
     RPC_WALLET_WRONG_ENC_STATE      = -15, //! Command given in wrong wallet encryption state (encrypting an encrypted wallet etc.)
     RPC_WALLET_ENCRYPTION_FAILED    = -16, //! Failed to encrypt the wallet
     RPC_WALLET_ALREADY_UNLOCKED     = -17, //! Wallet is already unlocked
+    RPC_WALLET_BACKUP_REQUIRED      = -18, //! User must acknowledge backup of the mnemonic seed.
 };
 
 std::string JSONRPCRequest(const std::string& strMethod, const UniValue& params, const UniValue& id);
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index d004f7b3328..9ba7e6b00ba 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -431,8 +431,7 @@ void JSONRequest::parse(const UniValue& valRequest)
     if (!valMethod.isStr())
         throw JSONRPCError(RPC_INVALID_REQUEST, "Method must be a string");
     strMethod = valMethod.get_str();
-    if (strMethod != "getblocktemplate")
-        LogPrint("rpc", "ThreadRPCServer method=%s\n", SanitizeString(strMethod));
+    LogPrint("rpc", "ThreadRPCServer method=%s\n", SanitizeString(strMethod));
 
     // Parse params
     UniValue valParams = find_value(request, "params");
diff --git a/src/rust/README.md b/src/rust/README.md
index a6e8e97f274..790db5d115a 100644
--- a/src/rust/README.md
+++ b/src/rust/README.md
@@ -6,6 +6,11 @@ the `zcashd` full node.
 The FFI API does not have any stability guarantees, and will change as required
 by `zcashd`.
 
+# zcashd-wallet-tool
+
+`zcashd-wallet-tool` is a command-line tool that allows confirming to a `zcashd`
+node that the emergency recovery phrase of the node's wallet has been backed up.
+
 ## License
 
 Licensed under either of
diff --git a/src/rust/bin/wallet_tool.rs b/src/rust/bin/wallet_tool.rs
new file mode 100644
index 00000000000..832ec9073eb
--- /dev/null
+++ b/src/rust/bin/wallet_tool.rs
@@ -0,0 +1,646 @@
+use std::cmp::min;
+use std::env::{self, consts::EXE_EXTENSION};
+use std::ffi::OsStr;
+use std::fs::File;
+use std::io::{self, BufRead, Stdin, Write};
+use std::iter;
+use std::panic;
+use std::path::{Path, PathBuf};
+use std::process::{self, ChildStdin, Command, Output, Stdio};
+use std::str::from_utf8;
+use std::time::SystemTime;
+
+use anyhow::{self, Context};
+use backtrace::Backtrace;
+use gumdrop::{Options, ParsingStyle};
+use rand::{thread_rng, Rng};
+use secrecy::{ExposeSecret, SecretString};
+use thiserror::Error;
+use time::macros::format_description;
+use time::OffsetDateTime;
+use tracing::debug;
+use tracing_subscriber::{fmt, EnvFilter};
+
+#[derive(Debug, Options)]
+struct CliOptions {
+    #[options(no_short, help = "Print this help output")]
+    help: bool,
+
+    #[options(
+        no_short,
+        help = "Specify configuration filename, relative to the data directory (default: zcash.conf)",
+        meta = "FILENAME"
+    )]
+    conf: Option<String>,
+
+    #[options(
+        no_short,
+        help = "Specify data directory (this path cannot use '~')",
+        meta = "PATH"
+    )]
+    datadir: Option<String>,
+
+    #[options(no_short, help = "Use the test chain")]
+    testnet: bool,
+
+    #[options(
+        no_short,
+        help = "Send commands to node running on IPADDR (default: 127.0.0.1)",
+        meta = "IPADDR"
+    )]
+    rpcconnect: Option<String>,
+
+    #[options(
+        no_short,
+        help = "Connect to JSON-RPC on PORT (default: 8232 or testnet: 18232)",
+        meta = "PORT"
+    )]
+    rpcport: Option<u16>,
+
+    #[options(
+        no_short,
+        help = "Username for JSON-RPC connections",
+        meta = "USERNAME"
+    )]
+    rpcuser: Option<String>,
+
+    #[options(
+        no_short,
+        help = "Password for JSON-RPC connections",
+        meta = "PASSWORD"
+    )]
+    rpcpassword: Option<String>,
+
+    #[options(
+        no_short,
+        help = "Timeout in seconds during HTTP requests, or 0 for no timeout. (default: 900)",
+        meta = "SECONDS"
+    )]
+    rpcclienttimeout: Option<u32>,
+}
+
+impl CliOptions {
+    fn to_zcash_cli_options(&self) -> Vec<String> {
+        iter::empty::<String>()
+            .chain(self.conf.as_ref().map(|o| format!("-conf={}", o)))
+            .chain(self.datadir.as_ref().map(|o| format!("-datadir={}", o)))
+            .chain(if self.testnet {
+                Some("-testnet".into())
+            } else {
+                None
+            })
+            .chain(
+                self.rpcconnect
+                    .as_ref()
+                    .map(|o| format!("-rpcconnect={}", o)),
+            )
+            .chain(self.rpcport.as_ref().map(|o| format!("-rpcport={}", o)))
+            .chain(self.rpcuser.as_ref().map(|o| format!("-rpcuser={}", o)))
+            .chain(
+                self.rpcpassword
+                    .as_ref()
+                    .map(|o| format!("-rpcpassword={}", o)),
+            )
+            .chain(
+                self.rpcclienttimeout
+                    .as_ref()
+                    .map(|o| format!("-rpcclienttimeout={}", o)),
+            )
+            .collect()
+    }
+}
+
+#[derive(Debug, Error)]
+enum WalletToolError {
+    #[error("zcash-cli executable not found")]
+    ZcashCliNotFound,
+
+    #[error("Unexpected response from zcash-cli or zcashd")]
+    UnexpectedResponse,
+
+    #[error("Could not connect to zcashd")]
+    ZcashdConnection,
+
+    #[error("zcashd -exportdir option not set")]
+    ExportDirNotSet,
+
+    #[error("Could not parse a recovery phrase from the export file")]
+    RecoveryPhraseNotFound,
+
+    #[error("Unexpected EOF in input")]
+    UnexpectedEof,
+}
+
+pub fn main() {
+    // Log to stderr, configured by the RUST_LOG environment variable.
+    fmt()
+        .with_writer(io::stderr)
+        .with_env_filter(EnvFilter::from_default_env())
+        .init();
+
+    // Allow either Bitcoin-style or GNU-style arguments.
+    let mut args = env::args();
+    let command = args.next().expect("argv[0] should exist");
+    let args: Vec<_> = args
+        .map(|s| {
+            if s.starts_with('-') && !s.starts_with("--") {
+                format!("-{}", s)
+            } else {
+                s
+            }
+        })
+        .collect();
+
+    const USAGE_NOTE: &str = concat!(
+        "Options can be given in GNU style (`--conf=CONF` or `--conf CONF`),\n",
+        "or in Bitcoin style with a single hyphen (`-conf=CONF`).\n\n",
+        "The environment variable RUST_LOG controls debug output, e.g.\n",
+        "`RUST_LOG=debug`.\n",
+    );
+
+    let opts = CliOptions::parse_args(&args, ParsingStyle::default()).unwrap_or_else(|e| {
+        eprintln!(
+            "{}: {}\n\nUsage: {} [OPTIONS]\n\n{}\n\n{}",
+            command,
+            e,
+            command,
+            CliOptions::usage(),
+            USAGE_NOTE,
+        );
+        process::exit(2);
+    });
+
+    if opts.help_requested() {
+        println!(
+            "Usage: {} [OPTIONS]\n\n{}\n\n{}",
+            command,
+            opts.self_usage(),
+            USAGE_NOTE
+        );
+        process::exit(0);
+    }
+
+    if let Err(e) = run(&opts) {
+        eprintln!("{}: {}", command, e);
+        process::exit(1);
+    }
+}
+
+fn run(opts: &CliOptions) -> anyhow::Result<()> {
+    let cli_options: Vec<String> = opts.to_zcash_cli_options();
+
+    println!(concat!(
+        "To reduce the risk of loss of funds, we're going to confirm that the\n",
+        "zcashd wallet is backed up reliably.\n\n",
+        "  👛 ➜ 🗃️ \n"
+    ));
+
+    println!("Checking that we can connect to zcashd...");
+    let zcash_cli = zcash_cli_path()?;
+
+    // Pass an invalid filename, "\x01", and use the error message to distinguish
+    // whether zcashd is running with the -exportdir option, running without that
+    // option, or not running / cannot connect.
+    let mut cli_args = cli_options.clone();
+    cli_args.extend_from_slice(&["z_exportwallet".to_string(), "\x01".to_string()]);
+    let out = exec(&zcash_cli, &cli_args, None)?;
+    let cli_err: Vec<_> = from_utf8(&out.stderr)
+        .with_context(|| "Output from zcash-cli was not UTF-8")?
+        .lines()
+        .map(|s| s.trim_end_matches('\r'))
+        .collect();
+    debug!("stderr {:?}", cli_err);
+
+    if !cli_err.is_empty() {
+        if cli_err[0].starts_with("Error reading configuration file") {
+            println!(
+                "\nNo, we could not read the zcashd configuration file, expected to be at\n{:?}.",
+                Path::new(opts.datadir.as_ref().map_or("~/.zcash", |s| &s[..])).join(Path::new(
+                    opts.conf.as_ref().map_or("zcash.conf", |s| &s[..])
+                )),
+            );
+            println!(concat!(
+                "If it is not at that path, please try again with the '-datadir' and/or\n",
+                "'-conf' options set correctly (see '--help' for details). Also make sure\n",
+                "that the current user has permission to read the configuration file.\n",
+            ));
+            return Err(WalletToolError::ZcashdConnection.into());
+        }
+        if cli_err[0].starts_with("error: couldn't connect") {
+            println!(concat!(
+                "\nNo, we could not connect. zcashd might not be running; in that case\n",
+                "please start it. The '-exportdir' option should be set to the absolute\n",
+                "path of the directory you want to save the wallet export file to.\n\n",
+                "(Don't forget to restart zcashd without '-exportdir' after finishing\n",
+                "the backup, if running it long-term with that option is not desired\n",
+                "or would be a security hazard in your environment.)\n\n",
+                "If you believe zcashd is running, it might be using an unexpected port,\n",
+                "address, or authentication options for the RPC interface, for example.\n",
+                "In that case try to connect to it using zcash-cli, and if successful,\n",
+                "use the same connection options for zcashd-wallet-tool (see '--help' for\n",
+                "accepted options) as for zcash-cli.\n"
+            ));
+            return Err(WalletToolError::ZcashdConnection.into());
+        }
+        if cli_err[0] == "error code: -28" {
+            println!(concat!(
+                "\nNo, we could not connect. zcashd seems to be initializing; please try\n",
+                "again once it has finished.\n",
+            ));
+            return Err(WalletToolError::ZcashdConnection.into());
+        }
+    }
+
+    const REMINDER_MSG: &str = concat!(
+        "\n\nPlease start or restart zcashd with '-exportdir' set to the absolute\n",
+        "path of the directory you want to save the wallet export file to.\n",
+        "(Don't forget to restart zcashd without '-exportdir' after finishing\n",
+        "the backup, if running it long-term with that option is not desired\n",
+        "or would be a security hazard in your environment.)\n",
+    );
+
+    if cli_err.len() >= 3
+        && cli_err[0] == "error code: -4"
+        && cli_err[2].contains("zcashd -exportdir")
+    {
+        println!(
+            "\nIt looks like zcashd is running without the '-exportdir' option.{}",
+            REMINDER_MSG
+        );
+        return Err(WalletToolError::ExportDirNotSet.into());
+    }
+    if !(cli_err.len() >= 3
+        && cli_err[0] == "error code: -4"
+        && cli_err[2].starts_with("Filename is invalid"))
+    {
+        println!(
+            "\nThere was an unexpected response from zcash-cli or zcashd:\n> {}{}",
+            cli_err.join("\n> "),
+            REMINDER_MSG,
+        );
+        return Err(WalletToolError::UnexpectedResponse.into());
+    }
+    println!("Yes, and it is running with the '-exportdir' option as required.");
+
+    let mut stdin = io::stdin();
+
+    let base = default_filename_base();
+    let mut r = 0u32;
+    let out = loop {
+        let default_filename = if r != 0 {
+            format!("{}r{}", base, r)
+        } else {
+            base.to_string()
+        };
+        println!(
+            concat!(
+                "\nEnter the filename for the wallet export file, using only characters\n",
+                "a-z, A-Z and 0-9 (default '{}')."
+            ),
+            default_filename
+        );
+        let response = prompt(&mut stdin)?;
+        let response = strip(&response);
+        let filename = if response.is_empty() {
+            r = r.saturating_add(1);
+            &default_filename
+        } else {
+            response
+        };
+        debug!("Using filename {:?}", filename);
+
+        let mut cli_args = cli_options.clone();
+        cli_args.extend_from_slice(&["z_exportwallet".to_string(), filename.to_string()]);
+        let out = exec(&zcash_cli, &cli_args, None)?;
+        let cli_err: Vec<_> = from_utf8(&out.stderr)
+            .with_context(|| "Output from zcash-cli was not UTF-8")?
+            .lines()
+            .map(|s| s.trim_end_matches('\r'))
+            .collect();
+        debug!("stderr {:?}", cli_err);
+
+        if cli_err.len() >= 3
+            && cli_err[0] == "error code: -8"
+            && cli_err[1] == "error message:"
+            && cli_err[2].contains("overwrite existing")
+        {
+            println!(concat!(
+                "That file already exists. Please pick a unique filename in the\n",
+                "directory specified by the '-exportdir' option to zcashd."
+            ));
+            continue;
+        } else {
+            break out;
+        }
+    };
+
+    let cli_out: Vec<_> = from_utf8(&out.stdout)
+        .with_context(|| "Output from zcash-cli was not UTF-8")?
+        .lines()
+        .map(|s| s.trim_end_matches('\r'))
+        .collect();
+    debug!("stdout {:?}", cli_out);
+
+    if cli_out.is_empty() {
+        return Err(WalletToolError::UnexpectedResponse.into());
+    }
+    let export_path = cli_out[0];
+
+    println!("\nSaved the export file to '{}'.", export_path);
+    println!("IMPORTANT: This file contains secrets that allow spending all wallet funds.\n");
+
+    let export_file = File::open(export_path)
+        .with_context(|| format!("Could not open {:?} for reading", export_path))?;
+
+    // TODO: ensure the buffer will be zeroized (#5650)
+    let phrase_line: Vec<_> = io::BufReader::new(export_file)
+        .lines()
+        .map(|line| line.map(SecretString::new))
+        .filter(|s| {
+            s.as_ref()
+                .map(|t| t.expose_secret().starts_with("# - recovery_phrase=\""))
+                .unwrap_or(false)
+        })
+        .collect();
+
+    let phrase = match &phrase_line[..] {
+        [Ok(line)] => line
+            .expose_secret()
+            .trim_start_matches("# - recovery_phrase=\"")
+            .trim_end_matches('"'),
+        _ => return Err(WalletToolError::RecoveryPhraseNotFound.into()),
+    };
+
+    // This panic hook allows us to make a best effort to clear the screen (and then print
+    // another reminder about secrets in the export file) even if a panic occurs.
+
+    let old_hook = panic::take_hook();
+    {
+        let export_path = export_path.to_string();
+        panic::set_hook(Box::new(move |panic_info| {
+            clear_and_show_cautions(&export_path);
+
+            let s = panic_info.payload().downcast_ref::<&str>().unwrap_or(&"");
+            eprintln!("\nPanic: {}\n{:?}", s, Backtrace::new());
+        }));
+    }
+
+    let res = (|| -> anyhow::Result<()> {
+        println!("The recovery phrase is:\n");
+
+        const WORDS_PER_LINE: usize = 3;
+
+        let words: Vec<_> = phrase.split(' ').collect();
+        let max_len = words.iter().map(|w| w.len()).max().unwrap_or(0);
+
+        for (i, word) in words.iter().enumerate() {
+            print!("{0:2}: {1:2$}", i + 1, word, max_len + 2);
+            if (i + 1) % WORDS_PER_LINE == 0 {
+                println!();
+            }
+        }
+        if words.len() % WORDS_PER_LINE != 0 {
+            println!();
+        }
+
+        println!(concat!(
+            "\nPlease write down this phrase (including the numbering of words) on\n",
+            "something durable that you will keep in a secure location.\n",
+            "Press Enter when finished; then the phrase will disappear and you'll be\n",
+            "asked to re-enter a selection of words from it."
+        ));
+
+        let mut stdin = io::stdin();
+        prompt(&mut stdin)?;
+
+        // The only reliable and portable way to make sure the recovery phrase
+        // is no longer displayed is to clear the whole terminal (including
+        // scrollback, if possible). The text is only printed if clearing fails.
+        try_to_clear(concat!(
+            "\n\n\n\n\n\n\n\n\n\n\n\n",
+            "Please adjust the terminal window so that you can't see the\n",
+            "recovery phrase above. After finishing the backup, close the\n",
+            "terminal window or clear it"
+        ));
+
+        println!("\nNow we're going to confirm that you backed up the recovery phrase.");
+
+        let mut rng = thread_rng();
+        let mut unconfirmed: Vec<usize> = (0..words.len()).collect();
+        for _ in 0..min(3, words.len()) {
+            let index: usize = rng.gen_range(0..unconfirmed.len());
+            let n = unconfirmed[index];
+            unconfirmed[index] = unconfirmed[unconfirmed.len() - 1];
+            unconfirmed.pop().expect("should be nonempty");
+
+            loop {
+                println!("\nPlease enter the {} word:", ordinal(n + 1));
+                let line = prompt(&mut stdin)?;
+                if words[n] == strip(&line) {
+                    break;
+                }
+                println!("That's not correct, please try again.");
+            }
+        }
+        Ok(())
+    })();
+
+    panic::set_hook(old_hook);
+    clear_and_show_cautions(export_path);
+    res?;
+
+    let mut cli_args = cli_options;
+    cli_args.extend_from_slice(&["-stdin".to_string(), "walletconfirmbackup".to_string()]);
+    exec(&zcash_cli, &cli_args, Some(phrase))
+        .and_then(|out| {
+            let cli_err: Vec<_> = from_utf8(&out.stderr)
+                .with_context(|| "Output from zcash-cli was not UTF-8")?
+                .lines()
+                .map(|s| s.trim_end_matches('\r'))
+                .collect();
+            debug!("stderr {:?}", cli_err);
+
+            if !cli_err.is_empty() {
+                if cli_err[0].starts_with("error: couldn't connect") {
+                    println!("\nWe could not connect to zcashd; it may have exited.");
+                    return Err(WalletToolError::ZcashdConnection.into());
+                } else {
+                    println!(
+                        "\nThere was an unexpected response from zcash-cli or zcashd:\n> {}",
+                        cli_err.join("\n> "),
+                    );
+                    return Err(WalletToolError::UnexpectedResponse.into());
+                }
+            }
+            println!(concat!(
+                "\nThe backup of the emergency recovery phrase for the zcashd\n",
+                "wallet has been successfully confirmed 🙂. You can now use the\n",
+                "zcashd RPC methods that create keys and addresses in that wallet.\n\n",
+                "If you use other wallets, their recovery information will need\n",
+                "to be backed up separately.\n"
+            ));
+            Ok(())
+        })
+        .map_err(|e| {
+            println!(concat!(
+                "\nzcash-wallet-tool was unable to communicate to zcashd that the\n",
+                "backup was confirmed. This can happen if zcashd stopped, in which\n",
+                "case you should try again. If zcashd is still running, please seek\n",
+                "help or try to use 'zcash-cli -stdin walletconfirmbackup' manually.\n"
+            ));
+            e
+        })?;
+    Ok(())
+}
+
+const MAX_USER_INPUT_LEN: usize = 100;
+
+fn prompt(input: &mut Stdin) -> anyhow::Result<SecretString> {
+    let mut buf = String::with_capacity(MAX_USER_INPUT_LEN);
+    let res = input
+        .read_line(&mut buf)
+        .with_context(|| "Error reading from stdin");
+
+    // Ensure the buffer is zeroized even on error.
+    let line = SecretString::new(buf);
+    res.and_then(|_| {
+        if line.expose_secret().ends_with('\n') {
+            Ok(line)
+        } else {
+            Err(WalletToolError::UnexpectedEof.into())
+        }
+    })
+}
+
+fn strip(input: &SecretString) -> &str {
+    input
+        .expose_secret()
+        .trim_end_matches(|c| c == '\r' || c == '\n')
+        .trim()
+}
+
+fn ordinal(num: usize) -> String {
+    let suffix = if (11..=13).contains(&(num % 100)) {
+        "th"
+    } else {
+        match num % 10 {
+            1 => "st",
+            2 => "nd",
+            3 => "rd",
+            _ => "th",
+        }
+    };
+    format!("{}{}", num, suffix)
+}
+
+fn zcash_cli_path() -> anyhow::Result<PathBuf> {
+    // First look for `zcash_cli[.exe]` as a sibling of the executable.
+    let mut exe = env::current_exe()
+        .with_context(|| "Cannot determine the path of the running executable")?;
+    exe.set_file_name("zcash-cli");
+    exe.set_extension(EXE_EXTENSION);
+
+    debug!("Testing for zcash-cli at {:?}", exe);
+    if exe.exists() {
+        return Ok(exe);
+    }
+    // If not found there, look in `../src/zcash_cli[.exe]` provided
+    // that `src` is a sibling of `target`.
+    exe.pop(); // strip filename
+    exe.pop(); // ..
+    if exe.file_name() != Some(OsStr::new("target")) {
+        // or in `../../src/zcash_cli[.exe]` under the same proviso
+        exe.pop(); // ../..
+        if exe.file_name() != Some(OsStr::new("target")) {
+            return Err(WalletToolError::ZcashCliNotFound.into());
+        }
+    }
+    // Replace 'target/' with 'src/'.
+    exe.set_file_name("src");
+    exe.push("zcash-cli");
+    exe.set_extension(EXE_EXTENSION);
+
+    debug!("Testing for zcash-cli at {:?}", exe);
+    if !exe.exists() {
+        return Err(WalletToolError::ZcashCliNotFound.into());
+    }
+    Ok(exe)
+}
+
+fn exec(exe_path: &Path, args: &[String], stdin: Option<&str>) -> anyhow::Result<Output> {
+    debug!("Running {:?} {:?}", exe_path, args);
+    let mut cmd = Command::new(exe_path);
+    let cli = cmd.args(args);
+    match stdin {
+        None => Ok(cli.output()?),
+        Some(data) => {
+            let mut cli_process = cli
+                .stdin(Stdio::piped())
+                .stdout(Stdio::piped())
+                .stderr(Stdio::piped())
+                .spawn()?;
+            cli_process
+                .stdin
+                .take()
+                .with_context(|| "Could not open pipe to zcash-cli's stdin")
+                .and_then(|mut pipe: ChildStdin| -> anyhow::Result<()> {
+                    pipe.write_all(data.as_bytes())?;
+                    pipe.write_all("\n".as_bytes())?;
+                    Ok(())
+                })
+                .with_context(|| "Could not write to zcash-cli's stdin")?;
+            Ok(cli_process.wait_with_output()?)
+        }
+    }
+}
+
+fn default_filename_base() -> String {
+    let format = format_description!("export[year][month][day]");
+
+    // We use the UTC date because there is a security issue in obtaining the local date
+    // from either `chrono` or `time`: <https://github.com/chronotope/chrono/issues/602>.
+    // We could use the approach in
+    // <https://github.com/ArekPiekarz/rusty-tax-break/commit/3aac8f0c26fd96b7365619509a544f78b59627fe>
+    // if it were important, but it isn't worth the dependency on `tz-rs`.
+
+    OffsetDateTime::from(SystemTime::now())
+        .format(&format)
+        .unwrap_or_else(|_| "export".to_string())
+}
+
+fn clear_and_show_cautions(export_path: &str) {
+    try_to_clear(concat!(
+        "\nCAUTION: This terminal window might be showing secrets (or have\n",
+        "them in the scrollback). Please copy any useful information and\n",
+        "then close it, or clear it"
+    ));
+
+    println!(
+        concat!(
+            "\nIMPORTANT: Secrets that allow spending all zcashd wallet funds\n",
+            "have been left in the file '{}'.\n\n",
+            "Don't forget to restart zcashd without '-exportdir', if running it\n",
+            "long-term with that option is not desired or would be a security\n",
+            "hazard in your environment.\n\n",
+            "When choosing a location for the physical backup of your emergency\n",
+            "recovery phrase, please make sure to consider both risk of theft,\n",
+            "and your long-term ability to remember where it is kept."
+        ),
+        export_path,
+    );
+}
+
+fn try_to_clear(error_blurb: &str) {
+    if let Err(e) = clearscreen::clear() {
+        eprintln!("Unable to clear screen: {}.", e);
+
+        #[cfg(target_os = "windows")]
+        const HOW_TO_CLEAR: &str = "using 'cls'";
+        #[cfg(target_os = "macos")]
+        const HOW_TO_CLEAR: &str = "by pressing Command + K";
+        #[cfg(not(any(target_os = "windows", target_os = "macos")))]
+        const HOW_TO_CLEAR: &str = "using 'clear'";
+
+        println!("{} {}.", error_blurb, HOW_TO_CLEAR);
+    }
+}
diff --git a/src/rust/include/librustzcash.h b/src/rust/include/librustzcash.h
index 66c5aaa896c..fbf03770bbf 100644
--- a/src/rust/include/librustzcash.h
+++ b/src/rust/include/librustzcash.h
@@ -286,34 +286,106 @@ extern "C" {
     );
 
     /// Derive the master ExtendedSpendingKey from a seed.
-    void librustzcash_zip32_xsk_master(
+    void librustzcash_zip32_sapling_xsk_master(
         const unsigned char *seed,
         size_t seedlen,
         unsigned char *xsk_master
     );
 
     /// Derive a child ExtendedSpendingKey from a parent.
-    void librustzcash_zip32_xsk_derive(
+    void librustzcash_zip32_sapling_xsk_derive(
         const unsigned char *xsk_parent,
         uint32_t i,
         unsigned char *xsk_i
     );
 
+    /// Derive a internal ExtendedSpendingKey from an external key
+    void librustzcash_zip32_sapling_xsk_derive_internal(
+        const unsigned char *xsk_external,
+        unsigned char *xsk_internal
+    );
+
     /// Derive a child ExtendedFullViewingKey from a parent.
-    bool librustzcash_zip32_xfvk_derive(
+    bool librustzcash_zip32_sapling_xfvk_derive(
         const unsigned char *xfvk_parent,
         uint32_t i,
         unsigned char *xfvk_i
     );
 
-    /// Derive a PaymentAddress from an ExtendedFullViewingKey.
-    bool librustzcash_zip32_xfvk_address(
-        const unsigned char *xfvk,
+    /**
+     * Derive the Sapling internal FVK corresponding to the given
+     * Sapling external FVK.
+     */
+    void librustzcash_zip32_sapling_derive_internal_fvk(
+        const unsigned char *fvk,
+        const unsigned char *dk,
+        unsigned char *fvk_ret,
+        unsigned char *dk_ret
+    );
+
+    /**
+     * Derive a PaymentAddress from a (SaplingFullViewingKey, DiversifierKey)
+     * pair.  Returns 'false' if no valid address can be derived for the
+     * specified diversifier index.
+     *
+     * Arguments:
+     * - fvk: [c_uchar; 96] the serialized form of a Sapling full viewing key
+     * - dk: [c_uchar; 32] the byte representation of a Sapling diversifier key
+     * - j: [c_uchar; 11] the 88-bit diversifier index, encoded in little-endian
+     *   order
+     * - addr_ret: [c_uchar; 43] array to which the returned address will be
+     *   written, if the specified diversifier index `j` produces a valid
+     *   address.
+     */
+    bool librustzcash_zip32_sapling_address(
+        const unsigned char *fvk,
+        const unsigned char *dk,
+        const unsigned char *j,
+        unsigned char *addr_ret
+    );
+
+    /**
+     * Derive a PaymentAddress from a (SaplingFullViewingKey, DiversifierKey)
+     * pair by searching the space of valid diversifiers starting at
+     * diversifier index `j`. This will always return a valid address along
+     * with the diversifier index that produced the address unless no addresses
+     * can be derived at any diversifier index >= `j`, in which case this
+     * function will return `false`.
+     *
+     * Arguments:
+     * - fvk: [c_uchar; 96] the serialized form of a Sapling full viewing key
+     * - dk: [c_uchar; 32] the byte representation of a Sapling diversifier key
+     * - j: [c_uchar; 11] the 88-bit diversifier index at which to start
+     *   searching, encoded in little-endian order
+     * - j_ret: [c_uchar; 11] array that will store the diversifier index at
+     *   which the returned address was found
+     * - addr_ret: [c_uchar; 43] array to which the returned address will be
+     *   written
+     */
+    bool librustzcash_zip32_find_sapling_address(
+        const unsigned char *fvk,
+        const unsigned char *dk,
         const unsigned char *j,
         unsigned char *j_ret,
         unsigned char *addr_ret
     );
 
+    /**
+     * Decrypts a Sapling diversifier using the specified diversifier key
+     * to obtain the diversifier index `j` at which the diversifier was
+     * derived.
+     *
+     * Arguments:
+     * - dk: [c_uchar; 32] the byte representation of a Sapling diversifier key
+     * - addr: [c_uchar; 11] the bytes of the diversifier
+     * - j_ret: [c_uchar; 11] array that will store the resulting diversifier index
+     */
+    void librustzcash_sapling_diversifier_index(
+        const unsigned char *dk,
+        const unsigned char *d,
+        unsigned char *j_ret
+    );
+
     /// Fills the provided buffer with random bytes. This is intended to
     /// be a cryptographically secure RNG; it uses Rust's `OsRng`, which
     /// is implemented in terms of the `getrandom` crate. The first call
diff --git a/src/rust/include/rust/VA_OPT.hpp b/src/rust/include/rust/VA_OPT.hpp
index 553b637ac7a..8f84c88e8e7 100644
--- a/src/rust/include/rust/VA_OPT.hpp
+++ b/src/rust/include/rust/VA_OPT.hpp
@@ -56,7 +56,7 @@
   -------------
   Clang -std=c++2a enables it. GCC has it enabled without -std=c++2a
   but warns "__VA_OPT__ is not available until C++2a" if another -std
-  flag is supplied along with -pedantic (dont know how to supress it).
+  flag is supplied along with -pedantic (dont know how to suppress it).
   MSVC TBD
 
   Credits
diff --git a/src/rust/include/rust/address.h b/src/rust/include/rust/address.h
index ab9e8750a7f..92636c8aaac 100644
--- a/src/rust/include/rust/address.h
+++ b/src/rust/include/rust/address.h
@@ -5,17 +5,20 @@
 #ifndef ZCASH_RUST_INCLUDE_RUST_ADDRESS_H
 #define ZCASH_RUST_INCLUDE_RUST_ADDRESS_H
 
+#include "rust/orchard/keys.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+typedef bool (*orchard_receiver_t)(void* ua, OrchardRawAddressPtr* addr);
 typedef bool (*raw_to_receiver_t)(void* ua, const unsigned char* raw);
 typedef bool (*unknown_receiver_t)(
     void* ua,
-    uint8_t typecode,
+    uint32_t typecode,
     const unsigned char* data,
     size_t len);
-typedef uint8_t (*get_typecode_t)(const void* ua, size_t index);
+typedef uint32_t (*get_typecode_t)(const void* ua, size_t index);
 typedef size_t (*get_receiver_len_t)(const void* ua, size_t index);
 typedef void (*get_receiver_t)(const void* ua, size_t index, unsigned char* data, size_t length);
 
@@ -24,6 +27,7 @@ bool zcash_address_parse_unified(
     const char* str,
     const char* network,
     void* ua,
+    orchard_receiver_t orchard_cb,
     raw_to_receiver_t sapling_cb,
     raw_to_receiver_t p2sh_cb,
     raw_to_receiver_t p2pkh_cb,
diff --git a/src/rust/include/rust/builder.h b/src/rust/include/rust/builder.h
new file mode 100644
index 00000000000..a95e5ddfb49
--- /dev/null
+++ b/src/rust/include/rust/builder.h
@@ -0,0 +1,105 @@
+// Copyright (c) 2022 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+#ifndef ZCASH_RUST_INCLUDE_RUST_BUILDER_H
+#define ZCASH_RUST_INCLUDE_RUST_BUILDER_H
+
+#include "rust/orchard.h"
+#include "rust/orchard/keys.h"
+#include "rust/transaction.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/// A type-safe pointer to a Rust-allocated struct containing the information
+/// needed to spend an Orchard note.
+struct OrchardSpendInfoPtr;
+typedef struct OrchardSpendInfoPtr OrchardSpendInfoPtr;
+
+/// Pointer to Rust-allocated Orchard bundle builder.
+struct OrchardBuilderPtr;
+typedef struct OrchardBuilderPtr OrchardBuilderPtr;
+
+/// Pointer to Rust-allocated Orchard bundle without proofs
+/// or authorizing data.
+struct OrchardUnauthorizedBundlePtr;
+typedef struct OrchardUnauthorizedBundlePtr OrchardUnauthorizedBundlePtr;
+
+/// Frees the memory associated with an Orchard spend info struct that was
+/// allocated by Rust.
+void orchard_spend_info_free(OrchardSpendInfoPtr* ptr);
+
+/// Construct a new Orchard transaction builder.
+///
+/// If `anchor` is `null`, the root of the empty Orchard commitment tree is used.
+OrchardBuilderPtr* orchard_builder_new(
+    bool spends_enabled,
+    bool outputs_enabled,
+    const unsigned char* anchor);
+
+/// Frees an Orchard builder returned from `orchard_builder_new`.
+void orchard_builder_free(OrchardBuilderPtr* ptr);
+
+/// Adds a note to be spent in this bundle.
+///
+/// Returns `false` if the Merkle path in `spend_info` does not have the
+/// required anchor.
+///
+/// `spend_info` is always freed by this method, whether or not it succeeds.
+bool orchard_builder_add_spend(
+    OrchardBuilderPtr* ptr,
+    OrchardSpendInfoPtr* spend_info);
+
+/// Adds an address which will receive funds in this bundle.
+///
+/// `ovk` is a pointer to the outgoing viewing key to make this recipient recoverable by,
+/// or `null` to make the recipient unrecoverable by the sender.
+///
+/// `memo` is a pointer to the 512-byte memo field encoding, or `null` for "no memo".
+bool orchard_builder_add_recipient(
+    OrchardBuilderPtr* ptr,
+    const unsigned char* ovk,
+    const OrchardRawAddressPtr* recipient,
+    uint64_t value,
+    const unsigned char* memo);
+
+/// Builds a bundle containing the given spent notes and recipients.
+///
+/// Returns `null` if an error occurs.
+///
+/// `builder` is always freed by this method.
+OrchardUnauthorizedBundlePtr* orchard_builder_build(OrchardBuilderPtr* builder);
+
+/// Frees an Orchard bundle returned from `orchard_bundle_build`.
+void orchard_unauthorized_bundle_free(OrchardUnauthorizedBundlePtr* bundle);
+
+/// Adds proofs and signatures to the bundle.
+///
+/// Returns `null` if an error occurs.
+///
+/// `bundle` is always freed by this method.
+OrchardBundlePtr* orchard_unauthorized_bundle_prove_and_sign(
+    OrchardUnauthorizedBundlePtr* bundle,
+    const OrchardSpendingKeyPtr** keys,
+    size_t keys_len,
+    const unsigned char* sighash);
+
+/// Calculates a ZIP 244 shielded signature digest for the given under-construction
+/// transaction.
+///
+/// Returns `false` if any of the parameters are invalid; in this case, `sighash_ret`
+/// will be unaltered.
+///
+/// `preTx` is always freed by this method.
+bool zcash_builder_zip244_shielded_signature_digest(
+    PrecomputedTxParts* preTx,
+    const OrchardUnauthorizedBundlePtr* bundle,
+    unsigned char* sighash_ret);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // ZCASH_RUST_INCLUDE_RUST_BUILDER_H
diff --git a/src/rust/include/rust/orchard.h b/src/rust/include/rust/orchard.h
index 106801e08c9..5cb32ac0fd3 100644
--- a/src/rust/include/rust/orchard.h
+++ b/src/rust/include/rust/orchard.h
@@ -13,6 +13,7 @@
 extern "C" {
 #endif
 
+/// Typesafe pointer to a Rust-allocated orchard::bundle::Bundle value
 struct OrchardBundlePtr;
 typedef struct OrchardBundlePtr OrchardBundlePtr;
 
diff --git a/src/rust/include/rust/orchard/incremental_merkle_tree.h b/src/rust/include/rust/orchard/incremental_merkle_tree.h
new file mode 100644
index 00000000000..d0d07524b79
--- /dev/null
+++ b/src/rust/include/rust/orchard/incremental_merkle_tree.h
@@ -0,0 +1,87 @@
+// Copyright (c) 2021 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+#ifndef ZCASH_RUST_INCLUDE_RUST_ORCHARD_INCREMENTAL_MERKLE_TREE_H
+#define ZCASH_RUST_INCLUDE_RUST_ORCHARD_INCREMENTAL_MERKLE_TREE_H
+
+#include "rust/streams.h"
+#include "rust/orchard.h"
+
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define SINSEMILLA_DIGEST_LEN 32U
+
+/// Pointer to an Orchard incremental merkle tree frontier
+struct OrchardMerkleFrontierPtr;
+typedef struct OrchardMerkleFrontierPtr OrchardMerkleFrontierPtr;
+
+// Create an empty Orchard Merkle frontier.
+//
+// Memory allocated to the resulting value must be manually freed.
+OrchardMerkleFrontierPtr* orchard_merkle_frontier_empty();
+
+// Clones the given Orchard Merkle frontier and returns
+// a pointer to the newly created tree. Both the original
+// tree's memory and the newly allocated one need to be freed
+// independently.
+OrchardMerkleFrontierPtr* orchard_merkle_frontier_clone(
+        const OrchardMerkleFrontierPtr* tree_ptr);
+
+// Free the memory allocated for the given Orchard Merkle frontier.
+void orchard_merkle_frontier_free(
+        OrchardMerkleFrontierPtr* tree_ptr);
+
+// Parses an Orchard Merkle frontier from a stream. If parsing
+// fails, this will return the null pointer.
+//
+// Memory allocated to the resulting value must be manually freed.
+OrchardMerkleFrontierPtr* orchard_merkle_frontier_parse(
+        void* stream,
+        read_callback_t read_cb);
+
+// Serializes an Orchard Merkle frontier to a stream.
+//
+// Returns `false` if an error occurs while writing to the stream.
+bool orchard_merkle_frontier_serialize(
+        const OrchardMerkleFrontierPtr* tree_ptr,
+        void* stream,
+        write_callback_t write_cb);
+
+// For each action in the provided bundle, append its
+// commitment to the frontier.
+//
+// Returns `true` if the append succeeds, `false` if the
+// tree is full.
+bool orchard_merkle_frontier_append_bundle(
+        OrchardMerkleFrontierPtr* tree_ptr,
+        const OrchardBundlePtr* bundle);
+
+// Computes the root of the provided orchard Merkle frontier
+void orchard_merkle_frontier_root(
+        const OrchardMerkleFrontierPtr* tree_ptr,
+        unsigned char* digest_ret);
+
+// The total number of leaves that have been appended to obtain
+// the current state of the frontier. Subtract 1 from this value
+// to obtain the position of the most recently appended leaf.
+uint64_t orchard_merkle_frontier_num_leaves(
+        const OrchardMerkleFrontierPtr* tree_ptr);
+
+// Estimate the amount of memory consumed by the merkle frontier.
+size_t orchard_merkle_frontier_dynamic_mem_usage(
+        const OrchardMerkleFrontierPtr* tree_ptr);
+
+// Computes the empty leaf value for the incremental Merkle tree.
+void orchard_merkle_tree_empty_root(
+        unsigned char* digest_ret);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // ZCASH_RUST_INCLUDE_RUST_ORCHARD_INCREMENTAL_MERKLE_TREE_H
diff --git a/src/rust/include/rust/orchard/incremental_sinsemilla_tree.h b/src/rust/include/rust/orchard/incremental_sinsemilla_tree.h
deleted file mode 100644
index 097c70703f2..00000000000
--- a/src/rust/include/rust/orchard/incremental_sinsemilla_tree.h
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright (c) 2021 The Zcash developers
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or https://www.opensource.org/licenses/mit-license.php .
-
-#ifndef ZCASH_RUST_INCLUDE_RUST_ORCHARD_INCREMENTAL_SINSEMILLA_TREE_H
-#define ZCASH_RUST_INCLUDE_RUST_ORCHARD_INCREMENTAL_SINSEMILLA_TREE_H
-
-#include "rust/streams.h"
-#include "rust/orchard.h"
-
-#include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define SINSEMILLA_DIGEST_LEN 32U
-
-/// Pointer to an Orchard incremental merkle tree frontier
-struct OrchardMerkleFrontierPtr;
-typedef struct OrchardMerkleFrontierPtr OrchardMerkleFrontierPtr;
-
-// Create an empty Orchard Merkle frontier.
-//
-// Memory allocated to the resulting value must be manually freed.
-OrchardMerkleFrontierPtr* orchard_merkle_frontier_empty();
-
-// Clones the given Orchard Merkle frontier and returns
-// a pointer to the newly created tree. Both the original
-// tree's memory and the newly allocated one need to be freed
-// independently.
-OrchardMerkleFrontierPtr* orchard_merkle_frontier_clone(
-        const OrchardMerkleFrontierPtr* tree_ptr);
-
-// Free the memory allocated for the given Orchard Merkle frontier.
-void orchard_merkle_frontier_free(
-        OrchardMerkleFrontierPtr* tree_ptr);
-
-// Parses an Orchard Merkle frontier from a stream. If parsing
-// fails, this will return the null pointer.
-//
-// Memory allocated to the resulting value must be manually freed.
-OrchardMerkleFrontierPtr* orchard_merkle_frontier_parse(
-        void* stream,
-        read_callback_t read_cb);
-
-// Serializes an Orchard Merkle frontier to a stream.
-//
-// Returns `false` if an error occurs while writing to the stream.
-bool orchard_merkle_frontier_serialize(
-        const OrchardMerkleFrontierPtr* tree_ptr,
-        void* stream,
-        write_callback_t write_cb);
-
-// For each action in the provided bundle, append its
-// commitment to the frontier.
-//
-// Returns `true` if the append succeeds, `false` if the
-// tree is full.
-bool orchard_merkle_frontier_append_bundle(
-        OrchardMerkleFrontierPtr* tree_ptr,
-        const OrchardBundlePtr* bundle);
-
-// Computes the root of the provided orchard Merkle frontier
-void orchard_merkle_frontier_root(
-        const OrchardMerkleFrontierPtr* tree_ptr,
-        unsigned char* digest_ret);
-
-// The total number of leaves that have been appended to obtain
-// the current state of the frontier. Subtract 1 from this value
-// to obtain the position of the most recently appended leaf.
-size_t orchard_merkle_frontier_num_leaves(
-        const OrchardMerkleFrontierPtr* tree_ptr);
-
-// Estimate the amount of memory consumed by the merkle frontier.
-size_t orchard_merkle_frontier_dynamic_mem_usage(
-        const OrchardMerkleFrontierPtr* tree_ptr);
-
-/// Pointer to an Orchard incremental Sinsemilla tree
-struct IncrementalSinsemillaTreePtr;
-typedef struct IncrementalSinsemillaTreePtr IncrementalSinsemillaTreePtr;
-
-// Create an empty incremental Sinsemilla tree.
-//
-// Memory allocated to the resulting value must be manually freed.
-IncrementalSinsemillaTreePtr* incremental_sinsemilla_tree_empty();
-
-// Clones the given incremental Sinsemilla tree and returns
-// a pointer to the newly created tree. Both the original
-// tree's memory and the newly allocated one need to be freed
-// independently.
-IncrementalSinsemillaTreePtr* incremental_sinsemilla_tree_clone(
-        const IncrementalSinsemillaTreePtr* tree_ptr);
-
-// Free the memory allocated for the given incremental Sinsemilla tree.
-void incremental_sinsemilla_tree_free(
-        IncrementalSinsemillaTreePtr* tree_ptr);
-
-// Parses an incremental Sinsemilla tree from a stream. If parsing
-// fails, this will return the null pointer.
-//
-// Memory allocated to the resulting value must be manually freed.
-IncrementalSinsemillaTreePtr* incremental_sinsemilla_tree_parse(
-        void* stream,
-        read_callback_t read_cb);
-
-// Serializes an incremental Sinsemilla tree to a stream.
-//
-// Returns false if an error occurs while writing to the stream.
-bool incremental_sinsemilla_tree_serialize(
-        const IncrementalSinsemillaTreePtr* tree_ptr,
-        void* stream,
-        write_callback_t write_cb);
-
-// For each action in the provided bundle, append its
-// commitment to the incremental Merkle tree.
-//
-// Returns `true` if the append succeeds, `false` if the
-// tree is full.
-bool incremental_sinsemilla_tree_append_bundle(
-        IncrementalSinsemillaTreePtr* tree_ptr,
-        const OrchardBundlePtr* bundle);
-
-// Save the current state of the incremental merkle tree
-// as a point to which the tree can be rewound.
-void incremental_sinsemilla_tree_checkpoint(
-        IncrementalSinsemillaTreePtr* tree_ptr);
-
-// Rewind the incremental merkle tree to the latest checkpoint.
-//
-// Returns `true` if the rewind succeeds, `false` if the attempted
-// rewind would require the destruction of witness data.
-bool incremental_sinsemilla_tree_rewind(
-        IncrementalSinsemillaTreePtr* tree_ptr);
-
-// Computes the root of the provided incremental Sinsemilla tree.
-void incremental_sinsemilla_tree_root(
-        const IncrementalSinsemillaTreePtr* tree_ptr,
-        unsigned char* digest_ret);
-
-// Computes the empty leaf value for the incremental Sinsemilla tree.
-void incremental_sinsemilla_tree_empty_root(
-        unsigned char* digest_ret);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // ZCASH_RUST_INCLUDE_RUST_ORCHARD_INCREMENTAL_SINSEMILLA_TREE_H
diff --git a/src/rust/include/rust/orchard/keys.h b/src/rust/include/rust/orchard/keys.h
new file mode 100644
index 00000000000..8dd08c568a6
--- /dev/null
+++ b/src/rust/include/rust/orchard/keys.h
@@ -0,0 +1,269 @@
+// Copyright (c) 2021 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+#ifndef ZCASH_RUST_INCLUDE_RUST_ORCHARD_KEYS_H
+#define ZCASH_RUST_INCLUDE_RUST_ORCHARD_KEYS_H
+
+#include "rust/streams.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * A pointer to an Orchard shielded payment address, as defined in
+ * https://zips.z.cash/protocol/nu5.pdf#orchardpaymentaddrencoding
+ */
+struct OrchardRawAddressPtr;
+typedef struct OrchardRawAddressPtr OrchardRawAddressPtr;
+
+/**
+ * Clones the given Orchard payment address and returns
+ * a pointer to the newly created value. Both the original
+ * one's memory and the newly allocated one need to be freed
+ * independently.
+ */
+OrchardRawAddressPtr* orchard_address_clone(
+        const OrchardRawAddressPtr* ptr);
+
+/**
+ * Frees the memory allocated for the given Orchard payment address
+ */
+void orchard_address_free(OrchardRawAddressPtr* ptr);
+
+/**
+ * Parses Orchard raw address bytes from the given stream.
+ *
+ * - If the key does not parse correctly, the returned pointer will be null.
+ */
+OrchardRawAddressPtr* orchard_raw_address_parse(
+    void* stream,
+    read_callback_t read_cb);
+
+
+/**
+ * Serializes Orchard raw address bytes to the given stream.
+ *
+ * This will return `false` and leave the stream unmodified if
+ * `raw_address == nullptr`;
+ */
+bool orchard_raw_address_serialize(
+    const OrchardRawAddressPtr* raw_address,
+    void* stream,
+    write_callback_t write_cb);
+
+/**
+ * Implements the "equal" operation for comparing two Orchard addresses.
+ */
+bool orchard_address_eq(
+    const OrchardRawAddressPtr* k0,
+    const OrchardRawAddressPtr* k1);
+
+/**
+ * Implements the "less than" operation `k0 < k1` for comparing two Orchard
+ * addresses.  This is a comparison of the raw bytes, only useful for cases
+ * where a semantically irrelevant ordering is needed (such as for map keys).
+ */
+bool orchard_address_lt(
+    const OrchardRawAddressPtr* k0,
+    const OrchardRawAddressPtr* k1);
+
+//
+// Incoming Viewing Keys
+//
+
+struct OrchardIncomingViewingKeyPtr;
+typedef struct OrchardIncomingViewingKeyPtr OrchardIncomingViewingKeyPtr;
+
+/**
+ * Clones the given Orchard incoming viewing key and returns
+ * a pointer to the newly created value. Both the original
+ * one's memory and the newly allocated one need to be freed
+ * independently.
+ */
+OrchardIncomingViewingKeyPtr* orchard_incoming_viewing_key_clone(
+        const OrchardIncomingViewingKeyPtr* ptr);
+
+/**
+ * Frees the memory allocated for the given Orchard incoming viewing key
+ */
+void orchard_incoming_viewing_key_free(OrchardIncomingViewingKeyPtr* ptr);
+
+/**
+ * Returns the address at the specified diversifier index.
+ */
+OrchardRawAddressPtr* orchard_incoming_viewing_key_to_address(
+    const OrchardIncomingViewingKeyPtr* incoming_viewing_key,
+    const unsigned char* j);
+
+/**
+ * Decrypts the diversifier component of an Orchard raw address with the
+ * specified IVK, and verifies that the address was derived from that IVK.
+ *
+ * Returns `false` and leaves the `j_ret` parameter unmodified if the address
+ * was not derived from the specified IVK.
+ */
+bool orchard_incoming_viewing_key_decrypt_diversifier(
+    const OrchardIncomingViewingKeyPtr* incoming_viewing_key,
+    const OrchardRawAddressPtr* addr,
+    uint8_t *j_ret);
+
+/**
+ * Parses an Orchard incoming viewing key from the given stream.
+ *
+ * - If the key does not parse correctly, the returned pointer will be null.
+ */
+OrchardIncomingViewingKeyPtr* orchard_incoming_viewing_key_parse(
+    void* stream,
+    read_callback_t read_cb);
+
+
+/**
+ * Serializes an Orchard incoming viewing key to the given stream.
+ *
+ * This will return `false` and leave the stream unmodified if
+ * `incoming_viewing_key == nullptr`.
+ */
+bool orchard_incoming_viewing_key_serialize(
+    const OrchardIncomingViewingKeyPtr* incoming_viewing_key,
+    void* stream,
+    write_callback_t write_cb);
+
+/**
+ * Implements the "less than" operation for comparing two keys.
+ */
+bool orchard_incoming_viewing_key_lt(
+    const OrchardIncomingViewingKeyPtr* k0,
+    const OrchardIncomingViewingKeyPtr* k1);
+
+/**
+ * Implements equality testing between incoming viewing keys.
+ */
+bool orchard_incoming_viewing_key_eq(
+    const OrchardIncomingViewingKeyPtr* k0,
+    const OrchardIncomingViewingKeyPtr* k1);
+
+//
+// Full Viewing Keys
+//
+
+struct OrchardFullViewingKeyPtr;
+typedef struct OrchardFullViewingKeyPtr OrchardFullViewingKeyPtr;
+
+/**
+ * Clones the given Orchard full viewing key and returns
+ * a pointer to the newly created value. Both the original
+ * one's memory and the newly allocated one need to be freed
+ * independently.
+ */
+OrchardFullViewingKeyPtr* orchard_full_viewing_key_clone(
+        const OrchardFullViewingKeyPtr* ptr);
+
+/**
+ * Free the memory allocated for the given Orchard full viewing key
+ */
+void orchard_full_viewing_key_free(OrchardFullViewingKeyPtr* ptr);
+
+/**
+ * Parses an Orchard full viewing key from the given stream.
+ *
+ * - If the key does not parse correctly, the returned pointer will be null.
+ */
+OrchardFullViewingKeyPtr* orchard_full_viewing_key_parse(
+    void* stream,
+    read_callback_t read_cb);
+
+/**
+ * Serializes an Orchard full viewing key to the given stream.
+ *
+ * This will return `false` and leave the stream unmodified if
+ * `full_viewing_key == nullptr`.
+ */
+bool orchard_full_viewing_key_serialize(
+    const OrchardFullViewingKeyPtr* full_viewing_key,
+    void* stream,
+    write_callback_t write_cb);
+
+/**
+ * Returns the incoming viewing key for the specified full viewing key.
+ */
+OrchardIncomingViewingKeyPtr* orchard_full_viewing_key_to_incoming_viewing_key(
+    const OrchardFullViewingKeyPtr* key);
+
+/**
+ * Returns the internal incoming viewing key for the specified full viewing key.
+ */
+OrchardIncomingViewingKeyPtr* orchard_full_viewing_key_to_internal_incoming_viewing_key(
+    const OrchardFullViewingKeyPtr* key);
+
+/**
+ * Returns the external outgoing viewing key for the specified full viewing key.
+ *
+ * `ovk_ret` must be 32 bytes.
+ */
+OrchardIncomingViewingKeyPtr* orchard_full_viewing_key_to_external_outgoing_viewing_key(
+    const OrchardFullViewingKeyPtr* fvk,
+    uint8_t *ovk_ret);
+
+/**
+ * Returns the internal outgoing viewing key for the specified full viewing key.
+ *
+ * `ovk_ret` must be 32 bytes.
+ */
+OrchardIncomingViewingKeyPtr* orchard_full_viewing_key_to_internal_outgoing_viewing_key(
+    const OrchardFullViewingKeyPtr* fvk,
+    uint8_t *ovk_ret);
+
+/**
+ * Implements equality testing between full viewing keys.
+ */
+bool orchard_full_viewing_key_eq(
+    const OrchardFullViewingKeyPtr* k0,
+    const OrchardFullViewingKeyPtr* k1);
+
+//
+// Spending Keys
+//
+
+struct OrchardSpendingKeyPtr;
+typedef struct OrchardSpendingKeyPtr OrchardSpendingKeyPtr;
+
+/**
+ * Constructs a spending key by ZIP-32 derivation to the account
+ * level from the provided seed.
+ */
+OrchardSpendingKeyPtr* orchard_spending_key_for_account(
+        const unsigned char* seed,
+        size_t seed_len,
+        uint32_t bip44_coin_type,
+        uint32_t account_id);
+
+/**
+ * Clones the given Orchard spending key and returns
+ * a pointer to the newly created value. Both the original
+ * one's memory and the newly allocated one need to be freed
+ * independently.
+ */
+OrchardSpendingKeyPtr* orchard_spending_key_clone(
+        const OrchardSpendingKeyPtr* ptr);
+
+/**
+ * Free the memory allocated for the given Orchard spending key
+ */
+void orchard_spending_key_free(OrchardSpendingKeyPtr* ptr);
+
+/**
+ * Returns the full viewing key for the specified spending key.
+ *
+ * The resulting pointer must be ultimately freed by the caller
+ * using `orchard_full_viewing_key_free`.
+ */
+OrchardFullViewingKeyPtr* orchard_spending_key_to_full_viewing_key(
+    const OrchardSpendingKeyPtr* key);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // ZCASH_RUST_INCLUDE_RUST_ORCHARD_KEYS_H
diff --git a/src/rust/include/rust/orchard/wallet.h b/src/rust/include/rust/orchard/wallet.h
new file mode 100644
index 00000000000..41c4398aa3f
--- /dev/null
+++ b/src/rust/include/rust/orchard/wallet.h
@@ -0,0 +1,378 @@
+// Copyright (c) 2021 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+#ifndef ZCASH_RUST_INCLUDE_RUST_ORCHARD_WALLET_H
+#define ZCASH_RUST_INCLUDE_RUST_ORCHARD_WALLET_H
+
+#include "rust/orchard/keys.h"
+#include "rust/builder.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * A type-safe pointer type for an Orchard wallet.
+ */
+struct OrchardWalletPtr;
+typedef struct OrchardWalletPtr OrchardWalletPtr;
+
+/**
+ * Constructs a new empty Orchard wallet and return a pointer to it.
+ * Memory is allocated by Rust and must be manually freed using
+ * `orchard_wallet_free`.
+ */
+OrchardWalletPtr* orchard_wallet_new();
+
+/**
+ * Frees the memory associated with an Orchard wallet that was allocated
+ * by Rust.
+ */
+void orchard_wallet_free(OrchardWalletPtr* wallet);
+
+/**
+ * Reset the state of the wallet to be suitable for rescan from the NU5 activation
+ * height.  This removes all witness and spentness information from the wallet. The
+ * keystore is unmodified and decrypted note, nullifier, and conflict data are left
+ * in place with the expectation that they will be overwritten and/or updated in
+ * the rescan process.
+ */
+bool orchard_wallet_reset(OrchardWalletPtr* wallet);
+
+/**
+ * Checkpoint the note commitment tree. This returns `false` and leaves the note
+ * commitment tree unmodified if the block height specified is not the successor
+ * to the last block height checkpointed.
+ */
+bool orchard_wallet_checkpoint(
+        OrchardWalletPtr* wallet,
+        uint32_t blockHeight
+        );
+
+/**
+ * Returns whether or not the wallet has any checkpointed state to which it can rewind.
+ * If so, `blockHeightRet` will be modified to contain the last block height at which a
+ * checkpoint was created.
+ */
+bool orchard_wallet_get_last_checkpoint(
+        const OrchardWalletPtr* wallet,
+        uint32_t* blockHeightRet);
+
+/**
+ * Rewinds to the most recent checkpoint, and marks as unspent any notes previously
+ * identified as having been spent by transactions in the latest block.
+ *
+ * The `blockHeight` argument provides the height to which the witness tree should be
+ * rewound, such that after the rewind this height corresponds to the latest block
+ * appended to the tree. The number of blocks that were removed from the witness
+ * tree in the rewind process is returned via `blocksRewoundRet`.
+ *
+ * Returns `true` if the rewind is successful, in which case the number of blocks that were
+ * removed from the witness tree in the rewind process is returned via `blocksRewoundRet`;
+ * this returns `false` and leaves `blocksRewoundRet` unmodified.
+ */
+bool orchard_wallet_rewind(
+        OrchardWalletPtr* wallet,
+        uint32_t blockHeight,
+        uint32_t* blocksRewoundRet
+        );
+
+/**
+ * A C struct used to transfer action_idx/IVK pairs back from Rust across the FFI
+ * boundary. This must have the same in-memory representation as the `FFIActionIVK` type
+ * in orchard_ffi/wallet.rs.
+ *
+ * Values of the `ivk` pointer must be freed manually; the best way to do this is to
+ * wrap this pointer in an `OrchardIncomingViewingKey` which handles deallocation
+ * in the object destructor.
+ */
+struct RawOrchardActionIVK {
+    uint64_t actionIdx;
+    OrchardIncomingViewingKeyPtr* ivk;
+};
+static_assert(
+    sizeof(RawOrchardActionIVK) == 16,
+    "RawOrchardActionIVK struct should have exactly a 128-bit in-memory representation.");
+static_assert(alignof(RawOrchardActionIVK) == 8, "RawOrchardActionIVK struct alignment is not 64 bits.");
+
+typedef void (*push_action_ivk_callback_t)(void* rec, const RawOrchardActionIVK actionIvk);
+
+typedef void (*push_spend_action_idx_callback_t)(void* rec, uint32_t actionIdx);
+
+/**
+ * Searches the provided bundle for notes that are visible to the specified wallet's
+ * incoming viewing keys, and adds those notes to the wallet.  For each note decryptable
+ * by one of the wallet's keys, this method will insert a `RawOrchardActionIVK` value into
+ * the provided `callbackReceiver` referent using the `push_cb` callback. Note that
+ * this callback can perform transformations on the provided RawOrchardActionIVK in this
+ * process.  For each action spending one of the wallet's notes, this method will pass
+ * a `uint32_t` action index corresponding to that action to the `callbackReceiver` referent;
+ * using the specified callback; usually, this will push the value into a result vector owned
+ * by the caller.
+ *
+ * The provided bundle must be a component of the transaction from which `txid` was
+ * derived.
+ *
+ * Returns `true` if the bundle is involved with the wallet; i.e. if it contains
+ * notes spendable by the wallet, or spends any of the wallet's notes.
+ */
+bool orchard_wallet_add_notes_from_bundle(
+        OrchardWalletPtr* wallet,
+        const unsigned char txid[32],
+        const OrchardBundlePtr* bundle,
+        void* callbackReceiver,
+        push_action_ivk_callback_t push_cb,
+        push_spend_action_idx_callback_t spend_cb
+        );
+
+/**
+ * Decrypts a selection of notes from the bundle with specified incoming viewing
+ * keys, and adds those notes to the wallet.
+ *
+ * The provided bundle must be a component of the transaction from which
+ * `txid` was derived.
+ *
+ * The value the `blockHeight` pointer points to be set to the height at which the
+ * transaction was mined, or `nullptr` if the transaction is not in the main chain.
+ */
+bool orchard_wallet_load_bundle(
+        OrchardWalletPtr* wallet,
+        const uint32_t* blockHeight,
+        const unsigned char txid[32],
+        const OrchardBundlePtr* bundle,
+        const RawOrchardActionIVK* actionIvks,
+        size_t actionIvksLen,
+        const uint32_t* actionsSpendingWalletNotes,
+        size_t actionsSpendingWalletNotesLen
+        );
+
+/**
+ * Add the note commitment values for the specified bundle to the wallet's note
+ * commitment tree, and mark any Orchard notes that belong to the wallet so
+ * that we can construct authentication paths to these notes in the future.
+ *
+ * This requires the block height and the index of the block within the
+ * transaction in order to guarantee that note commitments are appended in the
+ * correct order. Returns `false` if the provided bundle is not in the correct
+ * position to have its note commitments appended to the note commitment tree.
+ */
+bool orchard_wallet_append_bundle_commitments(
+        OrchardWalletPtr* wallet,
+        const uint32_t block_height,
+        const size_t block_tx_idx,
+        const unsigned char txid[32],
+        const OrchardBundlePtr* bundle
+        );
+
+/**
+ * Returns the root of the wallet's note commitment tree.
+ */
+void orchard_wallet_commitment_tree_root(
+        const OrchardWalletPtr* wallet,
+        unsigned char* root_ret);
+
+/**
+ * Returns whether the specified transaction involves any Orchard notes that belong to
+ * this wallet.
+ */
+bool orchard_wallet_tx_involves_my_notes(
+        const OrchardWalletPtr* wallet,
+        const unsigned char txid[32]);
+
+/**
+ * Add the specified spending key to the wallet's key store.  This will also compute and
+ * add the associated full and incoming viewing keys.
+ */
+void orchard_wallet_add_spending_key(
+        OrchardWalletPtr* wallet,
+        const OrchardSpendingKeyPtr* sk);
+
+/**
+ * Add the specified full viewing key to the wallet's key store.  This will also compute
+ * and add the associated incoming viewing key.
+ */
+void orchard_wallet_add_full_viewing_key(
+        OrchardWalletPtr* wallet,
+        const OrchardFullViewingKeyPtr* fvk);
+
+/**
+ * Add the specified raw address to the wallet's key store, associated with the incoming
+ * viewing key from which that address was derived.
+ */
+bool orchard_wallet_add_raw_address(
+        OrchardWalletPtr* wallet,
+        const OrchardRawAddressPtr* addr,
+        const OrchardIncomingViewingKeyPtr* ivk);
+
+/**
+ * Returns a pointer to the Orchard spending key corresponding to the specified raw
+ * address, if it is known to the wallet, or `nullptr` otherwise.
+ *
+ * Memory is allocated by Rust and must be manually freed using
+ * `orchard_spending_key_free`.
+ */
+OrchardSpendingKeyPtr* orchard_wallet_get_spending_key_for_address(
+        const OrchardWalletPtr* wallet,
+        const OrchardRawAddressPtr* addr);
+
+/**
+ * Returns a pointer to the Orchard incoming viewing key corresponding to the specified
+ * raw address, if it is known to the wallet, or `nullptr` otherwise.
+ *
+ * Memory is allocated by Rust and must be manually freed using
+ * `orchard_incoming_viewing_key_free`.
+ */
+OrchardIncomingViewingKeyPtr* orchard_wallet_get_ivk_for_address(
+        const OrchardWalletPtr* wallet,
+        const OrchardRawAddressPtr* addr);
+
+/**
+ * A C struct used to transfer note metadata information across the Rust FFI boundary.
+ * This must have the same in-memory representation as the `FFINoteMetadata` type in
+ * orchard_ffi/wallet.rs.
+ */
+struct RawOrchardNoteMetadata {
+    unsigned char txid[32];
+    uint32_t actionIdx;
+    OrchardRawAddressPtr* addr;
+    CAmount noteValue;
+    unsigned char memo[512];
+};
+
+typedef void (*push_note_callback_t)(void* resultVector, const RawOrchardNoteMetadata noteMeta);
+
+/**
+ * Finds notes that belong to the wallet that were sent to addresses derived from the
+ * specified incoming viewing key, subject to the specified flags, and uses the provided
+ * callback to push RawOrchardNoteMetadata values corresponding to those notes on to the
+ * provided result vector.  Note that the push_cb callback can perform any necessary
+ * conversion from a RawOrchardNoteMetadata value in addition to modifying the provided
+ * result vector.
+ *
+ * If `ivk` is null, all notes belonging to the wallet will be returned.  The
+ * `RawOrchardNoteMetadata::addr` pointers for values provided to the callback must be
+ * manually freed by the caller.
+ */
+void orchard_wallet_get_filtered_notes(
+        const OrchardWalletPtr* wallet,
+        const OrchardIncomingViewingKeyPtr* ivk,
+        bool ignoreMined,
+        bool requireSpendingKey,
+        void* resultVector,
+        push_note_callback_t push_cb
+        );
+
+/**
+ * A C struct used to transfer Orchard action spend information across the FFI boundary.
+ * This must have the same in-memory representation as the `FFIActionSpend` type in
+ * orchard_ffi/wallet.rs.
+ */
+struct RawOrchardActionSpend {
+    uint32_t spendActionIdx;
+    unsigned char outpointTxId[32];
+    uint32_t outpointActionIdx;
+    OrchardRawAddressPtr* receivedAt;
+    CAmount noteValue;
+};
+
+/**
+ * A C struct used to transfer Orchard action output information across the FFI boundary.
+ * This must have the same in-memory representation as the `FFIActionOutput` type in
+ * orchard_ffi/wallet.rs.
+ */
+struct RawOrchardActionOutput {
+    uint32_t outputActionIdx;
+    OrchardRawAddressPtr* addr;
+    CAmount noteValue;
+    unsigned char memo[512];
+    bool isOutgoing;
+};
+
+typedef void (*push_spend_t)(void* callbackReceiver, const RawOrchardActionSpend data);
+
+typedef void (*push_output_t)(void* callbackReceiver, const RawOrchardActionOutput data);
+
+/**
+ * Trial-decrypts the specfied Orchard bundle, and uses the provided callbacks to pass
+ * `RawOrchardActionSpend` and `RawOrchardActionOutput` values (corresponding to the
+ * actions of that bundle) to the provided result receiver.
+ *
+ * Note that the callbacks can perform any necessary conversion from a
+ * `RawOrchardActionSpend` or `RawOrchardActionOutput` value in addition to modifying the
+ * provided result receiver.
+ *
+ * `raw_ovks` must be a pointer to an array of `unsigned char[32]`.
+ *
+ * The `addr` pointer on each `RawOrchardActionOutput` value must be freed using
+ * `orchard_address_free`.
+ */
+bool orchard_wallet_get_txdata(
+        const OrchardWalletPtr* wallet,
+        const OrchardBundlePtr* bundle,
+        const unsigned char* raw_ovks,
+        size_t raw_ovks_len,
+        void* callbackReceiver,
+        push_spend_t push_spend_cb,
+        push_output_t push_output_cb
+        );
+
+typedef void (*push_txid_callback_t)(void* resultVector, unsigned char txid[32]);
+
+/**
+ * Returns a vector of transaction IDs for transactions that have been observed as
+ * spending the given outpoint (transaction ID and action index) by using the `push_cb`
+ * callback to push transaction IDs onto the provided result vector.
+ */
+void orchard_wallet_get_potential_spends(
+        const OrchardWalletPtr* wallet,
+        const unsigned char txid[32],
+        const uint32_t action_idx,
+        void* resultVector,
+        push_txid_callback_t push_cb
+        );
+
+/**
+ * Fetches the information needed to spend the wallet note at the given outpoint,
+ * relative to the current root known to the wallet of the Orchard commitment
+ * tree.
+ *
+ * Returns `null` if the outpoint is not known to the wallet, or the Orchard
+ * bundle containing the note has not been passed to
+ * `orchard_wallet_append_bundle_commitments`.
+ */
+OrchardSpendInfoPtr* orchard_wallet_get_spend_info(
+        const OrchardWalletPtr* wallet,
+        const unsigned char txid[32],
+        uint32_t action_idx);
+
+/**
+ * Run the garbage collection operation on the wallet's note commitment
+ * tree.
+ */
+void orchard_wallet_gc_note_commitment_tree(OrchardWalletPtr* wallet);
+
+/**
+ * Write the wallet's note commitment tree to the provided stream.
+ */
+bool orchard_wallet_write_note_commitment_tree(
+        const OrchardWalletPtr* wallet,
+        void* stream,
+        write_callback_t write_cb);
+
+/**
+ * Read a note commitment tree from the provided stream, and update the wallet's internal
+ * note commitment tree state to equal the value that was read.
+ */
+bool orchard_wallet_load_note_commitment_tree(
+        OrchardWalletPtr* wallet,
+        void* stream,
+        read_callback_t read_cb);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // ZCASH_RUST_INCLUDE_RUST_ORCHARD_WALLET_H
+
+
diff --git a/src/rust/include/rust/unified_keys.h b/src/rust/include/rust/unified_keys.h
new file mode 100644
index 00000000000..d485f3fae11
--- /dev/null
+++ b/src/rust/include/rust/unified_keys.h
@@ -0,0 +1,144 @@
+// Copyright (c) 2021 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+#ifndef ZCASH_RUST_INCLUDE_RUST_UNIFIED_KEYS_H
+#define ZCASH_RUST_INCLUDE_RUST_UNIFIED_KEYS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//
+// Unified full viewing keys
+//
+
+/**
+ * Void pointer type representing a reference to a Rust-allocated
+ * unified::Ufvk value
+ */
+struct UnifiedFullViewingKeyPtr;
+typedef struct UnifiedFullViewingKeyPtr UnifiedFullViewingKeyPtr;
+
+/**
+ * Free the memory allocated for the given address::unified::Ufvk;
+ */
+void unified_full_viewing_key_free(UnifiedFullViewingKeyPtr* ptr);
+
+/**
+ * Clones the given Unified full viewing key and returns
+ * a pointer to the newly created value. Both the original
+ * one's memory and the newly allocated one need to be freed
+ * independently.
+ */
+UnifiedFullViewingKeyPtr* unified_full_viewing_key_clone(
+        const UnifiedFullViewingKeyPtr* ptr);
+
+/**
+ * Parses a unified full viewing key from the given string.
+ *
+ * - If the key does not parse correctly, or the network for which the
+ *   key was encoded does not match the specified network the returned
+ *   pointer will be null.
+ */
+UnifiedFullViewingKeyPtr* unified_full_viewing_key_parse(
+    const char* network,
+    const char* str);
+
+/**
+ * Serializes a unified full viewing key and returns its string representation.
+ *
+ * The returned string's memory must be freed by the caller using
+ * `zcash_address_string_free`.
+ */
+char* unified_full_viewing_key_serialize(
+    const char* network,
+    const UnifiedFullViewingKeyPtr* full_viewing_key);
+
+/**
+ * Reads the transparent component of a unified full viewing key.
+ *
+ * `tkeyout` must be of length 65.
+ *
+ * Returns `true` if the UFVK contained a transparent component, `false`
+ * otherwise. If this returns `true`, the transparent key will be copied to
+ * `tkeyout` as the byte representation of the `(ChainCode, CPubKey)` pair.
+ * If it returns `false` then `tkeyout` will be unchanged.
+ */
+bool unified_full_viewing_key_read_transparent(
+    const UnifiedFullViewingKeyPtr* full_viewing_key,
+    unsigned char* tkeyout);
+
+/**
+ * Reads the Sapling component of a unified full viewing key.
+ *
+ * `skeyout` must be of length 128.
+ *
+ * Returns `true` if the UFVK contained a Sapling component,
+ * `false` otherwise. The bytes of the `(ak, nk, ovk, dk)` fields
+ * of the viewing key, in the encoding given by `EncodeExtFVKParts`
+ * defined in ZIP 32, will be copied to `skeyout` if `true` is returned.
+ * If `false` is returned then `skeyout` will be unchanged.
+ */
+bool unified_full_viewing_key_read_sapling(
+    const UnifiedFullViewingKeyPtr* full_viewing_key,
+    unsigned char* skeyout);
+
+/**
+ * Reads the Orchard component of a unified full viewing key.
+ *
+ * `skeyout` must be of length 96.
+ *
+ * Returns `true` if the UFVK contained an Orchard component, `false` otherwise.
+ * The bytes of the Orchard Raw Full Viewing Key, in the encoding given in
+ * section 5.6.4.4 of the Zcash Protocol Specification, will be copied to
+ * `skeyout` if `true` is returned.
+ *
+ * If `false` is returned then `skeyout` will be unchanged.
+ */
+bool unified_full_viewing_key_read_orchard(
+    const UnifiedFullViewingKeyPtr* full_viewing_key,
+    unsigned char* skeyout);
+
+/**
+ * Constructs a unified full viewing key from the binary encodings
+ * of its constituent parts.
+ *
+ * If `t_key` is not `null`, it must be of length 65 and must be the concatenated
+ * bytes of the serialized `(ChainCode, CPubKey)` pair.
+ *
+ * If `sapling_key` is not `null`, it must be of length 128 and must be the concatenated
+ * bytes of the `(ak, nk, ovk, dk)` fields in the encoding given by
+ * `EncodeExtFVKParts` defined in ZIP 32.
+ *
+ * Returns a pointer to newly allocated UFVK if the operation succeeds,
+ * or the null pointer otherwise. The pointer returned by this function
+ * must be freed by the caller with `unified_full_viewing_key_free`.
+ */
+UnifiedFullViewingKeyPtr* unified_full_viewing_key_from_components(
+    const unsigned char* t_key,
+    const unsigned char* sapling_key,
+    const unsigned char* orchard_key);
+
+/**
+ * Derive the internal and external OVKs for the binary encoding
+ * of a transparent FVK (the concatenated bytes of the serialized
+ * `(ChainCode, CPubKey)` pair.)
+ *
+ * Returns `true` if `t_key` was successfully deserialized,
+ * in which case `internal_ovk_ret` and `external_ovk_ret` (which
+ * should both point to 32-byte arrays) will have been updated
+ * with the appropriate key bytes; otherwise, this procedure
+ * returns `false` and the return values are unmodified.
+ */
+bool transparent_key_ovks(
+    const unsigned char* t_key,
+    unsigned char* internal_ovk_ret,
+    unsigned char* external_ovk_ret);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // ZCASH_RUST_INCLUDE_RUST_UNIFIED_KEYS_H
+
diff --git a/src/rust/src/address_ffi.rs b/src/rust/src/address_ffi.rs
index 6694e25b88d..83118a373f3 100644
--- a/src/rust/src/address_ffi.rs
+++ b/src/rust/src/address_ffi.rs
@@ -5,25 +5,30 @@ use std::{
 };
 
 use libc::{c_char, c_void};
-use zcash_address::{unified, FromAddress, Network, ToAddress, ZcashAddress};
+use zcash_address::{
+    unified::{self, Container, Encoding},
+    FromAddress, Network, ToAddress, ZcashAddress,
+};
 use zcash_primitives::sapling;
 
 pub type UnifiedAddressObj = NonNull<c_void>;
+pub type AddOrchardReceiverCb =
+    unsafe extern "C" fn(ua: Option<UnifiedAddressObj>, orchard: *const orchard::Address) -> bool;
 pub type AddReceiverCb =
     unsafe extern "C" fn(ua: Option<UnifiedAddressObj>, raw: *const u8) -> bool;
 pub type UnknownReceiverCb = unsafe extern "C" fn(
     ua: Option<UnifiedAddressObj>,
-    typecode: u8,
+    typecode: u32,
     data: *const u8,
     len: usize,
 ) -> bool;
-pub type GetTypecodeCb = unsafe extern "C" fn(ua: Option<UnifiedAddressObj>, index: usize) -> u8;
+pub type GetTypecodeCb = unsafe extern "C" fn(ua: Option<UnifiedAddressObj>, index: usize) -> u32;
 pub type GetReceiverLenCb =
     unsafe extern "C" fn(ua: Option<UnifiedAddressObj>, index: usize) -> usize;
 pub type GetReceiverDataCb =
     unsafe extern "C" fn(ua: Option<UnifiedAddressObj>, index: usize, data: *mut u8, length: usize);
 
-fn network_from_cstr(network: *const c_char) -> Option<Network> {
+pub(crate) fn network_from_cstr(network: *const c_char) -> Option<Network> {
     match unsafe { CStr::from_ptr(network) }.to_str().unwrap() {
         "main" => Some(Network::Main),
         "test" => Some(Network::Test),
@@ -50,10 +55,12 @@ impl FromAddress for UnifiedAddressHelper {
 }
 
 impl UnifiedAddressHelper {
+    #[allow(clippy::too_many_arguments)]
     fn into_cpp(
         self,
         network: Network,
         ua_obj: Option<UnifiedAddressObj>,
+        orchard_cb: Option<AddOrchardReceiverCb>,
         sapling_cb: Option<AddReceiverCb>,
         p2sh_cb: Option<AddReceiverCb>,
         p2pkh_cb: Option<AddReceiverCb>,
@@ -69,29 +76,27 @@ impl UnifiedAddressHelper {
         }
 
         self.ua
-            .receivers()
+            .items()
             .into_iter()
             .map(|receiver| match receiver {
                 unified::Receiver::Orchard(data) => {
-                    // ZIP 316: Senders MUST reject Unified Addresses in which any
-                    // constituent address does not meet the validation requirements of
-                    // its Receiver Encoding.
-                    // TODO: Add this API to the orchard crate.
-                    // if let Err(e) = orchard::Address::from_bytes(data) {
-                    //     tracing::error!("{}", e);
-                    //     false
-                    // } else {
-                    {
+                    // ZIP 316: Consumers MUST reject Unified Addresses/Viewing Keys in
+                    // which any constituent Item does not meet the validation
+                    // requirements of its encoding.
+                    let addr = orchard::Address::from_raw_address_bytes(&data);
+                    if addr.is_none().into() {
+                        tracing::error!("Unified Address contains invalid Orchard receiver");
+                        false
+                    } else {
                         unsafe {
-                            // TODO: Replace with Orchard support.
-                            (unknown_cb.unwrap())(ua_obj, 0x03, data.as_ptr(), data.len())
+                            (orchard_cb.unwrap())(ua_obj, Box::into_raw(Box::new(addr.unwrap())))
                         }
                     }
                 }
                 unified::Receiver::Sapling(data) => {
-                    // ZIP 316: Senders MUST reject Unified Addresses in which any
-                    // constituent address does not meet the validation requirements of
-                    // its Receiver Encoding.
+                    // ZIP 316: Consumers MUST reject Unified Addresses/Viewing Keys in
+                    // which any constituent Item does not meet the validation
+                    // requirements of its encoding.
                     if sapling::PaymentAddress::from_bytes(&data).is_none() {
                         tracing::error!("Unified Address contains invalid Sapling receiver");
                         false
@@ -118,6 +123,7 @@ pub extern "C" fn zcash_address_parse_unified(
     encoded: *const c_char,
     network: *const c_char,
     ua_obj: Option<UnifiedAddressObj>,
+    orchard_cb: Option<AddOrchardReceiverCb>,
     sapling_cb: Option<AddReceiverCb>,
     p2sh_cb: Option<AddReceiverCb>,
     p2pkh_cb: Option<AddReceiverCb>,
@@ -139,13 +145,15 @@ pub extern "C" fn zcash_address_parse_unified(
 
     let ua: UnifiedAddressHelper = match addr.convert() {
         Ok(ua) => ua,
-        Err(e) => {
-            tracing::error!("{}", e);
+        Err(_) => {
+            // `KeyIO::DecodePaymentAddress` handles the rest of the address kinds.
             return false;
         }
     };
 
-    ua.into_cpp(network, ua_obj, sapling_cb, p2sh_cb, p2pkh_cb, unknown_cb)
+    ua.into_cpp(
+        network, ua_obj, orchard_cb, sapling_cb, p2sh_cb, p2pkh_cb, unknown_cb,
+    )
 }
 
 #[no_mangle]
@@ -162,45 +170,49 @@ pub extern "C" fn zcash_address_serialize_unified(
         None => return ptr::null_mut(),
     };
 
-    let receivers: Vec<unified::Receiver> = (0..receivers_len)
-        .map(
-            |i| match unsafe { (typecode_cb.unwrap())(ua_obj, i) }.into() {
-                unified::Typecode::Orchard => {
-                    // TODO: Replace with Orchard support.
-                    let data_len = unsafe { (receiver_len_cb.unwrap())(ua_obj, i) };
-                    let mut data = vec![0; data_len];
-                    unsafe { (receiver_cb.unwrap())(ua_obj, i, data.as_mut_ptr(), data_len) };
-                    unified::Receiver::Unknown {
-                        typecode: 0x03,
-                        data,
+    let receivers: Vec<unified::Receiver> = match (0..receivers_len)
+        .map(|i| {
+            Ok(
+                match unsafe { (typecode_cb.unwrap())(ua_obj, i) }.try_into()? {
+                    unified::Typecode::Orchard => {
+                        let mut data = [0; 43];
+                        unsafe { (receiver_cb.unwrap())(ua_obj, i, data.as_mut_ptr(), data.len()) };
+                        unified::Receiver::Orchard(data)
                     }
-                }
-                unified::Typecode::Sapling => {
-                    let mut data = [0; 43];
-                    unsafe { (receiver_cb.unwrap())(ua_obj, i, data.as_mut_ptr(), data.len()) };
-                    unified::Receiver::Sapling(data)
-                }
-                unified::Typecode::P2sh => {
-                    let mut data = [0; 20];
-                    unsafe { (receiver_cb.unwrap())(ua_obj, i, data.as_mut_ptr(), data.len()) };
-                    unified::Receiver::P2sh(data)
-                }
-                unified::Typecode::P2pkh => {
-                    let mut data = [0; 20];
-                    unsafe { (receiver_cb.unwrap())(ua_obj, i, data.as_mut_ptr(), data.len()) };
-                    unified::Receiver::P2pkh(data)
-                }
-                unified::Typecode::Unknown(typecode) => {
-                    let data_len = unsafe { (receiver_len_cb.unwrap())(ua_obj, i) };
-                    let mut data = vec![0; data_len];
-                    unsafe { (receiver_cb.unwrap())(ua_obj, i, data.as_mut_ptr(), data_len) };
-                    unified::Receiver::Unknown { typecode, data }
-                }
-            },
-        )
-        .collect();
+                    unified::Typecode::Sapling => {
+                        let mut data = [0; 43];
+                        unsafe { (receiver_cb.unwrap())(ua_obj, i, data.as_mut_ptr(), data.len()) };
+                        unified::Receiver::Sapling(data)
+                    }
+                    unified::Typecode::P2sh => {
+                        let mut data = [0; 20];
+                        unsafe { (receiver_cb.unwrap())(ua_obj, i, data.as_mut_ptr(), data.len()) };
+                        unified::Receiver::P2sh(data)
+                    }
+                    unified::Typecode::P2pkh => {
+                        let mut data = [0; 20];
+                        unsafe { (receiver_cb.unwrap())(ua_obj, i, data.as_mut_ptr(), data.len()) };
+                        unified::Receiver::P2pkh(data)
+                    }
+                    unified::Typecode::Unknown(typecode) => {
+                        let data_len = unsafe { (receiver_len_cb.unwrap())(ua_obj, i) };
+                        let mut data = vec![0; data_len];
+                        unsafe { (receiver_cb.unwrap())(ua_obj, i, data.as_mut_ptr(), data_len) };
+                        unified::Receiver::Unknown { typecode, data }
+                    }
+                },
+            )
+        })
+        .collect::<Result<_, unified::ParseError>>()
+    {
+        Ok(receivers) => receivers,
+        Err(e) => {
+            tracing::error!("{}", e);
+            return ptr::null_mut();
+        }
+    };
 
-    let ua: unified::Address = match receivers.try_into() {
+    let ua = match unified::Address::try_from_items(receivers) {
         Ok(ua) => ua,
         Err(e) => {
             tracing::error!("{}", e);
diff --git a/src/rust/src/builder_ffi.rs b/src/rust/src/builder_ffi.rs
new file mode 100644
index 00000000000..1be37370591
--- /dev/null
+++ b/src/rust/src/builder_ffi.rs
@@ -0,0 +1,229 @@
+use std::convert::TryInto;
+use std::ptr;
+use std::slice;
+
+use incrementalmerkletree::Hashable;
+use libc::size_t;
+use orchard::keys::SpendingKey;
+use orchard::{
+    builder::{Builder, InProgress, Unauthorized, Unproven},
+    bundle::{Authorized, Flags},
+    keys::{FullViewingKey, OutgoingViewingKey},
+    tree::{MerkleHashOrchard, MerklePath},
+    value::NoteValue,
+    Bundle, Note,
+};
+use rand_core::OsRng;
+use tracing::error;
+use zcash_primitives::transaction::{
+    components::{sapling, transparent, Amount},
+    sighash::{SignableInput, SIGHASH_ALL},
+    sighash_v5::v5_signature_hash,
+    txid::TxIdDigester,
+    Authorization, TransactionData, TxVersion,
+};
+
+use crate::{transaction_ffi::PrecomputedTxParts, ORCHARD_PK};
+
+pub struct OrchardSpendInfo {
+    fvk: FullViewingKey,
+    note: Note,
+    merkle_path: MerklePath,
+}
+
+impl OrchardSpendInfo {
+    pub fn from_parts(fvk: FullViewingKey, note: Note, merkle_path: MerklePath) -> Self {
+        OrchardSpendInfo {
+            fvk,
+            note,
+            merkle_path,
+        }
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_spend_info_free(spend_info: *mut OrchardSpendInfo) {
+    if !spend_info.is_null() {
+        drop(unsafe { Box::from_raw(spend_info) });
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_builder_new(
+    spends_enabled: bool,
+    outputs_enabled: bool,
+    anchor: *const [u8; 32],
+) -> *mut Builder {
+    let anchor = unsafe { anchor.as_ref() }
+        .map(|a| orchard::Anchor::from_bytes(*a).unwrap())
+        .unwrap_or_else(|| MerkleHashOrchard::empty_root(32.into()).into());
+    Box::into_raw(Box::new(Builder::new(
+        Flags::from_parts(spends_enabled, outputs_enabled),
+        anchor,
+    )))
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_builder_add_spend(
+    builder: *mut Builder,
+    orchard_spend_info: *mut OrchardSpendInfo,
+) -> bool {
+    let builder = unsafe { builder.as_mut() }.expect("Builder may not be null.");
+    let orchard_spend_info = unsafe { Box::from_raw(orchard_spend_info) };
+
+    match builder.add_spend(
+        orchard_spend_info.fvk,
+        orchard_spend_info.note,
+        orchard_spend_info.merkle_path,
+    ) {
+        Ok(()) => true,
+        Err(e) => {
+            error!("Failed to add Orchard spend: {}", e);
+            false
+        }
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_builder_add_recipient(
+    builder: *mut Builder,
+    ovk: *const [u8; 32],
+    recipient: *const orchard::Address,
+    value: u64,
+    memo: *const [u8; 512],
+) -> bool {
+    let builder = unsafe { builder.as_mut() }.expect("Builder may not be null.");
+    let ovk = unsafe { ovk.as_ref() }
+        .copied()
+        .map(OutgoingViewingKey::from);
+    let recipient = unsafe { recipient.as_ref() }.expect("Recipient may not be null.");
+    let value = NoteValue::from_raw(value);
+    let memo = unsafe { memo.as_ref() }.copied();
+
+    match builder.add_recipient(ovk, *recipient, value, memo) {
+        Ok(()) => true,
+        Err(e) => {
+            error!("Failed to add Orchard recipient: {}", e);
+            false
+        }
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_builder_free(builder: *mut Builder) {
+    if !builder.is_null() {
+        drop(unsafe { Box::from_raw(builder) });
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_builder_build(
+    builder: *mut Builder,
+) -> *mut Bundle<InProgress<Unproven, Unauthorized>, Amount> {
+    if builder.is_null() {
+        error!("Called with null builder");
+        return ptr::null_mut();
+    }
+    let builder = unsafe { Box::from_raw(builder) };
+
+    match builder.build(OsRng) {
+        Ok(bundle) => Box::into_raw(Box::new(bundle)),
+        Err(e) => {
+            error!("Failed to build Orchard bundle: {:?}", e);
+            ptr::null_mut()
+        }
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_unauthorized_bundle_free(
+    bundle: *mut Bundle<InProgress<Unproven, Unauthorized>, Amount>,
+) {
+    if !bundle.is_null() {
+        drop(unsafe { Box::from_raw(bundle) });
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_unauthorized_bundle_prove_and_sign(
+    bundle: *mut Bundle<InProgress<Unproven, Unauthorized>, Amount>,
+    keys: *const *const SpendingKey,
+    keys_len: size_t,
+    sighash: *const [u8; 32],
+) -> *mut Bundle<Authorized, Amount> {
+    let bundle = unsafe { Box::from_raw(bundle) };
+    let keys = unsafe { slice::from_raw_parts(keys, keys_len) };
+    let sighash = unsafe { sighash.as_ref() }.expect("sighash pointer may not be null.");
+    let pk = unsafe { ORCHARD_PK.as_ref() }.unwrap();
+
+    let signing_keys = keys
+        .iter()
+        .map(|sk| {
+            unsafe { sk.as_ref() }
+                .expect("SpendingKey pointers must not be null")
+                .into()
+        })
+        .collect::<Vec<_>>();
+
+    let res = bundle
+        .create_proof(pk)
+        .and_then(|b| b.apply_signatures(OsRng, *sighash, &signing_keys));
+
+    match res {
+        Ok(signed) => Box::into_raw(Box::new(signed)),
+        Err(e) => {
+            error!(
+                "An error occurred while authorizing the orchard bundle: {:?}",
+                e
+            );
+            std::ptr::null_mut()
+        }
+    }
+}
+
+/// Calculates a ZIP 244 shielded signature digest for the given under-construction
+/// transaction.
+///
+/// Returns `false` if any of the parameters are invalid; in this case, `sighash_ret`
+/// will be unaltered.
+#[no_mangle]
+pub extern "C" fn zcash_builder_zip244_shielded_signature_digest(
+    precomputed_tx: *mut PrecomputedTxParts,
+    bundle: *const Bundle<InProgress<Unproven, Unauthorized>, Amount>,
+    sighash_ret: *mut [u8; 32],
+) -> bool {
+    let precomputed_tx = if !precomputed_tx.is_null() {
+        unsafe { Box::from_raw(precomputed_tx) }
+    } else {
+        error!("Invalid precomputed transaction");
+        return false;
+    };
+    if matches!(
+        precomputed_tx.tx.version(),
+        TxVersion::Sprout(_) | TxVersion::Overwinter | TxVersion::Sapling,
+    ) {
+        error!("Cannot calculate ZIP 244 digest for pre-v5 transaction");
+        return false;
+    }
+    let bundle = unsafe { bundle.as_ref().unwrap() };
+
+    struct Signable {}
+    impl Authorization for Signable {
+        type TransparentAuth = transparent::Authorized;
+        type SaplingAuth = sapling::Authorized;
+        type OrchardAuth = InProgress<Unproven, Unauthorized>;
+    }
+
+    let txdata: TransactionData<Signable> =
+        precomputed_tx
+            .tx
+            .into_data()
+            .map_bundles(|b| b, |b| b, |_| Some(bundle.clone()));
+    let txid_parts = txdata.digest(TxIdDigester);
+
+    let sighash = v5_signature_hash(&txdata, SIGHASH_ALL, &SignableInput::Shielded, &txid_parts);
+
+    // `v5_signature_hash` output is always 32 bytes.
+    *unsafe { &mut *sighash_ret } = sighash.as_ref().try_into().unwrap();
+    true
+}
diff --git a/src/rust/src/incremental_merkle_tree.rs b/src/rust/src/incremental_merkle_tree.rs
new file mode 100644
index 00000000000..ec2e3199804
--- /dev/null
+++ b/src/rust/src/incremental_merkle_tree.rs
@@ -0,0 +1,115 @@
+use byteorder::{ReadBytesExt, WriteBytesExt};
+use std::io::{self, Read, Write};
+
+use incrementalmerkletree::{
+    bridgetree::{BridgeTree, Checkpoint},
+    Hashable,
+};
+use zcash_encoding::Vector;
+use zcash_primitives::merkle_tree::{
+    incremental::{
+        read_bridge_v1, read_leu64_usize, read_position, write_bridge_v1, write_position,
+        write_usize_leu64, SER_V1,
+    },
+    HashSer,
+};
+
+pub fn write_checkpoint_v1<H: HashSer + Ord, W: Write>(
+    mut writer: W,
+    checkpoint: &Checkpoint<H>,
+) -> io::Result<()> {
+    write_usize_leu64(&mut writer, checkpoint.bridges_len())?;
+    writer.write_u8(if checkpoint.is_witnessed() { 1 } else { 0 })?;
+    Vector::write_sized(
+        &mut writer,
+        checkpoint.forgotten().iter(),
+        |mut w, ((pos, leaf_value), idx)| {
+            write_position(&mut w, *pos)?;
+            leaf_value.write(&mut w)?;
+            write_usize_leu64(&mut w, *idx)
+        },
+    )?;
+
+    Ok(())
+}
+
+pub fn read_checkpoint_v1<H: HashSer + Ord, R: Read>(mut reader: R) -> io::Result<Checkpoint<H>> {
+    Ok(Checkpoint::from_parts(
+        read_leu64_usize(&mut reader)?,
+        reader.read_u8()? == 1,
+        Vector::read_collected(&mut reader, |mut r| {
+            Ok((
+                (read_position(&mut r)?, H::read(&mut r)?),
+                read_leu64_usize(&mut r)?,
+            ))
+        })?,
+    ))
+}
+
+pub fn write_tree_v1<H: Hashable + HashSer + Ord, W: Write>(
+    mut writer: W,
+    tree: &BridgeTree<H, 32>,
+) -> io::Result<()> {
+    Vector::write(&mut writer, tree.bridges(), |w, b| write_bridge_v1(w, b))?;
+    Vector::write_sized(
+        &mut writer,
+        tree.witnessed_indices().iter(),
+        |mut w, ((pos, a), i)| {
+            write_position(&mut w, *pos)?;
+            a.write(&mut w)?;
+            write_usize_leu64(&mut w, *i)
+        },
+    )?;
+    Vector::write(&mut writer, tree.checkpoints(), |w, c| {
+        write_checkpoint_v1(w, c)
+    })?;
+    write_usize_leu64(&mut writer, tree.max_checkpoints())?;
+
+    Ok(())
+}
+
+#[allow(clippy::redundant_closure)]
+pub fn read_tree_v1<H: Hashable + HashSer + Ord + Clone, R: Read>(
+    mut reader: R,
+) -> io::Result<BridgeTree<H, 32>> {
+    BridgeTree::from_parts(
+        Vector::read(&mut reader, |r| read_bridge_v1(r))?,
+        Vector::read_collected(&mut reader, |mut r| {
+            Ok((
+                (read_position(&mut r)?, H::read(&mut r)?),
+                read_leu64_usize(&mut r)?,
+            ))
+        })?,
+        Vector::read(&mut reader, |r| read_checkpoint_v1(r))?,
+        read_leu64_usize(&mut reader)?,
+    )
+    .map_err(|err| {
+        io::Error::new(
+            io::ErrorKind::InvalidInput,
+            format!(
+                "Consistency violation found when attempting to deserialize Merkle tree: {:?}",
+                err
+            ),
+        )
+    })
+}
+
+pub fn write_tree<H: Hashable + HashSer + Ord, W: Write>(
+    mut writer: W,
+    tree: &BridgeTree<H, 32>,
+) -> io::Result<()> {
+    writer.write_u8(SER_V1)?;
+    write_tree_v1(&mut writer, tree)
+}
+
+pub fn read_tree<H: Hashable + HashSer + Ord + Clone, R: Read>(
+    mut reader: R,
+) -> io::Result<BridgeTree<H, 32>> {
+    match reader.read_u8()? {
+        SER_V1 => read_tree_v1(&mut reader),
+        flag => Err(io::Error::new(
+            io::ErrorKind::InvalidInput,
+            format!("Unrecognized tree serialization version: {:?}", flag),
+        )),
+    }
+}
diff --git a/src/rust/src/incremental_merkle_tree_ffi.rs b/src/rust/src/incremental_merkle_tree_ffi.rs
new file mode 100644
index 00000000000..f70a2003f50
--- /dev/null
+++ b/src/rust/src/incremental_merkle_tree_ffi.rs
@@ -0,0 +1,160 @@
+use incrementalmerkletree::{bridgetree, Altitude, Frontier, Hashable};
+use std::mem::size_of_val;
+use std::ptr;
+
+use orchard::{bundle::Authorized, tree::MerkleHashOrchard};
+use tracing::error;
+use zcash_primitives::{
+    merkle_tree::incremental::{read_frontier_v1, write_frontier_v1},
+    transaction::components::Amount,
+};
+
+use crate::streams_ffi::{CppStreamReader, CppStreamWriter, ReadCb, StreamObj, WriteCb};
+
+pub const MERKLE_DEPTH: u8 = 32;
+
+//
+// Operations on Merkle frontiers.
+//
+
+#[no_mangle]
+pub extern "C" fn orchard_merkle_frontier_empty(
+) -> *mut bridgetree::Frontier<MerkleHashOrchard, MERKLE_DEPTH> {
+    let empty_tree = bridgetree::Frontier::<MerkleHashOrchard, MERKLE_DEPTH>::empty();
+    Box::into_raw(Box::new(empty_tree))
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_merkle_frontier_clone(
+    tree: *const bridgetree::Frontier<MerkleHashOrchard, MERKLE_DEPTH>,
+) -> *mut bridgetree::Frontier<MerkleHashOrchard, MERKLE_DEPTH> {
+    unsafe { tree.as_ref() }
+        .map(|tree| Box::into_raw(Box::new(tree.clone())))
+        .unwrap_or(std::ptr::null_mut())
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_merkle_frontier_free(
+    tree: *mut bridgetree::Frontier<MerkleHashOrchard, MERKLE_DEPTH>,
+) {
+    if !tree.is_null() {
+        drop(unsafe { Box::from_raw(tree) });
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_merkle_frontier_parse(
+    stream: Option<StreamObj>,
+    read_cb: Option<ReadCb>,
+) -> *mut bridgetree::Frontier<MerkleHashOrchard, MERKLE_DEPTH> {
+    let reader = CppStreamReader::from_raw_parts(stream, read_cb.unwrap());
+
+    match read_frontier_v1(reader) {
+        Ok(parsed) => Box::into_raw(Box::new(parsed)),
+        Err(e) => {
+            error!("Failed to parse Orchard bundle: {}", e);
+            ptr::null_mut()
+        }
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_merkle_frontier_serialize(
+    frontier: *const bridgetree::Frontier<MerkleHashOrchard, MERKLE_DEPTH>,
+    stream: Option<StreamObj>,
+    write_cb: Option<WriteCb>,
+) -> bool {
+    let frontier = unsafe {
+        frontier
+            .as_ref()
+            .expect("Orchard note commitment tree pointer may not be null.")
+    };
+
+    let writer = CppStreamWriter::from_raw_parts(stream, write_cb.unwrap());
+    match write_frontier_v1(writer, frontier) {
+        Ok(()) => true,
+        Err(e) => {
+            error!("{}", e);
+            false
+        }
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_merkle_frontier_append_bundle(
+    tree: *mut bridgetree::Frontier<MerkleHashOrchard, MERKLE_DEPTH>,
+    bundle: *const orchard::Bundle<Authorized, Amount>,
+) -> bool {
+    let tree = unsafe {
+        tree.as_mut()
+            .expect("Orchard note commitment tree pointer may not be null.")
+    };
+    if let Some(bundle) = unsafe { bundle.as_ref() } {
+        for action in bundle.actions().iter() {
+            if !tree.append(&MerkleHashOrchard::from_cmx(action.cmx())) {
+                error!("Orchard note commitment tree is full.");
+                return false;
+            }
+        }
+    }
+
+    true
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_merkle_frontier_root(
+    tree: *const bridgetree::Frontier<MerkleHashOrchard, MERKLE_DEPTH>,
+    root_ret: *mut [u8; 32],
+) {
+    let tree = unsafe {
+        tree.as_ref()
+            .expect("Orchard note commitment tree pointer may not be null.")
+    };
+
+    let root_ret = unsafe {
+        root_ret
+            .as_mut()
+            .expect("Cannot return to the null pointer.")
+    };
+
+    *root_ret = tree.root().to_bytes();
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_merkle_frontier_num_leaves(
+    tree: *const bridgetree::Frontier<MerkleHashOrchard, MERKLE_DEPTH>,
+) -> u64 {
+    let tree = unsafe {
+        tree.as_ref()
+            .expect("Orchard note commitment tree pointer may not be null.")
+    };
+
+    tree.position().map_or(0, |p| <u64>::from(p) + 1)
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_merkle_frontier_dynamic_mem_usage(
+    tree: *const bridgetree::Frontier<MerkleHashOrchard, MERKLE_DEPTH>,
+) -> usize {
+    let tree = unsafe {
+        tree.as_ref()
+            .expect("Orchard note commitment tree pointer may not be null.")
+    };
+
+    size_of_val(tree) + tree.dynamic_memory_usage()
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_merkle_tree_empty_root(root_ret: *mut [u8; 32]) {
+    let root_ret = unsafe {
+        root_ret
+            .as_mut()
+            .expect("Cannot return to the null pointer.")
+    };
+
+    let altitude = Altitude::from(MERKLE_DEPTH);
+
+    let digest = MerkleHashOrchard::empty_root(altitude).to_bytes();
+
+    *root_ret = digest;
+}
diff --git a/src/rust/src/orchard_ffi.rs b/src/rust/src/orchard_ffi.rs
index eb782f5cb5d..dbc6649c671 100644
--- a/src/rust/src/orchard_ffi.rs
+++ b/src/rust/src/orchard_ffi.rs
@@ -1,11 +1,13 @@
 use std::{mem, ptr};
 
 use libc::size_t;
+use memuse::DynamicUsage;
 use orchard::{
     bundle::Authorized,
     keys::OutgoingViewingKey,
+    note_encryption::OrchardDomain,
     primitives::redpallas::{self, Binding, SpendAuth},
-    Bundle, OrchardDomain,
+    Bundle,
 };
 use rand_core::OsRng;
 use tracing::{debug, error};
@@ -17,8 +19,6 @@ use zcash_primitives::transaction::{
 
 use crate::streams_ffi::{CppStreamReader, CppStreamWriter, ReadCb, StreamObj, WriteCb};
 
-mod incremental_sinsemilla_tree_ffi;
-
 #[no_mangle]
 pub extern "C" fn orchard_bundle_clone(
     bundle: *const Bundle<Authorized, Amount>,
@@ -198,6 +198,48 @@ impl BatchValidator {
     fn new() -> Self {
         BatchValidator { signatures: vec![] }
     }
+
+    fn add_bundle(&mut self, bundle: &Bundle<Authorized, Amount>, txid: TxId) {
+        for action in bundle.actions().iter() {
+            self.signatures.push(BundleSignature {
+                signature: action
+                    .rk()
+                    .create_batch_item(action.authorization().clone(), txid.as_ref()),
+            });
+        }
+
+        self.signatures.push(BundleSignature {
+            signature: bundle.binding_validating_key().create_batch_item(
+                bundle.authorization().binding_signature().clone(),
+                txid.as_ref(),
+            ),
+        });
+    }
+
+    fn validate(&self) -> bool {
+        if self.signatures.is_empty() {
+            // An empty batch is always valid, but is not free to run; skip it.
+            return true;
+        }
+
+        let mut validator = redpallas::batch::Verifier::new();
+        for sig in self.signatures.iter() {
+            validator.queue(sig.signature.clone());
+        }
+
+        match validator.verify(OsRng) {
+            Ok(()) => true,
+            Err(e) => {
+                error!("RedPallas batch validation failed: {}", e);
+                // TODO: Try sub-batches to figure out which signatures are invalid. We can
+                // postpone this for now:
+                // - For per-transaction batching (when adding to the mempool), we don't care
+                //   which signature within the transaction failed.
+                // - For per-block batching, we currently don't care which transaction failed.
+                false
+            }
+        }
+    }
 }
 
 /// Creates a RedPallas batch validation context.
@@ -232,22 +274,7 @@ pub extern "C" fn orchard_batch_add_bundle(
     let txid = unsafe { txid.as_ref() }.cloned().map(TxId::from_bytes);
 
     match (batch, bundle, txid) {
-        (Some(batch), Some(bundle), Some(txid)) => {
-            for action in bundle.actions().iter() {
-                batch.signatures.push(BundleSignature {
-                    signature: action
-                        .rk()
-                        .create_batch_item(action.authorization().clone(), txid.as_ref()),
-                });
-            }
-
-            batch.signatures.push(BundleSignature {
-                signature: bundle.binding_validating_key().create_batch_item(
-                    bundle.authorization().binding_signature().clone(),
-                    txid.as_ref(),
-                ),
-            });
-        }
+        (Some(batch), Some(bundle), Some(txid)) => batch.add_bundle(bundle, txid),
         (_, _, None) => error!("orchard_batch_add_bundle() called without txid!"),
         (Some(_), None, Some(txid)) => debug!("Tx {} has no Orchard component", txid),
         (None, Some(_), _) => debug!("Orchard BatchValidator not provided, assuming disabled."),
@@ -262,23 +289,7 @@ pub extern "C" fn orchard_batch_add_bundle(
 #[no_mangle]
 pub extern "C" fn orchard_batch_validate(batch: *const BatchValidator) -> bool {
     if let Some(batch) = unsafe { batch.as_ref() } {
-        let mut validator = redpallas::batch::Verifier::new();
-        for sig in batch.signatures.iter() {
-            validator.queue(sig.signature.clone());
-        }
-
-        match validator.verify(OsRng) {
-            Ok(()) => true,
-            Err(e) => {
-                error!("RedPallas batch validation failed: {}", e);
-                // TODO: Try sub-batches to figure out which signatures are invalid. We can
-                // postpone this for now:
-                // - For per-transaction batching (when adding to the mempool), we don't care
-                //   which signature within the transaction failed.
-                // - For per-block batching, we currently don't care which transaction failed.
-                false
-            }
-        }
+        batch.validate()
     } else {
         // The orchard::BatchValidator C++ class uses null to represent a disabled batch
         // validator.
diff --git a/src/rust/src/orchard_ffi/incremental_sinsemilla_tree_ffi.rs b/src/rust/src/orchard_ffi/incremental_sinsemilla_tree_ffi.rs
deleted file mode 100644
index 74c5552ede8..00000000000
--- a/src/rust/src/orchard_ffi/incremental_sinsemilla_tree_ffi.rs
+++ /dev/null
@@ -1,295 +0,0 @@
-use incrementalmerkletree::{
-    bridgetree::{self, BridgeTree},
-    Altitude, Frontier, Hashable, Tree,
-};
-use std::mem::size_of_val;
-use std::ptr;
-
-use orchard::{bundle::Authorized, tree::MerkleCrhOrchardOutput};
-
-use zcash_primitives::{
-    merkle_tree::incremental::{read_frontier_v1, read_tree, write_frontier_v1, write_tree},
-    transaction::components::Amount,
-};
-
-use crate::orchard_ffi::{error, CppStreamReader, CppStreamWriter, ReadCb, StreamObj, WriteCb};
-
-pub const MERKLE_DEPTH: u8 = 32;
-pub const MAX_CHECKPOINTS: usize = 100;
-
-//
-// Operations on Merkle frontiers.
-//
-
-#[no_mangle]
-pub extern "C" fn orchard_merkle_frontier_empty(
-) -> *mut bridgetree::Frontier<MerkleCrhOrchardOutput, MERKLE_DEPTH> {
-    let empty_tree = bridgetree::Frontier::<MerkleCrhOrchardOutput, MERKLE_DEPTH>::empty();
-    Box::into_raw(Box::new(empty_tree))
-}
-
-#[no_mangle]
-pub extern "C" fn orchard_merkle_frontier_clone(
-    tree: *const bridgetree::Frontier<MerkleCrhOrchardOutput, MERKLE_DEPTH>,
-) -> *mut bridgetree::Frontier<MerkleCrhOrchardOutput, MERKLE_DEPTH> {
-    unsafe { tree.as_ref() }
-        .map(|tree| Box::into_raw(Box::new(tree.clone())))
-        .unwrap_or(std::ptr::null_mut())
-}
-
-#[no_mangle]
-pub extern "C" fn orchard_merkle_frontier_free(
-    tree: *mut bridgetree::Frontier<MerkleCrhOrchardOutput, MERKLE_DEPTH>,
-) {
-    if !tree.is_null() {
-        drop(unsafe { Box::from_raw(tree) });
-    }
-}
-
-#[no_mangle]
-pub extern "C" fn orchard_merkle_frontier_parse(
-    stream: Option<StreamObj>,
-    read_cb: Option<ReadCb>,
-) -> *mut bridgetree::Frontier<MerkleCrhOrchardOutput, MERKLE_DEPTH> {
-    let reader = CppStreamReader::from_raw_parts(stream, read_cb.unwrap());
-
-    match read_frontier_v1(reader) {
-        Ok(parsed) => Box::into_raw(Box::new(parsed)),
-        Err(e) => {
-            error!("Failed to parse Orchard bundle: {}", e);
-            ptr::null_mut()
-        }
-    }
-}
-
-#[no_mangle]
-pub extern "C" fn orchard_merkle_frontier_serialize(
-    frontier: *const bridgetree::Frontier<MerkleCrhOrchardOutput, MERKLE_DEPTH>,
-    stream: Option<StreamObj>,
-    write_cb: Option<WriteCb>,
-) -> bool {
-    let frontier = unsafe {
-        frontier
-            .as_ref()
-            .expect("Orchard note commitment tree pointer may not be null.")
-    };
-
-    let writer = CppStreamWriter::from_raw_parts(stream, write_cb.unwrap());
-    match write_frontier_v1(writer, frontier) {
-        Ok(()) => true,
-        Err(e) => {
-            error!("{}", e);
-            false
-        }
-    }
-}
-
-#[no_mangle]
-pub extern "C" fn orchard_merkle_frontier_append_bundle(
-    tree: *mut bridgetree::Frontier<MerkleCrhOrchardOutput, MERKLE_DEPTH>,
-    bundle: *const orchard::Bundle<Authorized, Amount>,
-) -> bool {
-    let tree = unsafe {
-        tree.as_mut()
-            .expect("Orchard note commitment tree pointer may not be null.")
-    };
-    if let Some(bundle) = unsafe { bundle.as_ref() } {
-        for action in bundle.actions().iter() {
-            if !tree.append(&MerkleCrhOrchardOutput::from_cmx(action.cmx())) {
-                error!("Orchard note commitment tree is full.");
-                return false;
-            }
-        }
-    }
-
-    true
-}
-
-#[no_mangle]
-pub extern "C" fn orchard_merkle_frontier_root(
-    tree: *const bridgetree::Frontier<MerkleCrhOrchardOutput, MERKLE_DEPTH>,
-    root_ret: *mut [u8; 32],
-) {
-    let tree = unsafe {
-        tree.as_ref()
-            .expect("Orchard note commitment tree pointer may not be null.")
-    };
-
-    let root_ret = unsafe {
-        root_ret
-            .as_mut()
-            .expect("Cannot return to the null pointer.")
-    };
-
-    *root_ret = tree.root().to_bytes();
-}
-
-#[no_mangle]
-pub extern "C" fn orchard_merkle_frontier_num_leaves(
-    tree: *const bridgetree::Frontier<MerkleCrhOrchardOutput, MERKLE_DEPTH>,
-) -> usize {
-    let tree = unsafe {
-        tree.as_ref()
-            .expect("Orchard note commitment tree pointer may not be null.")
-    };
-
-    tree.position().map_or(0, |p| (<u64>::from(p) + 1) as usize)
-}
-
-#[no_mangle]
-pub extern "C" fn orchard_merkle_frontier_dynamic_mem_usage(
-    tree: *const bridgetree::Frontier<MerkleCrhOrchardOutput, MERKLE_DEPTH>,
-) -> usize {
-    let tree = unsafe {
-        tree.as_ref()
-            .expect("Orchard note commitment tree pointer may not be null.")
-    };
-
-    size_of_val(tree) + tree.dynamic_memory_usage()
-}
-
-//
-// Operations on incremental merkle trees with interstitial
-// witnesses.
-//
-
-#[no_mangle]
-pub extern "C" fn incremental_sinsemilla_tree_empty(
-) -> *mut BridgeTree<MerkleCrhOrchardOutput, MERKLE_DEPTH> {
-    let empty_tree = BridgeTree::<MerkleCrhOrchardOutput, MERKLE_DEPTH>::new(MAX_CHECKPOINTS);
-    Box::into_raw(Box::new(empty_tree))
-}
-
-#[no_mangle]
-pub extern "C" fn incremental_sinsemilla_tree_clone(
-    tree: *const BridgeTree<MerkleCrhOrchardOutput, MERKLE_DEPTH>,
-) -> *mut BridgeTree<MerkleCrhOrchardOutput, MERKLE_DEPTH> {
-    unsafe { tree.as_ref() }
-        .map(|tree| Box::into_raw(Box::new(tree.clone())))
-        .unwrap_or(std::ptr::null_mut())
-}
-
-#[no_mangle]
-pub extern "C" fn incremental_sinsemilla_tree_free(
-    tree: *mut BridgeTree<MerkleCrhOrchardOutput, MERKLE_DEPTH>,
-) {
-    if !tree.is_null() {
-        drop(unsafe { Box::from_raw(tree) });
-    }
-}
-
-#[no_mangle]
-pub extern "C" fn incremental_sinsemilla_tree_parse(
-    stream: Option<StreamObj>,
-    read_cb: Option<ReadCb>,
-) -> *mut BridgeTree<MerkleCrhOrchardOutput, MERKLE_DEPTH> {
-    let reader = CppStreamReader::from_raw_parts(stream, read_cb.unwrap());
-
-    match read_tree(reader) {
-        Ok(parsed) => Box::into_raw(Box::new(parsed)),
-        Err(e) => {
-            error!("Failed to parse Orchard bundle: {}", e);
-            ptr::null_mut()
-        }
-    }
-}
-
-#[no_mangle]
-pub extern "C" fn incremental_sinsemilla_tree_serialize(
-    tree: *const BridgeTree<MerkleCrhOrchardOutput, MERKLE_DEPTH>,
-    stream: Option<StreamObj>,
-    write_cb: Option<WriteCb>,
-) -> bool {
-    let tree = unsafe {
-        tree.as_ref()
-            .expect("Orchard note commitment tree pointer may not be null.")
-    };
-
-    let writer = CppStreamWriter::from_raw_parts(stream, write_cb.unwrap());
-    match write_tree(writer, tree) {
-        Ok(()) => true,
-        Err(e) => {
-            error!("{}", e);
-            false
-        }
-    }
-}
-
-#[no_mangle]
-pub extern "C" fn incremental_sinsemilla_tree_append_bundle(
-    tree: *mut BridgeTree<MerkleCrhOrchardOutput, MERKLE_DEPTH>,
-    bundle: *const orchard::Bundle<Authorized, Amount>,
-) -> bool {
-    let tree = unsafe {
-        tree.as_mut()
-            .expect("Orchard note commitment tree pointer may not be null.")
-    };
-    if let Some(bundle) = unsafe { bundle.as_ref() } {
-        for action in bundle.actions().iter() {
-            if !tree.append(&MerkleCrhOrchardOutput::from_cmx(action.cmx())) {
-                error!("Orchard note commitment tree is full.");
-                return false;
-            }
-        }
-    }
-
-    true
-}
-
-#[no_mangle]
-pub extern "C" fn incremental_sinsemilla_tree_checkpoint(
-    tree: *mut BridgeTree<MerkleCrhOrchardOutput, MERKLE_DEPTH>,
-) {
-    let tree = unsafe {
-        tree.as_mut()
-            .expect("Orchard note commitment tree pointer may not be null.")
-    };
-
-    tree.checkpoint()
-}
-
-#[no_mangle]
-pub extern "C" fn incremental_sinsemilla_tree_rewind(
-    tree: *mut BridgeTree<MerkleCrhOrchardOutput, MERKLE_DEPTH>,
-) -> bool {
-    let tree = unsafe {
-        tree.as_mut()
-            .expect("Orchard note commitment tree pointer may not be null.")
-    };
-
-    tree.rewind()
-}
-
-#[no_mangle]
-pub extern "C" fn incremental_sinsemilla_tree_root(
-    tree: *const BridgeTree<MerkleCrhOrchardOutput, MERKLE_DEPTH>,
-    root_ret: *mut [u8; 32],
-) {
-    let tree = unsafe {
-        tree.as_ref()
-            .expect("Orchard note commitment tree pointer may not be null.")
-    };
-
-    let root_ret = unsafe {
-        root_ret
-            .as_mut()
-            .expect("Cannot return to the null pointer.")
-    };
-
-    *root_ret = tree.root().to_bytes();
-}
-
-#[no_mangle]
-pub extern "C" fn incremental_sinsemilla_tree_empty_root(root_ret: *mut [u8; 32]) {
-    let root_ret = unsafe {
-        root_ret
-            .as_mut()
-            .expect("Cannot return to the null pointer.")
-    };
-
-    let altitude = Altitude::from(MERKLE_DEPTH);
-
-    let digest = MerkleCrhOrchardOutput::empty_root(altitude).to_bytes();
-
-    *root_ret = digest;
-}
diff --git a/src/rust/src/orchard_keys_ffi.rs b/src/rust/src/orchard_keys_ffi.rs
new file mode 100644
index 00000000000..079de6439ac
--- /dev/null
+++ b/src/rust/src/orchard_keys_ffi.rs
@@ -0,0 +1,406 @@
+use std::io::{Read, Write};
+use std::slice;
+use tracing::error;
+
+use orchard::{
+    keys::{DiversifierIndex, FullViewingKey, IncomingViewingKey, OutgoingViewingKey, SpendingKey},
+    Address,
+};
+
+use crate::{
+    streams_ffi::{CppStreamReader, CppStreamWriter, ReadCb, StreamObj, WriteCb},
+    zcashd_orchard::OrderedAddress,
+};
+
+//
+// Addresses
+//
+
+#[no_mangle]
+pub extern "C" fn orchard_address_clone(addr: *const Address) -> *mut Address {
+    unsafe { addr.as_ref() }
+        .map(|addr| Box::into_raw(Box::new(*addr)))
+        .unwrap_or(std::ptr::null_mut())
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_address_free(addr: *mut Address) {
+    if !addr.is_null() {
+        drop(unsafe { Box::from_raw(addr) });
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_raw_address_parse(
+    stream: Option<StreamObj>,
+    read_cb: Option<ReadCb>,
+) -> *mut Address {
+    let mut reader = CppStreamReader::from_raw_parts(stream, read_cb.unwrap());
+
+    let mut buf = [0u8; 43];
+    match reader.read_exact(&mut buf) {
+        Err(e) => {
+            error!("Stream failure reading bytes of Orchard raw address: {}", e);
+            std::ptr::null_mut()
+        }
+        Ok(()) => {
+            let read = Address::from_raw_address_bytes(&buf);
+            if read.is_some().into() {
+                Box::into_raw(Box::new(read.unwrap()))
+            } else {
+                error!("Failed to parse Orchard raw address.");
+                std::ptr::null_mut()
+            }
+        }
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_raw_address_serialize(
+    key: *const Address,
+    stream: Option<StreamObj>,
+    write_cb: Option<WriteCb>,
+) -> bool {
+    let key = unsafe { key.as_ref() }.expect("Orchard raw address pointer may not be null.");
+
+    let mut writer = CppStreamWriter::from_raw_parts(stream, write_cb.unwrap());
+    match writer.write_all(&key.to_raw_address_bytes()) {
+        Ok(()) => true,
+        Err(e) => {
+            error!("Stream failure writing Orchard raw address: {}", e);
+            false
+        }
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_address_eq(a0: *const Address, a1: *const Address) -> bool {
+    let a0 = unsafe { a0.as_ref() };
+    let a1 = unsafe { a1.as_ref() };
+    a0 == a1
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_address_lt(a0: *const Address, a1: *const Address) -> bool {
+    let a0 = unsafe { a0.as_ref() };
+    let a1 = unsafe { a1.as_ref() };
+    a0.map(|a| OrderedAddress::new(*a)) < a1.map(|a| OrderedAddress::new(*a))
+}
+
+//
+// Incoming viewing keys
+//
+
+#[no_mangle]
+pub extern "C" fn orchard_incoming_viewing_key_clone(
+    key: *const IncomingViewingKey,
+) -> *mut IncomingViewingKey {
+    unsafe { key.as_ref() }
+        .map(|key| Box::into_raw(Box::new(key.clone())))
+        .unwrap_or(std::ptr::null_mut())
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_incoming_viewing_key_free(key: *mut IncomingViewingKey) {
+    if !key.is_null() {
+        drop(unsafe { Box::from_raw(key) });
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_incoming_viewing_key_parse(
+    stream: Option<StreamObj>,
+    read_cb: Option<ReadCb>,
+) -> *mut IncomingViewingKey {
+    let mut reader = CppStreamReader::from_raw_parts(stream, read_cb.unwrap());
+
+    let mut buf = [0u8; 64];
+    match reader.read_exact(&mut buf) {
+        Err(e) => {
+            error!(
+                "Stream failure reading bytes of Orchard incoming viewing key: {}",
+                e
+            );
+            std::ptr::null_mut()
+        }
+        Ok(()) => {
+            let read = IncomingViewingKey::from_bytes(&buf);
+            if read.is_some().into() {
+                Box::into_raw(Box::new(read.unwrap()))
+            } else {
+                error!("Failed to parse Orchard incoming viewing key.");
+                std::ptr::null_mut()
+            }
+        }
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_incoming_viewing_key_to_address(
+    key: *const IncomingViewingKey,
+    diversifier_index: *const [u8; 11],
+) -> *mut Address {
+    let key =
+        unsafe { key.as_ref() }.expect("Orchard incoming viewing key pointer may not be null.");
+
+    let diversifier_index = DiversifierIndex::from(unsafe { *diversifier_index });
+    Box::into_raw(Box::new(key.address_at(diversifier_index)))
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_incoming_viewing_key_decrypt_diversifier(
+    key: *const IncomingViewingKey,
+    addr: *const Address,
+    j_ret: *mut [u8; 11],
+) -> bool {
+    let key =
+        unsafe { key.as_ref() }.expect("Orchard incoming viewing key pointer may not be null.");
+    let addr = unsafe { addr.as_ref() }.expect("Orchard raw address pointer may not be null.");
+    let j_ret = unsafe { j_ret.as_mut() }.expect("j_ret may not be null.");
+
+    match key.diversifier_index(addr) {
+        Some(j) => {
+            j_ret.copy_from_slice(j.to_bytes());
+            true
+        }
+        None => false,
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_incoming_viewing_key_serialize(
+    key: *const IncomingViewingKey,
+    stream: Option<StreamObj>,
+    write_cb: Option<WriteCb>,
+) -> bool {
+    let key =
+        unsafe { key.as_ref() }.expect("Orchard incoming viewing key pointer may not be null.");
+
+    let mut writer = CppStreamWriter::from_raw_parts(stream, write_cb.unwrap());
+    match writer.write_all(&key.to_bytes()) {
+        Ok(()) => true,
+        Err(e) => {
+            error!("Stream failure writing Orchard incoming viewing key: {}", e);
+            false
+        }
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_incoming_viewing_key_lt(
+    k0: *const IncomingViewingKey,
+    k1: *const IncomingViewingKey,
+) -> bool {
+    let k0 = unsafe { k0.as_ref() };
+    let k1 = unsafe { k1.as_ref() };
+    k0 < k1
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_incoming_viewing_key_eq(
+    k0: *const IncomingViewingKey,
+    k1: *const IncomingViewingKey,
+) -> bool {
+    let k0 = unsafe { k0.as_ref() };
+    let k1 = unsafe { k1.as_ref() };
+    k0 == k1
+}
+
+//
+// Full viewing keys
+//
+
+#[no_mangle]
+pub extern "C" fn orchard_full_viewing_key_clone(
+    key: *const FullViewingKey,
+) -> *mut FullViewingKey {
+    unsafe { key.as_ref() }
+        .map(|key| Box::into_raw(Box::new(key.clone())))
+        .unwrap_or(std::ptr::null_mut())
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_full_viewing_key_free(key: *mut FullViewingKey) {
+    if !key.is_null() {
+        drop(unsafe { Box::from_raw(key) });
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_full_viewing_key_parse(
+    stream: Option<StreamObj>,
+    read_cb: Option<ReadCb>,
+) -> *mut FullViewingKey {
+    let reader = CppStreamReader::from_raw_parts(stream, read_cb.unwrap());
+
+    match FullViewingKey::read(reader) {
+        Err(e) => {
+            error!(
+                "Stream failure reading bytes of Orchard full viewing key: {}",
+                e
+            );
+            std::ptr::null_mut()
+        }
+        Ok(fvk) => Box::into_raw(Box::new(fvk)),
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_full_viewing_key_serialize(
+    key: *const FullViewingKey,
+    stream: Option<StreamObj>,
+    write_cb: Option<WriteCb>,
+) -> bool {
+    let key = unsafe { key.as_ref() }.expect("Orchard full viewing key pointer may not be null.");
+
+    let mut writer = CppStreamWriter::from_raw_parts(stream, write_cb.unwrap());
+    match key.write(&mut writer) {
+        Ok(()) => true,
+        Err(e) => {
+            error!("Stream failure writing Orchard full viewing key: {}", e);
+            false
+        }
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_full_viewing_key_to_incoming_viewing_key(
+    key: *const FullViewingKey,
+) -> *mut IncomingViewingKey {
+    unsafe { key.as_ref() }
+        .map(|key| Box::into_raw(Box::new(IncomingViewingKey::from(key))))
+        .unwrap_or(std::ptr::null_mut())
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_full_viewing_key_to_internal_incoming_viewing_key(
+    fvk: *const FullViewingKey,
+) -> *mut IncomingViewingKey {
+    unsafe { fvk.as_ref() }
+        .map(|fvk| {
+            let internal_fvk = fvk.derive_internal();
+            Box::into_raw(Box::new(IncomingViewingKey::from(&internal_fvk)))
+        })
+        .unwrap_or(std::ptr::null_mut())
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_full_viewing_key_to_external_outgoing_viewing_key(
+    fvk: *const FullViewingKey,
+    ovk_ret: *mut [u8; 32],
+) {
+    let fvk = unsafe { fvk.as_ref() }.expect("fvk must not be null");
+    let ovk_ret = unsafe { ovk_ret.as_mut() }.expect("ovk_ret must not be null");
+
+    let ovk = OutgoingViewingKey::from(fvk);
+    *ovk_ret = *ovk.as_ref();
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_full_viewing_key_to_internal_outgoing_viewing_key(
+    fvk: *const FullViewingKey,
+    ovk_ret: *mut [u8; 32],
+) {
+    let fvk = unsafe { fvk.as_ref() }.expect("fvk must not be null");
+    let ovk_ret = unsafe { ovk_ret.as_mut() }.expect("ovk_ret must not be null");
+
+    let internal_fvk = fvk.derive_internal();
+    let ovk = OutgoingViewingKey::from(&internal_fvk);
+    *ovk_ret = *ovk.as_ref();
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_full_viewing_key_eq(
+    k0: *const FullViewingKey,
+    k1: *const FullViewingKey,
+) -> bool {
+    let k0 = unsafe { k0.as_ref() };
+    let k1 = unsafe { k1.as_ref() };
+    k0 == k1
+}
+
+//
+// Spending keys
+//
+
+#[no_mangle]
+pub extern "C" fn orchard_spending_key_for_account(
+    seed: *const u8,
+    seed_len: usize,
+    bip44_coin_type: u32,
+    account_id: u32,
+) -> *mut SpendingKey {
+    let seed = unsafe { slice::from_raw_parts(seed, seed_len) };
+    SpendingKey::from_zip32_seed(seed, bip44_coin_type, account_id)
+        .map(|key| Box::into_raw(Box::new(key)))
+        .unwrap_or(std::ptr::null_mut())
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_spending_key_clone(key: *const SpendingKey) -> *mut SpendingKey {
+    unsafe { key.as_ref() }
+        .map(|key| Box::into_raw(Box::new(*key)))
+        .unwrap_or(std::ptr::null_mut())
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_spending_key_free(key: *mut SpendingKey) {
+    if !key.is_null() {
+        drop(unsafe { Box::from_raw(key) });
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_spending_key_parse(
+    stream: Option<StreamObj>,
+    read_cb: Option<ReadCb>,
+) -> *mut SpendingKey {
+    let mut reader = CppStreamReader::from_raw_parts(stream, read_cb.unwrap());
+
+    let mut buf = [0u8; 32];
+    match reader.read_exact(&mut buf) {
+        Err(e) => {
+            error!(
+                "Stream failure reading bytes of Orchard spending key: {}",
+                e
+            );
+            std::ptr::null_mut()
+        }
+        Ok(()) => {
+            let sk_opt = SpendingKey::from_bytes(buf);
+            if sk_opt.is_some().into() {
+                Box::into_raw(Box::new(sk_opt.unwrap()))
+            } else {
+                error!("Failed to parse Orchard spending key.");
+                std::ptr::null_mut()
+            }
+        }
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_spending_key_serialize(
+    key: *const SpendingKey,
+    stream: Option<StreamObj>,
+    write_cb: Option<WriteCb>,
+) -> bool {
+    let key = unsafe { key.as_ref() }.expect("Orchard spending key pointer may not be null.");
+
+    let mut writer = CppStreamWriter::from_raw_parts(stream, write_cb.unwrap());
+    match writer.write_all(key.to_bytes()) {
+        Ok(()) => true,
+        Err(e) => {
+            error!("Stream failure writing Orchard spending key: {}", e);
+            false
+        }
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_spending_key_to_full_viewing_key(
+    key: *const SpendingKey,
+) -> *mut FullViewingKey {
+    unsafe { key.as_ref() }
+        .map(|key| Box::into_raw(Box::new(FullViewingKey::from(key))))
+        .unwrap_or(std::ptr::null_mut())
+}
diff --git a/src/rust/src/rustzcash.rs b/src/rust/src/rustzcash.rs
index c4b1e6125bf..f5b85fd67f6 100644
--- a/src/rust/src/rustzcash.rs
+++ b/src/rust/src/rustzcash.rs
@@ -29,8 +29,9 @@ use std::fs::File;
 use std::io::BufReader;
 use std::path::{Path, PathBuf};
 use std::slice;
+use std::sync::Once;
 use subtle::CtOption;
-use tracing::info;
+use tracing::{error, info};
 
 #[cfg(not(target_os = "windows"))]
 use std::ffi::OsStr;
@@ -46,14 +47,16 @@ use zcash_primitives::{
     block::equihash,
     constants::{CRH_IVK_PERSONALIZATION, PROOF_GENERATION_KEY_GENERATOR, SPENDING_KEY_GENERATOR},
     merkle_tree::MerklePath,
-    sapling::{merkle_hash, spend_sig},
     sapling::{
+        self,
+        keys::FullViewingKey,
         note_encryption::sapling_ka_agree,
         redjubjub::{self, Signature},
         Diversifier, Note, PaymentAddress, ProofGenerationKey, Rseed, ViewingKey,
     },
+    sapling::{merkle_hash, spend_sig},
     transaction::components::Amount,
-    zip32,
+    zip32::{self, sapling_address, sapling_derive_internal_fvk, sapling_find_address},
 };
 use zcash_proofs::{
     circuit::sapling::TREE_DEPTH as SAPLING_TREE_DEPTH,
@@ -67,11 +70,18 @@ mod ed25519;
 mod metrics_ffi;
 mod streams_ffi;
 mod tracing_ffi;
+mod zcashd_orchard;
 
 mod address_ffi;
+mod builder_ffi;
 mod history_ffi;
+mod incremental_merkle_tree;
+mod incremental_merkle_tree_ffi;
 mod orchard_ffi;
+mod orchard_keys_ffi;
 mod transaction_ffi;
+mod unified_keys_ffi;
+mod wallet;
 mod zip339_ffi;
 
 mod test_harness_ffi;
@@ -79,6 +89,7 @@ mod test_harness_ffi;
 #[cfg(test)]
 mod tests;
 
+static PROOF_PARAMETERS_LOADED: Once = Once::new();
 static mut SAPLING_SPEND_VK: Option<PreparedVerifyingKey<Bls12>> = None;
 static mut SAPLING_OUTPUT_VK: Option<PreparedVerifyingKey<Bls12>> = None;
 static mut SPROUT_GROTH16_VK: Option<PreparedVerifyingKey<Bls12>> = None;
@@ -122,64 +133,66 @@ pub extern "C" fn librustzcash_init_zksnark_params(
     #[cfg(target_os = "windows")] sprout_path: *const u16,
     sprout_path_len: usize,
 ) {
-    #[cfg(not(target_os = "windows"))]
-    let (spend_path, output_path, sprout_path) = {
-        (
-            OsStr::from_bytes(unsafe { slice::from_raw_parts(spend_path, spend_path_len) }),
-            OsStr::from_bytes(unsafe { slice::from_raw_parts(output_path, output_path_len) }),
-            if sprout_path.is_null() {
-                None
-            } else {
-                Some(OsStr::from_bytes(unsafe {
-                    slice::from_raw_parts(sprout_path, sprout_path_len)
-                }))
-            },
-        )
-    };
-
-    #[cfg(target_os = "windows")]
-    let (spend_path, output_path, sprout_path) = {
-        (
-            OsString::from_wide(unsafe { slice::from_raw_parts(spend_path, spend_path_len) }),
-            OsString::from_wide(unsafe { slice::from_raw_parts(output_path, output_path_len) }),
-            if sprout_path.is_null() {
-                None
-            } else {
-                Some(OsString::from_wide(unsafe {
-                    slice::from_raw_parts(sprout_path, sprout_path_len)
-                }))
-            },
-        )
-    };
-
-    let (spend_path, output_path, sprout_path) = (
-        Path::new(&spend_path),
-        Path::new(&output_path),
-        sprout_path.as_ref().map(|p| Path::new(p)),
-    );
-
-    // Load params
-    let params = load_parameters(spend_path, output_path, sprout_path);
-
-    // Generate Orchard parameters.
-    info!(target: "main", "Loading Orchard parameters");
-    let orchard_pk = orchard::circuit::ProvingKey::build();
-    let orchard_vk = orchard::circuit::VerifyingKey::build();
-
-    // Caller is responsible for calling this function once, so
-    // these global mutations are safe.
-    unsafe {
-        SAPLING_SPEND_PARAMS = Some(params.spend_params);
-        SAPLING_OUTPUT_PARAMS = Some(params.output_params);
-        SPROUT_GROTH16_PARAMS_PATH = sprout_path.map(|p| p.to_owned());
-
-        SAPLING_SPEND_VK = Some(params.spend_vk);
-        SAPLING_OUTPUT_VK = Some(params.output_vk);
-        SPROUT_GROTH16_VK = params.sprout_vk;
-
-        ORCHARD_PK = Some(orchard_pk);
-        ORCHARD_VK = Some(orchard_vk);
-    }
+    PROOF_PARAMETERS_LOADED.call_once(|| {
+        #[cfg(not(target_os = "windows"))]
+        let (spend_path, output_path, sprout_path) = {
+            (
+                OsStr::from_bytes(unsafe { slice::from_raw_parts(spend_path, spend_path_len) }),
+                OsStr::from_bytes(unsafe { slice::from_raw_parts(output_path, output_path_len) }),
+                if sprout_path.is_null() {
+                    None
+                } else {
+                    Some(OsStr::from_bytes(unsafe {
+                        slice::from_raw_parts(sprout_path, sprout_path_len)
+                    }))
+                },
+            )
+        };
+
+        #[cfg(target_os = "windows")]
+        let (spend_path, output_path, sprout_path) = {
+            (
+                OsString::from_wide(unsafe { slice::from_raw_parts(spend_path, spend_path_len) }),
+                OsString::from_wide(unsafe { slice::from_raw_parts(output_path, output_path_len) }),
+                if sprout_path.is_null() {
+                    None
+                } else {
+                    Some(OsString::from_wide(unsafe {
+                        slice::from_raw_parts(sprout_path, sprout_path_len)
+                    }))
+                },
+            )
+        };
+
+        let (spend_path, output_path, sprout_path) = (
+            Path::new(&spend_path),
+            Path::new(&output_path),
+            sprout_path.as_ref().map(Path::new),
+        );
+
+        // Load params
+        let params = load_parameters(spend_path, output_path, sprout_path);
+
+        // Generate Orchard parameters.
+        info!(target: "main", "Loading Orchard parameters");
+        let orchard_pk = orchard::circuit::ProvingKey::build();
+        let orchard_vk = orchard::circuit::VerifyingKey::build();
+
+        // Caller is responsible for calling this function once, so
+        // these global mutations are safe.
+        unsafe {
+            SAPLING_SPEND_PARAMS = Some(params.spend_params);
+            SAPLING_OUTPUT_PARAMS = Some(params.output_params);
+            SPROUT_GROTH16_PARAMS_PATH = sprout_path.map(|p| p.to_owned());
+
+            SAPLING_SPEND_VK = Some(params.spend_vk);
+            SAPLING_OUTPUT_VK = Some(params.output_vk);
+            SPROUT_GROTH16_VK = params.sprout_vk;
+
+            ORCHARD_PK = Some(orchard_pk);
+            ORCHARD_VK = Some(orchard_vk);
+        }
+    });
 }
 
 /// Writes the "uncommitted" note value for empty leaves of the Merkle tree.
@@ -527,13 +540,23 @@ pub extern "C" fn librustzcash_eh_isvalid(
     soln: *const c_uchar,
     soln_len: size_t,
 ) -> bool {
-    if (k >= n) || (n % 8 != 0) || (soln_len != (1 << k) * ((n / (k + 1)) as usize + 1) / 8) {
+    let expected_soln_len = (1 << k) * ((n / (k + 1)) as usize + 1) / 8;
+    if (k >= n) || (n % 8 != 0) || (soln_len != expected_soln_len) {
+        error!(
+            "eh_isvalid: params wrong, n={}, k={}, soln_len={} expected={}",
+            n, k, soln_len, expected_soln_len,
+        );
         return false;
     }
     let rs_input = unsafe { slice::from_raw_parts(input, input_len) };
     let rs_nonce = unsafe { slice::from_raw_parts(nonce, nonce_len) };
     let rs_soln = unsafe { slice::from_raw_parts(soln, soln_len) };
-    equihash::is_valid_solution(n, k, rs_input, rs_nonce, rs_soln).is_ok()
+    if let Err(e) = equihash::is_valid_solution(n, k, rs_input, rs_nonce, rs_soln) {
+        error!("eh_isvalid: is_valid_solution: {}", e);
+        false
+    } else {
+        true
+    }
 }
 
 /// Creates a Sapling verification context. Please free this when you're done.
@@ -1024,7 +1047,7 @@ pub extern "C" fn librustzcash_sapling_proving_ctx_free(ctx: *mut SaplingProving
 
 /// Derive the master ExtendedSpendingKey from a seed.
 #[no_mangle]
-pub extern "C" fn librustzcash_zip32_xsk_master(
+pub extern "C" fn librustzcash_zip32_sapling_xsk_master(
     seed: *const c_uchar,
     seedlen: size_t,
     xsk_master: *mut [c_uchar; 169],
@@ -1039,7 +1062,7 @@ pub extern "C" fn librustzcash_zip32_xsk_master(
 
 /// Derive a child ExtendedSpendingKey from a parent.
 #[no_mangle]
-pub extern "C" fn librustzcash_zip32_xsk_derive(
+pub extern "C" fn librustzcash_zip32_sapling_xsk_derive(
     xsk_parent: *const [c_uchar; 169],
     i: u32,
     xsk_i: *mut [c_uchar; 169],
@@ -1054,9 +1077,26 @@ pub extern "C" fn librustzcash_zip32_xsk_derive(
         .expect("should be able to serialize an ExtendedSpendingKey");
 }
 
+/// Derive the Sapling internal spending key from the external extended
+/// spending key
+#[no_mangle]
+pub extern "C" fn librustzcash_zip32_sapling_xsk_derive_internal(
+    xsk_external: *const [c_uchar; 169],
+    xsk_internal_ret: *mut [c_uchar; 169],
+) {
+    let xsk_external = zip32::ExtendedSpendingKey::read(&unsafe { *xsk_external }[..])
+        .expect("valid ExtendedSpendingKey");
+
+    let xsk_internal = xsk_external.derive_internal();
+
+    xsk_internal
+        .write(&mut (unsafe { &mut *xsk_internal_ret })[..])
+        .expect("should be able to serialize an ExtendedSpendingKey");
+}
+
 /// Derive a child ExtendedFullViewingKey from a parent.
 #[no_mangle]
-pub extern "C" fn librustzcash_zip32_xfvk_derive(
+pub extern "C" fn librustzcash_zip32_sapling_xfvk_derive(
     xfvk_parent: *const [c_uchar; 169],
     i: u32,
     xfvk_i: *mut [c_uchar; 169],
@@ -1076,30 +1116,87 @@ pub extern "C" fn librustzcash_zip32_xfvk_derive(
     true
 }
 
+/// Derive the Sapling internal full viewing key from the corresponding external full viewing key
+#[no_mangle]
+pub extern "C" fn librustzcash_zip32_sapling_derive_internal_fvk(
+    fvk: *const [c_uchar; 96],
+    dk: *const [c_uchar; 32],
+    fvk_ret: *mut [c_uchar; 96],
+    dk_ret: *mut [c_uchar; 32],
+) {
+    let fvk = FullViewingKey::read(&unsafe { *fvk }[..]).expect("valid Sapling FullViewingKey");
+    let dk = zip32::DiversifierKey(unsafe { *dk });
+
+    let (fvk_internal, dk_internal) = sapling_derive_internal_fvk(&fvk, &dk);
+    let fvk_ret = unsafe { &mut *fvk_ret };
+    let dk_ret = unsafe { &mut *dk_ret };
+
+    fvk_ret.copy_from_slice(&fvk_internal.to_bytes());
+    dk_ret.copy_from_slice(&dk_internal.0);
+}
+
+/// Derive a PaymentAddress from an ExtendedFullViewingKey.
+#[no_mangle]
+pub extern "C" fn librustzcash_zip32_sapling_address(
+    fvk: *const [c_uchar; 96],
+    dk: *const [c_uchar; 32],
+    j: *const [c_uchar; 11],
+    addr_ret: *mut [c_uchar; 43],
+) -> bool {
+    let fvk = FullViewingKey::read(&unsafe { *fvk }[..]).expect("valid Sapling FullViewingKey");
+    let dk = zip32::DiversifierKey(unsafe { *dk });
+    let j = zip32::DiversifierIndex(unsafe { *j });
+
+    match sapling_address(&fvk, &dk, j) {
+        Some(addr) => {
+            let addr_ret = unsafe { &mut *addr_ret };
+            addr_ret.copy_from_slice(&addr.to_bytes());
+
+            true
+        }
+        None => false,
+    }
+}
+
 /// Derive a PaymentAddress from an ExtendedFullViewingKey.
 #[no_mangle]
-pub extern "C" fn librustzcash_zip32_xfvk_address(
-    xfvk: *const [c_uchar; 169],
+pub extern "C" fn librustzcash_zip32_find_sapling_address(
+    fvk: *const [c_uchar; 96],
+    dk: *const [c_uchar; 32],
     j: *const [c_uchar; 11],
     j_ret: *mut [c_uchar; 11],
     addr_ret: *mut [c_uchar; 43],
 ) -> bool {
-    let xfvk = zip32::ExtendedFullViewingKey::read(&unsafe { *xfvk }[..])
-        .expect("valid ExtendedFullViewingKey");
+    let fvk = FullViewingKey::read(&unsafe { *fvk }[..]).expect("valid Sapling FullViewingKey");
+    let dk = zip32::DiversifierKey(unsafe { *dk });
     let j = zip32::DiversifierIndex(unsafe { *j });
 
-    let addr = match xfvk.address(j) {
-        Ok(addr) => addr,
-        Err(_) => return false,
-    };
+    match sapling_find_address(&fvk, &dk, j) {
+        Some((j, addr)) => {
+            let j_ret = unsafe { &mut *j_ret };
+            let addr_ret = unsafe { &mut *addr_ret };
 
-    let j_ret = unsafe { &mut *j_ret };
-    let addr_ret = unsafe { &mut *addr_ret };
+            j_ret.copy_from_slice(&j.0);
+            addr_ret.copy_from_slice(&addr.to_bytes());
+
+            true
+        }
+        None => false,
+    }
+}
 
-    j_ret.copy_from_slice(&(addr.0).0);
-    addr_ret.copy_from_slice(&addr.1.to_bytes());
+#[no_mangle]
+pub extern "C" fn librustzcash_sapling_diversifier_index(
+    dk: *const [c_uchar; 32],
+    d: *const [c_uchar; 11],
+    j_ret: *mut [c_uchar; 11],
+) {
+    let dk = zip32::DiversifierKey(unsafe { *dk });
+    let diversifier = sapling::Diversifier(unsafe { *d });
+    let j_ret = unsafe { &mut *j_ret };
 
-    true
+    let j = dk.diversifier_index(&diversifier);
+    j_ret.copy_from_slice(&j.0);
 }
 
 #[no_mangle]
diff --git a/src/rust/src/transaction_ffi.rs b/src/rust/src/transaction_ffi.rs
index e2515671fed..3169ce53630 100644
--- a/src/rust/src/transaction_ffi.rs
+++ b/src/rust/src/transaction_ffi.rs
@@ -56,8 +56,8 @@ pub extern "C" fn zcash_transaction_digests(
 }
 
 pub struct PrecomputedTxParts {
-    tx: Transaction,
-    txid_parts: TxDigests<Hash>,
+    pub(crate) tx: Transaction,
+    pub(crate) txid_parts: TxDigests<Hash>,
 }
 
 /// Precomputes the `TxDigest` struct for the given transaction.
diff --git a/src/rust/src/unified_keys_ffi.rs b/src/rust/src/unified_keys_ffi.rs
new file mode 100644
index 00000000000..a676f956e7f
--- /dev/null
+++ b/src/rust/src/unified_keys_ffi.rs
@@ -0,0 +1,217 @@
+use libc::c_char;
+use std::ffi::{CStr, CString};
+use tracing::error;
+
+use zcash_address::unified::{Container, Encoding, Fvk, Ufvk};
+use zcash_primitives::legacy::keys::AccountPubKey;
+
+use crate::address_ffi::network_from_cstr;
+
+#[no_mangle]
+pub extern "C" fn unified_full_viewing_key_free(key: *mut Ufvk) {
+    if !key.is_null() {
+        drop(unsafe { Box::from_raw(key) });
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn unified_full_viewing_key_clone(key: *const Ufvk) -> *mut Ufvk {
+    unsafe { key.as_ref() }
+        .map(|key| Box::into_raw(Box::new(key.clone())))
+        .unwrap_or(std::ptr::null_mut())
+}
+
+#[no_mangle]
+pub extern "C" fn unified_full_viewing_key_parse(
+    network: *const c_char,
+    encoded: *const c_char,
+) -> *mut Ufvk {
+    let network = match network_from_cstr(network) {
+        Some(n) => n,
+        None => {
+            return std::ptr::null_mut();
+        }
+    };
+
+    match unsafe { CStr::from_ptr(encoded) }.to_str() {
+        Ok(encoded) => match Ufvk::decode(encoded) {
+            Ok((parsed_network, fvk)) if parsed_network == network => {
+                // ZIP 316: Consumers MUST reject Unified Addresses/Viewing Keys in which
+                // any constituent Item does not meet the validation requirements of its
+                // encoding.
+                for item in fvk.items() {
+                    match item {
+                        Fvk::Orchard(data) => {
+                            if orchard::keys::FullViewingKey::from_bytes(&data).is_none() {
+                                error!("Unified FVK contains invalid Orchard FVK");
+                                return std::ptr::null_mut();
+                            }
+                        }
+                        Fvk::Sapling(data) => {
+                            // The last 32 bytes is the diversifier key, which is opaque.
+                            // The remaining 96 bytes should be a valid Sapling FVK.
+                            if zcash_primitives::sapling::keys::FullViewingKey::read(&data[..96])
+                                .is_err()
+                            {
+                                error!("Unified FVK contains invalid Sapling FVK");
+                                return std::ptr::null_mut();
+                            }
+                        }
+                        Fvk::P2pkh(data) => {
+                            // The first 32 bytes is the chaincode, which is opaque.
+                            // The remaining 33 bytes should be the compressed encoding of
+                            // a secp256k1 point.
+                            if let Err(e) = secp256k1::PublicKey::from_slice(&data[32..]) {
+                                error!("Unified FVK contains invalid transparent FVK: {}", e);
+                                return std::ptr::null_mut();
+                            }
+                        }
+                        // Can't check anything for unknown typecodes.
+                        Fvk::Unknown { .. } => (),
+                    }
+                }
+                Box::into_raw(Box::new(fvk))
+            }
+            Ok((parsed_network, _)) => {
+                error!(
+                    "Key was encoded for a different network ({:?}) than what was requested ({:?})",
+                    parsed_network, network,
+                );
+                std::ptr::null_mut()
+            }
+            Err(e) => {
+                error!("Failure decoding unified full viewing key: {}", e);
+                std::ptr::null_mut()
+            }
+        },
+        Err(e) => {
+            error!("Failure reading bytes of unified full viewing key: {}", e);
+            std::ptr::null_mut()
+        }
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn unified_full_viewing_key_serialize(
+    network: *const c_char,
+    key: *const Ufvk,
+) -> *mut c_char {
+    let key = unsafe { key.as_ref() }.expect("Unified full viewing key pointer may not be null.");
+    match network_from_cstr(network) {
+        Some(n) => CString::new(key.encode(&n)).unwrap().into_raw(),
+        None => std::ptr::null_mut(),
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn unified_full_viewing_key_read_transparent(
+    key: *const Ufvk,
+    out: *mut [u8; 65],
+) -> bool {
+    let key = unsafe { key.as_ref() }.expect("Unified full viewing key pointer may not be null.");
+    let out = unsafe { &mut *out };
+
+    for r in &key.items() {
+        if let Fvk::P2pkh(data) = r {
+            *out = *data;
+            return true;
+        }
+    }
+
+    false
+}
+
+#[no_mangle]
+pub extern "C" fn unified_full_viewing_key_read_sapling(
+    key: *const Ufvk,
+    out: *mut [u8; 128],
+) -> bool {
+    let key = unsafe { key.as_ref() }.expect("Unified full viewing key pointer may not be null.");
+    let out = unsafe { &mut *out };
+
+    for r in &key.items() {
+        if let Fvk::Sapling(data) = r {
+            *out = *data;
+            return true;
+        }
+    }
+
+    false
+}
+
+#[no_mangle]
+pub extern "C" fn unified_full_viewing_key_read_orchard(
+    key: *const Ufvk,
+    out: *mut [u8; 96],
+) -> bool {
+    let key = unsafe { key.as_ref() }.expect("Unified full viewing key pointer may not be null.");
+    let out = unsafe { &mut *out };
+
+    for r in &key.items() {
+        if let Fvk::Orchard(data) = r {
+            *out = *data;
+            return true;
+        }
+    }
+
+    false
+}
+
+#[no_mangle]
+pub extern "C" fn unified_full_viewing_key_from_components(
+    t_key: *const [u8; 65],
+    sapling_key: *const [u8; 128],
+    orchard_key: *const [u8; 96],
+) -> *mut Ufvk {
+    let t_key = unsafe { t_key.as_ref() };
+    let sapling_key = unsafe { sapling_key.as_ref() };
+    let orchard_key = unsafe { orchard_key.as_ref() };
+
+    let mut items = vec![];
+    if let Some(t_bytes) = t_key {
+        items.push(Fvk::P2pkh(*t_bytes));
+    }
+    if let Some(sapling_bytes) = sapling_key {
+        items.push(Fvk::Sapling(*sapling_bytes));
+    }
+    if let Some(orchard_bytes) = orchard_key {
+        items.push(Fvk::Orchard(*orchard_bytes));
+    }
+
+    match Ufvk::try_from_items(items) {
+        Ok(ufvk) => Box::into_raw(Box::new(ufvk)),
+        Err(e) => {
+            error!(
+                "An error occurred constructing the unified full viewing key: {:?}",
+                e
+            );
+            std::ptr::null_mut()
+        }
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn transparent_key_ovks(
+    t_key: *const [u8; 65],
+    internal_ovk_ret: *mut [u8; 32],
+    external_ovk_ret: *mut [u8; 32],
+) -> bool {
+    let key_bytes = unsafe { t_key.as_ref() }.expect("Transparent FVK pointer may not be null.");
+    let internal_ovk = unsafe { &mut *internal_ovk_ret };
+    let external_ovk = unsafe { &mut *external_ovk_ret };
+    match AccountPubKey::deserialize(key_bytes) {
+        Ok(epubkey) => {
+            let (internal, external) = epubkey.ovks_for_shielding();
+            *internal_ovk = internal.as_bytes();
+            *external_ovk = external.as_bytes();
+            true
+        }
+        Err(e) => {
+            error!(
+                "An error occurred parsing the transparent full viewing key: {:?}",
+                e
+            );
+            false
+        }
+    }
+}
diff --git a/src/rust/src/wallet.rs b/src/rust/src/wallet.rs
new file mode 100644
index 00000000000..6d4670f4749
--- /dev/null
+++ b/src/rust/src/wallet.rs
@@ -0,0 +1,1212 @@
+use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
+use incrementalmerkletree::{bridgetree::BridgeTree, Frontier, Position, Tree};
+use libc::c_uchar;
+use std::collections::{BTreeMap, BTreeSet};
+use std::convert::TryInto;
+use std::io;
+use std::ptr;
+use std::slice;
+use tracing::error;
+
+use zcash_encoding::Optional;
+use zcash_primitives::{
+    consensus::BlockHeight,
+    transaction::{components::Amount, TxId},
+};
+
+use orchard::{
+    bundle::Authorized,
+    keys::{FullViewingKey, IncomingViewingKey, OutgoingViewingKey, SpendingKey},
+    note::Nullifier,
+    tree::{MerkleHashOrchard, MerklePath},
+    Address, Bundle, Note,
+};
+
+use crate::{
+    builder_ffi::OrchardSpendInfo,
+    incremental_merkle_tree::{read_tree, write_tree},
+    incremental_merkle_tree_ffi::MERKLE_DEPTH,
+    streams_ffi::{CppStreamReader, CppStreamWriter, ReadCb, StreamObj, WriteCb},
+    zcashd_orchard::OrderedAddress,
+};
+
+pub const MAX_CHECKPOINTS: usize = 100;
+
+/// A data structure tracking the last transaction whose notes
+/// have been added to the wallet's note commitment tree.
+#[derive(Debug, Clone)]
+pub struct LastObserved {
+    block_height: BlockHeight,
+    block_tx_idx: Option<usize>,
+}
+
+/// A pointer to a particular action in an Orchard transaction output.
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub struct OutPoint {
+    txid: TxId,
+    action_idx: usize,
+}
+
+/// A pointer to a previous output being spent in an Orchard action.
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub struct InPoint {
+    txid: TxId,
+    action_idx: usize,
+}
+
+#[derive(Debug, Clone)]
+pub struct DecryptedNote {
+    note: Note,
+    memo: [u8; 512],
+    /// The position of the note's commitment within the global Merkle tree.
+    position: Option<Position>,
+}
+
+/// A data structure tracking the note data that was decrypted from a single transaction,
+/// along with the height at which that transaction was discovered in the chain.
+#[derive(Debug, Clone)]
+pub struct TxNotes {
+    /// The block height containing the transaction from which these
+    /// notes were decrypted.
+    tx_height: Option<BlockHeight>,
+    /// A map from the index of the Orchard action from which this note
+    /// was decrypted to the decrypted note value.
+    decrypted_notes: BTreeMap<usize, DecryptedNote>,
+}
+
+struct KeyStore {
+    payment_addresses: BTreeMap<OrderedAddress, IncomingViewingKey>,
+    viewing_keys: BTreeMap<IncomingViewingKey, FullViewingKey>,
+    spending_keys: BTreeMap<FullViewingKey, SpendingKey>,
+}
+
+impl KeyStore {
+    pub fn empty() -> Self {
+        KeyStore {
+            payment_addresses: BTreeMap::new(),
+            viewing_keys: BTreeMap::new(),
+            spending_keys: BTreeMap::new(),
+        }
+    }
+
+    pub fn add_full_viewing_key(&mut self, fvk: FullViewingKey) {
+        // When we add a full viewing key, we need to add both the internal and external
+        // incoming viewing keys.
+        let external_ivk = IncomingViewingKey::from(&fvk);
+        let internal_ivk = IncomingViewingKey::from(&fvk.derive_internal());
+        self.viewing_keys.insert(external_ivk, fvk.clone());
+        self.viewing_keys.insert(internal_ivk, fvk);
+    }
+
+    pub fn add_spending_key(&mut self, sk: SpendingKey) {
+        let fvk = FullViewingKey::from(&sk);
+        self.add_full_viewing_key(fvk.clone());
+        self.spending_keys.insert(fvk, sk);
+    }
+
+    /// Adds an address/ivk pair to the wallet, and returns `true` if the IVK
+    /// corresponds to a FVK known by this wallet, `false` otherwise.
+    pub fn add_raw_address(&mut self, addr: Address, ivk: IncomingViewingKey) -> bool {
+        let has_fvk = self.viewing_keys.contains_key(&ivk);
+        self.payment_addresses
+            .insert(OrderedAddress::new(addr), ivk);
+        has_fvk
+    }
+
+    pub fn spending_key_for_ivk(&self, ivk: &IncomingViewingKey) -> Option<&SpendingKey> {
+        self.viewing_keys
+            .get(ivk)
+            .and_then(|fvk| self.spending_keys.get(fvk))
+    }
+
+    pub fn ivk_for_address(&self, addr: &Address) -> Option<&IncomingViewingKey> {
+        self.payment_addresses.get(&OrderedAddress::new(*addr))
+    }
+
+    pub fn get_nullifier(&self, note: &Note) -> Option<Nullifier> {
+        self.ivk_for_address(&note.recipient())
+            .and_then(|ivk| self.viewing_keys.get(ivk))
+            .map(|fvk| note.nullifier(fvk))
+    }
+}
+
+pub struct Wallet {
+    /// The in-memory index of keys and addresses known to the wallet.
+    key_store: KeyStore,
+    /// The in-memory index from txid to notes from the associated transaction that have
+    /// been decrypted with the IVKs known to this wallet.
+    wallet_received_notes: BTreeMap<TxId, TxNotes>,
+    /// The in-memory index from nullifier to the outpoint of the note from which that
+    /// nullifier was derived.
+    nullifiers: BTreeMap<Nullifier, OutPoint>,
+    /// The incremental Merkle tree used to track note commitments and witnesses for notes
+    /// belonging to the wallet.
+    witness_tree: BridgeTree<MerkleHashOrchard, MERKLE_DEPTH>,
+    /// The block height at which the last checkpoint was created, if any.
+    last_checkpoint: Option<BlockHeight>,
+    /// The block height and transaction index of the note most recently added to
+    /// `witness_tree`
+    last_observed: Option<LastObserved>,
+    /// Notes marked as mined as a consequence of their nullifiers having been observed
+    /// in bundle action inputs in bundles appended to the commitment tree.  The keys of
+    /// this map are the outpoints where the spent notes were created, and the values
+    /// are the inpoints identifying the actions in which they are spent.
+    mined_notes: BTreeMap<OutPoint, InPoint>,
+    /// For each nullifier which appears more than once in transactions that this
+    /// wallet has observed, the set of inpoints where those nullifiers were
+    /// observed as as having been spent.
+    potential_spends: BTreeMap<Nullifier, BTreeSet<InPoint>>,
+}
+
+#[derive(Debug, Clone)]
+pub enum WalletError {
+    OutOfOrder(LastObserved, BlockHeight, usize),
+    NoteCommitmentTreeFull,
+}
+
+#[derive(Debug, Clone)]
+pub enum RewindError {
+    /// The witness tree does not contain enough checkpoints to
+    /// rewind to the requested height. The number of blocks that
+    /// it is possible to rewind is returned as the payload of
+    /// this error.
+    InsufficientCheckpoints(usize),
+}
+
+#[derive(Debug, Clone)]
+pub enum BundleLoadError {
+    /// The action at the specified index failed to decrypt with
+    /// the provided IVK.
+    ActionDecryptionFailed(usize),
+    /// The wallet did not contain the full viewing key corresponding
+    /// to the incoming viewing key that successfullly decrypted a
+    /// note.
+    FvkNotFound(IncomingViewingKey),
+    /// An action index identified as potentially spending one of our
+    /// notes is not a valid action index for the bundle.
+    InvalidActionIndex(usize),
+}
+
+/// A struct used to return metadata about how a bundle was determined
+/// to be involved with the wallet.
+#[derive(Debug, Clone)]
+pub struct BundleWalletInvolvement {
+    receive_action_metadata: BTreeMap<usize, IncomingViewingKey>,
+    spend_action_metadata: Vec<usize>,
+}
+
+impl BundleWalletInvolvement {
+    pub fn new() -> Self {
+        BundleWalletInvolvement {
+            receive_action_metadata: BTreeMap::new(),
+            spend_action_metadata: Vec::new(),
+        }
+    }
+}
+
+impl Wallet {
+    pub fn empty() -> Self {
+        Wallet {
+            key_store: KeyStore::empty(),
+            wallet_received_notes: BTreeMap::new(),
+            nullifiers: BTreeMap::new(),
+            witness_tree: BridgeTree::new(MAX_CHECKPOINTS),
+            last_checkpoint: None,
+            last_observed: None,
+            mined_notes: BTreeMap::new(),
+            potential_spends: BTreeMap::new(),
+        }
+    }
+
+    /// Reset the state of the wallet to be suitable for rescan from the NU5 activation
+    /// height.  This removes all witness and spentness information from the wallet. The
+    /// keystore is unmodified and decrypted note, nullifier, and conflict data are left
+    /// in place with the expectation that they will be overwritten and/or updated in
+    /// the rescan process.
+    pub fn reset(&mut self) {
+        for tx_notes in self.wallet_received_notes.values_mut() {
+            tx_notes.tx_height = None;
+        }
+        self.witness_tree = BridgeTree::new(MAX_CHECKPOINTS);
+        self.last_checkpoint = None;
+        self.last_observed = None;
+        self.mined_notes = BTreeMap::new();
+    }
+
+    /// Checkpoints the note commitment tree. This returns `false` and leaves the note
+    /// commitment tree unmodified if the block height does not immediately succeed
+    /// the last checkpointed block height (unless the note commitment tree is empty,
+    /// in which case it unconditionally succeeds). This must be called exactly once
+    /// per block.
+    pub fn checkpoint(&mut self, block_height: BlockHeight) -> bool {
+        // checkpoints must be in order of sequential block height and every
+        // block must be checkpointed
+        if self
+            .last_checkpoint
+            .map_or(false, |last_height| block_height != last_height + 1)
+        {
+            return false;
+        }
+
+        self.witness_tree.checkpoint();
+        self.last_checkpoint = Some(block_height);
+        true
+    }
+
+    /// Returns the last checkpoint if any. If no checkpoint exists, the wallet has not
+    /// yet observed any blocks.
+    pub fn last_checkpoint(&self) -> Option<BlockHeight> {
+        self.last_checkpoint
+    }
+
+    /// Rewinds the note commitment tree to the given height, removes notes and
+    /// spentness information for transactions mined in the removed blocks, and returns
+    /// the number of blocks by which the tree has been rewound if successful. Returns  
+    /// `RewindError` if not enough checkpoints exist to execute the full rewind
+    /// requested. If the requested height is greater than or equal to the height of the
+    /// latest checkpoint, this returns `Ok(0)` and leaves the wallet unmodified.
+    pub fn rewind(&mut self, to_height: BlockHeight) -> Result<u32, RewindError> {
+        if let Some(checkpoint_height) = self.last_checkpoint {
+            if to_height >= checkpoint_height {
+                return Ok(0);
+            }
+
+            let blocks_to_rewind = <u32>::from(checkpoint_height) - <u32>::from(to_height);
+
+            // if the rewind length exceeds the number of checkpoints we have stored,
+            // return failure.
+            let checkpoint_count = self.witness_tree.checkpoints().len();
+            if blocks_to_rewind as usize > checkpoint_count {
+                return Err(RewindError::InsufficientCheckpoints(checkpoint_count));
+            }
+
+            for _ in 0..blocks_to_rewind {
+                // we've already checked that we have enough checkpoints to fully
+                // rewind by the requested amount.
+                assert!(self.witness_tree.rewind());
+            }
+
+            // reset our last observed height to ensure that notes added in the future are
+            // from a new block
+            let last_observed = LastObserved {
+                block_height: checkpoint_height - blocks_to_rewind,
+                block_tx_idx: None,
+            };
+
+            // retain notes that correspond to transactions that are not "un-mined" after
+            // the rewind
+            let to_retain: BTreeSet<_> = self
+                .wallet_received_notes
+                .iter()
+                .filter_map(|(txid, n)| {
+                    if n.tx_height
+                        .map_or(true, |h| h <= last_observed.block_height)
+                    {
+                        Some(*txid)
+                    } else {
+                        None
+                    }
+                })
+                .collect();
+
+            self.mined_notes.retain(|_, v| to_retain.contains(&v.txid));
+            // nullifier and received note data are retained, because these values are stable
+            // once we've observed a note for the first time. The block height at which we
+            // observed the note is set to `None` as the transaction will no longer have been
+            // observed as having been mined.
+            for (txid, n) in self.wallet_received_notes.iter_mut() {
+                // Erase block height and commitment tree information for any received
+                // notes that have been un-mined by the rewind.
+                if !to_retain.contains(txid) {
+                    n.tx_height = None;
+                    for dnote in n.decrypted_notes.values_mut() {
+                        dnote.position = None;
+                    }
+                }
+            }
+            self.last_observed = Some(last_observed);
+            self.last_checkpoint = if checkpoint_count > blocks_to_rewind as usize {
+                Some(checkpoint_height - blocks_to_rewind)
+            } else {
+                // checkpoint_count == blocks_to_rewind
+                None
+            };
+
+            Ok(blocks_to_rewind)
+        } else {
+            Err(RewindError::InsufficientCheckpoints(0))
+        }
+    }
+
+    /// Add note data for those notes that are decryptable with one of this wallet's
+    /// incoming viewing keys to the wallet, and return a a data structure that describes
+    /// the actions that are involved with this wallet, either spending notes belonging
+    /// to this wallet or creating new notes owned by this wallet.
+    pub fn add_notes_from_bundle(
+        &mut self,
+        txid: &TxId,
+        bundle: &Bundle<Authorized, Amount>,
+    ) -> BundleWalletInvolvement {
+        let mut involvement = BundleWalletInvolvement::new();
+        // If we recognize any of our notes as being consumed as inputs to actions
+        // in this bundle, record them as potential spends.
+        involvement.spend_action_metadata = self.add_potential_spends(txid, bundle);
+
+        let keys = self
+            .key_store
+            .viewing_keys
+            .keys()
+            .cloned()
+            .collect::<Vec<_>>();
+
+        for (action_idx, ivk, note, recipient, memo) in bundle.decrypt_outputs_with_keys(&keys) {
+            assert!(self.add_decrypted_note(
+                None,
+                txid,
+                action_idx,
+                ivk.clone(),
+                note,
+                recipient,
+                memo
+            ));
+            involvement.receive_action_metadata.insert(action_idx, ivk);
+        }
+
+        involvement
+    }
+
+    /// Restore note and potential spend data from a bundle using the provided
+    /// metadata.
+    ///
+    /// - `tx_height`: if the transaction containing the bundle has been mined,
+    ///   this should contain the block height it was mined at
+    /// - `txid`: The ID for the transaction from which the provided bundle was
+    ///   extracted.
+    /// - `bundle`: the bundle to decrypt notes from
+    /// - `hints`: a map from action index to the incoming viewing key that decrypts
+    ///   that action. If the IVK does not decrypt the action, or if it is not
+    ///   associated with a FVK in this wallet, `load_bundle` will return an error.
+    /// - `potential_spend_idxs`: a list of action indices that were previously
+    ///   detected as spending our notes. If an index is out of range, `load_bundle`
+    ///   will return an error.
+    pub fn load_bundle(
+        &mut self,
+        tx_height: Option<BlockHeight>,
+        txid: &TxId,
+        bundle: &Bundle<Authorized, Amount>,
+        hints: BTreeMap<usize, &IncomingViewingKey>,
+        potential_spend_idxs: &[u32],
+    ) -> Result<(), BundleLoadError> {
+        for action_idx in potential_spend_idxs {
+            let action_idx: usize = (*action_idx).try_into().unwrap();
+            if action_idx < bundle.actions().len() {
+                self.add_potential_spend(
+                    bundle.actions()[action_idx].nullifier(),
+                    InPoint {
+                        txid: *txid,
+                        action_idx,
+                    },
+                );
+            } else {
+                return Err(BundleLoadError::InvalidActionIndex(action_idx));
+            }
+        }
+
+        for (action_idx, ivk) in hints.into_iter() {
+            if let Some((note, recipient, memo)) = bundle.decrypt_output_with_key(action_idx, ivk) {
+                if !self.add_decrypted_note(
+                    tx_height,
+                    txid,
+                    action_idx,
+                    ivk.clone(),
+                    note,
+                    recipient,
+                    memo,
+                ) {
+                    return Err(BundleLoadError::FvkNotFound(ivk.clone()));
+                }
+            } else {
+                return Err(BundleLoadError::ActionDecryptionFailed(action_idx));
+            }
+        }
+        Ok(())
+    }
+
+    // Common functionality for add_notes_from_bundle and load_bundle
+    #[allow(clippy::too_many_arguments)]
+    fn add_decrypted_note(
+        &mut self,
+        tx_height: Option<BlockHeight>,
+        txid: &TxId,
+        action_idx: usize,
+        ivk: IncomingViewingKey,
+        note: Note,
+        recipient: Address,
+        memo: [u8; 512],
+    ) -> bool {
+        // Generate the nullifier for the received note and add it to the nullifiers map so
+        // that we can detect when the note is later spent.
+        if let Some(fvk) = self.key_store.viewing_keys.get(&ivk) {
+            let outpoint = OutPoint {
+                txid: *txid,
+                action_idx,
+            };
+
+            // Generate the nullifier for the received note and add it to the nullifiers map so
+            // that we can detect when the note is later spent.
+            let nf = note.nullifier(fvk);
+            self.nullifiers.insert(nf, outpoint);
+
+            // add the decrypted note data to the wallet
+            let note_data = DecryptedNote {
+                note,
+                memo,
+                position: None,
+            };
+            self.wallet_received_notes
+                .entry(*txid)
+                .or_insert_with(|| TxNotes {
+                    tx_height,
+                    decrypted_notes: BTreeMap::new(),
+                })
+                .decrypted_notes
+                .insert(action_idx, note_data);
+
+            self.nullifiers.insert(nf, outpoint);
+
+            // add the association between the address and the IVK used
+            // to decrypt the note
+            self.key_store.add_raw_address(recipient, ivk.clone());
+
+            true
+        } else {
+            false
+        }
+    }
+
+    /// For each Orchard action in the provided bundle, if the wallet
+    /// is tracking a note corresponding to the action's revealed nullifer,
+    /// mark that note as potentially spent.
+    pub fn add_potential_spends(
+        &mut self,
+        txid: &TxId,
+        bundle: &Bundle<Authorized, Amount>,
+    ) -> Vec<usize> {
+        // Check for spends of our notes by matching against the nullifiers
+        // we're tracking, and when we detect one, associate the current
+        // txid and action as spending the note.
+        let mut spend_action_idxs = vec![];
+        for (action_idx, action) in bundle.actions().iter().enumerate() {
+            let nf = action.nullifier();
+            // If a nullifier corresponds to one of our notes, add its inpoint as a
+            // potential spend (the transaction may not end up being mined).
+            if self.nullifiers.contains_key(nf) {
+                self.add_potential_spend(
+                    nf,
+                    InPoint {
+                        txid: *txid,
+                        action_idx,
+                    },
+                );
+                spend_action_idxs.push(action_idx);
+            }
+        }
+        spend_action_idxs
+    }
+
+    fn add_potential_spend(&mut self, nf: &Nullifier, inpoint: InPoint) {
+        self.potential_spends
+            .entry(*nf)
+            .or_insert_with(BTreeSet::new)
+            .insert(inpoint);
+    }
+
+    /// Add note commitments for the Orchard components of a transaction to the note
+    /// commitment tree, and mark the tree at the notes decryptable by this wallet so that
+    /// in the future we can produce authentication paths to those notes.
+    ///
+    /// * `block_height` - Height of the block containing the transaction that provided
+    ///   this bundle.
+    /// * `block_tx_idx` - Index of the transaction within the block
+    /// * `txid` - Identifier of the transaction.
+    /// * `bundle` - Orchard component of the transaction.
+    pub fn append_bundle_commitments(
+        &mut self,
+        block_height: BlockHeight,
+        block_tx_idx: usize,
+        txid: &TxId,
+        bundle: &Bundle<Authorized, Amount>,
+    ) -> Result<(), WalletError> {
+        // Check that the wallet is in the correct state to update the note commitment tree with
+        // new outputs.
+        if let Some(last) = &self.last_observed {
+            if !(
+                // we are observing a subsequent transaction in the same block
+                (block_height == last.block_height && last.block_tx_idx.map_or(false, |idx| idx < block_tx_idx))
+                // or we are observing a new block
+                || block_height > last.block_height
+            ) {
+                return Err(WalletError::OutOfOrder(
+                    last.clone(),
+                    block_height,
+                    block_tx_idx,
+                ));
+            }
+        }
+
+        self.last_observed = Some(LastObserved {
+            block_height,
+            block_tx_idx: Some(block_tx_idx),
+        });
+
+        // update the block height recorded for the transaction
+        if let Some(tx_notes) = self.wallet_received_notes.get_mut(txid) {
+            tx_notes.tx_height = Some(block_height);
+        }
+
+        let mut my_notes_for_tx = self.wallet_received_notes.get_mut(txid);
+        for (action_idx, action) in bundle.actions().iter().enumerate() {
+            // append the note commitment for each action to the witness tree
+            if !self
+                .witness_tree
+                .append(&MerkleHashOrchard::from_cmx(action.cmx()))
+            {
+                return Err(WalletError::NoteCommitmentTreeFull);
+            }
+
+            // for notes that are ours, witness the current state of the tree
+            if let Some(dnote) = my_notes_for_tx
+                .as_mut()
+                .and_then(|n| n.decrypted_notes.get_mut(&action_idx))
+            {
+                let (pos, cmx) = self.witness_tree.witness().expect("tree is not empty");
+                assert_eq!(cmx, MerkleHashOrchard::from_cmx(action.cmx()));
+                dnote.position = Some(pos);
+            }
+
+            // For nullifiers that are ours that we detect as spent by this action,
+            // we will record that input as being mined.
+            if let Some(outpoint) = self.nullifiers.get(action.nullifier()) {
+                self.mined_notes.insert(
+                    *outpoint,
+                    InPoint {
+                        txid: *txid,
+                        action_idx,
+                    },
+                );
+            }
+        }
+
+        Ok(())
+    }
+
+    /// Returns whether the transaction contains any notes either sent to or spent by this
+    /// wallet.
+    pub fn tx_involves_my_notes(&self, txid: &TxId) -> bool {
+        self.wallet_received_notes.contains_key(txid)
+            || self.nullifiers.values().any(|v| v.txid == *txid)
+    }
+
+    pub fn get_filtered_notes(
+        &self,
+        ivk: Option<&IncomingViewingKey>,
+        ignore_mined: bool,
+        require_spending_key: bool,
+    ) -> Vec<(OutPoint, DecryptedNote)> {
+        self.wallet_received_notes
+            .iter()
+            .flat_map(|(txid, tx_notes)| {
+                tx_notes
+                    .decrypted_notes
+                    .iter()
+                    .filter_map(move |(idx, dnote)| {
+                        let outpoint = OutPoint {
+                            txid: *txid,
+                            action_idx: *idx,
+                        };
+
+                        self.key_store
+                            .ivk_for_address(&dnote.note.recipient())
+                            // if `ivk` is `None`, return all notes that match the other conditions
+                            .filter(|dnote_ivk| ivk.map_or(true, |ivk| &ivk == dnote_ivk))
+                            .and_then(|dnote_ivk| {
+                                if (ignore_mined && self.mined_notes.contains_key(&outpoint))
+                                    || (require_spending_key
+                                        && self.key_store.spending_key_for_ivk(dnote_ivk).is_none())
+                                {
+                                    None
+                                } else {
+                                    Some((outpoint, (*dnote).clone()))
+                                }
+                            })
+                    })
+            })
+            .collect()
+    }
+
+    pub fn note_commitment_tree_root(&self) -> MerkleHashOrchard {
+        self.witness_tree.root()
+    }
+
+    /// Fetches the information necessary to spend the note at the given `OutPoint`,
+    /// relative to the current root known to the wallet of the Orchard commitment tree.
+    ///
+    /// Returns `None` if the `OutPoint` is not known to the wallet, or the Orchard bundle
+    /// containing the note has not been passed to `Wallet::append_bundle_commitments`.
+    pub fn get_spend_info(&self, outpoint: OutPoint) -> Option<OrchardSpendInfo> {
+        // TODO: Take `confirmations` parameter and obtain the Merkle path to the root at
+        // that checkpoint, not the latest root.
+        self.wallet_received_notes
+            .get(&outpoint.txid)
+            .and_then(|tx_notes| tx_notes.decrypted_notes.get(&outpoint.action_idx))
+            .and_then(|dnote| {
+                self.key_store
+                    .ivk_for_address(&dnote.note.recipient())
+                    .and_then(|ivk| self.key_store.viewing_keys.get(ivk))
+                    .zip(dnote.position)
+                    .map(|(fvk, position)| {
+                        let path = self
+                            .witness_tree
+                            .authentication_path(
+                                position,
+                                &MerkleHashOrchard::from_cmx(&dnote.note.commitment().into()),
+                            )
+                            .expect("wallet always has paths to positioned notes");
+                        OrchardSpendInfo::from_parts(
+                            fvk.clone(),
+                            dnote.note,
+                            MerklePath::from_parts(
+                                u64::from(position).try_into().unwrap(),
+                                path.try_into().unwrap(),
+                            ),
+                        )
+                    })
+            })
+    }
+}
+
+//
+// FFI
+//
+
+/// A type alias for a pointer to a C++ value that is the target of
+/// a mutating action by a callback across the FFI
+pub type FFICallbackReceiver = std::ptr::NonNull<libc::c_void>;
+
+#[no_mangle]
+pub extern "C" fn orchard_wallet_new() -> *mut Wallet {
+    let empty_wallet = Wallet::empty();
+    Box::into_raw(Box::new(empty_wallet))
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_wallet_free(wallet: *mut Wallet) {
+    if !wallet.is_null() {
+        drop(unsafe { Box::from_raw(wallet) });
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_wallet_reset(wallet: *mut Wallet) {
+    let wallet = unsafe { wallet.as_mut() }.expect("Wallet pointer may not be null");
+    wallet.reset();
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_wallet_checkpoint(wallet: *mut Wallet, block_height: u32) -> bool {
+    let wallet = unsafe { wallet.as_mut() }.expect("Wallet pointer may not be null");
+    wallet.checkpoint(block_height.into())
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_wallet_get_last_checkpoint(
+    wallet: *const Wallet,
+    block_height_ret: *mut u32,
+) -> bool {
+    let wallet = unsafe { wallet.as_ref() }.expect("Wallet pointer may not be null");
+    let block_height_ret =
+        unsafe { block_height_ret.as_mut() }.expect("Block height return pointer may not be null");
+    if let Some(height) = wallet.last_checkpoint() {
+        *block_height_ret = height.into();
+        true
+    } else {
+        false
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_wallet_rewind(
+    wallet: *mut Wallet,
+    to_height: BlockHeight,
+    blocks_rewound: *mut u32,
+) -> bool {
+    let wallet = unsafe { wallet.as_mut() }.expect("Wallet pointer may not be null");
+    let blocks_rewound =
+        unsafe { blocks_rewound.as_mut() }.expect("Return value pointer may not be null.");
+    match wallet.rewind(to_height) {
+        Ok(rewound) => {
+            *blocks_rewound = rewound;
+            true
+        }
+        Err(e) => {
+            error!(
+                "Unable to rewind the wallet to height {:?}: {:?}",
+                to_height, e
+            );
+            false
+        }
+    }
+}
+
+/// A type used to pass action decryption metadata across the FFI boundary.
+/// This must have the same representation as `struct RawOrchardActionIVK`
+/// in `rust/include/rust/orchard/wallet.h`. action_idx is
+#[repr(C)]
+pub struct FFIActionIvk {
+    action_idx: u64,
+    ivk_ptr: *mut IncomingViewingKey,
+}
+
+/// A C++-allocated function pointer that can pass a FFIActionIVK value
+/// to a C++ callback receiver.
+pub type ActionIvkPushCb =
+    unsafe extern "C" fn(obj: Option<FFICallbackReceiver>, value: FFIActionIvk);
+
+/// A C++-allocated function pointer that can pass a FFIActionIVK value
+/// to a C++ callback receiver.
+pub type SpendIndexPushCb = unsafe extern "C" fn(obj: Option<FFICallbackReceiver>, value: u32);
+
+#[no_mangle]
+pub extern "C" fn orchard_wallet_add_notes_from_bundle(
+    wallet: *mut Wallet,
+    txid: *const [c_uchar; 32],
+    bundle: *const Bundle<Authorized, Amount>,
+    cb_receiver: Option<FFICallbackReceiver>,
+    action_ivk_push_cb: Option<ActionIvkPushCb>,
+    spend_idx_push_cb: Option<SpendIndexPushCb>,
+) -> bool {
+    let wallet = unsafe { wallet.as_mut() }.expect("Wallet pointer may not be null");
+    let txid = TxId::from_bytes(*unsafe { txid.as_ref() }.expect("txid may not be null."));
+    if let Some(bundle) = unsafe { bundle.as_ref() } {
+        let added = wallet.add_notes_from_bundle(&txid, bundle);
+        let involved =
+            !(added.receive_action_metadata.is_empty() && added.spend_action_metadata.is_empty());
+        for (action_idx, ivk) in added.receive_action_metadata.into_iter() {
+            let action_ivk = FFIActionIvk {
+                action_idx: action_idx.try_into().unwrap(),
+                ivk_ptr: Box::into_raw(Box::new(ivk.clone())),
+            };
+            unsafe { (action_ivk_push_cb.unwrap())(cb_receiver, action_ivk) };
+        }
+        for action_idx in added.spend_action_metadata {
+            unsafe { (spend_idx_push_cb.unwrap())(cb_receiver, action_idx.try_into().unwrap()) };
+        }
+        involved
+    } else {
+        false
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_wallet_load_bundle(
+    wallet: *mut Wallet,
+    block_height: *const u32,
+    txid: *const [c_uchar; 32],
+    bundle: *const Bundle<Authorized, Amount>,
+    hints: *const FFIActionIvk,
+    hints_len: usize,
+    potential_spend_idxs: *const u32,
+    potential_spend_idxs_len: usize,
+) -> bool {
+    let wallet = unsafe { wallet.as_mut() }.expect("Wallet pointer may not be null");
+    let block_height = unsafe { block_height.as_ref() }.map(|h| BlockHeight::from(*h));
+    let txid = TxId::from_bytes(*unsafe { txid.as_ref() }.expect("txid may not be null."));
+    let bundle = unsafe { bundle.as_ref() }.expect("bundle pointer may not be null.");
+
+    let hints_data = unsafe { slice::from_raw_parts(hints, hints_len) };
+    let potential_spend_idxs =
+        unsafe { slice::from_raw_parts(potential_spend_idxs, potential_spend_idxs_len) };
+
+    let mut hints = BTreeMap::new();
+    for action_ivk in hints_data {
+        hints.insert(
+            action_ivk.action_idx.try_into().unwrap(),
+            unsafe { action_ivk.ivk_ptr.as_ref() }.expect("ivk pointer may not be null"),
+        );
+    }
+
+    match wallet.load_bundle(block_height, &txid, bundle, hints, potential_spend_idxs) {
+        Ok(_) => true,
+        Err(e) => {
+            error!("Failed to restore decrypted notes to wallet: {:?}", e);
+            false
+        }
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_wallet_append_bundle_commitments(
+    wallet: *mut Wallet,
+    block_height: u32,
+    block_tx_idx: usize,
+    txid: *const [c_uchar; 32],
+    bundle: *const Bundle<Authorized, Amount>,
+) -> bool {
+    let wallet = unsafe { wallet.as_mut() }.expect("Wallet pointer may not be null");
+    let txid = TxId::from_bytes(*unsafe { txid.as_ref() }.expect("txid may not be null."));
+    if let Some(bundle) = unsafe { bundle.as_ref() } {
+        if let Err(e) =
+            wallet.append_bundle_commitments(block_height.into(), block_tx_idx, &txid, bundle)
+        {
+            error!("An error occurred adding the Orchard bundle's notes to the note commitment tree: {:?}", e);
+            return false;
+        }
+    }
+
+    true
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_wallet_commitment_tree_root(
+    wallet: *const Wallet,
+    root_ret: *mut [u8; 32],
+) {
+    let wallet = unsafe { wallet.as_ref() }.expect("Wallet pointer may not be null");
+    let root_ret = unsafe { root_ret.as_mut() }.expect("Cannot return to the null pointer.");
+
+    *root_ret = wallet.note_commitment_tree_root().to_bytes();
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_wallet_add_spending_key(wallet: *mut Wallet, sk: *const SpendingKey) {
+    let wallet = unsafe { wallet.as_mut() }.expect("Wallet pointer may not be null");
+    let sk = unsafe { sk.as_ref() }.expect("Spending key may not be null.");
+
+    wallet.key_store.add_spending_key(*sk);
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_wallet_add_full_viewing_key(
+    wallet: *mut Wallet,
+    fvk: *const FullViewingKey,
+) {
+    let wallet = unsafe { wallet.as_mut() }.expect("Wallet pointer may not be null.");
+    let fvk = unsafe { fvk.as_ref() }.expect("Full viewing key pointer may not be null.");
+
+    wallet.key_store.add_full_viewing_key(fvk.clone());
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_wallet_add_raw_address(
+    wallet: *mut Wallet,
+    addr: *const Address,
+    ivk: *const IncomingViewingKey,
+) -> bool {
+    let wallet = unsafe { wallet.as_mut() }.expect("Wallet pointer may not be null.");
+    let addr = unsafe { addr.as_ref() }.expect("Address may not be null.");
+    let ivk = unsafe { ivk.as_ref() }.expect("Incoming viewing key may not be null.");
+
+    wallet.key_store.add_raw_address(*addr, ivk.clone())
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_wallet_get_spending_key_for_address(
+    wallet: *const Wallet,
+    addr: *const Address,
+) -> *mut SpendingKey {
+    let wallet = unsafe { wallet.as_ref() }.expect("Wallet pointer may not be null.");
+    let addr = unsafe { addr.as_ref() }.expect("Address may not be null.");
+
+    wallet
+        .key_store
+        .ivk_for_address(addr)
+        .and_then(|ivk| wallet.key_store.spending_key_for_ivk(ivk))
+        .map(|sk| Box::into_raw(Box::new(*sk)))
+        .unwrap_or(std::ptr::null_mut())
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_wallet_get_ivk_for_address(
+    wallet: *const Wallet,
+    addr: *const Address,
+) -> *mut IncomingViewingKey {
+    let wallet = unsafe { wallet.as_ref() }.expect("Wallet pointer may not be null.");
+    let addr = unsafe { addr.as_ref() }.expect("Address may not be null.");
+
+    wallet
+        .key_store
+        .ivk_for_address(addr)
+        .map(|ivk| Box::into_raw(Box::new(ivk.clone())))
+        .unwrap_or(std::ptr::null_mut())
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_wallet_tx_involves_my_notes(
+    wallet: *const Wallet,
+    txid: *const [c_uchar; 32],
+) -> bool {
+    let wallet = unsafe { wallet.as_ref() }.expect("Wallet pointer may not be null.");
+    let txid = TxId::from_bytes(*unsafe { txid.as_ref() }.expect("txid may not be null."));
+
+    wallet.tx_involves_my_notes(&txid)
+}
+
+/// A type used to pass note metadata across the FFI boundary.
+/// This must have the same representation as `struct RawOrchardNoteMetadata`
+/// in `rust/include/rust/orchard/wallet.h`.
+#[repr(C)]
+pub struct FFINoteMetadata {
+    txid: [u8; 32],
+    action_idx: u32,
+    recipient: *mut Address,
+    note_value: i64,
+    memo: [u8; 512],
+}
+
+/// A C++-allocated function pointer that can push a FFINoteMetadata value
+/// onto a C++ vector.
+pub type NotePushCb = unsafe extern "C" fn(obj: Option<FFICallbackReceiver>, meta: FFINoteMetadata);
+
+#[no_mangle]
+pub extern "C" fn orchard_wallet_get_filtered_notes(
+    wallet: *const Wallet,
+    ivk: *const IncomingViewingKey,
+    ignore_mined: bool,
+    require_spending_key: bool,
+    result: Option<FFICallbackReceiver>,
+    push_cb: Option<NotePushCb>,
+) {
+    let wallet = unsafe { wallet.as_ref() }.expect("Wallet pointer may not be null.");
+    let ivk = unsafe { ivk.as_ref() };
+
+    for (outpoint, dnote) in wallet.get_filtered_notes(ivk, ignore_mined, require_spending_key) {
+        let metadata = FFINoteMetadata {
+            txid: *outpoint.txid.as_ref(),
+            action_idx: outpoint.action_idx as u32,
+            recipient: Box::into_raw(Box::new(dnote.note.recipient())),
+            note_value: dnote.note.value().inner() as i64,
+            memo: dnote.memo,
+        };
+        unsafe { (push_cb.unwrap())(result, metadata) };
+    }
+}
+
+/// A type used to pass decrypted spend information across the FFI boundary.
+/// This must have the same representation as `struct RawOrchardSpendData`
+/// in `rust/include/rust/orchard/wallet.h`.
+#[repr(C)]
+pub struct FFIActionSpend {
+    spend_action_idx: u32,
+    outpoint_txid: [u8; 32],
+    outpoint_action_idx: u32,
+    received_at: *mut Address,
+    value: i64,
+}
+
+/// A type used to pass decrypted output information across the FFI boundary.
+/// This must have the same representation as `struct RawOrchardOutputData`
+/// in `rust/include/rust/orchard/wallet.h`.
+#[repr(C)]
+pub struct FFIActionOutput {
+    action_idx: u32,
+    recipient: *mut Address,
+    value: i64,
+    memo: [u8; 512],
+    is_outgoing: bool,
+}
+
+/// A C++-allocated function pointer that can send a FFIActionSpend value
+/// to a receiver.
+pub type SpendPushCB = unsafe extern "C" fn(obj: Option<FFICallbackReceiver>, data: FFIActionSpend);
+
+/// A C++-allocated function pointer that can send a FFIActionOutput value
+/// to a receiver.
+pub type OutputPushCB =
+    unsafe extern "C" fn(obj: Option<FFICallbackReceiver>, data: FFIActionOutput);
+
+#[no_mangle]
+pub extern "C" fn orchard_wallet_get_txdata(
+    wallet: *const Wallet,
+    bundle: *const Bundle<Authorized, Amount>,
+    raw_ovks: *const [u8; 32],
+    raw_ovks_len: usize,
+    callback_receiver: Option<FFICallbackReceiver>,
+    spend_push_cb: Option<SpendPushCB>,
+    output_push_cb: Option<OutputPushCB>,
+) -> bool {
+    let wallet = unsafe { wallet.as_ref() }.expect("Wallet pointer may not be null.");
+    let raw_ovks = unsafe { slice::from_raw_parts(raw_ovks, raw_ovks_len) };
+    let ovks: Vec<OutgoingViewingKey> = raw_ovks
+        .iter()
+        .map(|k| OutgoingViewingKey::from(*k))
+        .collect();
+    if let Some(bundle) = unsafe { bundle.as_ref() } {
+        let ivks = wallet
+            .key_store
+            .viewing_keys
+            .keys()
+            .cloned()
+            .collect::<Vec<_>>();
+
+        let incoming: BTreeMap<usize, (Note, Address, [u8; 512])> = bundle
+            .decrypt_outputs_with_keys(&ivks)
+            .into_iter()
+            .map(|(idx, _, note, addr, memo)| (idx, (note, addr, memo)))
+            .collect();
+
+        let outgoing: BTreeMap<usize, (Note, Address, [u8; 512])> = bundle
+            .recover_outputs_with_ovks(&ovks)
+            .into_iter()
+            .map(|(idx, _, note, addr, memo)| (idx, (note, addr, memo)))
+            .collect();
+
+        for (idx, action) in bundle.actions().iter().enumerate() {
+            let nf = action.nullifier();
+            if let Some(spend) = wallet.nullifiers.get(nf).and_then(|outpoint| {
+                wallet
+                    .wallet_received_notes
+                    .get(&outpoint.txid)
+                    .and_then(|txnotes| txnotes.decrypted_notes.get(&outpoint.action_idx))
+                    .map(|dnote| FFIActionSpend {
+                        spend_action_idx: idx as u32,
+                        outpoint_txid: *outpoint.txid.as_ref(),
+                        outpoint_action_idx: outpoint.action_idx as u32,
+                        received_at: Box::into_raw(Box::new(dnote.note.recipient())),
+                        value: dnote.note.value().inner() as i64,
+                    })
+            }) {
+                unsafe { (spend_push_cb.unwrap())(callback_receiver, spend) };
+            }
+
+            if let Some(((note, addr, memo), is_outgoing)) = incoming
+                .get(&idx)
+                .map(|n| (n, false))
+                .or_else(|| outgoing.get(&idx).map(|n| (n, true)))
+            {
+                let output = FFIActionOutput {
+                    action_idx: idx as u32,
+                    recipient: Box::into_raw(Box::new(*addr)),
+                    value: note.value().inner() as i64,
+                    memo: *memo,
+                    is_outgoing,
+                };
+                unsafe { (output_push_cb.unwrap())(callback_receiver, output) };
+            }
+        }
+        true
+    } else {
+        false
+    }
+}
+
+pub type PushTxId = unsafe extern "C" fn(obj: Option<FFICallbackReceiver>, txid: *const [u8; 32]);
+
+#[no_mangle]
+pub extern "C" fn orchard_wallet_get_potential_spends(
+    wallet: *const Wallet,
+    txid: *const [c_uchar; 32],
+    action_idx: u32,
+    result: Option<FFICallbackReceiver>,
+    push_cb: Option<PushTxId>,
+) {
+    let wallet = unsafe { wallet.as_ref() }.expect("Wallet pointer may not be null.");
+    let txid = TxId::from_bytes(*unsafe { txid.as_ref() }.expect("txid may not be null."));
+
+    if let Some(inpoints) = wallet
+        .wallet_received_notes
+        .get(&txid)
+        .and_then(|txnotes| txnotes.decrypted_notes.get(&action_idx.try_into().unwrap()))
+        .and_then(|dnote| wallet.key_store.get_nullifier(&dnote.note))
+        .and_then(|nf| wallet.potential_spends.get(&nf))
+    {
+        for inpoint in inpoints {
+            unsafe { (push_cb.unwrap())(result, inpoint.txid.as_ref()) };
+        }
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_wallet_get_spend_info(
+    wallet: *const Wallet,
+    txid: *const [c_uchar; 32],
+    action_idx: usize,
+) -> *mut OrchardSpendInfo {
+    let wallet = unsafe { wallet.as_ref() }.expect("Wallet pointer may not be null.");
+    let txid = TxId::from_bytes(*unsafe { txid.as_ref() }.expect("txid may not be null."));
+
+    let outpoint = OutPoint { txid, action_idx };
+
+    if let Some(ret) = wallet.get_spend_info(outpoint) {
+        Box::into_raw(Box::new(ret))
+    } else {
+        tracing::error!(
+            "Requested note in action {} of transaction {} wasn't in the wallet",
+            outpoint.action_idx,
+            outpoint.txid
+        );
+        ptr::null_mut()
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_wallet_gc_note_commitment_tree(wallet: *mut Wallet) {
+    let wallet = unsafe { wallet.as_mut() }.expect("Wallet pointer may not be null.");
+    wallet.witness_tree.garbage_collect();
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_wallet_write_note_commitment_tree(
+    wallet: *const Wallet,
+    stream: Option<StreamObj>,
+    write_cb: Option<WriteCb>,
+) -> bool {
+    let wallet = unsafe { wallet.as_ref() }.expect("Wallet pointer may not be null.");
+    let mut writer = CppStreamWriter::from_raw_parts(stream, write_cb.unwrap());
+
+    let mut write_all = move || -> io::Result<()> {
+        Optional::write(&mut writer, wallet.last_checkpoint, |w, h| {
+            w.write_u32::<LittleEndian>(h.into())
+        })?;
+        write_tree(&mut writer, &wallet.witness_tree)
+    };
+
+    match write_all() {
+        Ok(()) => true,
+        Err(e) => {
+            error!("Failure in writing Orchard note commitment tree: {}", e);
+            false
+        }
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn orchard_wallet_load_note_commitment_tree(
+    wallet: *mut Wallet,
+    stream: Option<StreamObj>,
+    read_cb: Option<ReadCb>,
+) -> bool {
+    let wallet = unsafe { wallet.as_mut() }.expect("Wallet pointer may not be null.");
+    let mut reader = CppStreamReader::from_raw_parts(stream, read_cb.unwrap());
+
+    let mut read_all = move || -> io::Result<()> {
+        let last_checkpoint = Optional::read(&mut reader, |r| {
+            r.read_u32::<LittleEndian>().map(BlockHeight::from)
+        })?;
+        let witness_tree = read_tree(&mut reader)?;
+
+        wallet.last_checkpoint = last_checkpoint;
+        wallet.witness_tree = witness_tree;
+        Ok(())
+    };
+
+    match read_all() {
+        Ok(_) => true,
+        Err(e) => {
+            error!(
+                "Failed to read Orchard note commitment or last checkpoint height: {}",
+                e
+            );
+            false
+        }
+    }
+}
diff --git a/src/rust/src/zcashd_orchard.rs b/src/rust/src/zcashd_orchard.rs
new file mode 100644
index 00000000000..09c091b8f05
--- /dev/null
+++ b/src/rust/src/zcashd_orchard.rs
@@ -0,0 +1,35 @@
+use orchard::Address;
+use std::cmp::Ordering;
+
+/// Internal newtype wrapper that allows us to use addresses as
+/// BTreeMap keys.
+#[derive(Clone, Copy, PartialEq, Eq)]
+#[repr(transparent)]
+pub(crate) struct OrderedAddress(Address);
+
+impl std::ops::Deref for OrderedAddress {
+    type Target = Address;
+
+    #[inline]
+    fn deref(&self) -> &Address {
+        &self.0
+    }
+}
+
+impl OrderedAddress {
+    pub(crate) fn new(addr: Address) -> Self {
+        OrderedAddress(addr)
+    }
+}
+
+impl PartialOrd for OrderedAddress {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl Ord for OrderedAddress {
+    fn cmp(&self, other: &Self) -> Ordering {
+        (&self.to_raw_address_bytes()).cmp(&other.to_raw_address_bytes())
+    }
+}
diff --git a/src/rust/src/zip339_ffi.rs b/src/rust/src/zip339_ffi.rs
index eeafa5bcd0f..32005c2dbef 100644
--- a/src/rust/src/zip339_ffi.rs
+++ b/src/rust/src/zip339_ffi.rs
@@ -4,6 +4,7 @@ use std::{
     ffi::{CStr, CString},
     ptr, slice,
 };
+use zeroize::Zeroize;
 
 use zcash_primitives::zip339;
 
@@ -63,7 +64,9 @@ pub extern "C" fn zip339_free_phrase(phrase: *const c_char) {
     if !phrase.is_null() {
         unsafe {
             // It is correct to cast away const here; the memory is not actually immutable.
-            CString::from_raw(phrase as *mut c_char);
+            CString::from_raw(phrase as *mut c_char)
+                .into_bytes()
+                .zeroize();
         }
     }
 }
diff --git a/src/script/script.h b/src/script/script.h
index e671191972d..b20227caf90 100644
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -625,6 +625,16 @@ class CScript : public CScriptBase
     }
 };
 
+/** A reference to a CScript: the Hash160 of its serialization */
+class CScriptID : public uint160
+{
+public:
+    CScriptID() : uint160() {}
+    explicit CScriptID(const CScript& in);
+    CScriptID(const uint160& in) : uint160(in) {}
+    explicit CScriptID(const std::vector<unsigned char>& vch) : uint160(vch) {}
+};
+
 class CReserveScript
 {
 public:
diff --git a/src/script/standard.h b/src/script/standard.h
index 09a23368f47..920ac165d5e 100644
--- a/src/script/standard.h
+++ b/src/script/standard.h
@@ -18,15 +18,6 @@ static const bool DEFAULT_ACCEPT_DATACARRIER = true;
 class CKeyID;
 class CScript;
 
-/** A reference to a CScript: the Hash160 of its serialization (see script.h) */
-class CScriptID : public uint160
-{
-public:
-    CScriptID() : uint160() {}
-    explicit CScriptID(const CScript& in);
-    CScriptID(const uint160& in) : uint160(in) {}
-};
-
 /**
  * Default setting for nMaxDatacarrierBytes. 80 bytes of data, +1 for OP_RETURN,
  * +2 for the pushdata opcodes.
diff --git a/src/script/zcash_script.cpp b/src/script/zcash_script.cpp
index 9ea67fcc5ee..aed1e99a9c2 100644
--- a/src/script/zcash_script.cpp
+++ b/src/script/zcash_script.cpp
@@ -69,6 +69,22 @@ struct ECCryptoClosure
 };
 
 ECCryptoClosure instance_of_eccryptoclosure;
+
+// Copy of GetLegacySigOpCount from main.cpp commit c4b2ef7c4.
+// Replace with the copy from src/consensus/tx_verify.{cpp,h} after backporting that refactor.
+unsigned int GetLegacySigOpCount(const CTransaction& tx)
+{
+    unsigned int nSigOps = 0;
+    for (const CTxIn& txin : tx.vin)
+    {
+        nSigOps += txin.scriptSig.GetSigOpCount(false);
+    }
+    for (const CTxOut& txout : tx.vout)
+    {
+        nSigOps += txout.scriptPubKey.GetSigOpCount(false);
+    }
+    return nSigOps;
+}
 }
 
 struct PrecomputedTransaction {
@@ -92,7 +108,7 @@ void* zcash_script_new_precomputed_tx(
             return nullptr;
         }
 
-        // Regardless of the verification result, the tx did not error.
+        // Deserializing the tx did not error.
         set_error(err, zcash_script_ERR_OK);
         auto preTx = new PrecomputedTransaction(tx);
         return preTx;
@@ -166,6 +182,42 @@ int zcash_script_verify(
     }
 }
 
+unsigned int zcash_script_legacy_sigop_count_precomputed(
+    const void* pre_preTx,
+    zcash_script_error* err)
+{
+    const PrecomputedTransaction* preTx = static_cast<const PrecomputedTransaction*>(pre_preTx);
+
+    // The current implementation of this method never errors.
+    set_error(err, zcash_script_ERR_OK);
+
+    return GetLegacySigOpCount(preTx->tx);
+}
+
+unsigned int zcash_script_legacy_sigop_count(
+    const unsigned char *txTo,
+    unsigned int txToLen,
+    zcash_script_error* err)
+{
+    try {
+        TxInputStream stream(SER_NETWORK, PROTOCOL_VERSION, txTo, txToLen);
+        CTransaction tx;
+        stream >> tx;
+        if (GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION) != txToLen) {
+            set_error(err, zcash_script_ERR_TX_SIZE_MISMATCH);
+            return UINT_MAX;
+        }
+
+        // Deserializing the tx did not error.
+        set_error(err, zcash_script_ERR_OK);
+
+        return GetLegacySigOpCount(tx);
+    } catch (const std::exception&) {
+        set_error(err, zcash_script_ERR_TX_DESERIALIZE); // Error deserializing
+        return UINT_MAX;
+    }
+}
+
 unsigned int zcash_script_version()
 {
     // Just use the API version for now
diff --git a/src/script/zcash_script.h b/src/script/zcash_script.h
index a34963cba54..db19b1bef97 100644
--- a/src/script/zcash_script.h
+++ b/src/script/zcash_script.h
@@ -33,7 +33,7 @@
 extern "C" {
 #endif
 
-#define ZCASH_SCRIPT_API_VER 1
+#define ZCASH_SCRIPT_API_VER 2
 
 typedef enum zcash_script_error_t
 {
@@ -56,6 +56,9 @@ enum
 ///
 /// Returns a pointer to the precomputed transaction. Free this with
 /// zcash_script_free_precomputed_tx once you are done.
+/// The precomputed transaction is guaranteed to not keep a reference to any
+/// part of the input buffers, so they can be safely overwritten or deallocated
+/// after this function returns.
 ///
 /// If not NULL, err will contain an error/success code for the operation.
 void* zcash_script_new_precomputed_tx(
@@ -99,6 +102,28 @@ EXPORT_SYMBOL int zcash_script_verify(
     uint32_t consensusBranchId,
     zcash_script_error* err);
 
+/// Returns the number of transparent signature operations in the
+/// transparent inputs and outputs of the precomputed transaction
+/// pointed to by preTx.
+///
+/// Returns UINT_MAX on error, so that invalid transactions don't pass the Zcash consensus rules.
+/// If not NULL, err will contain an error/success code for the operation.
+EXPORT_SYMBOL unsigned int zcash_script_legacy_sigop_count_precomputed(
+    const void* preTx,
+    zcash_script_error* err);
+
+/// Returns the number of transparent signature operations in the
+/// transparent inputs and outputs of the serialized transaction
+/// pointed to by txTo.
+///
+/// Returns UINT_MAX on error.
+/// If not NULL, err will contain an error/success code for the operation.
+EXPORT_SYMBOL unsigned int zcash_script_legacy_sigop_count(
+    const unsigned char *txTo,
+    unsigned int txToLen,
+    zcash_script_error* err);
+
+/// Returns the current version of the zcash_script library.
 EXPORT_SYMBOL unsigned int zcash_script_version();
 
 #ifdef __cplusplus
diff --git a/src/sendalert.cpp b/src/sendalert.cpp
index 05cbdf9f57f..d1b839e740f 100644
--- a/src/sendalert.cpp
+++ b/src/sendalert.cpp
@@ -117,13 +117,12 @@ void ThreadSendAlert()
     CDataStream sMsg(SER_NETWORK, CLIENT_VERSION);
     sMsg << *(CUnsignedAlert*)&alert;
     alert.vchMsg = std::vector<unsigned char>(sMsg.begin(), sMsg.end());
-    CKey key;
-    if (!key.SetPrivKey(vchPrivKey, false))
-    {
+    std::optional<CKey> key = CKey::FromPrivKey(vchPrivKey, false);
+    if (!key.has_value()) {
         printf("ThreadSendAlert() : key.SetPrivKey failed\n");
         return;
     }
-    if (!key.Sign(Hash(alert.vchMsg.begin(), alert.vchMsg.end()), alert.vchSig))
+    if (!key.value().Sign(Hash(alert.vchMsg.begin(), alert.vchMsg.end()), alert.vchSig))
     {
         printf("ThreadSendAlert() : key.Sign failed\n");
         return;
diff --git a/src/serialize.h b/src/serialize.h
index 2c933bc0f39..db3f752760b 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -65,7 +65,7 @@ inline T* NCONST_PTR(const T* val)
     return const_cast<T*>(val);
 }
 
-/** 
+/**
  * Get begin pointer of vector (non-const version).
  * @note These functions avoid the undefined case of indexing into an empty
  * vector, as well as that of indexing after the end of the vector.
@@ -197,11 +197,11 @@ enum
 #define READWRITE(obj)      (::SerReadWrite(s, (obj), ser_action))
 #define READWRITEMANY(...)      (::SerReadWriteMany(s, ser_action, __VA_ARGS__))
 
-/** 
+/**
  * Implement two methods, "Serialize" and "Unserialize", for serializable objects. These are
  * actually wrappers over the "SerializationOp" template method, which implements the body of each
  * classes' serialization code. Adding "ADD_SERIALIZE_METHODS" in the body of the class causes these
- * wrapper methods to be added as members. 
+ * wrapper methods to be added as members.
  */
 #define ADD_SERIALIZE_METHODS                                         \
     template<typename Stream>                                         \
@@ -324,16 +324,16 @@ uint64_t ReadCompactSize(Stream& is)
  * sure the encoding is one-to-one, one is subtracted from all but the last digit.
  * Thus, the byte sequence a[] with length len, where all but the last byte
  * has bit 128 set, encodes the number:
- * 
+ *
  *  (a[len-1] & 0x7F) + sum(i=1..len-1, 128^i*((a[len-i-1] & 0x7F)+1))
- * 
+ *
  * Properties:
  * * Very small (0-127: 1 byte, 128-16511: 2 bytes, 16512-2113663: 3 bytes)
  * * Every integer has exactly one encoding
  * * Encoding does not depend on size of original integer type
  * * No redundancy: every (infinite) byte sequence corresponds to a list
  *   of encoded integers.
- * 
+ *
  * 0:         [0x00]  256:        [0x81 0x00]
  * 1:         [0x01]  16383:      [0xFE 0x7F]
  * 127:       [0x7F]  16384:      [0xFF 0x00]
@@ -394,7 +394,7 @@ I ReadVarInt(Stream& is)
 #define COMPACTSIZE(obj) REF(CCompactSize(REF(obj)))
 #define LIMITED_STRING(obj,n) REF(LimitedString< n >(REF(obj)))
 
-/** 
+/**
  * Wrapper for serializing arrays and POD.
  */
 class CFlatData
@@ -510,8 +510,11 @@ CVarInt<I> WrapVarInt(I& n) { return CVarInt<I>(n); }
 /**
  *  string
  */
-template<typename Stream, typename C> void Serialize(Stream& os, const std::basic_string<C>& str);
-template<typename Stream, typename C> void Unserialize(Stream& is, std::basic_string<C>& str);
+template<typename Stream, typename C, typename T, typename A>
+void Serialize(Stream& os, const std::basic_string<C, T, A>& str);
+
+template<typename Stream, typename C, typename T, typename A>
+void Unserialize(Stream& is, std::basic_string<C, T, A>& str);
 
 /**
  * prevector
@@ -625,16 +628,16 @@ inline void Unserialize(Stream& is, T& a)
 /**
  * string
  */
-template<typename Stream, typename C>
-void Serialize(Stream& os, const std::basic_string<C>& str)
+template<typename Stream, typename C, typename T, typename A>
+void Serialize(Stream& os, const std::basic_string<C, T, A>& str)
 {
     WriteCompactSize(os, str.size());
     if (!str.empty())
         os.write((char*)&str[0], str.size() * sizeof(str[0]));
 }
 
-template<typename Stream, typename C>
-void Unserialize(Stream& is, std::basic_string<C>& str)
+template<typename Stream, typename C, typename T, typename A>
+void Unserialize(Stream& is, std::basic_string<C, T, A>& str)
 {
     unsigned int nSize = ReadCompactSize(is);
     str.resize(nSize);
diff --git a/src/support/cleanse.cpp b/src/support/cleanse.cpp
index 9fa2fc182e3..8e02a2b08fe 100644
--- a/src/support/cleanse.cpp
+++ b/src/support/cleanse.cpp
@@ -21,7 +21,7 @@ void memory_cleanse(void *ptr, size_t len)
 
     /* In order to prevent the compiler from optimizing out the memset, this uses an
      * unremovable (see https://gcc.gnu.org/onlinedocs/gcc/Extended-Asm.html#Volatile )
-     * asm block that the compiler must assume could access arbitary memory, including
+     * asm block that the compiler must assume could access arbitrary memory, including
      * the zero bytes written by std::memset.
      *
      * Quoting Adam Langley <agl@google.com> in commit ad1907fe73334d6c696c8539646c21b11178f20f
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index b006c2160ae..ff13b80a9a4 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -126,8 +126,7 @@ BOOST_DATA_TEST_CASE(DoS_mapOrphans, boost::unit_test::data::xrange(static_cast<
 {
     uint32_t consensusBranchId = NetworkUpgradeInfo[sample].nBranchId;
 
-    CKey key;
-    key.MakeNewKey(true);
+    CKey key = CKey::TestOnlyRandomKey(true);
     CBasicKeyStore keystore;
     keystore.AddKey(key);
 
diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp
index 39640745384..711cd018bc8 100644
--- a/src/test/addrman_tests.cpp
+++ b/src/test/addrman_tests.cpp
@@ -392,7 +392,7 @@ BOOST_AUTO_TEST_CASE(addrman_getaddr)
     size_t percent23 = (addrman.size() * 23) / 100;
     BOOST_CHECK(vAddr.size() == percent23);
     BOOST_CHECK(vAddr.size() == 461);
-    // (Addrman.size() < number of addresses added) due to address collisons.
+    // (Addrman.size() < number of addresses added) due to address collisions.
     BOOST_CHECK(addrman.size() == 2007);
 }
 
diff --git a/src/test/alert_tests.cpp b/src/test/alert_tests.cpp
index ec428f45165..ba4fae55e08 100644
--- a/src/test/alert_tests.cpp
+++ b/src/test/alert_tests.cpp
@@ -117,13 +117,12 @@ bool SignAlert(CAlert &alert)
     // sign alert
     std::vector<unsigned char> vchTmp(ParseHex(pszPrivKey));
     CPrivKey vchPrivKey(vchTmp.begin(), vchTmp.end());
-    CKey key;
-    if (!key.SetPrivKey(vchPrivKey, false))
-    {
+    std::optional<CKey> key = CKey::FromPrivKey(vchPrivKey, false);
+    if (!key.has_value()) {
         printf("key.SetPrivKey failed\n");
         return false;
     }
-    if (!key.Sign(Hash(alert.vchMsg.begin(), alert.vchMsg.end()), alert.vchSig))
+    if (!key.value().Sign(Hash(alert.vchMsg.begin(), alert.vchMsg.end()), alert.vchSig))
     {
         printf("SignAlert() : key.Sign failed\n");
         return false;
diff --git a/src/test/bip32_tests.cpp b/src/test/bip32_tests.cpp
index f83ed78c872..2a78dc9d62a 100644
--- a/src/test/bip32_tests.cpp
+++ b/src/test/bip32_tests.cpp
@@ -80,10 +80,8 @@ TestVector test2 =
 
 void RunTest(const TestVector &test) {
     std::vector<unsigned char> seed = ParseHex(test.strHexMaster);
-    CExtKey key;
-    CExtPubKey pubkey;
-    key.SetMaster(&seed[0], seed.size());
-    pubkey = key.Neuter();
+    CExtKey key = CExtKey::Master(&seed[0], seed.size()).value();
+    CExtPubKey pubkey = key.Neuter();
     KeyIO keyIO(Params());
     for (const TestDerivation &derive : test.vDerive) {
         unsigned char data[74];
@@ -99,16 +97,16 @@ void RunTest(const TestVector &test) {
         BOOST_CHECK(keyIO.DecodeExtPubKey(derive.pub) == pubkey); //ensure a base58 decoded pubkey also matches
 
         // Derive new keys
-        CExtKey keyNew;
-        BOOST_CHECK(key.Derive(keyNew, derive.nChild));
-        CExtPubKey pubkeyNew = keyNew.Neuter();
+        auto keyNew = key.Derive(derive.nChild);
+        BOOST_CHECK(keyNew.has_value());
+        CExtPubKey pubkeyNew = keyNew.value().Neuter();
         if (!(derive.nChild & 0x80000000)) {
             // Compare with public derivation
             CExtPubKey pubkeyNew2;
             BOOST_CHECK(pubkey.Derive(pubkeyNew2, derive.nChild));
             BOOST_CHECK(pubkeyNew == pubkeyNew2);
         }
-        key = keyNew;
+        key = keyNew.value();
         pubkey = pubkeyNew;
 
         CDataStream ssPub(SER_DISK, CLIENT_VERSION);
@@ -116,7 +114,7 @@ void RunTest(const TestVector &test) {
         BOOST_CHECK(ssPub.size() == 75);
 
         CDataStream ssPriv(SER_DISK, CLIENT_VERSION);
-        ssPriv << keyNew;
+        ssPriv << keyNew.value();
         BOOST_CHECK(ssPriv.size() == 75);
 
         CExtPubKey pubCheck;
diff --git a/src/test/bitcoin-util-test.py b/src/test/bitcoin-util-test.py
index fd8824febb3..b0282376dec 100755
--- a/src/test/bitcoin-util-test.py
+++ b/src/test/bitcoin-util-test.py
@@ -14,7 +14,7 @@
 
 Runs automatically during `make check`.
 
-Can also be run manually from the src directory by specifiying the source directory:
+Can also be run manually from the src directory by specifying the source directory:
 
 test/bitcoin-util-test.py --srcdir='srcdir' [--verbose]
 """
diff --git a/src/test/checkqueue_tests.cpp b/src/test/checkqueue_tests.cpp
index 260a86408aa..e52fd127831 100644
--- a/src/test/checkqueue_tests.cpp
+++ b/src/test/checkqueue_tests.cpp
@@ -302,7 +302,7 @@ BOOST_AUTO_TEST_CASE(test_CheckQueue_UniqueCheck)
 }
 
 
-// Test that blocks which might allocate lots of memory free their memory agressively.
+// Test that blocks which might allocate lots of memory free their memory aggressively.
 //
 // This test attempts to catch a pathological case where by lazily freeing
 // checks might mean leaving a check un-swapped out, and decreasing by 1 each
diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
index 91dc364c4b4..3fbb3f4110c 100644
--- a/src/test/coins_tests.cpp
+++ b/src/test/coins_tests.cpp
@@ -13,7 +13,9 @@
 #include "undo.h"
 #include "primitives/transaction.h"
 #include "pubkey.h"
+#include "transaction_builder.h"
 #include "zcash/Note.hpp"
+#include "zcash/address/mnemonic.h"
 
 #include <vector>
 #include <map>
@@ -32,7 +34,7 @@ class CCoinsViewTest : public CCoinsView
     std::map<uint256, CCoins> map_;
     std::map<uint256, SproutMerkleTree> mapSproutAnchors_;
     std::map<uint256, SaplingMerkleTree> mapSaplingAnchors_;
-    std::map<uint256, OrchardMerkleTree> mapOrchardAnchors_;
+    std::map<uint256, OrchardMerkleFrontier> mapOrchardAnchors_;
     std::map<uint256, bool> mapSproutNullifiers_;
     std::map<uint256, bool> mapSaplingNullifiers_;
     std::map<uint256, bool> mapOrchardNullifiers_;
@@ -41,7 +43,7 @@ class CCoinsViewTest : public CCoinsView
     CCoinsViewTest() {
         hashBestSproutAnchor_ = SproutMerkleTree::empty_root();
         hashBestSaplingAnchor_ = SaplingMerkleTree::empty_root();
-        hashBestOrchardAnchor_ = OrchardMerkleTree::empty_root();
+        hashBestOrchardAnchor_ = OrchardMerkleFrontier::empty_root();
     }
 
     bool GetSproutAnchorAt(const uint256& rt, SproutMerkleTree &tree) const {
@@ -76,14 +78,14 @@ class CCoinsViewTest : public CCoinsView
         }
     }
 
-    bool GetOrchardAnchorAt(const uint256& rt, OrchardMerkleTree &tree) const {
-        if (rt == OrchardMerkleTree::empty_root()) {
-            OrchardMerkleTree new_tree;
+    bool GetOrchardAnchorAt(const uint256& rt, OrchardMerkleFrontier &tree) const {
+        if (rt == OrchardMerkleFrontier::empty_root()) {
+            OrchardMerkleFrontier new_tree;
             tree = new_tree;
             return true;
         }
 
-        std::map<uint256, OrchardMerkleTree>::const_iterator it = mapOrchardAnchors_.find(rt);
+        std::map<uint256, OrchardMerkleFrontier>::const_iterator it = mapOrchardAnchors_.find(rt);
         if (it == mapOrchardAnchors_.end()) {
             return false;
         } else {
@@ -217,7 +219,7 @@ class CCoinsViewTest : public CCoinsView
 
         BatchWriteAnchors<SproutMerkleTree, CAnchorsSproutMap, CAnchorsSproutCacheEntry>(mapSproutAnchors, mapSproutAnchors_);
         BatchWriteAnchors<SaplingMerkleTree, CAnchorsSaplingMap, CAnchorsSaplingCacheEntry>(mapSaplingAnchors, mapSaplingAnchors_);
-        BatchWriteAnchors<OrchardMerkleTree, CAnchorsOrchardMap, CAnchorsOrchardCacheEntry>(mapOrchardAnchors, mapOrchardAnchors_);
+        BatchWriteAnchors<OrchardMerkleFrontier, CAnchorsOrchardMap, CAnchorsOrchardCacheEntry>(mapOrchardAnchors, mapOrchardAnchors_);
 
         BatchWriteNullifiers(mapSproutNullifiers, mapSproutNullifiers_);
         BatchWriteNullifiers(mapSaplingNullifiers, mapSaplingNullifiers_);
@@ -267,6 +269,7 @@ class TxWithNullifiers
     CTransaction tx;
     uint256 sproutNullifier;
     uint256 saplingNullifier;
+    uint256 orchardNullifier;
 
     TxWithNullifiers()
     {
@@ -282,7 +285,13 @@ class TxWithNullifiers
         sd.nullifier = saplingNullifier;
         mutableTx.vShieldedSpend.push_back(sd);
 
-        // TODO: Orchard nullifier
+        // The Orchard bundle builder always pads to two Actions, so we can just
+        // use an empty builder to create a dummy Orchard bundle.
+        uint256 orchardAnchor;
+        uint256 dataToBeSigned;
+        auto builder = orchard::Builder(true, true, orchardAnchor);
+        mutableTx.orchardBundle = builder.Build().value().ProveAndSign({}, dataToBeSigned).value();
+        orchardNullifier = mutableTx.orchardBundle.GetNullifiers()[0];
 
         tx = CTransaction(mutableTx);
     }
@@ -302,21 +311,43 @@ uint256 appendRandomSproutCommitment(SproutMerkleTree &tree)
     return cm;
 }
 
+template<typename Tree> void AppendRandomLeaf(Tree &tree);
+template<> void AppendRandomLeaf(SproutMerkleTree &tree) { tree.append(GetRandHash()); }
+template<> void AppendRandomLeaf(SaplingMerkleTree &tree) { tree.append(GetRandHash()); }
+template<> void AppendRandomLeaf(OrchardMerkleFrontier &tree) {
+    // OrchardMerkleFrontier only has APIs to append entire bundles, but
+    // fortunately the tests only require that the tree root change.
+    // TODO: Remove the need to create proofs by having a testing-only way to
+    // append a random leaf to OrchardMerkleFrontier.
+    uint256 orchardAnchor;
+    uint256 dataToBeSigned;
+    auto builder = orchard::Builder(true, true, orchardAnchor);
+    auto bundle = builder.Build().value().ProveAndSign({}, dataToBeSigned).value();
+    tree.AppendBundle(bundle);
+}
+
 template<typename Tree> bool GetAnchorAt(const CCoinsViewCacheTest &cache, const uint256 &rt, Tree &tree);
 template<> bool GetAnchorAt(const CCoinsViewCacheTest &cache, const uint256 &rt, SproutMerkleTree &tree) { return cache.GetSproutAnchorAt(rt, tree); }
 template<> bool GetAnchorAt(const CCoinsViewCacheTest &cache, const uint256 &rt, SaplingMerkleTree &tree) { return cache.GetSaplingAnchorAt(rt, tree); }
+template<> bool GetAnchorAt(const CCoinsViewCacheTest &cache, const uint256 &rt, OrchardMerkleFrontier &tree) { return cache.GetOrchardAnchorAt(rt, tree); }
 
-BOOST_FIXTURE_TEST_SUITE(coins_tests, BasicTestingSetup)
+BOOST_FIXTURE_TEST_SUITE(coins_tests, JoinSplitTestingSetup)
 
 void checkNullifierCache(const CCoinsViewCacheTest &cache, const TxWithNullifiers &txWithNullifiers, bool shouldBeInCache) {
     // Make sure the nullifiers have not gotten mixed up
     BOOST_CHECK(!cache.GetNullifier(txWithNullifiers.sproutNullifier, SAPLING));
+    BOOST_CHECK(!cache.GetNullifier(txWithNullifiers.sproutNullifier, ORCHARD));
     BOOST_CHECK(!cache.GetNullifier(txWithNullifiers.saplingNullifier, SPROUT));
+    BOOST_CHECK(!cache.GetNullifier(txWithNullifiers.saplingNullifier, ORCHARD));
+    BOOST_CHECK(!cache.GetNullifier(txWithNullifiers.orchardNullifier, SPROUT));
+    BOOST_CHECK(!cache.GetNullifier(txWithNullifiers.orchardNullifier, SAPLING));
     // Check if the nullifiers either are or are not in the cache
     bool containsSproutNullifier = cache.GetNullifier(txWithNullifiers.sproutNullifier, SPROUT);
     bool containsSaplingNullifier = cache.GetNullifier(txWithNullifiers.saplingNullifier, SAPLING);
+    bool containsOrchardNullifier = cache.GetNullifier(txWithNullifiers.orchardNullifier, ORCHARD);
     BOOST_CHECK(containsSproutNullifier == shouldBeInCache);
     BOOST_CHECK(containsSaplingNullifier == shouldBeInCache);
+    BOOST_CHECK(containsOrchardNullifier == shouldBeInCache);
 }
 
 BOOST_AUTO_TEST_CASE(nullifier_regression_test)
@@ -416,7 +447,7 @@ template<typename Tree> void anchorPopRegressionTestImpl(ShieldedType type)
 
         // Create dummy anchor/commitment
         Tree tree;
-        tree.append(GetRandHash());
+        AppendRandomLeaf(tree);
 
         // Add the anchor
         cache1.PushAnchor(tree);
@@ -445,7 +476,7 @@ template<typename Tree> void anchorPopRegressionTestImpl(ShieldedType type)
 
         // Create dummy anchor/commitment
         Tree tree;
-        tree.append(GetRandHash());
+        AppendRandomLeaf(tree);
 
         // Add the anchor and flush to disk
         cache1.PushAnchor(tree);
@@ -488,6 +519,9 @@ BOOST_AUTO_TEST_CASE(anchor_pop_regression_test)
     BOOST_TEST_CONTEXT("Sapling") {
         anchorPopRegressionTestImpl<SaplingMerkleTree>(SAPLING);
     }
+    BOOST_TEST_CONTEXT("Orchard") {
+        anchorPopRegressionTestImpl<OrchardMerkleFrontier>(ORCHARD);
+    }
 }
 
 template<typename Tree> void anchorRegressionTestImpl(ShieldedType type)
@@ -499,7 +533,7 @@ template<typename Tree> void anchorRegressionTestImpl(ShieldedType type)
 
         // Insert anchor into base.
         Tree tree;
-        tree.append(GetRandHash());
+        AppendRandomLeaf(tree);
 
         cache1.PushAnchor(tree);
         cache1.Flush();
@@ -516,7 +550,7 @@ template<typename Tree> void anchorRegressionTestImpl(ShieldedType type)
 
         // Insert anchor into base.
         Tree tree;
-        tree.append(GetRandHash());
+        AppendRandomLeaf(tree);
         cache1.PushAnchor(tree);
         cache1.Flush();
 
@@ -533,7 +567,7 @@ template<typename Tree> void anchorRegressionTestImpl(ShieldedType type)
 
         // Insert anchor into base.
         Tree tree;
-        tree.append(GetRandHash());
+        AppendRandomLeaf(tree);
         cache1.PushAnchor(tree);
         cache1.Flush();
 
@@ -556,7 +590,7 @@ template<typename Tree> void anchorRegressionTestImpl(ShieldedType type)
 
         // Insert anchor into base.
         Tree tree;
-        tree.append(GetRandHash());
+        AppendRandomLeaf(tree);
         cache1.PushAnchor(tree);
         cache1.Flush();
 
@@ -580,6 +614,9 @@ BOOST_AUTO_TEST_CASE(anchor_regression_test)
     BOOST_TEST_CONTEXT("Sapling") {
         anchorRegressionTestImpl<SaplingMerkleTree>(SAPLING);
     }
+    BOOST_TEST_CONTEXT("Orchard") {
+        anchorRegressionTestImpl<OrchardMerkleFrontier>(ORCHARD);
+    }
 }
 
 BOOST_AUTO_TEST_CASE(nullifiers_test)
@@ -613,7 +650,7 @@ template<typename Tree> void anchorsFlushImpl(ShieldedType type)
         CCoinsViewCacheTest cache(&base);
         Tree tree;
         BOOST_CHECK(GetAnchorAt(cache, cache.GetBestAnchor(type), tree));
-        tree.append(GetRandHash());
+        AppendRandomLeaf(tree);
 
         newrt = tree.root();
 
@@ -643,6 +680,9 @@ BOOST_AUTO_TEST_CASE(anchors_flush_test)
     BOOST_TEST_CONTEXT("Sapling") {
         anchorsFlushImpl<SaplingMerkleTree>(SAPLING);
     }
+    BOOST_TEST_CONTEXT("Orchard") {
+        anchorsFlushImpl<OrchardMerkleFrontier>(ORCHARD);
+    }
 }
 
 BOOST_AUTO_TEST_CASE(chained_joinsplits)
@@ -738,13 +778,13 @@ template<typename Tree> void anchorsTestImpl(ShieldedType type)
 
         BOOST_CHECK(GetAnchorAt(cache, cache.GetBestAnchor(type), tree));
         BOOST_CHECK(cache.GetBestAnchor(type) == tree.root());
-        tree.append(GetRandHash());
-        tree.append(GetRandHash());
-        tree.append(GetRandHash());
-        tree.append(GetRandHash());
-        tree.append(GetRandHash());
-        tree.append(GetRandHash());
-        tree.append(GetRandHash());
+        AppendRandomLeaf(tree);
+        AppendRandomLeaf(tree);
+        AppendRandomLeaf(tree);
+        AppendRandomLeaf(tree);
+        AppendRandomLeaf(tree);
+        AppendRandomLeaf(tree);
+        AppendRandomLeaf(tree);
 
         Tree save_tree_for_later;
         save_tree_for_later = tree;
@@ -762,8 +802,8 @@ template<typename Tree> void anchorsTestImpl(ShieldedType type)
             BOOST_CHECK(confirm_same.root() == newrt);
         }
 
-        tree.append(GetRandHash());
-        tree.append(GetRandHash());
+        AppendRandomLeaf(tree);
+        AppendRandomLeaf(tree);
 
         newrt2 = tree.root();
 
@@ -801,6 +841,9 @@ BOOST_AUTO_TEST_CASE(anchors_test)
     BOOST_TEST_CONTEXT("Sapling") {
         anchorsTestImpl<SaplingMerkleTree>(SAPLING);
     }
+    BOOST_TEST_CONTEXT("Orchard") {
+        anchorsTestImpl<OrchardMerkleFrontier>(ORCHARD);
+    }
 }
 
 static const unsigned int NUM_SIMULATION_ITERATIONS = 40000;
diff --git a/src/test/data/script_valid.json b/src/test/data/script_valid.json
index 572814c8090..3ccc192e2c7 100644
--- a/src/test/data/script_valid.json
+++ b/src/test/data/script_valid.json
@@ -665,7 +665,7 @@
 ["0 0x02 0x0000 0", "CHECKMULTISIGVERIFY 1", ""],
 
 ["While not really correctly DER encoded, the empty signature is allowed by"],
-["STRICTENC to provide a compact way to provide a delibrately invalid signature."],
+["STRICTENC to provide a compact way to provide a deliberately invalid signature."],
 ["0", "0x21 0x02865c40293a680cb9c020e7b1e106d8c1916d3cef99aa431a56d253e69256dac0 CHECKSIG NOT", "STRICTENC"],
 ["0 0", "1 0x21 0x02865c40293a680cb9c020e7b1e106d8c1916d3cef99aa431a56d253e69256dac0 1 CHECKMULTISIG NOT", "STRICTENC"],
 
diff --git a/src/test/data/tx_invalid.json b/src/test/data/tx_invalid.json
index b99a72da9b9..9c6718f79bb 100644
--- a/src/test/data/tx_invalid.json
+++ b/src/test/data/tx_invalid.json
@@ -158,7 +158,7 @@
 [[["0000000000000000000000000000000000000000000000000000000000000100", 0, "499999999 NOP2 1"]],
 "0100000001000100000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000fe64cd1d", "P2SH,CHECKLOCKTIMEVERIFY"],
 
-["By-time locks, with argument just beyond tx nLockTime (but within numerical boundries)"],
+["By-time locks, with argument just beyond tx nLockTime (but within numerical boundaries)"],
 [[["0000000000000000000000000000000000000000000000000000000000000100", 0, "500000001 NOP2 1"]],
 "01000000010001000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000065cd1d", "P2SH,CHECKLOCKTIMEVERIFY"],
 [[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 NOP2 1"]],
diff --git a/src/test/data/tx_valid.json b/src/test/data/tx_valid.json
index 265ba5de66c..762e1449ee2 100644
--- a/src/test/data/tx_valid.json
+++ b/src/test/data/tx_valid.json
@@ -102,7 +102,7 @@
 [[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 NOP2 1"]],
 "0100000001000100000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000ff64cd1d", "P2SH,CHECKLOCKTIMEVERIFY"],
 
-["By-time locks, with argument just beyond tx nLockTime (but within numerical boundries)"],
+["By-time locks, with argument just beyond tx nLockTime (but within numerical boundaries)"],
 [[["0000000000000000000000000000000000000000000000000000000000000100", 0, "500000000 NOP2 1"]],
 "01000000010001000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000065cd1d", "P2SH,CHECKLOCKTIMEVERIFY"],
 [[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 NOP2 1"]],
diff --git a/src/test/data/unified_addrs.json b/src/test/data/unified_addrs.json
index dd14807df9b..57be6b4dcfc 100644
--- a/src/test/data/unified_addrs.json
+++ b/src/test/data/unified_addrs.json
@@ -1,15 +1,24 @@
 [
     ["From https://github.com/zcash-hackworks/zcash-test-vectors/blob/master/unified_address.py"],
-    ["p2pkh_bytes, p2sh_bytes, sapling_raw_addr, orchard_raw_addr, unified_addr"],
-    [null, "7a8f739a2d9e945b0ce152a8049e294c4d6e66b1", null, "dcb1d2a37762148db4cee3bbf19fb1ec05891894b13801c622ba6a90faf1119f8224ae3985c6abd3b7bbae", "75316532386638787a6e656d676574797872647a6b66676a756773667839646b713274686e657a65396c333474707674706d656a656774643567686b7768676a7268736466646e74336b34736632757939656138637461756d7a7075646c657a356667756c77716b70753566766a77796374747a79646c383664373434613430617175747a687a7674797a6e68"],
-    ["b3534201cfb1cd8dbf69b8250c18ef41294ca979", null, "902b6565a1c44e7e7a080571af1dd774697cc126f1fc0435d3cdbf868783e9fb4620df4bf175cbf2c3e36f", "05f61273a7201295332fee4579474534809a0aeb817a2bc0594166ad7a462067712533b6eec0fa2d1be99f", "75313371733278796b66737464343332777076366368367336636b683473346833736372746435686b6179367277366a6e3667656e3734726d76636136357775736771653637716d6b6b667a79686c6b7767383071796a33726363616e68356667377a73393032793234676e3271796636706b636363686730356a7a70337972666e3470753861746538673771397239737465767832383434357235776e3378333570663771713332346e746878747a6377786576796661346c326d326d327873376564766570396674613476747776686b617878"],
-    [null, "e8c7203d996af7d477083756d59af80d06a745f4", null, "4ea7d6b3dfa338192af06cbbf47ad405715bc7832bedb1466217dc0d93314de9f3c25eec89f9a21bfe0e93", "75317270776b64357837746534657a636d6c716172676b66336372737066716b686d787766737170713032346a6173733267373465347233367a70353071737333766863743732736163687573306b37303578796768756c726a786364777764617130716a6e6e737366326676616b7a7a386634367077387263613933366665796566366d6c36657137776c6c"],
-    [null, null, "02f1536b622c01346742d8f90e9d4ff39137f1bebe6e23ad9971776b3372702494cc08951eef032b35350f", null, "7531396468786d38386776637739747774767a6b7537637a376a753372767075356a766832637138676d38716465766e6c34657365793833667a7239796d666133676a6d6d6b3472786a3279703838677478646b71676e6a366e6e717974667568303875796335667572"],
-    [null, "183e31d49f25c9a138f49b1a537edcf04be34a98", "3246b59a5b492dab1855cc176bddfa28418f11f97f7b361cc3e8834b2c30d2a1717df323ef98ea7de71d2e", "ab6d26252c521547049de208283d96278bb221a6874cb5a86af1d3f8b3db3fbee3dbefedcb2c71e3ca1ead", "75313563327972666a7774743636336e713068707173683678746a793238387a7476616375616c37336d666675723338336d7465706339687278743374703465613568373830706733686b35756a326775393770326c756d39716a6836327872613763336879366e6471327877686737657138713736766632386333326437766d6c337a323934767438656374636c773672307032336e64703578647a666578633971773065777572796e6a353235736b78376d306a756b636a7265616b6a3261703332376b6a7172767567656435667930737a79"],
-    [null, null, "970dc3450d34554141d356cb548056279c57708fa73bd16ffe9a2e24ea694898a7b8af1b0ff92585d02623", "0414bb62b86149ee731851f27d532ac0361169da46e6d53d19d3dfd07a5bae22969922d8d0af7dc1e13bae", "75317a6467397a376c7732713037357977396e306a376668387279756a73726a727237347a71783939337463736874666d6d3271786b74763372303438653774723471356a38736665703367396e76387770786639767472336a7a6e6d6d35367a3775706a6530356b7a766d75726d706371703034633033377a32646833356364383232357874336b34376e7a6668327974737630376d337438676433337035723276376b66656739343571376a63306768"],
-    [null, "098b79535e790fe53e29fef2b3766697ac32b4f4", "a8a8797c1ba69f78672affa65b943975026931ea628431f0991e744872ac9f36946f5dcd6851a0b5af29cf", "678ab0079bea28bf165c1ab976a2a58c18a7811ca2ad0ad649e876273d04325da6ca53cdb83c111e8e4394", "7531796a7733366d7a777a346a643879746e726436676b68376179676d656a3272746c716733766a397965656866646b3233356a657336727170666a6c777167333776346d653575676a6c7a72646e68676c383872726c6567383378386130716d77797a7936393872387675636e346877616772367163657a7373663663683074373466633068766e366d373737687037353761766632636b7a63333239357033323430716c7675707964656c37336c377163746e343063796b357536736573617772367a6d6b746c6a6678687163633765773468"],
-    [null, null, "3509c9e069e89fe501d97622c283ac98923da2d7e6eb346b4bafa67865e1e6dae7cf213b1ea3648dc09b48", null, "753171786b796d6b68647a6372727a6c79346672717563646b66736e6a377776776c716575306b3466337472706e657a3476777a75686b64616a6b356537363437346d6a34396b75653978396866776566386d34377363633861703933686e6773657567333864706371"],
-    [null, "30d069896cff30eb414f727b89e001afa2fb8dc3", "55bc46aea6f60c1d61915640029b2af6334d7d27e1c47a248ab47c9fbe5d2d7bb5818739f062e37136654c", null, "75316433726b71777a396b37346b7475766c746e32746d746a36676b6c6739336877733937797473337a75363038766b76673363327973686d6d3330713668386b6434727433733076703475616a776668396137356538613837306e39346c6b70657835617337716e77333436346e7261747563356e35793575766e7a7666326d3466656a687a6576686e306d"],
-    [null, null, "5c26a8117729334a957ca7941d47b2ce7040e844fa9882c25bfd2fcf51fa8ab21376f5300d0123f5703e9e", null, "75316166617430647574617379666b736161766d34726c336178716e75786c777437363573393476397a716a7430397a793633646c356d6d7970397835636b7672756c6d647134636b6a337272763766396c37756e78666c306438723635383234746773677276673071"]
+    ["p2pkh_bytes, p2sh_bytes, sapling_raw_addr, orchard_raw_addr, unknown_typecode, unknown_bytes, unified_addr, root_seed, account, diversifier_index"],
+    ["e6cabf813929132d772d04b03ae85223d03b9be8", null, null, "d4714ee761d1ae823b6972152e20957fefa3f6e3129ea4dfb0a9e98703a63dab929589d6dc51c970f935b3", 65533, "f6ee6921481cdd86b3cc4318d9614fc820905d042bb1ef9ca3f24988c7b3534201cfb1cd8dbf69b8250c18ef41294ca97993db546c1fe0", "7531353966636630777639336c366464666d396c726434736a6177373272646a716b657779736367377038667166307563366b766479386b796a7133667263756376356e6a66767065756a676c71327433667a6763706e77613336356d6e616139346e78706634337373633575707433717970773363747235717930356d6c6b33376565777532396a37686b64", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 0, 0],
+    ["7bec9de217c04f7ce1a86f1fb458aa881c8f39e4", null, null, "d8e5ecb4e005c28718e61a5c336a4f369e771ccdb3363f4f7a04b02a966901a4c05da662d5fd75678f7fb4", 65530, null, "75317a35677538783364766b7677636d726a30716b3568727839706361646c3536683834663777647970366e7635337233643563636365646563686d77393835746765357733633272353639716137326c676775753578727178683739616a7a63376b716d65733230706b747a71726a6c707835367168676d716d3536686e39777432686379787064616d616b", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 1, 0],
+    ["aa6d43480fd9d91375ce6c4a020706361bd296de", null, "88533c398a49c2513dc85162bf220abaf47dc983f14e908ddaaa7322dba16531bc62efe750fe575c8d149b", null, 65530, null, "7531343367706a3772643934766d39356d7a73757537746a74716161677934706d6678386c6b77656d70786a7463777a33357a746361383530796e6c7a323932307477617a6171703270367168787878337a357178616b6e73716372676c7578716a337070757367776635757963686c61677938376b376874613768773965793336776d7930367065776c6470", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 2, 0],
+    [null, "a8d7551db5fd9313e8c7203d996af7d477083756", "52fd6aedefbf401633c2e4532515ebcf95bcc2b4b8e4d676dfad7e17925c6dfb8671e52544dc2ca075e261", null, 65534, null, "753178797970646a307a7978637466666b6878796d766a6e6b376e383371666c376e7365356c3071726b346e3266376465376c3733727a79787970347463727975356d6b7875617a6c646e633279306479747a7567797a79636739373034616a66786173376b63757761776d706877776e383839743938743735376579716667346a766566746b687672337167", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 3, 0],
+    [null, "f44ab023752cb5b406ed8985e18130ab33362697", null, "165082de84f2ad7204426ffafd6b6c7de9cab6d25c13846a1786715268c415948db788f4a5e0daa03d699e", 65533, null, "7531706a336c72656d6e7175737368393878667161336a66647077303872726b35377330346b6c32366865707a7133746a72736e78653574367371716567653976716d776c63366c786373746e6333306e3575357232776b6b7a687039367a3564306a797530716137746b686378366663386a35396b616b387a35636570363261716d61336d36343566683863", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 4, 0],
+    [null, null, null, "ea9df83fbee07d6f7895ebb2ea41ec7c4ba682b863e069b4a438e31c9571c83126c305d75456412aeaef1b", 65531, null, "753132787567643930666c726b646b6575336e6c6e6e337565736b793533707175356d323479366170786d38386d34387637333734636c7335367a7039336e61796c617864636866307161796678747267653034376d393533717a3376326772346c74737232736b3372", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 5, 0],
+    [null, null, null, "3c40246912b6efefab9a55244ac2c174e1a9f8c0bc0fd526933963c6ecb9b84ec8b0f6b40dc858fa23c72b", 65530, null, "75317370757467353667736a763233637435346d7277646c616e7a7665716337747a73356d78786e616135636465676d303368673778363661797079647336356d39327674397561786c3637327375687063367a3768747776657079686b727066757376617a71756539", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 6, 0],
+    [null, "defa3d5a57efc2e1e9b01a035587d5fb1a38e01d", null, "cc099cc214e56b1192c7b5b17e958c3413e27fefd553380700aca81b24b2918cac951a1a68017fac525a18", 65535, null, "75317667736b636d3939783567687561757668337978713777747037756e366130793663617964736e6e33357032647577707773356873367079676a6877703738326a716e65727a6c6878773370343971666d713237383339716a7472667976686b377964393877396e3064366a6e7336756834666333687364663736366b6e74716e6c6a646b64353667636e", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 7, 0],
+    [null, null, null, "5f09a9807a56323b263b05df368dc28391b21a64a0e1b40f9a6803b7e68f3905923f35cb01f119b223f493", 65530, null, "75316378636379656d6d3038747964776d743968703273356e6638776a766c757575366c32653861396a666c6c647861736e7a6b6438667665727170636a30786e767261637a71673235356377356e767936783977727566666d703975657a727a72376763783535396b", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 8, 0],
+    [null, "10acd20b183e31d49f25c9a138f49b1a537edcf0", "9b60ae3d302248b349d601567e3d7795bfb334ea1fd1a7e71402169ebbe14bd2ceaa244ccd6e5aa2245613", "e340636542ece1c81285ed4eab448adbb5a8c0f4d386eeff337e88e6915f6c3ec1b6ea835a88d56612d2bd", 65531, null, "75317a656b68686d686b353478356365356333367274376e63323735676570376e6176326e73783473683061666c6c75703976726835687338367a38736b6a746436646e736c7667736d6174743068386832343763676e666b73646c776c39786d617275797570666c743064716673637830647979656d3266616139776571653378616b397736656672353437636a3832397232746e7974613032687866647873646a6d76397a72356b746b70323066706378656164686672683032616b346136686e7876357336377267717272766670646a7435", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 9, 0],
+    [null, "af9db6990ed83dd64af3597c04323ea51b0052ad", null, "cdf7fed0d0822fd849cffb20a4d5ee701ad8141e66d81ddfabf87875117c05092240603c546b8dc187cd8c", 65532, null, "753165353471636e30746570796c33307a7a326672677a37713461366d736e326530326e7076326e6666736433683532336d747838643232616a7666767371757235736a7a3876666e6d77327973363730387170386b6139306a3561343330757938763833616c6a63306330357a6a7535347879356e7677336d66686b376e7737366b6b7964796c713466656c", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 10, 0],
+    [null, null, null, "24fd59f32b2d39dde66e46c39206a31bc04fa5c6847976ea6bbd3163ee14f58f584acc131479ea558d3f84", 65530, null, "75317a38777372686d66366d3967766136766c33737a636b303670393730783577686d36336a666a3266726d6d63396e39756d34796373387975746a37673833387672676832306c667879353279306832367474386e6776643267796370797176396b793032716b6373", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 11, 0],
+    [null, null, "78d85bd0db639043377987cdd814c6390016964b684016faf1ad4f166c5f72399a5e8d469ec6beb873d55d", null, 65535, null, "75317861686a333570376d7639756c6b3337327333766465687172663438753077646633786c3772787a7270653461307468753864306d396d7961617078376b35767836747a357074636a76637675346472667137753771777a6d667565336b74387376736333736535", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 12, 0],
+    ["33a6dd87b4d872a4895d345761e4ec423b77928d", null, null, "5178924f7067eac261044ca27ba3cf52f798486973af0795e61587aa1b1ecad333dc520497edc61df88980", 65533, "91e00c7a1d48af046827591e9733a97fa6b679f3dc601d008285edcbdae69ce8fc1be4aac00ff2711ebd931de518856878f73476f21a482ec9378365c8f7393c94e2885315eb4671098b79535e790fe53e29fef2b3766697ac32b4f473f468a008e72389fc03880d780cb07fcfaabe3f1a84b27db59a4a153d882d2b2103596555ed9494c6ac893c49723833ec8926c1", "75316439356e6a7630783035643671747a703779757976667765647438796734746a306e663063727038656a74666430653866637a3271617939346b3463667877376666363070636c747076776c3378326b646c646a65617335336e686e613567393578326c7533763370723233657430643063726e7a63396e636477636d7233766a306b6c73653474793538", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 13, 0],
+    ["a56c057ef71dab58aa90e47025695c5faaea5123", null, "a75a6de421d2ad1ee8f4b25e398adda9c0aaa6ab1f2518981a9ddb1de6a3957d77842332d6289dbe94e832", "b208c9235c8d40e49b76100b2d010f3783f12c66e7d3beb117b2c96321b7f6562adb4efc144e39d909e728", 65533, null, "7531646670723876647335683361756e79657a7a7877726d38756461353273743837733876726c676732746730357430713070783336686368783974676b786b6c77747370753332786a6135617271336b7470326e387a613470773779776a30676d68713372776539353072386b3973756e736a76773734743538716c3333347065673464766b616c6b746d6e676e716b7077723332353837653779747932376e6d673636747371377976723779343639776570366b7077346a3530786e6c6d78306a78786737766c6735796c6671387566657664", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 14, 0],
+    [null, null, null, "9e5445d6cd3cb9f98b0df1062bda47adffd5a66c0c2c483c8bf15c3176d755914a3576496b5c35fee28a88", 65531, null, "75316a676c686a326d617936646674777a39753271796e786a717a6e75743637343768617375306d646d6c63303266636173756178756764797a776a326c38346d6a3966677a6a3779306b396663706a373336736c6d6a38676b37377567386c6c61766367326c666d6d", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 15, 0],
+    ["b02aec10f6fa02a08667bf9b924c3d0574a1334f", null, null, "2598d84dffb34f5908b90732490f3881399150d4c694fce9bf30d1560b2c56f09829fe123b9add20e5d71c", 65534, null, "7531397163617a647761793438707566366a77616a78307732386d307871756d746d6e6435677974796c6c6e79676867396c76393978356d3872387439673566396a307a30786e34787a6d6e7866747a3772746633756164786b79367178706e6b7438666b66686c78386b63396d6e72646c6e7874733536786378656a7a6472776c65787a7637377876797634", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 16, 0],
+    [null, null, "d3a803803feee7a032a24adfaa8f6a94cecb9671c1333d0d5d1a3d79d82bc310727c665364d71022559c50", "7c98b8f613f9ff02746bea2a167cfd1bd3a1862af9631bf61d9d604e0824e2cb8467a1e549db87a76e7a8a", 65535, null, "75316136346c303971727378756c666a7a6e6d366b326735333575737968746166386564363076346a726a6d6b77766b757834743770647963336e6b7a7265666467746e77383432306c6a3873686d30356a6139667878676e68726139326e6873713536677838633270757a33666b6b676e726b7166357975716664746637743672616e343767646366357676646661637a7766337575793466797368336d7a7538686435746b6c30356d76726765396e38", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 17, 0],
+    ["26c061d67beb8bad48c6b4774a156551e30e4fe2", null, null, "a80405d5568ab8ab8f8546163d951ab297fd5e6f43e7fcebcb664feacfab5afd80aaf7f354c07a9901788c", 65535, null, "7531787a757764386163686667776d336577793976326d6a3537373268726b6e6d6578777a6339346d7a6133356d78363863656e767877727a3973396670306e39767a753872756a357a71666d6d376c65387775366c363275346c6d30376e75717865656d383733677838366a766e776c70787379636c397576366b786b72686d30726c677037307830357366", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 18, 0],
+    [null, null, "8660070e3757ff6507060791fd694f6a631b8495a2b74ffa39236cf653caea5575b86af3200b010e513bab", "63b7b706d991169986aee56133f0a50b2a0c8225fba6dae95176007b1f023a1e97c1aa366e99bf970fda82", 65534, null, "7531766736326d676a64646e6c763577366c646b793278653063387465746d633832747539766c7a7a6b75796e783439666e75716a76786a743564676e33636d3874356e38357a6371356c6a727467377a6d77686b3730683672646d636c6637736378786e67756b35666c76663261707037367875393037636d6a796c787673656e3235786539763776336b727378613975793076326a6a7133376b6834796d6c61666e3870657671616c716134646d3637", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 19, 5]
 ]
-
diff --git a/src/test/data/unified_full_viewing_keys.json b/src/test/data/unified_full_viewing_keys.json
new file mode 100644
index 00000000000..82bc19689ac
--- /dev/null
+++ b/src/test/data/unified_full_viewing_keys.json
@@ -0,0 +1,25 @@
+[
+    ["From https://github.com/zcash-hackworks/zcash-test-vectors/blob/master/unified_full_viewing_keys.py"],
+    ["t_key_bytes, sapling_fvk_bytes, orchard_fvk_bytes, unknown_fvk_typecode, unknown_fvk_bytes, unified_fvk, root_seed, account"],
+    ["9ba0439c6a2d3d903883d4537c362288626da62c6299012e362d8fb6efebab4702ed638532c475f67400350fb1d6eda559cdc289a19b4319eb175140aa86893836", null, "7648764a4567b7165410bc313f922b72fa34153dcad112a3971620240ffbf30d7f19edb9f295cdf160be1863b41c96312daf7273ba01198f5066f28629b56f17e4ab726579eea0fb19ab5ae2b8889ce455c79c5959bfda796823ee805c794814", 65533, "f6ee6921481cdd86b3cc4318d9614fc820905d042bb1ef9ca3f24988c7b3534201cfb1cd8dbf69b8250c18ef41294ca97993db546c1fe0", "757669657731636772716e7279343738636b7670723066353830743666736168703061356d6a326539786c3768763264326a64346c647a793434396d77776b326c3979657574733835776a6c7336686a74676864737935766868766d6a6477336a786c3363786872673376733239366133637a617a7279637272356379776a6877633563337a7466796a64686d7a306578767a7a6579656a616d7970306372397a386639776a30393533667a6874306d346c656e6b3934743730727577676a786167327476703633776e3966747a68746b683230677972653377357332346636776c6771786e6a6834306764326c786537357366337a3868357932783061747078637966397433656d3468306576767366746c757275716e65367734736d303636737730716535793871673432336772706c6535666674787271797937786d716d617476376e7a643774636a6164753866376d717a346c38336a73797879347438706b61797974796b376e7270343637647338356b6e656b646b766e643768716b666572386d6e7164377076", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 0],
+    ["fa9291b353be21ac452f85cb96e4fc978d352e34c5c0259ac28d0beab1b8e29803fc399e613d010865d5a1fa8765b7109f9db1ed56218983f9bd54b8c712478829", null, "b5523cae2a454d3dbcd88b8cebf4c4336db6f906264af982ab4dd4a797dd6f051a139b42cd6e6378ba7c9c7ae0a52dc311fd0a92730e56834c0ab07a99cea50b1160f497b619794819d5f654c57a60ed9e5358fb55aea05bac7133ee381a4324", 65530, null, "757669657731363732323738776472756361637065756a6e7a743274756874646c6a35653665636a6c676c3732756c39727475643479636e6a616374766139636c6e65673271333973766136396b6478356672713066346837706b397934307a6c3370676a666666663964366e306678766a6870736b36367a7835673533333668663871727233713077686d397474356d35386a386773736e796b7473367273796c3065366877756c717237776e367a796a7435376438757330796471683732327863736738766e7230737373637a7264776b376d76356d656865716733723074727933647275776b38637965796b7a79383667756375326a6d747476767a78636574636c6d6b756c7133756c727070666e6435307a77706c6b76643565716c646d7377396333756a7773306676", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 1],
+    ["f6a704fc093882166a88eeb243e2658f0eb7b5b7943ce47c3924c67c96474cea029f1794895562430d5dc8be5e88cfeee3261d6be4e6eb5b238ecc9e7ebdeb1bf0", "0fec4a4553bde5638ff97ac262635ddce4fd10e9b9eedb3bf2b60a4cb01730e1971db5d0921a68a3e4d78379076f47fb26388a874a16c14dd21cacfc0f14475e4381ed27a5002ea7a9c87339d66ba14675e7f806d9580b2e71c4d166c15243a57b2ce29b1c441fb68534de0441e5d75c2da24667372d9ae6db6cf63693f44d86", null, 65530, null, "757669657731386a706634636a7974356e66613734377561347361777476396370706c3867353736613475746d74736c76656e7a6d32616a7965667a326679653277376c6a6a6d3633663672393033667568646d36666d766733646e706778773037746c6c66713768636564653871796c3266616e61617276736d38643074727a35636b63376b3437646e6537386d6677356c726b6763383833616b6b6177327674333763646d767936736e61707875667238353772357039766d66396a7833733030773733776536667a34773439797939776463337539326b7278307673303574336334723666617664746739756a327471733934736b6d3578646e39713476707767666d6b6367776c336338736a346570706838663639383339713870377074383678766435656a73376b3837646e33746c7766656e7a717a6c68616c6d3776777761717935366d6d647973646e71656d6d73657336733635336e36787134", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 2],
+    ["3ebe46d6204feeb43bd83511cd816134c2f03d8582c664318cc60063eca38a04020f8aed7690bc84e3fa6510c362bb9290904b6ff5b75e4e5ca6de821bf3389fae", "507cc7052c6a80b54f01eb8ffb6aed4e3d5ecc50f3447076612df3412d098256ac7767bd7c7b3e6705bc39c86a22800e76cd503258d9fa8fb8b28b719e98362bc697040a0f00c948ef2e110cb09bee90a4a7ebe424b058ec9d97272f9d4f9d687da2f89c201c6f5fa2ac7a7bf73ee32344d13d6f89e8960452613212fe98d0cc", null, 65534, null, "75766965773161716a726b3673777430663877323365763567756d6b7a33646e39393039376661326e653867706d747261377a306c7432787638717037767a76666766786d63647a79386a7470667464756a75766d37706c6c653932343736767773306d39357a6c66667970377272307632727a76366e7968727668363061743971717377746a38796c343476743967647775737a356c367032647a637a726d357a6d6c33757163756467396565616334726730763979656871757a683478346c3377726336376d71753275767177743034346a7376687637386875356768787464377265796366336c7775727867797235723837327373736a3868366d72346372776330396e306436386330796c737768787779366b303576726b307436336b3679646376353738763879347a6e61737478706e726777683070613268783767397072327a37646d7777777466676376336c7972617879743973336561673368", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 3],
+    ["934d5c7b67ecebc7fe717ffba06f30973ecdb4735dd8c8173528c357ec23311f039efddc9cc1bf9f4214a09a7f0188540789b26197cdededc993be5381587f79de", null, "0572a55aa8d307c5be909a8f4ae2d9307292b9f7ba7ba7657193fbfa3cba7104cab2e3d78fb6bcb1c824f0b61c08185c0efb62e502dea31ec88145d295be4214a0b79dd0caa56c5fb2a53b78597c1be7663c5191fe1542e72d903273e653d901", 65533, null, "75766965773139656d6d77686d3971797267336c33747765346c357830646d3475723671346e76733777366d6775726b6b35366e797a7172366a38366667366b776e7368306d61683971353467796e6d6b786661737365636b346b3870647667737838763275386a646e30386a386d7372736e7a7068726865763863713073636d61397a336b6b797065386d366a6d676a6179366e636574396a6a6c70736b7a76797a78637a66686874766a34377a7a65306374726b33706138396a36636e6d6e646e366e637276666d6d73346830733233347066367a6d7474366e6a7973766c716d356d343472763034673664303539676a3876337864723570326433726e706c6d37687a6d6c6a6a6e3874356b3839646a70796c387232336777737777796830336c7667366738753470616e", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 4],
+    [null, null, "dd7a56b35e69c4ad129df5aa0d3f087d4bcfc9090978b511c18cd39ce83a402c2fe1828d9d1f3a5f71e7ad056aa8e60e6f3fe4eabd258abe3c3316fb098d9115261c9a4499c984cd6a62e70c24967f1650d7c4354d60a8c4671a5c3a4d67380e", 65531, null, "757669657731386e71326765707073367470776c396361677a6c6a6e676b74333334703533616b71776b6465326e683534786770746633636364347479656833676c656b39706d766b366178786b7338796c396837357071756e746c6d3967396637617268667236336e36393037746e6661787337306e7734707538386678736e336e386177703239636a75377234683576767632356573706e6e6e793373646b743639686764677165686b616c78777a6567757238747a37306a7a6332777332726b", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 5],
+    [null, null, "48e057b53fc1c94392f04b631c1f4696fdefb74fb91ad813a91fd70290845e09a1d6cb1108385b9c20238733b3ca1b3586c5353ea6b323ad37413d001770c20b325f2e53aecdac5d36cb6585e402e96f9f079d3b888add2e6037f0a09ea8272f", 65530, null, "7576696577313864747037716e61346a636c396b383539356c7178796d346465687a6d707375656830323967633777716b726b653678646b32386479656a366d63673230716e336538687a6479766679336a756777327966376b7270666b74653666663861646e6a6b61397a783361676d636a707537663875767363373261346163737a686b6d6a67786d73763337766533757a307363326471767578666b323566706871636e67793435746575657679327776706778306a74387771736671673767", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 6],
+    ["694cc09dd242e4a7b74e3b3cd795fe6959fa577ba56fdeb5fcf4c1a4502dec750214158dc4631f2a3784bfb42b9ad44dcb779dcf0f26a1def9120f81c9836bf4b5", null, "0b264d58dfe23d503b5ef1493e0cd388193dd20fe0131209e28fdff27d494a0ba5e5d9e4e5daf7f3d471bbd7209440a6eb1a5677cd06c211546a025052e1a806630c2b4ddaa21db96eb31ac1d1bbb974305b2396d66b9bb802cf9f473ab14f25", 65535, null, "75766965773164303677676b7666737735336a6163793467336177326b67616b6675613833766a786476617a373732616d646a3464306a6b366364736d71707a727839347170306c37746e37716676797a357233717264727a6e357464737a6b7467616b66796d3430776b77637173676b353834333670686d78327934716a336a73306c3079366d707539703472377467713865647972387739786e756c7077646a6b7474733070717866646e6577786c61346d3670643370676c75376b6a726a773875396467356636616e6567356e7a6137396b6167306e6e356166656137766e6a687271727634367836357178676c306464393778306667306a7167716d79773432326d7938653573386c6e71796a683561377372327066786163303535363277616d6e63357a667377616b", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 7],
+    [null, null, "5a597f1414b10558f5c76406afb5a025a8abc02cf46738b7a15933663f9f1f1c1a4e6a217bafda3180c08eff58d76fd33a22cbbb485334b6e5d4b68e0119331e8fb43b7d91f9579249a95ef11c500b779baaa35cda27a146438f19bb48575e1b", 65530, null, "757669657731673230677072656b666336746c61377564776d716c35633470346e643237723066727876676b75737266306736306577663273356c30397338726730336e767974366d676b7365666a616e363030783936377663796163786674343572366a3578397a75736176776538636b6b776e3434663434647664333871376a36713538656a6373747837376e356e72646b6a3570737968366430716d616630367663336a613373396b68307277387a67706d7730737674666567386a77383968", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 8],
+    ["b60895766bdad050ed932d0099832255dc0966eab8f98a3b1577f450f226a9410295599fc048f2181156f9e453735d989eb61623f6eee8a060b8f3fa59666cdfe1", "65aeee89ce971199487ac959c2960cee07477bad7d07a4c71a363894d671edc7090213b1b25d74d9d07cbe5b5034248bad5bc5394972c8532ea24b3f3887f9e6d312ca8ed244af57ce0412209ba3d537bcac08bf7f64744100dafac55fb25629204f19a123bdbbba7159510e52376938fb893ebdadde04d5f0646a3ad0f4cbc6", "20f8c2edbe19901c0d1b5cc7ab185e67354511bfc5174fe6bc0e6362c5880b28fabbf237258f8d03b200ad7fe0f3fa7e80e628f2b745dc9983b038c3a81f8237b6654db322e68436a972c6d3bc56e5560fb8658055524a11d6ee62e5a7d7a516", 65531, null, "7576696577317174646a67686e6c30366e6834747579707665787472617a723975786573353268363477676837786b7770663561687675676b6165766473776e72796838336677657664777239303566396771676d37767837307137703867726c36636a39397a6d686a6d6e377068676535716d703937667930343534346b636579396d34387979726471616b6c3836617a7034346a6d7765796e397979373071686a703072647971306a3334756d686168657379367473753738737975327339326777636765786b6b3533716b74736b3463756b38356d61657a633078717278326b793737396d6778303437323036776e71397673346a76717566367a373976346438367830686e3267666a337065376e68757377356e34727971337534757273326b39643079346c6e68787a7264766873676578743576633236666774377a707236377667646e39726c676e76396d6b636e6e6a387063786537307a346b74766566376d667032333566727761767370343970663067637a3079786a68646777337466396c32657136706d337663683434787475336e73647772366e6675757337383837723268646672736e793430736a7837346363356b3530307830303971306776323232616635706c673761636e676e633936617079363936713366797233347a676b366c66657930393438746b726b6e376379723676356538", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 9],
+    ["948ae8172f75da36040a5c6b10d4c66fb5b04bb4bd9371cf1955e0e2fcace749030b478a94651e25797404b9563869829f43ae5bd41ecdd4e92ecf5489573fe451", null, "042790a274f603d5dcd5d28dab5c4e341feeb358618a886b9d1284b1095c633aff807d0499ae89b5b3401b22086e11961d287ab7de1ab534a0b336f959679e3dd0f09728e61eb9cbded2ebc76a36ca901d903ec2019ec04ccf6df46045e2241c", 65532, null, "757669657731393032706d7861756d6a376661683973613875686774657037636468326138337a67307a7935656766327567673763787a6a79677430686d756a706b61766a756e7261327177373433346877733471716a776e6d386b3238727a306e727872356c34307368716c39367576727779647438766834737170396c786a6a616765736e3478366537767477706e613878637865736c30736a797a6766656d74786135776c6e6e653466307767676a6d38757639656e7634336b70686e6e737961773577686a7435396b727a776678376636647534393563707174776c393237346a756a336b6c35343866703561746c6a7a716d6436347476646c3938656733307070396e6865686d7472737670737333343967357267336334347132327a6830676b68736161666d376c", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 10],
+    [null, null, "612611e4529f127a539c31b01241750616e6f5b3d7a1625cd301ee4b898dcf0e85f8b38eb5846c2ede2e394588723b8f583c3841d589e7d285ad218ee5a6ea299fb823267795a5e3c9a651af384289d6453972be95022aed8167a1ca660b2f0a", 65530, null, "7576696577316775367534306a7579786670716535616675367564716a34686b7a6671643778746b376872686b37796c6c71736d7a6466647267717136367839347270666768307a36656e38356a7161747030636c6132796c767571776c3735727433717371646c75666b33723635613372796e767a7077776e683035323975637a7735783572686534716d76653064397036716a796839796a6b616a307a776a78776b3376683338387a346566787935757368753675707068656a67397468687979", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 11],
+    [null, "82c3b3d788f6cc8714421d6b74c20b5bc58debd9a33e24b4be99a4c601959b34d8436534693bb2f793ad6e4b488d9c7e202771f11cae68405ec816c71b4a906401d4cb12115fbd978735bf537d8589154a8a84ca61d6c202b60477107a5e0cf8de349c22cd8bfab48e92e90834504d65a438ab76010e3bab7437153a79755d17", null, 65535, null, "7576696577316b726e766a6e396e6b397973797a617a716374727763743778706b703735687230397a75386c617a386165356b756a397467756a723575666d32666164786d797239636c327963736d6565646e68346a646579743774747a71376337726a68716e377733777135306c3278656338357374637a6a32777670376375367563326475367965303071303066673930766e667772777975776663746e667a776b367a6b3438397130617663346a756568746533326c6b74616e737a65753768387a757330787033636736736b386e737461686578303577617475773035653438337179686e66367232647876357179746533", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 12],
+    ["6f5ea3456800b2fcd67d451af033ac9e0978ceed3b4dc656c420fe6a313a040f03f9d51fdf9593ab447a1bc8a8ee8ee802ce85efbe7d2d0b3c2b9d15682a1d7ec0", null, "310e66c574051ac9d885f9fe9a4a7c0c76f32c60258e75a091b86117a733d024ae45b81a071cddb7e1095da271a20cd62a7e85e57167d10cc0aaf2e9fb081b3f47dbb1af9421a75be2ca3bac8b86a60ae8fe9af14f893c0c5714319b2a0b1f23", 65533, "91e00c7a1d48af046827591e9733a97fa6b679f3dc601d008285edcbdae69ce8fc1be4aac00ff2711ebd931de518856878f73476f21a482ec9378365c8f7393c94e2885315eb4671098b79535e790fe53e29fef2b3766697ac32b4f473f468a008e72389fc03880d780cb07fcfaabe3f1a84b27db59a4a153d882d2b2103596555ed9494c6ac893c49723833ec8926c1", "757669657731756e77777136726a74786877376e687170396772656c71686467647467307a73386e706132646c3932776d6b73706a7871353075736d6c68766a6b6a6c6e326d6e7265357464383275766a7a30333033396670706b306b6836386c356b726735763365306a706764617a303871686c72326e61643967393966363078796465686c3736673835687666306532617975653971767575326c74796d7135646d3032686479303668723339736a337065307066773367687672766c72663070736176387876327173687a72636d3732617a78646173777178677932777964327572393833766378776c6479666130686b71366a717a346c6436326d7675646d6870333763373365373868643063367a61663335796832676133386836716330736e36376334756838323365306a376b7a7933766c74336a34347239757a6d33616a796764723834636d396a67796c73376171717337786136667a767532393938666b6a67706d3270776772707a70727776703979683465797a633532337a65677270303071706676337765796e346c73737634736b77756e39703967686d757a303030347a746774337a65726639636c64666a727063786130677a6d70366661796d3638386471727535307a396672766d3877723361777877366a6536376673753939383364363264617272613664747776746363387675736533377a73686e6736326a6679647a736a3239346d616667747468343079", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 13],
+    ["b9cc7c2fb05f06458a0b87d0ac47270b52266cad661332b15455f989f6576538028185d9021ac4ccc6847e3def047aa6f4384e63fe497dd0b49b3364c3da15ebaa", "282b9f0424760d2126ccdd1c7e0fdd0d9ded2c5a294cbbc019ce8d35fd33b3bd2ed6a319400cd89bb329d79318173df4cd9af45e62d8719d9f2f66f9e81421ee4cc45e4690268df0040baba4955edf22951b3f5a2a2374eefa91dacf19c080aa0737d310920e67d83715ca4646d38d5ab5387e86db43751daa16684088872427", "8e880f8e62d87ef6c18b5882061dc512727e00a7e36862f506977ce96d761135e2616a1306955609ac674da547746112a27dbacc776b992f80e0762a79e5063df6e35f273df2ef59a14f11a4b465b9397c313682dcb878c23b5384e9459c142a", 65533, null, "7576696577316467756365746a7575646c336d737636746365636a306765746e787364706b356a36306837346e636b64747272717335703467766638613373336c666c7865646e7072373734737837747961716678773073386d6e6e6c376e6b3768346d356d337938786c376566676a7072617238736471366b336d6861396c39636c6e3577793373366b3467376d6130746337793330783578776c37657a78727a68766e7267643871397a7a68346c3038386d74613933326d6c37776c6c33397933733832716d73653538756c72377036726a35396c68397630673765766370676875336e746e68366a72326a7a6a327664633930346168686c6b7136736e306a647974336c3473306368366166376e766834656d6c737074333268676b357435396d67336e75786e6a7170767078323676776366767075686d38766d707930726179346d687768747a3964653867767767343233727077376c3839396676797530776d72356c70356c753436636b75666132677074396d736a70787861636835636e757761787068303065363574666d656c7879656437387435377434673766387639713966713033373867323379716c3274397470373867336d7030786c333071363233726d78676c686b6e6c373965376c74777572667670773777346b3537797a763937657871396830667630757267766666753664716d6b35", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 14],
+    [null, null, "0384454f17022a1482cfeba6905337fd310a7c2c3a0047abc7b1e7042550e80e237e5bbf5369af2e8b610fd4ecce60e4e88c35d11a30b546e9d14828f62d320c7ca2bda474d8a86c15c60ac120e79d4a99916e6ce1f92a56bcf8804d610f2107", 65531, null, "7576696577317274686a346c67716e6b74386473756673747366636563766d35666e61663868756e7333747337336a706c7575306e706e746a326e72386d6a75786b636837356e76706e7264666d71383768327975676c34326a74336d756667326e67396571723771703338736a33636e346c667a706b6136663963733737637677716471376d36723938713233397161327836326568776e6c65656e6e6e6b33393667766d706430346761656737386c6573377770366b7173727267757961756673", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 15],
+    ["7168544c05a8a120bb6b532589533fad6e19f38e65bdbde41b720afeae539657037460e104528508724a707d2e9a896742bfc7b73a0fd0416fe0d6229549089788", null, "982a22c3aa25c6dea0ec60cc9208b4dcc796f0d0ec6d8c76f6cdf54957cd36292e4917585d1f1967cfb5942c08589b78f10eb0a4faea9711841f446d048da13e1b6027c0fb0b440d06f472d8092216ef3b76d4e122f88897b1e97dd253a97d34", 65534, null, "7576696577316d74366332717a7975736570747a39327a35347674673864666c6e73796572756c7277713971797137667667357664766c3561753773676766707767346637776833646e78727077763368746e77736138646d7267666765713539733966737063767a6a3932777a786d65786565733664683632643478356a3233306d756e7972726873616a63636577766871666e786e67787065797166726a397978656e656c366a787066727139387968796e3279386e3964737232706734367367376c6e6b683736666b76756a75746776336a743567767770786d786c657272386c797a32356c73767830616d61756e386a75387a367a657034756d77636733356473736a7738346b7034713861753679713661716732326e3077776a77706a6d366c7239796a3539657466", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 16],
+    [null, "b7e107e0c3637526387c663dc51e2cb7f34416fa271e085246dea1015478a9b51f4f38acfee3e2d7ee3a1906c326d835948412f6647c218ed13b5d606f753d145ca102aa497e3f2190f50ca17873b6aca1a40612a540ca9eea6c4096f0db6dfa60e3822c1e69731a1e5013c7055a4348cf53e8bde2758f95b87a3a43c9e6ff6d", "2d3c2f7796db54f14a1753b5201e2499da0973016b978f9a4f49f515cd1c3c2670403dc59e67aed5dbf58c2fe4b3490caf854596436bc6f98dcb325ad7a6f22c8e3ae8448f413b2592363947088f9ae1c9908fe60313c10749f4a36281908724", 65535, null, "75766965773176653039326766677972636d77736b6c6665616d3377743670766d306e687037386361306e377673706b64773671346c38736b6e616163766637766778633478646a767063787266307a383532666e7a7370716b34683930353934616330307137656c73306d7671783977786d396b756775377977727639616361347164726d763277646c39357372366178393332703032373033787463327879777a706172787178676a3935326e676630397764796e63343536396d30686d6577786e7866666c77723534647832376c346a337972386a3863303032776c716b6b74637037373675306c376d70786b3961706470686a333634666373327464756a6361376563766e386379786d6b7166326d376c7839306d6c616d306676337677797830393979657179793032346d77366e6d373577796d347935367a687134746b756775653363793371706779766d367672656b797579796c6a6b336534756b3068396e6e3735616572666e667a7a6436336d63727a666b376b736c706e6570353666326432756734737378666e743667", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 17],
+    ["f90c60ebe5428502d2de8c9adfd003a1db5d161c73fe4ff1990794a6ed9733930231987bb4878e9e8078a9ea711f662bccc0d64f7e286d6872ddd9347d3b422cbc", null, "082ac71bb6882c48a63678a4207bd28d93ce949efc9f9963c7696ff6312dc62054e150736f5e3d26c87d5ab24a64508260ff60fa7e360e4daefcf04d10b96d1ccd8553ca2fa3d6ba62644bb8d72d6ee0159e469d6ed5eb2c512c78915be17922", 65535, null, "757669657731747a6a3675373077347463656639726d7177647a73376a7a6d3061656d6774756e66687a686c7a6b39726367653239746a78386a6a7a376d6a327479613978336e307767787337746b33786b773572687979756471723835377a30776d796a396c32383466647a3467336663366e746e656b75686d343770703835617076396a376a396867647a6c34396a6e7a726a6866677634683061727a7033386e6e7a79356a333739636a7267356735617367366a3274786c3278397475707963756b63717036677179736877706566676c75327667676173646e32337a63753879376577366532783563766636396773306766647965766830776a326177367771326639616a71687a7a366c7a6d396c72747374687272357a6839353935347579647739756c6c6761666d", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 18],
+    [null, "d9e0d580c264aa721420bff06666b991635989ec21813e9ef8989728a82835163564d29ae007573f0d48b12f2ca2a8135f8adedd27c0e1d04399773ce1aa29949485d60142c6896d6aaab7d5abb01ff34440c1b7d5ca239576d5a243ac37df2ffd3dc2815d5052e67991abf2ef9742d788e7c45264af01b6237558157596ed96", "77051a5802d4ef29655f7e149ddc1b1e94640f2d30d3e51856b7d10813da99165aee0e247964d23398b6ae89eb0167d9c48584e274ad212cc6dd7e65c1a60a23ab47eb191d1c16c28235ca654e7e637eab6da823ea090ccaf84a8ae13e432911", 65534, null, "757669657731777376373363796a6467387479716530366e6e6d71673432646d6376766438616838776d6b72646161746a7638336373663267373368643936326361797279646730746438327563636e33326e7a6c3768776b793232666e6a6173346372683236616a3367716a36687366617a7266663377767573767134306c61756832363771616d7174753234646837747a6d7a6839676d6d6134656d6d3966667a3736723771706b36773365716e36776d7039343235796e323774686a3774353661306d6c753637376a307472336830347476376868346d3933786d6434733238747030613739637437326a3275706e663736667164616c72343936726a647a6836326c613534616b78733968786d64397272777232797377617736687176677a743837723668723530716776657935713432786e346c717a703334396776346d7432736a3634737830717461726a637365746b726b77347a787133356e793266637463397a7137716639373971646477666834763661356d70713935306d36326d6434306e396d773771386c6d646174", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", 19]
+]
+
diff --git a/src/test/data/zip0244.json b/src/test/data/zip0244.json
index 829ebd1ac75..6ec6dfa97e3 100644
--- a/src/test/data/zip0244.json
+++ b/src/test/data/zip0244.json
@@ -1,14 +1,14 @@
 [
     ["From https://github.com/zcash-hackworks/zcash-test-vectors/blob/master/zip_0244.py"],
     ["tx, txid, auth_digest, transparent_input, script_code, amount, sighash_all, sighash_none, sighash_single, sighash_all_anyone, sighash_none_anyone, sighash_single_anyone"],
-    ["050000800a27a72698a119f97a8f739a2d6f2c0201e152a8049e294c4d6e66b164939daffa2ef6ee6921481cdd86b3cc4318d9614fc820905d0453516aaca3f2498800019f33bf3a109bdd1b232b47b1646d91e1296634ebde5ccad57288b5b2228186e54b6968912a6381ce3dc166d56a1d62f5a8d7551db5fd9313e8c7203d996af7d41a38e01d94903d3c3e0ad3360c1d3710acd20b183e31d49f25c9a138f49b1a5301466b3da612149df5eda0f14f2efc5c6ac03884428a315dc91f8d7b492ebc57e475a4a6f26572504b192232ecb9f0c02411e52596bc5e90457e745939ffedbd121e37ec1e9dddc31b06dc9576a1738ef73e6ba71648913dbf75a779fdd488d83f857deecc40a98d5f2935395ee4762dd21afdbb5d47fa9a6dd984d567db2857b927b7fae2db587105415d4642789d38f50b8dbcc129cab3d17d19f3355bcf73cecb8cb8a5da01307152f13936a270572670dc82d39026c6cb4cd4b0f7f5aa2a4f5a5341ec5dd715406f2fdd2afa733f5f641c8c21862a1bafce2609d9eecfa158cfb5cd79f88008e315dc7d8388e76c1782fd2795d18a763624c25fa959cc97489ce75745824b77868c53239cfbdf73caec65604037314faaceb56218c6bd30f8374ac13386793f21a9fb80ad03bc0cda4a44946c00e1b1a1df0e5b87b5bece477a709649e950060591394812951e1fe3895b8cc3d14d2cf6556df6ed4b4ddd3d9a69f53357d7767f4f5ccbdbc596631277f8fecd08cb056b95e3025b9792fff7f244fc716269b926d62e9596fa825c6bf21aff9e68625a192440ea06828123d97884806f15fa08da52754a1095e3ff1abd5ce4fddfccfc3a6128aef784a64610a89d1a7099216d0814d3a2d452431c32d411ac1cce82ad0229407bbc48985675e3f874a4533f1d63a84dfa3e0f460fe2f57e34fbc75423c3737f5b2a0615f5722db041a3ef66fa483afd3c2e19e59444a64add6df1d963f5dd5b5010d3d025f0287c4cf19c75f33d51ddddba5d657b43ee8da645443814cc7329f3e9b4e54c236c29af3923101756d9fa4bd0f7d2ddaacb6b0f86a2658e0a07a05ac5b950051cd24c47a88d13d659ba2a46ca1830816d09cd7646f76f716abec5de07fe9b523410806ea6f288f8736c23357c85f45791e1708029d9824d90704607f387a03e49bf9836574431345a7877efaa8a08e73081ef8d62cb780ab6883a50a0d470190dfba10a857f82842d3825b3d6da0573d316eb160dc0b716c48fbd467f75b780149ae8808f4e68f50c0536acddf6f1aeab016b6bc1a51ed44cfab70000c7b3534201cfb1cd8dbf69b8250c18ef41294ca97993db546c1fe01f7e9c8e367edcf04be34a9851a7af9db6990ed83dd64af3597c04323ea51b0052ad8084a8b9da948d320dadd64f5431e61ddf658d24ae67c22c8d1309131fc00fe7f235734276d38d47f1e191e00c7a1d48af046827591e9733a97fa6b679f3dc601d008285edcbdae69ce8fc1be4aac00ff2711ebd931de518856878f73476f21a482ec9378365c8f7393c94e2885315eb4671098b79535e790fe53e29fef2b3766697ac32b4f473f468a008e72389fc03880d780cb07fcfaabe3f1a84b27db59a4a153d1070689f2ccf975b2b176e1c69dbe381340ef1f98fdc4b453abda3a2bfac3069ba7f1cc50a81c2520e412fab4e5d397ecf739f280d5b684533d5d29cfe7e7302ec144b4e553acfd670f77e755fc88e0677e31ba459b44e307768958fe3789d41c2b1ff434cb30e15914f01bc6bc2307b488d2556d7b7380ea4ffd712f6b02fe806b94569cd4059f396bf29b99d0a40e5e1711ca944f72d436a102fca4b97693da0b086fe9d2e7162470d02e0f05d4bec9512bfb3f38327296efaa74328b118c27402c70c3a90b49ad4bbc68e37c0aa7d9b3fe17799d73b841e751713a02943905aae0803fd69442eb7681ec2a05600054e92eed555028f21b6a155268a2dd664052528a5f8ed028f59af985ad1315c2e25aeb9d7f134e4bf478642ab96b15d3b3e13ce2387ac84dc0819e81260e11d392a5f06db8b5633de281a0e9c958c24060297f608af1dc51616562b1ffff6e2a28bab1f7772713a0a4b56fe47fb5a7b73aeee5345566ecf3e95e825f92eb469eb5d69164206a0ea1ce73bfb2a942e73703214d270d80534389b1a1e2bba67481eb3667d6d38254ac4b44559b4708cdd12898972a895bf0fb055cf1fb9b73029d6bfb27da2b5294f5cb354a894322848cc3d35b9554a5f62b44a7dcb25406e5ba07882cb6473714e77a051a7dcd29fea0a943785b325cdab95404fc7aed70525cddb41872cfcc214b13232edc78609753dbff930eb0dc156612b9cb434bc4b693392deb87c530435312edcedc6a961133338d786c4a3e103f60110a16b1337129704bf4754ff6ba9fbe65951e610620f71cda8fc877625f2c5bb04cbe1228b1e886f4050afd8fe94e97d2e9e85c6bb748c0042d3249abb1342bb0eebf62058bf3de080d94611a3750915b5dc6c0b3899d41222bace760ee9c8818ded599e34c56d7372af1eb86852f2a732104bdb750739de6c2c6e0f9eb7cb17f1942bfc9f4fd6ebb6b4cdd4da2bca26fac4578e9f543405acc7d86ff59158bd0cba3aef6f4a8472d144d99f8b8d1dedaa9077d4f01d4bb27bbe31d88fbefac3dcd4797563a26b1d61fcd9a464ab21ed550fe6fa09695ba0b2f10eea6468cc6e20a66f826e3d14c5006f0563887f5e1289be1b2004caca8d3f34d6e84bf59c1e04619a7c23a996941d889e4622a9b9b1d59d5e319094318cd405ba27b7e2c084762d31453ec4549a4d97729d033460fcf89d6494f2ffd789e98082ea5ce9534b3acd60fe49e37e4f666931677319ed89f85588741b3128901a93bd78e4be0225a9e2692c77c969ed0176bdf9555948cbd5a332d045de6ba6bf4490adfe7444cd467a09075417fcc0062e49f008c51ad4227439c1b4476ccd8e97862dab7be1e8d399c05ef27c6e22ee273e15786e394c8f1be31682a30147963ac8da8d41d804258426a3f70289b8ad19d8de13be4eebe3bd4c8a6f55d6e0c373d456851879f5fbc282db9e134806bff71e11bc33ab75dd6ca067fb73a043b646a7cf39cab4928386786d2f24141ee120fdc34d6764eafc66880ee0204f53cc1167ed20b43a52dea3ca7cff8ef35cd8e6d7c111a68ef44bcd0c1513ad47ca61c659cc5d325b440f6b9f59aff66879bb6688fdb462af43582b983f92b5698b87db46e4b02dd8e81eca555a44f2f1aef11d88a0bcee76af9ad3f9c46a67062e1a9ca7ea5c014384af07219c7c0ee7fc7bfc7933d174650f46b4cc000190c19b44c57ae891aa86646c10a177a8626be064409931c37d9e8bdc433b7d79e08a12f738a8f0dbddfef2f2657ef3e47d1b0fd11e6a13654db2854fcbff49aa0dadafec320b6ed2d4b279aee9060c1b221e2eb2f13b0691c4d842406d0ec4282c9526174a09878fe8fdde33a29604e5e5e7b2a025d6650b97dbb52befb59b1d30a57433b0a351474444099daa371046613260cf3354cfcdada663ece824ffd7e44393886a86165ddddf2b4c41773554c86995269408b11e6737a4c447586f69173446d8e48bf84cbc000a807899973eb93c5e819aad669413f8387933ad1584aa35e43f4ecd1e2d0407c0b1b89920ffdfdb9bea51ac95b557af71b89f903f5d9848f14fcbeb1837570f544d6359eb23faf38a0822da36ce426c4a2fbeffeb0a8a2e297a9d19ba15024590e3329d9fa9261f9938a4032dd34606c9cf9f3dd33e576f05cd1dd6811c6298757d77d9e810abdb226afcaa4346a6560f8932b3181fd355d5d391976183f8d99388839632d6354f666d09d3e5629ea19737388613d38a34fd0f6e50ee5a0cc9677177f50028c141378187bd2819403fc534f80076e9380cb4964d3b6b45819d3b8e9caf54f051852d671bf8c1ffde2d1510756418cb4810936aa57e6965d6fb656a760b7f19adf96c173488552193b147ee58858033dac7cd0eb204c06490bbdedf5f7571acb2ebe76acef3f2a01ee987486dfe6c3f0a5e234c127258f97a28fb5d164a8176be946b8097d0e317287f33bf9c16f9a545409ce29b1f4273725fc0df02a04ebae178b3414fb0a82d50deb09fcf4e6ee9d180ff4f56ff3bc1d3601fc2dc90d814c3256f4967d3a8d64c83fea339c51f5a8e5801fbb97835581b602465dee04b5922c2761b54245bec0c9eef2db97d22b2b3556cc969fbb13d06509765a52b3fac54b93f421bf08e18d52ddd52cc1c8ca8adfaccab7e5cc2f4573fbbf8239bb0b8aedbf8dad16282da5c9125dba1c059d0df8abf621078f02d6c4bc86d40845ac1d59710c45f07d585eb48b32fc0167ba256e73ca3b9311c62d1094903570519d4442f0200e6ad11f2452dc9ae85aec01fc56f8cbfda75a7727b75ebbd6bbffb43b63a3b1b871e40feb0db002974a3c3b1a788567231bf6399ff89236981149d423802d2341a3bedb9ddcbac1fe7b6435e1479c72e7089d029e7fbbaf3cf37e9b9a6b776791e4c5e6fda57e8d5f14c8c35a2d270846b9dbe005cda16af4408f3ab06a916eeeb9c9594b70424a4c1d171295b6763b22f47f80b53ccbb904bd68fd65fbd3fbdea1035e98c21a7dba5fe1089f7d1c032f24d36835aa8815266e897ff829403cfac3a715954b9b68958a0111a2c9265633ba2831a2e86b941e569d58d99c1383597fad81193c4c13151f40aedb487b5c04ae3b1ddfbafa26e720099f26d5a7535aee57306fd2c4f30673cd9b698fecf32faf88f62e21c90665859dd26833d21d9bc5452bd19515d3fa5c1e68bc209b9dc2a10ae6b630726a67b33603c691fafc281dd94dc9888a68c4f45155aa7897c045aafd9335be2e0ddcf5f586d7f6b4fe12dad9a17f5db7031", "44953d98d6da0500d389a2632a4ac7873c8b69d0fb6dd9d4b165c5f7197d6cbf", "9e760dec2ee3d4ade905273dc073359e605a91d2a9a7dacd52a64c25d7e0bb1c", 0, "650051", 570688904498311, "6401ef6037a6b71f7d4ffd40f74f25f967e81062399780d8104ef609ee73fff8", "86be75d840f644a28596e3f6d61b3289f55e8c822b60eb233dea83754b1be689", "86be75d840f644a28596e3f6d61b3289f55e8c822b60eb233dea83754b1be689", "237bbe3329b0e24dba8a1038f0531535dd38114f713b10c952f4800465d359f7", "237bbe3329b0e24dba8a1038f0531535dd38114f713b10c952f4800465d359f7", "237bbe3329b0e24dba8a1038f0531535dd38114f713b10c952f4800465d359f7"],
-    ["050000800a27a72698a119f91fc998c31f4dd20800015058e5754c2104000753ac515300515202f89d3226fb53292bfb5dbbf7ff013af3341ea7a35f553f6d7a0221ae195ea84eb97a14943649305521326bde085630864629291bae25ff8822a14c4b666a9259bea6fa0bf2999956fbfd0ee68ec36e4688809ae231eb8bc4369f5fe1573f57e0685406994d28264e4d74d5a25fa3fa38fed813c505dd90289f301c75e53a716c5b54a45eb32c165448d4d5d61ca2859585369f53f1a137e9e82b67b8fdaf01bda54a317311896ae10280a032440c420a421e944d1e952b70d5826cd3b08b7db901e5849f96bae6f2056f33ab1e6989d7d264adc97855a990103b4d1e6350d5c31a39c3caf69459e462f141be8b39037ffa255ce27e4ad7b566a29620a9f011ab08fb2ad3050652b3f65b8e34526a2a15fc2ddc5b5113e4882c7cca0dd5577be067ba7a175dae4bbe3ef4863d53708915090f47a068e227433f9e49d3aa09e356d8d66d0c0121e91a3c4aa3f27fa1b63396e2b41db908fdab8b18cc7304e94e970568f9421c0dbbbaf84598d972b0534f48a5e52670436aaa776ed2482ad703430201e53443c36dcfd34a0cb6637876105e79bf3bd58ec148cb64970e3223a91f71dfcfd5a04b667fbaf3d4b3b908b9828820dfecdd753750b5f9d2216e56c615272f854464c0ca4b1e85aedd038292c4e1a57744ebba010b9ebfbb011bd6f0b78805025d27f3c17746bae116c15d9f471f0f6288a150647b2afe9df7cccf01f5cde5f04680bbfed87f6cf429fb27ad6babe791766611cf5bc20e48bef119259b9b8a0e39c3df28cb9582ea338601cdc481b32fb82adeebb3dade25d1a3df20c37e712506b5d996c49a9f0f30ddcb91fe9004e1e83294a6c9203d94e8dc2cbb449de4155032604e47997016b304fd437d8235045e255a19b743a0a9f2e336b44cae307bb3987bd3e4e777fbb34c0ab8cc3d67466c0a88dd4ccad18a07a8d1068df5b629e5718d0f6df5c957cf71bb00a5178f175caca944e635c5159f738e2402a2d21aa081e10e456afb00b9f62416c8b9c0f7228f510729e0be3f305313d77f7379dc2af24869c6c74ee4471498861d192f0ff0f508285dab6b6a36ccf7d12256cc76b95503720ac672d08268d2cf7773b6ba2a5f664847bf707f2fc10c98f2f006ec22ccb5a8c8b7c40c7c2d49a6639b9f2ce33c25c04bc461e744dfa536b00d94baddf4f4d14044c695a33881477df124f0fcf206a9fb2e65e304cdbf0c4d2390170c130ab849c2f22b5cdd3921640c8cf1976ae1010b0dfd9cb2543e45f99749cc4d61f2e8aabfe98bd905fa39951b33ea769c45ab9531c57209862ad12fd76ba4807e65417b6cd12fa8ec916f013ebb8706a9a556c762f8850000bdcbd49fe4f85b623c7828c71382e1034ea67bc8ae97404b0c50b2a04f559e4999d9c09901bf39caac48dc11956a8ae905ead86954547c448ae43d315e669c4242da565938f417bf43ce7b2b30b1cd4018388e1a910f0fc41fb0877a5925e466819d375b0a912d4fe843b76ef6f223f0f7c894f38f7ab780dfd75f669c8c06cffa43eb47565a50e3b1fa45ad61ce9a1c4727b7aaa53562f523e73952bbf33d8a4104078ade3eaaa49699a69fdf1c5ac7732146ee5e1d6b6ca9b9180f964cc9d0878ae1373524d7d510e58227df6de9d30d271867640177b0f1856e28d5c8afb0630fe4fd5f22125de840fcc40b98038af11d55be25432597b4b65b9ec1c7a8bbfd052cbf7e1c1785314934b262d5853754f1f17771cfb7503072655753fa3f54ecc587e9f83b581916092df26e63e18994cb0db91a0bbdc7b6119b32222adf5e61d8d8ae89dae4954b54813bb33f08d562ba513fee1b09c0fcd516055419474dd7fda038a89c84ea7b9468287f0eb0c10c4b132520194d3d8d5351fc10d09c15c8cc101aa1663bbf17b84111f38bb439f07353bdea3596d15e713e1e2e7d3f1c93cfcb46238b6e0398b46d76aff2d8f05745c465a94fca4365a93741b2e7516a1d2a00de7d1f80a5d3f791d35058a96380dced302c60c0062f67a331cf71e004ef78407a7c51161c7b8d46aba76714bac170d185e27ce3ebff2446164e0db23c02ea332b6afe11084ac25d73e63e51e75f6da74707bec9b1c2224f11dc18ed0a6effeda06c4be24b04846392e9d1e6930eae01fa21fbd700583fb598b92c8f4eb8a61aa6235db60f2841cf3a1c6ab54c67066844711d091eb931a1bd6281aedf2a0e8fab18817202a9be06402ed9cc720c16bfe881e4df4255e87afb7fc62f38116bbe03cd8a3cb11a27d568414782f47b1a44c97c680467694bc9709d32916c97e8006cbb07ba0e4180a3738038c374c4cce8f32959afb25f303f5815c4533124acf9d18940e77522ac5dc4b9570aae8f47b7f57fd8767bea1a24ae7bed65b409e1dd26b8dddd68858d6f5161f073d90636860a9aaee18629b06330a8ee30591debfcef56a026bb28c3b06ec2cfaf5b79ab72694d1d012a7594dd80ae7dfa0c00", "03b08aa510ac31b7bf2979daa7bfb7fce4a5f84db0a07f7485179b82289c18cb", "be78adfc71515f0f2cf94947fd9725619eb887e6e2a1b83214f196165051ed64", null, null, null, "03b08aa510ac31b7bf2979daa7bfb7fce4a5f84db0a07f7485179b82289c18cb", null, null, null, null, null],
-    ["050000800a27a72698a119f9c2eb518f68984d020000000000", "cd97299dd6dd625b98cd1bc7ff6bb76a57f9cbb183bb32a2561a4e3779d84d7f", "ed22293620cc26b4e0f108f1d8da60d9f6793d9314fcfce4e81d1164b678da04", null, null, null, "cd97299dd6dd625b98cd1bc7ff6bb76a57f9cbb183bb32a2561a4e3779d84d7f", null, null, null, null, null],
-    ["050000800a27a72698a119f95e3dbaf7ae12670d0001516cf4adec75070003656500000000", "bfb1c2ca149a1a0565dc789f9cc7f9d54fe3a110e6c315f18b28d96c5f35268b", "ed22293620cc26b4e0f108f1d8da60d9f6793d9314fcfce4e81d1164b678da04", null, null, null, "bfb1c2ca149a1a0565dc789f9cc7f9d54fe3a110e6c315f18b28d96c5f35268b", null, null, null, null, null],
-    ["050000800a27a72698a119f9ff6acc0ffc2e490d03146b9d49dd8c7835f43a37dca0787e3ec9f6605223d5ba7ae0ab9025b73bc03f7fac36c009636363635100635365bca7e54cc1a12d127b57c8138976e791013b015f06a624f521b6ee04ec980893c7e5e01a3362035904ac000053d7445fe2d09130f63511da54832de9136b39f4599f5aa5dfbb45da60cdceab7eefde89be63f3f7c00452006aace1405def0244fd7f99b67d040004630063ac12f6465073e1020009636a5351520065ac65000000", "1e5ba2486609062c16d33a720e58d4039390f5857007a4ce7c9778362645b31e", "b34ac0688293e11f6d7b8e504aa7e7dbadbb9f87d193b612e9b31fb339687c9e", 1, "ac0000", 693972628630138, "b0431734f9296d596523fdb4b80f34ac82fd10f8e99b139208a690edef08a524", "b64c9c23097103e959193962015311a858a7092c8401950b803d2d8f27de4411", "b2c23fec2e9696fe806d4519183685a023be85509f388f4f4c1d7c463161c2c4", "86617533ef5fc517f7cd26e99ef7d83546dcc00c3db0acd9d72b4eb2fb4b3be1", "6a8767d706027ec535bef6f7f85c630aaa15fccf4b32180464ad41dbc0beae21", "20f661902955f3f8adc6aa940151217c08480d87e8e186382dd9f9d5f6cb0fb6"],
-    ["050000800a27a72698a119f9dedc5e5f0756fb19000133a490768c1600000851535351516563000001dab9578157ebf9cd8113078866e952d6218c69455fbc9c5548725b189cc216ab58483a5a4d28cce4b2fae6513dc6c094307eb498166ba95999ac5f8464b2ff6b295d6e94b0227b5c43a121a34ac907e8d0d07a2d6d79712a776614b0cdec4de09b2627218f0c292fa66ada945fa55bb23548e33a83a562957a3149a993cc472362298736a8b778d97ce423013d64b32cd172efa551bf7f368f04bdaec6091a3004a757598b801dcf675cb83e43a53ae8b254d333bcda20d4817d3477abfba25bb83df5949c126f149b1d99341e4e6f9120f4d41e629185002c72c012c414d2382a6d47c7b3deaba770c400ca96b2814f6b26c3ef17429f1a98c85d83db20efad48be8996fb1bff591efff360fe1199056c56e5feec61a7b8b9f699d6012c2849232f329fef95c7af370098ffe4918e0ca1df47f275867b739e0a514d3209325e217045927b479c1ce2e5d54f25488cad1513e3f44a21266cfd841633327dee6cf810fbf7393e317d9e53d1be1d5ae7839b66b943b9ed18f2c530e975422332c3439cce49a29f2a336a4851263c5e9bd13d731109e844b7f8c392a5c1dcaa2ae5f50ff63fab9765e016702c35a67cd7364d3fab552fb349e35c15c50250453fd18f7b855992632e2c76c0fbf1ef963ea80e3223de3277bc559251725829ec03f213ba8955cab2822ff21a9b0a4904d668fcd77224bde3dd01f6ffc4828f6b64230b35c6a049873494276ea1d7ed5e92cb4f90ba83a9e49601b194042f2900d99d312d7b70508cf176066d154dbe96ef9d4367e4c840e4a17b5e5122e8ebe2158a3c5f4cbae21ea3fa1ae6c25a9462ebcbb0fd5f14554bc97747c33e34da90c816d8d0d50bfe37618c5812891484fa259322c15092d4155d8696d6f12f24fd364496b3be0871ca3dd9625348a614b59bde45885649bae36de34def8fcec85343475d976ae1e9b27829ce2ac5efd0b399a8b448be6504294ee6b3c1c6a5342d7c01ae9d8ad3070c2b1a91573af5e0c5e4cbbf4acdc6b54c9272200d9970250c17c1036f06085c41858ed3a0c48150bc697e4a695fefc6be7b68d0120200335f7ad07e1a46dc767ff822db70e6669080b9816b2232c81a4c66cc586abfe1eaa8ca6cf41fc3c3e6c7b886fb6dac9f4822b4fc6fff9d0513d61a21c80a377671d135a668a0ae2bb934c82c4142da69d12ca7de9a7df706400ec79878d868e17e8f71ea31495af819a016cc419e07c501aa8309b2e6c85b79b2763733a37bbc0420d42537b871b4294a65d3e055ff718dd9dc8c75e7e5b2efe442637371b7c48f6ee99e3ea38a4b0f2f67fc2b908cda657eae754e037e262e9a9f9bd7ec4267b5420240add20a389cb678706917f97cc8162fb1dcc6c28b6eda930f055ce86bd84ec0f3ffacda10485cce037a43b0780fd591452390c924c04f54924bf6ac0d025b39b01398f37e78067cfa374bb53eb00fb2a95d03dabf6bf6c5f77feeaf651068aae477fce410ac2d5de6095861c111d7feb3e6bb4fbb5a5495549597279835c72c633a4bd01b150be28ec3d843f1bcfc0bf35b772a3c7263dc89016ed4a112ed8406f96980288726599c1238978691ba421df6027de5af1e4745d58681061564d951eb7684dedcd335fb1bd2a6978cdb797e1f3b659d3a557e407735753c8f8a2b7d4385f1c95af937df78dfd8757fab434968b0b57c66574468f160b447ac8221e5060676a842a1c6b7172dd3340f764070ab1fe091c5c74c95a5dc043390723a4c127da14cdde1dc2675a62340b3e6afd0522a31de26e7d1ec3a9c8a091ffdc75b7ecfdc7c12995a5e37ce3488bd29f8629d68f696492448dd526697476dc061346ebe3f677217ff9c60efce943af28dfd3f9e59692598a6047c23c4c01400f1ab5730eac0ae8d5843d5051c376240172af218d7a1ecfe65b4f75100638983c14de4974755dade8018c9b8f4543fb095961513e67c61dbc59c607f9b51f8d09bdcad28bcfb9e5d2744ea8848b2623ac07f8ef61a81a35910b8a1baf39a919a7b60bc604d63185f759221d847cc54a22765a4c33475b5791e9af3271fc8d9350667090d8184ec50522d804f23c4fb44ffa481bc92ae408d1b9f2b131904f9705c59e2f4bde7a3b2c085d93fd2abc5e14d163001a12f51938d021afa92239b873dc6c357eaa8af4ee6d00540657fe32914103b5d98f68bd3e2b5359f08ccd88d0c811e4c31fbb49f3a90bbd05dce62f344e7077593159ae35050b04c9e6b86bc432dc8b048c73c0018ca5b69411297732a4e1aa99a928c71e7a24fd277856aa42501e51b012aea9446a2104e93f815a0b3a29b458314f3d8be2b9823d342f46213e942a7e19a46e970b5c506708430317b1bb3b35df68ae33a4926a03e6bfeb5510416fcbb0524c9ca5074156cc5a5d6fe1c995edc60a2f550411aa41e3da3bdcf64bcf04a0510571b936d47e55cec0330ee8dfe73563404f047d7f3a8a3d7743bc554955210f1eb0d08599ea77d5f974d87176d37d98b9c0ad440407209ed6a9f08464d565593e1a63b938536b49244e97d880173b640f2ddb74d068ecb46cf289b7d891307bba37054cf91b31fc82f74d5fc461fc5e978920e95d2804bbd5be7fb86b1b0961f35386c586bf4890ea6d607ae27b4c2b271061857eecb8fd90fd08eb5c43ceb736b6831e8c110f16cfdb3a42711215ca70517fd02dd25c84236e8de61e7ed8a3f26c83f4beb392cc07fc375af1968a52510744e95f837499abf7d7eaef506f1883a751588c7efa506c3e8d006961b9416af621e21c6787c5cf16ef846090f40f6158484007a6f536f656c52985673ece7fac73a0ed41ab0051753a7caa89be3139afd9793b3e02f27f040046595acd47bf13fd0da27f09eda48036d3ee437f2ee8f8606ea97343c33584657f46dba99db5cfe6ca176fab7b0f3bfa0ab61e340c34eb9f17c7ec2be03b180f0bb6f434c2a6542e00e84373f4f4649cda32bf686666143f622aa480460b5afac518607cd9af8bcd6b58c30127316b25d5ea7bf6b0cab8542ff69d9b2f180be12ed75344a395aa10f852f083ad64ef40e9c0309e9bba54b8cb33c95498a69538d3ae5b25e247098306fa8c74a8ee5bca941531d61aac27aab3dc5617d5606c9577a2a8346e8d85b32b8505775108dc85e2ade2eac1e636e1af4054c8b6f57632df269c3723b320872e4c57b218358dc7e9905bb04edf92edf0df635f3bf361e57a13296e1447af5087872d636e27518a9876e15eb01f5e8ded81892511cc2851b00b832712a6d3ba5666517bcd3567621a7cf8445589653262020c33bf78031b8ee0707de072068c170570327e6d9f5c6ddc335402efc548862f5a07094fd428a7bbc15d7b38d05362c9ca985f58a76647d2be4c2cd6b3d17d6870971d7a098baf72c6f6f1214cf1faae488bd7de259d3415c2f0ddec7457004f35708d1eccccc0df65a04943ad5cbc13f295f000fe056c40b2d88f27dc34cfeb803be3483a9ebf9b5a9026057725d63ead2c0c0ff1fe26ac1e7bdfcd6fad875842d194f331750462c06b8d7982d67995ed5d3ae96a05ae0067f4eb1c7c93231bd39773cbe0a9d66b0c9aa8cff6a376e1f372eac6ac4e46cc0942245d4c2dcf02d7640ffcc5a6ac3a87f5c411551bcc2f26cb94961d53f95ddb19ae930c8d70f031b29a5df99ff36695e802cbcb6b58c1ba7ed5eacfa76414a41ad4a44f71f1b580d34c3a952920b254a145fea517f5b42b2f65ecd0f82595478d80a0147e39a9cf3ef02000860f7bf1778a151c9fa667f5b880e556fa05241b10f5ac9a8408e925b626b323a471fe3bede52bba097b2a99a9ba5a86658c3fd9ec55bfa9b328567254ab36d2c7f44d2c7e13eb54beb70ea8fa94b6c6e012d79e3f53689c2b1a18102fc2334b7d094eb078f666ef96efc00b8f27fe280e8dbaca68558a3f12b8767a075e88291c7fae19d48f858acb292fb0eec645ffcbbe0ca5f8c561b257d1232e20cf850610c5e7f9e837e0cb42b2255e563c9d87140ad39caa233f9e9d200ae7f3ceac6e8fa0e4221925059c0887c2d3b60978d81a678b9ed8e4486b4d1063c0960441070896898bd5c0e8f5f729c872a27325c36fece03058bdb035c4013b4216056762ce3a396becc833feb8aeac0a08b8a11d84d0409b734f452aaf016", "4e70b2f502382bcd80520713898fe312141f8771ddd180f05116c0a6567480ad", "58441502764f68470e6a413f4e01fad4a397f7e0d8e3d6b681f289d36d4a3aee", null, null, null, "4e70b2f502382bcd80520713898fe312141f8771ddd180f05116c0a6567480ad", null, null, null, null, null],
-    ["050000800a27a72698a119f98f50258683daf61202399fd047eee288bb4585851dc93eccc62322924cd13b5dd4eed66ed8d9972d772629ea640665ac5351510006c062468e4bd8f7dd9af698f52ae814634e81d7f3e0c420317caca9ae4811c6af06fe80a8c02ab7046500ac65aa1ea1b700000000", "cd469ede171beee3f04b805513d0352ddfbc6d76d0bea5a223909f5668ef8a0a", "0f0442d32eb42dfefdcafa11d325ec57c73ecb70bf20f1b688ff2c3e5bf7be2c", 0, "6352516353", 107504874564564, "9d62e1cf7c478731ef8ead447cb572fd71aaca6e2960bca14869a3e34333c296", "9a77f3ff189c75e5643cf4a68121d2568e2608a66d4b5a8f91ffbf78ca4b9627", "9a77f3ff189c75e5643cf4a68121d2568e2608a66d4b5a8f91ffbf78ca4b9627", "c315f517db0007f9f7e89ec32863d46b35750d54ad8a39af9c2b2698e0d513cd", "c315f517db0007f9f7e89ec32863d46b35750d54ad8a39af9c2b2698e0d513cd", "c315f517db0007f9f7e89ec32863d46b35750d54ad8a39af9c2b2698e0d513cd"],
-    ["050000800a27a72698a119f9025f13ec913c29020001788f2602a2cf0600015300000342f736a0fb38ae3e42ec67b07486f90e60752e0dc6ee0365cbd21db5ae70fdba02691508db301d732272d965c14602e2297db65fa9699ea87ff47099ed36371b2db3811615bbf52dc655da35a9fc03f311be830e28550a71ce289b24fab93c0163a5ca959be63f37f2ba0d432366736d8632fce072b6ae5b6f3fd59d3faff6381e86576581e2af578119dcb6ecddaf2115bded85c81ac2a8136fc8372590f28a3676a8b403ae25ffd772f7081e9a32bcc1c5e2edd4e2a6576b783cce3aae11fa432262548856183ee682d5dc31beb38f061cbdeca7021a444e2dd417df26dcd220f2b731772b439e96d614e1facb486c7a7d5171b1de359f6ad3a96f649c969102a1964fb4b4a1a4279c68e6c372e42187d754e804a61653092069fb9b6d25266890808b015df28c801065da6febdc1a56bfd002625acfaa5373fde149c1cfc3649b4869696d44ecb12479c5ebef995f10029f8b530eeb3fdc2e50e8757fc0bb9e263023db82f878d9ac7ffb0bd4391df1d879899a3ef57bfd0d1f7755648edd85bb052a6edf71cd2628c987429f36dc505ccc43f30e7a869c9e255e2af9fcf30c121796d190000960cb6fe2f1bf246118b498f3247f9d484c73cf09393039e45326b8ffffb3e7e6159c46699f100792d4672950348a90552e45943beeacf03f3216f94e274d63d637d9f190e8a266cdeef153530bee5cb8355260505c2c2e5d990fffdc34ec0ff7f1af81b24ced0efa6213da6c7c60c487f5f7b03f8160a057f46d05bf8218b3add9c06893bd02db9b61191dfb133bfabe4858e47a4cc32e416ec08b8ac7915a43733f4406e9d967c560f344d7e904a28045d99f3af8c82e97e1b9c1b205e585fbebb48faf58f1b65dca2497e09a70aad4865f85715a280e186f3fc1740d8184d33e8322169521cdc132212939c84a108964e2de74b6ea55b4cb8f6f9bee98b10d415109455f48b776082dc30b4bc73477075511700308158ce2f2f9bf0f691b2ce53e61142cb740c15b7b623cf48b3f7bfefa31bcdc665c6d7123e95350811375947b055a43db07e03f33627df5c638bfad956ddc1ea7d7620a20f2792f63817a1cf32580d04274234af2a51b56bb68a29e43a954142ba4ca6823bde9053d72fdadbc61ad5936c53fdd7579441c5b969e08e9f2e1eb20c909b3de6553f5748484d9ddcc4227eec92d780aa51de20e95968a36c4257bb25f3ff75dbc38fff2f2f271eab89c628e18b5fcb43802ce65256d33ee8f5fe037951be9a760734460a2cf026bc8ddaeacef005abcfe0824849a30576d5846d604542a132da9570762c0b1c65855deba8422ca4b88ab2e03998fc6e1223e7c42672656b9d0b387642dff188366b65a3ae49c206b9a0636407fd7da93fd0de6400d3ab8977485cddfbed5932f507b79947adb2fad37615aa717db5f298099f20f263b359a1151a6b75c01365eb154ae42140d6e10342f14f34dc33e07ff0e4d1a6be375b32f84b92e5d81ebb639c4f27e715aa42cc75707d4ebd1bbfbe8f90fc7c953e7a9715e65af8267373d3451674ff084efd92ccf3bcc7aca1467b6327e4f9522b2cc579a7a8fff7ca7cf145dfc13eafc34153b2c3e8afbe53444d0c73b3bd5bc870b01cd457911e356313fd1dafb4c8151634a01aff7cf116d433c3d2b3adda9cebe18f7d172443e5e7b5ac9abe8db2256d7ebe2ff28020939503870597b9a955892c7389650a2d42ec92be723fedf2f2ede5a472aa1e74f33ad41901544edbbe3ac464cf439196015f4f22ac2b8fc01496beab4d45907f479812a259431a2cbc93d4f3b84e4dd366020273a6752e501af6ff1b78ddc817e6ea351d6006becf8d2ffb03990f67774a81e05b7f4bbad8577fa27c9de64e1b11dcf384f5956443748755a9fc6f2a00b10c3657ebac03bfc0b587bef2f45ec8acdaa51c143b0cb25b9142c61bd790a80d7c23f90cc03495b51e4d2843e557f9e2545108c6c6fae359f645c276891c0dcab3faf187700c082dc477740fb3f2cd7bb59fb358554e94c7e678ce01aebf94e515e49722967995aea858d64e7789ff306369577228180326a5b0af475e27a54b207b41f92e376170e3fb005028261c99c2dbd0eedee871c1c0f48b8e9b8e4be77d1b737fe21f0fa5a18ebb52755b5a6cf6130fb56944cfab87527c250d113b29bcac9aaa10c2e7de415edb0806c6da03020a134ca7ecdc8da1bd57a37f55a46940b45b241b1c16ee100927d1bd860d445a9de50d4c384d6e1d00108026c0ea5ebbf0b72fbf5c370bce18d3acbc46599099baae1d802f77333494a7ae130fe86e835cfb9f5db2a721ac646eadf76e426d8e888321827abcbffbfbf52d75e07131cca1e8c78c51ed377cd4afa894bd9bd12e707156da0726f7cf5729fabe3721604347642ba505ec940bab48370845a5bbf483ea8f856e5e28600904b97226eac27557deff7c656406f9f959996093b2cd710d3e1b3299dc9521f8b513badb01029a31b366a370fa1c2eb426c7a9f327e56b3b9b5b32a226b2de14b7f5259bbf525aaba565b84b845e163d1caef2533c3981637204f96a59c8e8024d9041b2029e94c15245f1a958840ba3f380a4d20f1184e77827de3ff8f3d73459afe241f723c084823230e003d3d21e53501ec0499b083a7dad685c57127f4de64733a880c2db28fdaabf1b542d205f664a35135712711dcccd931a50b9c5661882360d4cac0047681bc2e2b3bf6c99760d7cfb4fa21394377a4551c76d1f75ac03c262054dffd79a9ded05e888958199eea4501e2990a53a5cd2a46a401576588fd7d058a26f28438e5782f45ac1d07f6f6f5ed73741d5785837a6b844b474775718c29dd99084e9f88ef153a8329f532a69017dc3a97ed754367723098e5765840b022897244745fbbbb30a7cb54fa0511166e9544122000610bd2aacbd82325a59b95154ecd82c88d23abd1e20770ffb8aabf83fc0734964ccd411d1c935714e24aab566f4f08424014c4eca91b590f082b473f361c87415d37bd20d70fd0b52b6ddf1865f766702e32b05b3cf1630ee8597aae19633f3516a8555ac5be32c675be1817efbffd9369041a089c283f19649968c2498cde56f500434f280d77a9c62e43cbd3f136a4c6a00a43e6ed530cb2e8ae838860adc88aacc7bd6a00ae0c19ff4533a485efde082b5f4d1f7a8ebe7ed82b7b05a8cfe1e373459f1bdcbf9525747e8c9508a555facb798740e0bdf994d9739bbe5538a0ae0f076c582c0f5ba878b99b8249db1d7e95056c98af083d98cb0ed9e3f7436e1c7643766f966b83e999206ebd1393b9b2a7f414480fa017480069f85c7749c435ae2fba2ddc1038d547d84854817ef39635c29827aad86726c9ade3b265b9086c8b5b75ef56fe4bd8b4d62893895b3fd2734fdac464156d7e5ebc7ecf1d83b86f659637e3b142c164963b8cdcf4ba4f4035dffc5a789458847781918ac72fc18b01954ea6bf46500200e2f790fbbac4c45bc32d240ac16391202822330b32d58e6777765f22a4116304fd0e01b65b2ec516393ab3751b5356d2b0c9500c0f3e469181035bc3660f0b8f9fbe6e40b5e89cb79b063714ca75e72e2e100a10d63bf784df0820ef25f8ef40fe5f05fb95683f9105ff3cb2d219ab76605a064f69219f1dc0d00b3b48642f970dc00cca4b8b43308be18286ec5a4288d600a3785cb622d468a4c6969b3792f2485027d0ad9aa4a9c2cc972f9ee5190a95b1eb058dddd8c08e7d753f5e011b2bcfee1d52c1c4f2cacda30bdb6930653c0cc4486e60e89fa849b32083ba9db453fb8df683cd68754c87daa731f570a7a4060af0ce700d31bca7e74b3e3ba3d0e8a6392a062b8e86d9d7d00b21701e7b062e06b1bcd82a01d375626fbf872d27fa4511f5f8cf8c9abcef2a990176ae339325302e42236a1eb1057288ce53221fb608a547f2cfa51216338d4ea1330d6bad847fa88c1e1aa3e1565d647779bbd0f70e85f8c7d3aa5c2082b265249df057011a79535e36c44fe9eae846fa19c2253746bc558925944f898bb2cf4449604bccb23c7404fe995e0035a3d00bb2a246e95bfc60145c6a009687684460271ee1332441ce68db5c8e802e0df35b93bbd7f3873ea00d191612a18042b25520c6e5dc0ea452f3731c8cb65082a622a7c2e0013ea47d0bdd42d6990466649a905c684c3200e477ea165300aaa4cf6adf8e7d13b0fba29f4499016ef53c1043b43891e734b6a4351aece9b0e9297f06403d1978ead2da0dff82cd1f55ebca57b6337c8513", "e64f3d8d3273cbbf899cad5d22345006d92a514351a2a2bbec5b23712d70bb80", "cf5068180f31942410b3ec029c0cc08c5a86040db27d57152c6c547127cf48bb", null, null, null, "e64f3d8d3273cbbf899cad5d22345006d92a514351a2a2bbec5b23712d70bb80", null, null, null, null, null],
-    ["050000800a27a72698a119f979813d20210c6f10000331efbaa1ccfd050008515300ac5265ac65657c6e390ecf040009516aacac525165656394266fd6496e060001ac000001bbdf186d8c75d0fb191a1b119b2a4ac4a441813f92551d941f6336c87a6ee01ed7992cff3eca24de3e0984e10e68ae387534b96cde3792f135bf5f68787d370ca44e77b3ed5ccd60369c0f4760aa05c0a6f62ff890558d7221f920bf1f1b778a06e57a85302de1d6919719f38dd180e972a15d5cd0fcc57439a4350eaf098d3b85ba3dbeccfcc295fd490051db41e2c4d181443708b19a4d0d0e2efa1d79e00f66e4c0155a9c74a7a57ccf34c483ac7da1588a1b6b9941f11040f94cf78fad89bf11fed69aa0d83105adacdd4e5f04a62424023c9b9e33c4fb7f12bdf21f07f265c537d51c6551f4617b915d21991839c3d0d36393d646e0a8a41509217d0e7d2ca1a0a0d677a3eaca23edeb07b74e652a0bc50c6c083a55d6c7306e74086f4768933aa24873681867a7893d77cb7f29b8c847c583f2d071a686616e206719f761ae39c110442e06163d2b84590360695d4e19849e634f24d9ad396c19ff83ce74f46e645f932e141a41195936c85d514414f112e60b1a2537c38d6dc6c4638305c9bd6c62e366bc63123e3e6dd36eedd3136fce8deeca2aa09a3298a39d83859efc9b2b69cf9a7dee08a98e4be558ac7912fdcb42209075420260f7cad0f2c01f2afe33073f26249d944f7a50dd84839bc3ea7fdee4ed71449cf07533d26e1e27a3efb032c3a3b34bd3092622d2062ae536ef5149c49b5bc9475eafab6e675761008b0daddeecaa604470bbe0fada255d290e92b190c2c2d8c2dee5455d1fa9a9f3db7779b584643464aa8014ba66994de25517f83980e66ee4f62314ae6dbef452d5d38b0a16f3991f36d8a8b39ddc0d5595eed98762878cdf3f4a2edc5cda77d5fe4faf63a15f568a540da57dd9beb6fb1a977ccb91b4d79cb39b28911a29e7bf028ac6103796dfb6b20967239ad373c38c53f6df1823d4950a0283e99b9c06ab2966667c9df677716b0caded818df9e449c072e22f9d98bb0f9b03bd5fd013fcef3ed6a49aeb98720254087ef728e31947ffe8f766e63ee46ff20816d5fa8ff55a26398961490ab9ae366fc5a2d1996ed693ccca82356f600ab099f6eca8bfe645270d3f95edba5b0de7a32819233bcc754a5ce2e5ea07842e5ff2cebe62ad76e8eff8d15ea4c24a5f207868319a5af6b035006989624f8ff70300921a63b5da5f2553b83a947b16424bbf5f7cbc70b4cd7e8e3c951f358572e33787e7d52704a6721b30efc41017ae4d231558c5c82cc7dd7e3356c09dc24906f0438dfcc300856ac2ced8f77fa8015736c661e80248aeeb774874aa79d290b8f5027a0a509537fc7c689b7ad86116cfec2647ccaae1c74b416f3e6ae8f7cc60eaaf7b6a590d51544138e1732945603a53462c60e1f6cb0c9ca0390c488224c313269fcd59fcb611fb2049dd4be68c3cdae9aedc88ad2cc8e37fd895017f6727541a8e35dfaf48781ea3544489b9470b0dc62ee163c05f9412fc9713aaac25b4c26eb03f716646611ad7c2ed9be4c85e42f734b5786a82ce4177a3c4764760355adfbfc3f0c84665bd6a1ebf895f67e11053883449f70695d0c4e951d71305ef33d9737126d0e66210", "ae4fa86bf7aa105d1ba3747876eb2deb54014916e82ef149521daee4eeb72a2f", "c033c713b56957cc19db7af3e6233528ffdb9855a297ab2920ecc9b8642958f1", null, null, null, "ae4fa86bf7aa105d1ba3747876eb2deb54014916e82ef149521daee4eeb72a2f", null, null, null, null, null],
-    ["050000800a27a72698a119f91250926f6a8e6319038f69ad9a9192b302f26bdda465d90b94b12c57fa3fd6930083f184438d8a889d3f5ecea20252636736f2a0f18e26f4fa45d1be8f3dc4a707137e95d2ad594f6c03d24923067ae47fd6425efb9c1d50086a636a5300ac6551fe806f5756acb562f13c0ca1d803a195c2ebb2ef02ac33e6a88dea075ba996d3c336648e8694d3a10163ca531beb031aa2377fca6c00000700ac6a6aacac53d4e959af4a2e020002acacb75747fc903c05000300ac000275614934b7eb2bef279e31b965e6d33874b4e11b257f8960316c9a17c6a573a58f57015ca402c67d925c99acea3ee8cc4b008c5cb43966e714ef480fd05e07c7b2dda9aa3966113eaa293d3f622b309d64803ce1e6378b6aac4fab527c43cd45dbad57e9d25969bf43d0143b76c85ca095a90dac4ba07817f02631d72ee5dac1e16d0b77f02028da464100fde76d83dd0bb224f7b57a00c02f68ae648fdc529957a10490dce1fddbb0904f0d518bb387544019983b616975a78e74d854fddc4900f753db06f51001007c57ec890aff51a4d1d39ecd0e757f2917c738dd999b5c6e77da0b6b40a87006ed0a3c1a4b9fb18dcccfcdb6ac0c2421639cda0075a20dc5111b8d3d3199495bd9133dbab94541410e4fba92c7b606a5cb122f140cf1a3596f2788f3c8b92660f14cb65af5dd23dfdbac1371ecf4b33712fed2292c44f70834cf96c05d58827e69bfc2e696fa0874869c02f3dca11c3b90cb214e68bc1cae039d7a146cdc1d609d7a6b3fd5d461b0951c82cfb3e763fad2d1bc7678cdf82779f8fd5a1ce22a8d3c4547abd959838a46fb80afe01f8ecc9931513b1962ec540856cb189387cfbfb255167b55ef4bee465668b20ea4118ca569ae480e0f6e5e043a357b36d3ab36c861f2278301dce57674d5073b3a6f5103a0793af1b7d46f957e22d8d2583bf181836c3be9930bac8fa460e968aa7109870bbed17df5f888c8ca1467ae17dbbcde31c1105cb5bda88ac6c627002ce21c02140ffe81ec58bf1e6d1bb7aaada41fba0bb588778a7f65202ad811ea73d26c74550395aff75325107c9b3f9ae9dcdcd86ed081a2e7424719a3d185b7e0a43a472e298ac0afdc5287d7ad124cd9405a655059e183e964e7fc98bb48e367bbd68d8c9ece7b6bd213624856083fbf920ca53ffc8335f072af593bc991e805c3892b939632449554e40ae3c7a996c0ee02fc626603def306fd1ff4118b1c8e0669efe1b10fc16087199815430bf815a718bab91d8cf2950dbf25b42ec49a1f335ddfd5cad4bbafc1dcba2cd1c3d22b5605b9169e4ab21ff81dc36b21ec349b66bd88ffe7ff46ee18ece49e64198758938bc05215dbd8354613a0029489fe7b1dfebda9da980147397e97aa45d09451120803135701b8595c6e0f1764c3336e48e7f774675436502edda9cc00c7f24cb6090a80d0a61949608ba673710e93140630bf8672c4143d8b7acfd74e72c04d89240d22d67c92d7913f9906f0219e84ffd3932f8b4144461d0700cb7ad6cf9417533c26d2050d25b74b0e7b5a54df51157dc9e62d5f6c4abe5ce90a7fe2e52a8d780678cfcbdc0d5d9e43665af0fdbf5c4b7727680f4c534b54f9d5e9a357c836e085e10c1e3fac4058b682c68e54facae0f9c2dd4d64d9046152b4762332939f17e6aaf7d8b9d358e2218d4e0d69a4f119e1c64eec4c8b532809707131f01f55c7ad04cfb63f7c4a3d0a2b0ffb0b05a6be055b8c94ca80bb0a1d13cd4cd69ab98304ae2515d5f7699d4abee5c20be609d873511012f234bd85a7eff5fb634cff2658ba6516048563095ecefb3015ee3f03ca52a177f261ecdc26bc089d34c6404846e9c647fcfe98cc6acdbb464f64278ad8ce9d1ae0d415bc0c05245fddaf4ebc8dc703a85cb270f796ad2d937e2ac0d5e0a34821758000aa59c9d4652485294ee0ab29696b21430fa54dcfbf2b9c49d142064209eeeed4d471ffc017d4e20a796b0927804c061b9f4a7091fe015ada68fd8442e01825c88dfe55cf5de38936f7ce25311b902ba97a3c12a95cfa1c3a591b818f60832709d9e4839e410fb36b84f3ac4f070fc35e161978259e5b8edc744d90919aa770bb36215128e582b59641e23852e958eb8fc3c0aa96152ba4f77f138d6a6712a3ae3226015883f81db23e583c869c4c71143a6fffd65e8dfdc50c99a2f1f314cdcc71359e235f1d7dc2b5f38ef7b970843163c03f9dd40a8015efdc8791956a3f3cedd9ea64f8efa7a0815a70381d71467817bd04ca529aede07ff60d176aed0f855a2eaea89eaeaca89358c081826a0812a5bca28be1373f086dbdba7e43e203212c9fed21474ba19a055ffcc179412e893a744832298c5fe24cc6b18667f49b34dfb12379267419a9cb9403d8167d8d1e91d2811a043b29243b069b37587847dc6fcddb1831bd1cc2567ca033ac40f74ab6955f683b12e4e8254e4ea760d38b3f46791c5c4cb12bc7ccb0ed1865f25d601c303f81fb1fa1db48533d3d6b288e4d9a4dff8ec21c96f578399710c825fe7e32f93a8c0743f9ebd54cc151c761cb6638eba3a1fea6b9a972aa261b137d015861e14c59ec3a6f4c6d8e19e6463fa1e4304f49e43ae065e3fb196f76d9b879c7200862ead18dea5fb6a17acea3338870bde66449891b3eb051da407e7105cda20d73591139e9b2a2c729060c4a9fce5c0b6eacb9362ddcd774a0f2e147c30707a2cb6680a249ea9c7224392cbc0a9d58acdc4ba5623c498c72d7bac4f3013d0938bcda4f45166657e1f0d79d508b177852afd0abb90ade1d682726f42008b46ad7f8abdb18117f72641390f086b6e1498be69548527e6ada2b38b9fe121ef670af7437d32536d5cf5c4ab19dd99771582d038104b7e039a376f7acbbeadb34f945beb9d7ca0e4e3d5c5e4eb1d8526ebd13dacb1ba35735c6d04a4555acf4bf117626500d77b38189dd4888041225acbe3874a4c0f607fe6745f9355b3fa188f1d65c09f389af1b9d6232aa79447919c550f6f31fec35481cb922de2db5b4da2f81948617028e321706a3a778c1938c443bb00e5b0ff06ad8ab9b1ab0c11477673f85df9561dbea45d5f9781ebe317a0710ae5461e34fe6f1b1aa9b4e67b14910984802c2a7e38193bc7bdc8ba3e4e3d1d933bfb580f5b3e87a2a06517051410fe1b4ff1ea0ade824f338515456a57c7a916a74388ee8f1281f9ade0ae2a2613a0612c469df792b8df4cae4fc25c1cadba95a807ce61e5a5303faaf9e14653996b5a8adc34fd475ef1499094babaf1f3f07da9a390b1d9fc9a08327987adfe9564863fbdfa8f6b46a8841583099afb7870118face76347e40b6fd8cd15582ae8e23be9a0219bc3e4e4546a30d3bbbbd1686086876be0e4c859be71fb58f4fab3d28c0b4f7e75ad1edb7f88946fb40cfa5786a0fcba1303c8347ecee93d46d140bb5f69531d666548b109ce764bead7c87bd4c876494de82db6e5073a6c94f7c099a40d7a31c4a04b69c9fccf3c7dd56f5544776c53b4df7953981d55a96a6dcff9904a90842e5bafec8840c2d255bf5ad61c460f98feb82a10fa1c099f62776798236c5ca7f1e46ebdb2b144d8713e56c772f2c3b860ea5b03a8854bc6e6590d63cc0ea54f10b73ba241bf74b635551a2aaca9687ac5269fd368b26d70a737f267685998a3f7d2637914909c746495d24c498635ef97ac66a400894c09f73488eb7cf779237db2ac14e22658be28ae988cec4a671653b575fdea44f7de69cb7e396821e7c661739f9f028a9262bd80ebf9ce8c4a9382c6b03e7d8085e906cf84ca20173fc57be19361a83a7e3775f5b013a9a04b1a506fc59802cfc3cacfb635beb0b76395cba743c36279ba3b4f2c8ba4adb5b8763fb96d7ca333a12de3cefa91c2c96599919a4dfe8408acb99105ee54b79f227b6cb7e337bab04989857fe4f4437ddfabb7b65543b5f39cb2023d46789eb7d989af779e5b8d28385a85b0da2abe07f0c2bb4255fcea03188527a307d409159e90166fac6a070ba05b3e4dbfd3a2bfcc9ee6ed016c0f665be8133b7dc1d86044db0f9db40fb0e9f8bc2e4db5382a8b4f815b4e8434ad0dfbc51a5e9b145e1596cbf4670b7e05dfdafbb0cf3ddee28d76a82428e8aba4364e84bac379298df2932e69bb5d045516efc33ae6cc3947ceb09ed371667212a831b5485eafce8488188ea4e27d0cdf7ddd348abff777f4a13bbc716b6a5944ee727965690e209b49eb962c039975f939ed5c6e4c400d887759433d3ad716da0cb446113c7727a64b58c3f8a0f81189f98005233a81366aee73cec85228ebcfd5ee3c3fb44db76ba243f2842b7b5fc746ae51b0bc4bd4fc9fd833565ea852b92b224f6990318ad8c7d9437e20e2a1f20e818f9057c5abaaa2e5c15b94945cd424c28a5fa385dadfe4907b274d842707db3697a5ae6c8f542e5ecc07fe47350d1014670212efe81fb7c73e8450df814ef6232f7490f63ccf07480f884a66eaffc28fea448d7b401cdae10e7c0c7f9a7b15331969fc8cb36396773de191931c750f6ce5caaf29768ebb27dacc738056a8125b4772bf87ae10a8a309b9bd655043cfc3159494368c5ab8cadb7f671e9626bd263e31181a604b506a03b439a7ffe4355892477e2bdf338c62c3922f7d3c9a56c7103d911948a84b5ae2dbb16a3761add053a0f967e6b5bc94211b6547153267c6ee1cad0d974a71088583735e4f63d33156dadd54c2faf89114a127b97b94cc2a22ef303f459d04fc0b53ace5918d47ff33a558bd71a75f355fbd06bbccf4e02c3c0a4b63d0cc949801d63a64cb2d32373b2c7b274ab2db4682142c8b21d84c481f5ef21e4b5e3603451bf94774d0ef47f63fa6abb78d21c193cbe004d4355231dfd03003da4ea2a4c88bf677cf9754f0c47ef82e20975baaecb0232df880bd7d1de1321549462ec8d5df3e780ffa72eba8a8df7fcf398ec230513ca9d6123f8b9d8178560daf975111955a2bca3423eeefc527be3a8543eb90a5ec02f35a7c64b7dd59a72da0074634e01d2abf3637add77c7350f12b011b2b244613c3f638dfbc036c45541590a6f070534b13f4d4ec0995a082337438d04ea53f492070e201cdbb1dc5bd194d4919f911dfa7241c8d5792d43c457d5de1667c62ec09f08cb58f735e5e35efed184a5001018c10f8cb64b0a7b76814be117fae204a52008dbefcec9fc34c0e5be77fc8b5b5cd077115afde18405054e5d291aa8eb1619c049a60576b87867936b8c9b296888a860348e53c15f7341d8f1acdd0dde230755b4ce860f9f650fe40af6413640b81e4f631c981c11a2e1d18406f1ec93ae097d4c4c159ab6c4e6f527e80a8a7faff91d410de44438db1c7e9d2f17cad242fa9c3179c1a3aa81f7361649572c715c25a1f6cd5ace82c00ab2342b", "aa023b581070dc686fb9da6c155d271507de77c24772a5d95d01d55e05654616", "a64218286f78f8b74f72e7689dca7198e231e86e5f407cb7b18657989dc94687", 0, "", 1405243945822387, "c0147b110da12b4ce208cd4eff72de8797a59d5041f68a8749c549488fc707c7", "4cff8a073f9a517481f25b25f13a5a418025c98693eb83b2f1b4a0e262ccc099", "8609254f0ada09c9876ff63a1e3002da4bdbf20d66010c81cc7ce59222187b06", "9d3d3b2e7713f7930ec2872baba26a1e1b8d2d074b397419341a5a8237b8cbe3", "c35673537db4eb446513b4b62d56f19c21b43a1af830f2e8f57802cde81a36ad", "56ff0b5e624c46ebcdcc43c0c726234f126962dcddbbe03bcafa57e52a5f2100"]
+    ["050000800a27a726219651377a8f739a2d6f2c0201e152a8049e294c4d6e66b164939daffa2ef6ee6921481cdd86b3cc4318d9614fc820905d0453516aaca3f2498800019f33bf3a109bdd1b232b47b1646d91e1296634ebde5ccad57288b5b2228186e54b6968912a6381ce3dc166d56a1d62f5a8d7551db5fd9313e8c7203d996af7d41a38e01d94903d3c3e0ad3360c1d3710acd20b183e31d49f25c9a138f49b1a5301466b3da612149df5eda0f14f2efc5c6ac03884428a315dc91f8d7b492ebc57e475a4a6f26572504b192232ecb9f0c02411e52596bc5e90457e745939ffedbd121e37ec1e9dddc31b06dc9576a1738ef73e6ba71648913dbf75a779fdd488d83f857deecc40a98d5f2935395ee4762dd21afdbb5d47fa9a6dd984d567db2857b927b7fae2db587105415d4642789d38f50b8dbcc129cab3d17d19f3355bcf73cecb8cb8a5da01307152f13936a270572670dc82d39026c6cb4cd4b0f7f5aa2a4f5a5341ec5dd715406f2fdd2afa733f5f641c8c21862a1bafce2609d9eecfa158cfb5cd79f88008e315dc7d8388e76c1782fd2795d18a763624c25fa959cc97489ce75745824b77868c53239cfbdf73caec65604037314faaceb56218c6bd30f8374ac13386793f21a9fb80ad03bc0cda4a44946c00e1b1a1df0e5b87b5bece477a709649e950060591394812951e1fe3895b8cc3d14d2cf6556df6ed4b4ddd3d9a69f53357d7767f4f5ccbdbc596631277f8fecd08cb056b95e3025b9792fff7f244fc716269b926d62e9596fa825c6bf21aff9e68625a192440ea06828123d97884806f15fa08da52754a1095e3ff1abd5ce4fddfccfc3a6128aef784a64610a89d1a7099216d0814d3a2d452431c32d411ac1cce82ad0229407bbc48985675e3f874a4533f1d63a84dfa3e0f460fe2f57e34fbc75423c3737f5b2a0615f5722db041a3ef66fa483afd3c2e19e59444a64add6df1d963f5dd5b5010d3d025f0287c4cf19c75f33d51ddddba5d657b43ee8da645443814cc7329f3e9b4e54c236c29af3923101756d9fa4bd0f7d2ddaacb6b0f86a2658e0a07a05ac5b950051cd24c47a88d13d659ba2a46ca1830816d09cd7646f76f716abec5de07fe9b523410806ea6f288f8736c23357c85f45791e1708029d9824d90704607f387a03e49bf9836574431345a7877efaa8a08e73081ef8d62cb780ab6883a50a0d470190dfba10a857f82842d3825b3d6da0573d316eb160dc0b716c48fbd467f75b780149ae8808f4e68f50c0536acddf6f1aeab016b6bc1a51ed44cfab70000c7b3534201cfb1cd8dbf69b8250c18ef41294ca97993db546c1fe01f7e9c8e367edcf04be34a9851a7af9db6990ed83dd64af3597c04323ea51b0052ad8084a8b9da948d320dadd64f5431e61ddf658d24ae67c22c8d1309131fc00fe7f235734276d38d47f1e191e00c7a1d48af046827591e9733a97fa6b679f3dc601d008285edcbdae69ce8fc1be4aac00ff2711ebd931de518856878f73476f21a482ec9378365c8f7393c94e2885315eb4671098b79535e790fe53e29fef2b3766697ac32b4f473f468a008e72389fc03880d780cb07fcfaabe3f1a84b27db59a4a153d1070689f2ccf975b2b176e1c69dbe381340ef1f98fdc4b453abda3a2bfac3069ba7f1cc50a81c2520e412fab4e5d397ecf739f280d5b684533d5d29cfe7e7302ec144b4e553acfd670f77e755fc88e0677e31ba459b44e307768958fe3789d41c2b1ff434cb30e15914f01bc6bc2307b488d2556d7b7380ea4ffd712f6b02fe806b94569cd4059f396bf29b99d0a40e5e1711ca944f72d436a102fca4b97693da0b086fe9d2e7162470d02e0f05d4bec9512bfb3f38327296efaa74328b118c27402c70c3a90b49ad4bbc68e37c0aa7d9b3fe17799d73b841e751713a02943905aae0803fd69442eb7681ec2a05600054e92eed555028f21b6a155268a2dd664052528a5f8ed028f59af985ad1315c2e25aeb9d7f134e4bf478642ab96b15d3b3e13ce2387ac84dc0819e81260e11d392a5f06db8b5633de281a0e9c958c24060297f608af1dc51616562b1ffff6e2a28bab1f7772713a0a4b56fe47fb5a7b73aeee5345566ecf3e95e825f92eb469eb5d69164206a0ea1ce73bfb2a942e73703214d270d80534389b1a1e2bba67481eb3667d6d38254ac4b44559b4708cdd12898972a895bf0fb055cf1fb9b73029d6bfb27da2b5294f5cb354a894322848cc3d35b9554a5f62b44a7dcb25406e5ba07882cb6473714e77a051a7dcd29fea0a943785b325cdab95404fc7aed70525cddb41872cfcc214b13232edc78609753dbff930eb0dc156612b9cb434bc4b693392deb87c530435312edcedc6a961133338d786c4a3e103f60110a16b1337129704bf4754ff6ba9fbe65951e610620f71cda8fc877625f2c5bb04cbe1228b1e886f4050afd8fe94e97d2e9e85c6bb748c0042d3249abb1342bb0eebf62058bf3de080d94611a3750915b5dc6c0b3899d41222bace760ee9c8818ded599e34c56d7372af1eb86852f2a732104bdb750739de6c2c6e0f9eb7cb17f1942bfc9f4fd6ebb6b4cdd4da2bca26fac4578e9f543405acc7d86ff59158bd0cba3aef6f4a8472d144d99f8b8d1dedaa9077d4f01d4bb27bbe31d88fbefac3dcd4797563a26b1d61fcd9a464ab21ed550fe6fa09695ba0b2f10eea6468cc6e20a66f826e3d14c5006f0563887f5e1289be1b2004caca8d3f34d6e84bf59c1e04619a7c23a996941d889e4622a9b9b1d59d5e319094318cd405ba27b7e2c084762d31453ec4549a4d97729d033460fcf89d6494f2ffd789e98082ea5ce9534b3acd60fe49e37e4f666931677319ed89f85588741b3128901a93bd78e4be0225a9e2692c77c969ed0176bdf9555948cbd5a332d045de6ba6bf4490adfe7444cd467a09075417fcc0062e49f008c51ad4227439c1b4476ccd8e97862dab7be1e8d399c05ef27c6e22ee273e15786e394c8f1be31682a30147963ac8da8d41d804258426a3f70289b8ad19d8de13be4eebe3bd4c8a6f55d6e0c373d456851879f5fbc282db9e134806bff71e11bc33ab75dd6ca067fb73a043b646a7cf39cab4928386786d2f24141ee120fdc34d6764eafc66880ee0204f53cc1167ed20b43a52dea3ca7cff8ef35cd8e6d7c111a68ef44bcd0c1513ad47ca61c659cc5d325b440f6b9f59aff66879bb6688fdb462af43582b983f92b5698b87db46e4b02dd8e81eca555a44f2f1aef11d88a0bcee76af9ad3f9c46a67062e1a9ca7ea5c014384af07219c7c0ee7fc7bfc7933d174650f46b4cc000190c19b44c57ae891aa86646c10a177a8626be064409931c37d9e8bdc433b7d79e08a12f738a8f0dbddfef2f2657ef3e47d1b0fd11e6a13654db2854fcbff49aa0dadafec320b6ed2d4b279aee9060c1b221e2eb2f13b0691c4d842406d0ec4282c9526174a09878fe8fdde33a29604e5e5e7b2a025d6650b97dbb52befb59b1d30a57433b0a351474444099daa371046613260cf3354cfcdada663ece824ffd7e44393886a86165ddddf2b4c41773554c86995269408b11e6737a4c447586f69173446d8e48bf84cbc000a807899973eb93c5e819aad669413f8387933ad1584aa35e43f4ecd1e2d0407c0b1b89920ffdfdb9bea51ac95b557af71b89f903f5d9848f14fcbeb1837570f544d6359eb23faf38a0822da36ce426c4a2fbeffeb0a8a2e297a9d19ba15024590e3329d9fa9261f9938a4032dd34606c9cf9f3dd33e576f05cd1dd6811c6298757d77d9e810abdb226afcaa4346a6560f8932b3181fd355d5d391976183f8d99388839632d6354f666d09d3e5629ea19737388613d38a34fd0f6e50ee5a0cc9677177f50028c141378187bd2819403fc534f80076e9380cb4964d3b6b45819d3b8e9caf54f051852d671bf8c1ffde2d1510756418cb4810936aa57e6965d6fb656a760b7f19adf96c173488552193b147ee58858033dac7cd0eb204c06490bbdedf5f7571acb2ebe76acef3f2a01ee987486dfe6c3f0a5e234c127258f97a28fb5d164a8176be946b8097d0e317287f33bf9c16f9a545409ce29b1f4273725fc0df02a04ebae178b3414fb0a82d50deb09fcf4e6ee9d180ff4f56ff3bc1d3601fc2dc90d814c3256f4967d3a8d64c83fea339c51f5a8e5801fbb97835581b602465dee04b5922c2761b54245bec0c9eef2db97d22b2b3556cc969fbb13d06509765a52b3fac54b93f421bf08e18d52ddd52cc1c8ca8adfaccab7e5cc2f4573fbbf8239bb0b8aedbf8dad16282da5c9125dba1c059d0df8abf621078f02d6c4bc86d40845ac1d59710c45f07d585eb48b32fc0167ba256e73ca3b9311c62d1094903570519d4442f0200e6ad11f2452dc9ae85aec01fc56f8cbfda75a7727b75ebbd6bbffb43b63a3b1b871e40feb0db002974a3c3b1a788567231bf6399ff89236981149d423802d2341a3bedb9ddcbac1fe7b6435e1479c72e7089d029e7fbbaf3cf37e9b9a6b776791e4c5e6fda57e8d5f14c8c35a2d270846b9dbe005cda16af4408f3ab06a916eeeb9c9594b70424a4c1d171295b6763b22f47f80b53ccbb904bd68fd65fbd3fbdea1035e98c21a7dba5fe1089f7d1c032f24d36835aa8815266e897ff829403cfac3a715954b9b68958a0111a2c9265633ba2831a2e86b941e569d58d99c1383597fad81193c4c13151f40aedb487b5c04ae3b1ddfbafa26e720099f26d5a7535aee57306fd2c4f30673cd9b698fecf32faf88f62e21c90665859dd26833d21d9bc5452bd19515d3fa5c1e68bc209b9dc2a10ae6b630726a67b33603c691fafc281dd94dc9888a68c4f45155aa7897c045aafd9335be2e0ddcf5f586d7f6b4fe12dad9a17f5db7031", "917f2fcf5d1873f7ce8f639545680a90385eacb91c0f143ff6c059102ae97c3c", "6bda3c86c0091d45f240b804ec82b246837fdc212d636566b19df682b646601b", 0, "650051", 570688904498311, "2d1fad3c7a08326d110a037d86adec479077bb93f81ad138e00df39782ab5a12", "e0e80e4add7fe45b91f700bcc16ce27c0a0b859ec92455002b15d4b9657bef08", "e0e80e4add7fe45b91f700bcc16ce27c0a0b859ec92455002b15d4b9657bef08", "c6773d5edfd1ab024c83c0824f4fd15b13dcb1fdd042761ebe28c6ee6ee2ba0e", "c6773d5edfd1ab024c83c0824f4fd15b13dcb1fdd042761ebe28c6ee6ee2ba0e", "c6773d5edfd1ab024c83c0824f4fd15b13dcb1fdd042761ebe28c6ee6ee2ba0e"],
+    ["050000800a27a726219651371fc998c31f4dd20800015058e5754c2104000753ac515300515202f89d3226fb53292bfb5dbbf7ff013af3341ea7a35f553f6d7a0221ae195ea84eb97a14943649305521326bde085630864629291bae25ff8822a14c4b666a9259bea6fa0bf2999956fbfd0ee68ec36e4688809ae231eb8bc4369f5fe1573f57e0685406994d28264e4d74d5a25fa3fa38fed813c505dd90289f301c75e53a716c5b54a45eb32c165448d4d5d61ca2859585369f53f1a137e9e82b67b8fdaf01bda54a317311896ae10280a032440c420a421e944d1e952b70d5826cd3b08b7db901e5849f96bae6f2056f33ab1e6989d7d264adc97855a990103b4d1e6350d5c31a39c3caf69459e462f141be8b39037ffa255ce27e4ad7b566a29620a9f011ab08fb2ad3050652b3f65b8e34526a2a15fc2ddc5b5113e4882c7cca0dd5577be067ba7a175dae4bbe3ef4863d53708915090f47a068e227433f9e49d3aa09e356d8d66d0c0121e91a3c4aa3f27fa1b63396e2b41db908fdab8b18cc7304e94e970568f9421c0dbbbaf84598d972b0534f48a5e52670436aaa776ed2482ad703430201e53443c36dcfd34a0cb6637876105e79bf3bd58ec148cb64970e3223a91f71dfcfd5a04b667fbaf3d4b3b908b9828820dfecdd753750b5f9d2216e56c615272f854464c0ca4b1e85aedd038292c4e1a57744ebba010b9ebfbb011bd6f0b78805025d27f3c17746bae116c15d9f471f0f6288a150647b2afe9df7cccf01f5cde5f04680bbfed87f6cf429fb27ad6babe791766611cf5bc20e48bef119259b9b8a0e39c3df28cb9582ea338601cdc481b32fb82adeebb3dade25d1a3df20c37e712506b5d996c49a9f0f30ddcb91fe9004e1e83294a6c9203d94e8dc2cbb449de4155032604e47997016b304fd437d8235045e255a19b743a0a9f2e336b44cae307bb3987bd3e4e777fbb34c0ab8cc3d67466c0a88dd4ccad18a07a8d1068df5b629e5718d0f6df5c957cf71bb00a5178f175caca944e635c5159f738e2402a2d21aa081e10e456afb00b9f62416c8b9c0f7228f510729e0be3f305313d77f7379dc2af24869c6c74ee4471498861d192f0ff0f508285dab6b6a36ccf7d12256cc76b95503720ac672d08268d2cf7773b6ba2a5f664847bf707f2fc10c98f2f006ec22ccb5a8c8b7c40c7c2d49a6639b9f2ce33c25c04bc461e744dfa536b00d94baddf4f4d14044c695a33881477df124f0fcf206a9fb2e65e304cdbf0c4d2390170c130ab849c2f22b5cdd3921640c8cf1976ae1010b0dfd9cb2543e45f99749cc4d61f2e8aabfe98bd905fa39951b33ea769c45ab9531c57209862ad12fd76ba4807e65417b6cd12fa8ec916f013ebb8706a9a556c762f8850000bdcbd49fe4f85b623c7828c71382e1034ea67bc8ae97404b0c50b2a04f559e4999d9c09901bf39caac48dc11956a8ae905ead86954547c448ae43d315e669c4242da565938f417bf43ce7b2b30b1cd4018388e1a910f0fc41fb0877a5925e466819d375b0a912d4fe843b76ef6f223f0f7c894f38f7ab780dfd75f669c8c06cffa43eb47565a50e3b1fa45ad61ce9a1c4727b7aaa53562f523e73952bbf33d8a4104078ade3eaaa49699a69fdf1c5ac7732146ee5e1d6b6ca9b9180f964cc9d0878ae1373524d7d510e58227df6de9d30d271867640177b0f1856e28d5c8afb0630fe4fd5f22125de840fcc40b98038af11d55be25432597b4b65b9ec1c7a8bbfd052cbf7e1c1785314934b262d5853754f1f17771cfb7503072655753fa3f54ecc587e9f83b581916092df26e63e18994cb0db91a0bbdc7b6119b32222adf5e61d8d8ae89dae4954b54813bb33f08d562ba513fee1b09c0fcd516055419474dd7fda038a89c84ea7b9468287f0eb0c10c4b132520194d3d8d5351fc10d09c15c8cc101aa1663bbf17b84111f38bb439f07353bdea3596d15e713e1e2e7d3f1c93cfcb46238b6e0398b46d76aff2d8f05745c465a94fca4365a93741b2e7516a1d2a00de7d1f80a5d3f791d35058a96380dced302c60c0062f67a331cf71e004ef78407a7c51161c7b8d46aba76714bac170d185e27ce3ebff2446164e0db23c02ea332b6afe11084ac25d73e63e51e75f6da74707bec9b1c2224f11dc18ed0a6effeda06c4be24b04846392e9d1e6930eae01fa21fbd700583fb598b92c8f4eb8a61aa6235db60f2841cf3a1c6ab54c67066844711d091eb931a1bd6281aedf2a0e8fab18817202a9be06402ed9cc720c16bfe881e4df4255e87afb7fc62f38116bbe03cd8a3cb11a27d568414782f47b1a44c97c680467694bc9709d32916c97e8006cbb07ba0e4180a3738038c374c4cce8f32959afb25f303f5815c4533124acf9d18940e77522ac5dc4b9570aae8f47b7f57fd8767bea1a24ae7bed65b409e1dd26b8dddd68858d6f5161f073d90636860a9aaee18629b06330a8ee30591debfcef56a026bb28c3b06ec2cfaf5b79ab72694d1d012a7594dd80ae7dfa0c00", "a09b04de6a186492976e849bd727a344a6f4469a66fed1270a9e205da9e5952f", "b14e10849868f413ce7b246081464c3b0c1bca960fcfdc26a6b4d46bbfa04e36", null, null, null, "a09b04de6a186492976e849bd727a344a6f4469a66fed1270a9e205da9e5952f", null, null, null, null, null],
+    ["050000800a27a72621965137c2eb518f68984d020000000000", "f540b62cb4f80c03c0e4cae79511e24328e3d4c75443b79d103d7943f0922fa2", "38b79770f572fdd077843cb2594cae07ba43a178ff05677f9bee4ad1170afbd4", null, null, null, "f540b62cb4f80c03c0e4cae79511e24328e3d4c75443b79d103d7943f0922fa2", null, null, null, null, null],
+    ["050000800a27a726219651375e3dbaf7ae12670d0001516cf4adec75070003656500000000", "74245199dc164aa8c04b890c614069c6b553bab9f0f6bbe8db8bf10441e3c883", "38b79770f572fdd077843cb2594cae07ba43a178ff05677f9bee4ad1170afbd4", null, null, null, "74245199dc164aa8c04b890c614069c6b553bab9f0f6bbe8db8bf10441e3c883", null, null, null, null, null],
+    ["050000800a27a72621965137ff6acc0ffc2e490d03146b9d49dd8c7835f43a37dca0787e3ec9f6605223d5ba7ae0ab9025b73bc03f7fac36c009636363635100635365bca7e54cc1a12d127b57c8138976e791013b015f06a624f521b6ee04ec980893c7e5e01a3362035904ac000053d7445fe2d09130f63511da54832de9136b39f4599f5aa5dfbb45da60cdceab7eefde89be63f3f7c00452006aace1405def0244fd7f99b67d040004630063ac12f6465073e1020009636a5351520065ac65000000", "2b26e72130e401b146d2fd73430eb98ad90ef47ae9eb9cc8b6cde010d680f442", "f745ed405535760999edd6c0815682c69d2b14b4162827249aa20e8d5588584b", 1, "ac0000", 693972628630138, "4f3a41a6b7623522a8c9ae5cec17bad3af53f2040ca2214912b04a4afd9bac2c", "c37050589340027b5eed40a87f7d781a732a4dbb66b9424f4c5c5be90cf76d98", "0ce32aaf459fa555f19cf99f53e15a5aef51dcb0422843ba2c94a377ce6b0d5c", "526ede6d87426e53f028f6a0ce5716461c8999cfa7bf9854ab700e24d47752d7", "289ba674a4582b6c3b9e79dec8838019d9e58ece245357d8a4a886288cf59be6", "5d988441dcb0422b6c9caf0dd0edee928d2733ecfff263e9f5ae52363d5b539e"],
+    ["050000800a27a72621965137dedc5e5f0756fb19000133a490768c1600000851535351516563000001dab9578157ebf9cd8113078866e952d6218c69455fbc9c5548725b189cc216ab58483a5a4d28cce4b2fae6513dc6c094307eb498166ba95999ac5f8464b2ff6b295d6e94b0227b5c43a121a34ac907e8d0d07a2d6d79712a776614b0cdec4de09b2627218f0c292fa66ada945fa55bb23548e33a83a562957a3149a993cc472362298736a8b778d97ce423013d64b32cd172efa551bf7f368f04bdaec6091a3004a757598b801dcf675cb83e43a53ae8b254d333bcda20d4817d3477abfba25bb83df5949c126f149b1d99341e4e6f9120f4d41e629185002c72c012c414d2382a6d47c7b3deaba770c400ca96b2814f6b26c3ef17429f1a98c85d83db20efad48be8996fb1bff591efff360fe1199056c56e5feec61a7b8b9f699d6012c2849232f329fef95c7af370098ffe4918e0ca1df47f275867b739e0a514d3209325e217045927b479c1ce2e5d54f25488cad1513e3f44a21266cfd841633327dee6cf810fbf7393e317d9e53d1be1d5ae7839b66b943b9ed18f2c530e975422332c3439cce49a29f2a336a4851263c5e9bd13d731109e844b7f8c392a5c1dcaa2ae5f50ff63fab9765e016702c35a67cd7364d3fab552fb349e35c15c50250453fd18f7b855992632e2c76c0fbf1ef963ea80e3223de3277bc559251725829ec03f213ba8955cab2822ff21a9b0a4904d668fcd77224bde3dd01f6ffc4828f6b64230b35c6a049873494276ea1d7ed5e92cb4f90ba83a9e49601b194042f2900d99d312d7b70508cf176066d154dbe96ef9d4367e4c840e4a17b5e5122e8ebe2158a3c5f4cbae21ea3fa1ae6c25a9462ebcbb0fd5f14554bc97747c33e34da90c816d8d0d50bfe37618c5812891484fa259322c15092d4155d8696d6f12f24fd364496b3be0871ca3dd9625348a614b59bde45885649bae36de34def8fcec85343475d976ae1e9b27829ce2ac5efd0b399a8b448be6504294ee6b3c1c6a5342d7c01ae9d8ad3070c2b1a91573af5e0c5e4cbbf4acdc6b54c9272200d9970250c17c1036f06085c41858ed3a0c48150bc697e4a695fefc6be7b68d0120200335f7ad07e1a46dc767ff822db70e6669080b9816b2232c81a4c66cc586abfe1eaa8ca6cf41fc3c3e6c7b886fb6dac9f4822b4fc6fff9d0513d61a21c80a377671d135a668a0ae2bb934c82c4142da69d12ca7de9a7df706400ec79878d868e17e8f71ea31495af819a016cc419e07c501aa8309b2e6c85b79b2763733a37bbc0420d42537b871b4294a65d3e055ff718dd9dc8c75e7e5b2efe442637371b7c48f6ee99e3ea38a4b0f2f67fc2b908cda657eae754e037e262e9a9f9bd7ec4267b5420240add20a389cb678706917f97cc8162fb1dcc6c28b6eda930f055ce86bd84ec0f3ffacda10485cce037a43b0780fd591452390c924c04f54924bf6ac0d025b39b01398f37e78067cfa374bb53eb00fb2a95d03dabf6bf6c5f77feeaf651068aae477fce410ac2d5de6095861c111d7feb3e6bb4fbb5a5495549597279835c72c633a4bd01b150be28ec3d843f1bcfc0bf35b772a3c7263dc89016ed4a112ed8406f96980288726599c1238978691ba421df6027de5af1e4745d58681061564d951eb7684dedcd335fb1bd2a6978cdb797e1f3b659d3a557e407735753c8f8a2b7d4385f1c95af937df78dfd8757fab434968b0b57c66574468f160b447ac8221e5060676a842a1c6b7172dd3340f764070ab1fe091c5c74c95a5dc043390723a4c127da14cdde1dc2675a62340b3e6afd0522a31de26e7d1ec3a9c8a091ffdc75b7ecfdc7c12995a5e37ce3488bd29f8629d68f696492448dd526697476dc061346ebe3f677217ff9c60efce943af28dfd3f9e59692598a6047c23c4c01400f1ab5730eac0ae8d5843d5051c376240172af218d7a1ecfe65b4f75100638983c14de4974755dade8018c9b8f4543fb095961513e67c61dbc59c607f9b51f8d09bdcad28bcfb9e5d2744ea8848b2623ac07f8ef61a81a35910b8a1baf39a919a7b60bc604d63185f759221d847cc54a22765a4c33475b5791e9af3271fc8d9350667090d8184ec50522d804f23c4fb44ffa481bc92ae408d1b9f2b131904f9705c59e2f4bde7a3b2c085d93fd2abc5e14d163001a12f51938d021afa92239b873dc6c357eaa8af4ee6d00540657fe32914103b5d98f68bd3e2b5359f08ccd88d0c811e4c31fbb49f3a90bbd05dce62f344e7077593159ae35050b04c9e6b86bc432dc8b048c73c0018ca5b69411297732a4e1aa99a928c71e7a24fd277856aa42501e51b012aea9446a2104e93f815a0b3a29b458314f3d8be2b9823d342f46213e942a7e19a46e970b5c506708430317b1bb3b35df68ae33a4926a03e6bfeb5510416fcbb0524c9ca5074156cc5a5d6fe1c995edc60a2f550411aa41e3da3bdcf64bcf04a0510571b936d47e55cec0330ee8dfe73563404f047d7f3a8a3d7743bc554955210f1eb0d08599ea77d5f974d87176d37d98b9c0ad440407209ed6a9f08464d565593e1a63b938536b49244e97d880173b640f2ddb74d068ecb46cf289b7d891307bba37054cf91b31fc82f74d5fc461fc5e978920e95d2804bbd5be7fb86b1b0961f35386c586bf4890ea6d607ae27b4c2b271061857eecb8fd90fd08eb5c43ceb736b6831e8c110f16cfdb3a42711215ca70517fd02dd25c84236e8de61e7ed8a3f26c83f4beb392cc07fc375af1968a52510744e95f837499abf7d7eaef506f1883a751588c7efa506c3e8d006961b9416af621e21c6787c5cf16ef846090f40f6158484007a6f536f656c52985673ece7fac73a0ed41ab0051753a7caa89be3139afd9793b3e02f27f040046595acd47bf13fd0da27f09eda48036d3ee437f2ee8f8606ea97343c33584657f46dba99db5cfe6ca176fab7b0f3bfa0ab61e340c34eb9f17c7ec2be03b180f0bb6f434c2a6542e00e84373f4f4649cda32bf686666143f622aa480460b5afac518607cd9af8bcd6b58c30127316b25d5ea7bf6b0cab8542ff69d9b2f180be12ed75344a395aa10f852f083ad64ef40e9c0309e9bba54b8cb33c95498a69538d3ae5b25e247098306fa8c74a8ee5bca941531d61aac27aab3dc5617d5606c9577a2a8346e8d85b32b8505775108dc85e2ade2eac1e636e1af4054c8b6f57632df269c3723b320872e4c57b218358dc7e9905bb04edf92edf0df635f3bf361e57a13296e1447af5087872d636e27518a9876e15eb01f5e8ded81892511cc2851b00b832712a6d3ba5666517bcd3567621a7cf8445589653262020c33bf78031b8ee0707de072068c170570327e6d9f5c6ddc335402efc548862f5a07094fd428a7bbc15d7b38d05362c9ca985f58a76647d2be4c2cd6b3d17d6870971d7a098baf72c6f6f1214cf1faae488bd7de259d3415c2f0ddec7457004f35708d1eccccc0df65a04943ad5cbc13f295f000fe056c40b2d88f27dc34cfeb803be3483a9ebf9b5a9026057725d63ead2c0c0ff1fe26ac1e7bdfcd6fad875842d194f331750462c06b8d7982d67995ed5d3ae96a05ae0067f4eb1c7c93231bd39773cbe0a9d66b0c9aa8cff6a376e1f372eac6ac4e46cc0942245d4c2dcf02d7640ffcc5a6ac3a87f5c411551bcc2f26cb94961d53f95ddb19ae930c8d70f031b29a5df99ff36695e802cbcb6b58c1ba7ed5eacfa76414a41ad4a44f71f1b580d34c3a952920b254a145fea517f5b42b2f65ecd0f82595478d80a0147e39a9cf3ef02000860f7bf1778a151c9fa667f5b880e556fa05241b10f5ac9a8408e925b626b323a471fe3bede52bba097b2a99a9ba5a86658c3fd9ec55bfa9b328567254ab36d2c7f44d2c7e13eb54beb70ea8fa94b6c6e012d79e3f53689c2b1a18102fc2334b7d094eb078f666ef96efc00b8f27fe280e8dbaca68558a3f12b8767a075e88291c7fae19d48f858acb292fb0eec645ffcbbe0ca5f8c561b257d1232e20cf850610c5e7f9e837e0cb42b2255e563c9d87140ad39caa233f9e9d200ae7f3ceac6e8fa0e4221925059c0887c2d3b60978d81a678b9ed8e4486b4d1063c0960441070896898bd5c0e8f5f729c872a27325c36fece03058bdb035c4013b4216056762ce3a396becc833feb8aeac0a08b8a11d84d0409b734f452aaf016", "1a0181107ab15ab8fd5af75d55147271e15604288aa9e66f43026e5ab2ad1f44", "a54fb6614b3ba0f8ae349eb49f36122cd252ff4c64de1e2d00fb6b4021cfce37", null, null, null, "1a0181107ab15ab8fd5af75d55147271e15604288aa9e66f43026e5ab2ad1f44", null, null, null, null, null],
+    ["050000800a27a726219651378f50258683daf61202399fd047eee288bb4585851dc93eccc62322924cd13b5dd4eed66ed8d9972d772629ea640665ac5351510006c062468e4bd8f7dd9af698f52ae814634e81d7f3e0c420317caca9ae4811c6af06fe80a8c02ab7046500ac65aa1ea1b700000000", "7788d45d79fb61550ace6c24817c39e602b1f2df3e021bd864b099569c52716b", "e29e8659b5da9051d956484a7e55dbdd35f20874fcf7cb8d1577f7c6f02dec07", 0, "6352516353", 107504874564564, "1eb5be41c626f1301ce49caee6ccfaa05608abd89999d75a3f19ef657f566d20", "b2e2aaed42f57dfd724d104337d98f546e3dc85c42a17897fd7c560d6f3f16df", "b2e2aaed42f57dfd724d104337d98f546e3dc85c42a17897fd7c560d6f3f16df", "e6c150f4699656448a0c20fd7c1931921289732bad0e657db83db6b68f5bb92a", "e6c150f4699656448a0c20fd7c1931921289732bad0e657db83db6b68f5bb92a", "e6c150f4699656448a0c20fd7c1931921289732bad0e657db83db6b68f5bb92a"],
+    ["050000800a27a72621965137025f13ec913c29020001788f2602a2cf0600015300000342f736a0fb38ae3e42ec67b07486f90e60752e0dc6ee0365cbd21db5ae70fdba02691508db301d732272d965c14602e2297db65fa9699ea87ff47099ed36371b2db3811615bbf52dc655da35a9fc03f311be830e28550a71ce289b24fab93c0163a5ca959be63f37f2ba0d432366736d8632fce072b6ae5b6f3fd59d3faff6381e86576581e2af578119dcb6ecddaf2115bded85c81ac2a8136fc8372590f28a3676a8b403ae25ffd772f7081e9a32bcc1c5e2edd4e2a6576b783cce3aae11fa432262548856183ee682d5dc31beb38f061cbdeca7021a444e2dd417df26dcd220f2b731772b439e96d614e1facb486c7a7d5171b1de359f6ad3a96f649c969102a1964fb4b4a1a4279c68e6c372e42187d754e804a61653092069fb9b6d25266890808b015df28c801065da6febdc1a56bfd002625acfaa5373fde149c1cfc3649b4869696d44ecb12479c5ebef995f10029f8b530eeb3fdc2e50e8757fc0bb9e263023db82f878d9ac7ffb0bd4391df1d879899a3ef57bfd0d1f7755648edd85bb052a6edf71cd2628c987429f36dc505ccc43f30e7a869c9e255e2af9fcf30c121796d190000960cb6fe2f1bf246118b498f3247f9d484c73cf09393039e45326b8ffffb3e7e6159c46699f100792d4672950348a90552e45943beeacf03f3216f94e274d63d637d9f190e8a266cdeef153530bee5cb8355260505c2c2e5d990fffdc34ec0ff7f1af81b24ced0efa6213da6c7c60c487f5f7b03f8160a057f46d05bf8218b3add9c06893bd02db9b61191dfb133bfabe4858e47a4cc32e416ec08b8ac7915a43733f4406e9d967c560f344d7e904a28045d99f3af8c82e97e1b9c1b205e585fbebb48faf58f1b65dca2497e09a70aad4865f85715a280e186f3fc1740d8184d33e8322169521cdc132212939c84a108964e2de74b6ea55b4cb8f6f9bee98b10d415109455f48b776082dc30b4bc73477075511700308158ce2f2f9bf0f691b2ce53e61142cb740c15b7b623cf48b3f7bfefa31bcdc665c6d7123e95350811375947b055a43db07e03f33627df5c638bfad956ddc1ea7d7620a20f2792f63817a1cf32580d04274234af2a51b56bb68a29e43a954142ba4ca6823bde9053d72fdadbc61ad5936c53fdd7579441c5b969e08e9f2e1eb20c909b3de6553f5748484d9ddcc4227eec92d780aa51de20e95968a36c4257bb25f3ff75dbc38fff2f2f271eab89c628e18b5fcb43802ce65256d33ee8f5fe037951be9a760734460a2cf026bc8ddaeacef005abcfe0824849a30576d5846d604542a132da9570762c0b1c65855deba8422ca4b88ab2e03998fc6e1223e7c42672656b9d0b387642dff188366b65a3ae49c206b9a0636407fd7da93fd0de6400d3ab8977485cddfbed5932f507b79947adb2fad37615aa717db5f298099f20f263b359a1151a6b75c01365eb154ae42140d6e10342f14f34dc33e07ff0e4d1a6be375b32f84b92e5d81ebb639c4f27e715aa42cc75707d4ebd1bbfbe8f90fc7c953e7a9715e65af8267373d3451674ff084efd92ccf3bcc7aca1467b6327e4f9522b2cc579a7a8fff7ca7cf145dfc13eafc34153b2c3e8afbe53444d0c73b3bd5bc870b01cd457911e356313fd1dafb4c8151634a01aff7cf116d433c3d2b3adda9cebe18f7d172443e5e7b5ac9abe8db2256d7ebe2ff28020939503870597b9a955892c7389650a2d42ec92be723fedf2f2ede5a472aa1e74f33ad41901544edbbe3ac464cf439196015f4f22ac2b8fc01496beab4d45907f479812a259431a2cbc93d4f3b84e4dd366020273a6752e501af6ff1b78ddc817e6ea351d6006becf8d2ffb03990f67774a81e05b7f4bbad8577fa27c9de64e1b11dcf384f5956443748755a9fc6f2a00b10c3657ebac03bfc0b587bef2f45ec8acdaa51c143b0cb25b9142c61bd790a80d7c23f90cc03495b51e4d2843e557f9e2545108c6c6fae359f645c276891c0dcab3faf187700c082dc477740fb3f2cd7bb59fb358554e94c7e678ce01aebf94e515e49722967995aea858d64e7789ff306369577228180326a5b0af475e27a54b207b41f92e376170e3fb005028261c99c2dbd0eedee871c1c0f48b8e9b8e4be77d1b737fe21f0fa5a18ebb52755b5a6cf6130fb56944cfab87527c250d113b29bcac9aaa10c2e7de415edb0806c6da03020a134ca7ecdc8da1bd57a37f55a46940b45b241b1c16ee100927d1bd860d445a9de50d4c384d6e1d00108026c0ea5ebbf0b72fbf5c370bce18d3acbc46599099baae1d802f77333494a7ae130fe86e835cfb9f5db2a721ac646eadf76e426d8e888321827abcbffbfbf52d75e07131cca1e8c78c51ed377cd4afa894bd9bd12e707156da0726f7cf5729fabe3721604347642ba505ec940bab48370845a5bbf483ea8f856e5e28600904b97226eac27557deff7c656406f9f959996093b2cd710d3e1b3299dc9521f8b513badb01029a31b366a370fa1c2eb426c7a9f327e56b3b9b5b32a226b2de14b7f5259bbf525aaba565b84b845e163d1caef2533c3981637204f96a59c8e8024d9041b2029e94c15245f1a958840ba3f380a4d20f1184e77827de3ff8f3d73459afe241f723c084823230e003d3d21e53501ec0499b083a7dad685c57127f4de64733a880c2db28fdaabf1b542d205f664a35135712711dcccd931a50b9c5661882360d4cac0047681bc2e2b3bf6c99760d7cfb4fa21394377a4551c76d1f75ac03c262054dffd79a9ded05e888958199eea4501e2990a53a5cd2a46a401576588fd7d058a26f28438e5782f45ac1d07f6f6f5ed73741d5785837a6b844b474775718c29dd99084e9f88ef153a8329f532a69017dc3a97ed754367723098e5765840b022897244745fbbbb30a7cb54fa0511166e9544122000610bd2aacbd82325a59b95154ecd82c88d23abd1e20770ffb8aabf83fc0734964ccd411d1c935714e24aab566f4f08424014c4eca91b590f082b473f361c87415d37bd20d70fd0b52b6ddf1865f766702e32b05b3cf1630ee8597aae19633f3516a8555ac5be32c675be1817efbffd9369041a089c283f19649968c2498cde56f500434f280d77a9c62e43cbd3f136a4c6a00a43e6ed530cb2e8ae838860adc88aacc7bd6a00ae0c19ff4533a485efde082b5f4d1f7a8ebe7ed82b7b05a8cfe1e373459f1bdcbf9525747e8c9508a555facb798740e0bdf994d9739bbe5538a0ae0f076c582c0f5ba878b99b8249db1d7e95056c98af083d98cb0ed9e3f7436e1c7643766f966b83e999206ebd1393b9b2a7f414480fa017480069f85c7749c435ae2fba2ddc1038d547d84854817ef39635c29827aad86726c9ade3b265b9086c8b5b75ef56fe4bd8b4d62893895b3fd2734fdac464156d7e5ebc7ecf1d83b86f659637e3b142c164963b8cdcf4ba4f4035dffc5a789458847781918ac72fc18b01954ea6bf46500200e2f790fbbac4c45bc32d240ac16391202822330b32d58e6777765f22a4116304fd0e01b65b2ec516393ab3751b5356d2b0c9500c0f3e469181035bc3660f0b8f9fbe6e40b5e89cb79b063714ca75e72e2e100a10d63bf784df0820ef25f8ef40fe5f05fb95683f9105ff3cb2d219ab76605a064f69219f1dc0d00b3b48642f970dc00cca4b8b43308be18286ec5a4288d600a3785cb622d468a4c6969b3792f2485027d0ad9aa4a9c2cc972f9ee5190a95b1eb058dddd8c08e7d753f5e011b2bcfee1d52c1c4f2cacda30bdb6930653c0cc4486e60e89fa849b32083ba9db453fb8df683cd68754c87daa731f570a7a4060af0ce700d31bca7e74b3e3ba3d0e8a6392a062b8e86d9d7d00b21701e7b062e06b1bcd82a01d375626fbf872d27fa4511f5f8cf8c9abcef2a990176ae339325302e42236a1eb1057288ce53221fb608a547f2cfa51216338d4ea1330d6bad847fa88c1e1aa3e1565d647779bbd0f70e85f8c7d3aa5c2082b265249df057011a79535e36c44fe9eae846fa19c2253746bc558925944f898bb2cf4449604bccb23c7404fe995e0035a3d00bb2a246e95bfc60145c6a009687684460271ee1332441ce68db5c8e802e0df35b93bbd7f3873ea00d191612a18042b25520c6e5dc0ea452f3731c8cb65082a622a7c2e0013ea47d0bdd42d6990466649a905c684c3200e477ea165300aaa4cf6adf8e7d13b0fba29f4499016ef53c1043b43891e734b6a4351aece9b0e9297f06403d1978ead2da0dff82cd1f55ebca57b6337c8513", "5c54aaa94342609f04b4318917ad4662934e5f0bd9ab877b9feb7ed8f88a721b", "27058e12e3af3da6acb4871a16fa258121e5483e2a51a069f1018c5d27092300", null, null, null, "5c54aaa94342609f04b4318917ad4662934e5f0bd9ab877b9feb7ed8f88a721b", null, null, null, null, null],
+    ["050000800a27a7262196513779813d20210c6f10000331efbaa1ccfd050008515300ac5265ac65657c6e390ecf040009516aacac525165656394266fd6496e060001ac000001bbdf186d8c75d0fb191a1b119b2a4ac4a441813f92551d941f6336c87a6ee01ed7992cff3eca24de3e0984e10e68ae387534b96cde3792f135bf5f68787d370ca44e77b3ed5ccd60369c0f4760aa05c0a6f62ff890558d7221f920bf1f1b778a06e57a85302de1d6919719f38dd180e972a15d5cd0fcc57439a4350eaf098d3b85ba3dbeccfcc295fd490051db41e2c4d181443708b19a4d0d0e2efa1d79e00f66e4c0155a9c74a7a57ccf34c483ac7da1588a1b6b9941f11040f94cf78fad89bf11fed69aa0d83105adacdd4e5f04a62424023c9b9e33c4fb7f12bdf21f07f265c537d51c6551f4617b915d21991839c3d0d36393d646e0a8a41509217d0e7d2ca1a0a0d677a3eaca23edeb07b74e652a0bc50c6c083a55d6c7306e74086f4768933aa24873681867a7893d77cb7f29b8c847c583f2d071a686616e206719f761ae39c110442e06163d2b84590360695d4e19849e634f24d9ad396c19ff83ce74f46e645f932e141a41195936c85d514414f112e60b1a2537c38d6dc6c4638305c9bd6c62e366bc63123e3e6dd36eedd3136fce8deeca2aa09a3298a39d83859efc9b2b69cf9a7dee08a98e4be558ac7912fdcb42209075420260f7cad0f2c01f2afe33073f26249d944f7a50dd84839bc3ea7fdee4ed71449cf07533d26e1e27a3efb032c3a3b34bd3092622d2062ae536ef5149c49b5bc9475eafab6e675761008b0daddeecaa604470bbe0fada255d290e92b190c2c2d8c2dee5455d1fa9a9f3db7779b584643464aa8014ba66994de25517f83980e66ee4f62314ae6dbef452d5d38b0a16f3991f36d8a8b39ddc0d5595eed98762878cdf3f4a2edc5cda77d5fe4faf63a15f568a540da57dd9beb6fb1a977ccb91b4d79cb39b28911a29e7bf028ac6103796dfb6b20967239ad373c38c53f6df1823d4950a0283e99b9c06ab2966667c9df677716b0caded818df9e449c072e22f9d98bb0f9b03bd5fd013fcef3ed6a49aeb98720254087ef728e31947ffe8f766e63ee46ff20816d5fa8ff55a26398961490ab9ae366fc5a2d1996ed693ccca82356f600ab099f6eca8bfe645270d3f95edba5b0de7a32819233bcc754a5ce2e5ea07842e5ff2cebe62ad76e8eff8d15ea4c24a5f207868319a5af6b035006989624f8ff70300921a63b5da5f2553b83a947b16424bbf5f7cbc70b4cd7e8e3c951f358572e33787e7d52704a6721b30efc41017ae4d231558c5c82cc7dd7e3356c09dc24906f0438dfcc300856ac2ced8f77fa8015736c661e80248aeeb774874aa79d290b8f5027a0a509537fc7c689b7ad86116cfec2647ccaae1c74b416f3e6ae8f7cc60eaaf7b6a590d51544138e1732945603a53462c60e1f6cb0c9ca0390c488224c313269fcd59fcb611fb2049dd4be68c3cdae9aedc88ad2cc8e37fd895017f6727541a8e35dfaf48781ea3544489b9470b0dc62ee163c05f9412fc9713aaac25b4c26eb03f716646611ad7c2ed9be4c85e42f734b5786a82ce4177a3c4764760355adfbfc3f0c84665bd6a1ebf895f67e11053883449f70695d0c4e951d71305ef33d9737126d0e66210", "57cfd23dcf797ffe6c57dcf1298234f1cead32cf5b6dc6495b863ead11866743", "db39cf4f6f67ad1157f3702298b0d6effcd3ad8420b89e754555c00567403747", null, null, null, "57cfd23dcf797ffe6c57dcf1298234f1cead32cf5b6dc6495b863ead11866743", null, null, null, null, null],
+    ["050000800a27a726219651371250926f6a8e6319038f69ad9a9192b302f26bdda465d90b94b12c57fa3fd6930083f184438d8a889d3f5ecea20252636736f2a0f18e26f4fa45d1be8f3dc4a707137e95d2ad594f6c03d24923067ae47fd6425efb9c1d50086a636a5300ac6551fe806f5756acb562f13c0ca1d803a195c2ebb2ef02ac33e6a88dea075ba996d3c336648e8694d3a10163ca531beb031aa2377fca6c00000700ac6a6aacac53d4e959af4a2e020002acacb75747fc903c05000300ac000275614934b7eb2bef279e31b965e6d33874b4e11b257f8960316c9a17c6a573a58f57015ca402c67d925c99acea3ee8cc4b008c5cb43966e714ef480fd05e07c7b2dda9aa3966113eaa293d3f622b309d64803ce1e6378b6aac4fab527c43cd45dbad57e9d25969bf43d0143b76c85ca095a90dac4ba07817f02631d72ee5dac1e16d0b77f02028da464100fde76d83dd0bb224f7b57a00c02f68ae648fdc529957a10490dce1fddbb0904f0d518bb387544019983b616975a78e74d854fddc4900f753db06f51001007c57ec890aff51a4d1d39ecd0e757f2917c738dd999b5c6e77da0b6b40a87006ed0a3c1a4b9fb18dcccfcdb6ac0c2421639cda0075a20dc5111b8d3d3199495bd9133dbab94541410e4fba92c7b606a5cb122f140cf1a3596f2788f3c8b92660f14cb65af5dd23dfdbac1371ecf4b33712fed2292c44f70834cf96c05d58827e69bfc2e696fa0874869c02f3dca11c3b90cb214e68bc1cae039d7a146cdc1d609d7a6b3fd5d461b0951c82cfb3e763fad2d1bc7678cdf82779f8fd5a1ce22a8d3c4547abd959838a46fb80afe01f8ecc9931513b1962ec540856cb189387cfbfb255167b55ef4bee465668b20ea4118ca569ae480e0f6e5e043a357b36d3ab36c861f2278301dce57674d5073b3a6f5103a0793af1b7d46f957e22d8d2583bf181836c3be9930bac8fa460e968aa7109870bbed17df5f888c8ca1467ae17dbbcde31c1105cb5bda88ac6c627002ce21c02140ffe81ec58bf1e6d1bb7aaada41fba0bb588778a7f65202ad811ea73d26c74550395aff75325107c9b3f9ae9dcdcd86ed081a2e7424719a3d185b7e0a43a472e298ac0afdc5287d7ad124cd9405a655059e183e964e7fc98bb48e367bbd68d8c9ece7b6bd213624856083fbf920ca53ffc8335f072af593bc991e805c3892b939632449554e40ae3c7a996c0ee02fc626603def306fd1ff4118b1c8e0669efe1b10fc16087199815430bf815a718bab91d8cf2950dbf25b42ec49a1f335ddfd5cad4bbafc1dcba2cd1c3d22b5605b9169e4ab21ff81dc36b21ec349b66bd88ffe7ff46ee18ece49e64198758938bc05215dbd8354613a0029489fe7b1dfebda9da980147397e97aa45d09451120803135701b8595c6e0f1764c3336e48e7f774675436502edda9cc00c7f24cb6090a80d0a61949608ba673710e93140630bf8672c4143d8b7acfd74e72c04d89240d22d67c92d7913f9906f0219e84ffd3932f8b4144461d0700cb7ad6cf9417533c26d2050d25b74b0e7b5a54df51157dc9e62d5f6c4abe5ce90a7fe2e52a8d780678cfcbdc0d5d9e43665af0fdbf5c4b7727680f4c534b54f9d5e9a357c836e085e10c1e3fac4058b682c68e54facae0f9c2dd4d64d9046152b4762332939f17e6aaf7d8b9d358e2218d4e0d69a4f119e1c64eec4c8b532809707131f01f55c7ad04cfb63f7c4a3d0a2b0ffb0b05a6be055b8c94ca80bb0a1d13cd4cd69ab98304ae2515d5f7699d4abee5c20be609d873511012f234bd85a7eff5fb634cff2658ba6516048563095ecefb3015ee3f03ca52a177f261ecdc26bc089d34c6404846e9c647fcfe98cc6acdbb464f64278ad8ce9d1ae0d415bc0c05245fddaf4ebc8dc703a85cb270f796ad2d937e2ac0d5e0a34821758000aa59c9d4652485294ee0ab29696b21430fa54dcfbf2b9c49d142064209eeeed4d471ffc017d4e20a796b0927804c061b9f4a7091fe015ada68fd8442e01825c88dfe55cf5de38936f7ce25311b902ba97a3c12a95cfa1c3a591b818f60832709d9e4839e410fb36b84f3ac4f070fc35e161978259e5b8edc744d90919aa770bb36215128e582b59641e23852e958eb8fc3c0aa96152ba4f77f138d6a6712a3ae3226015883f81db23e583c869c4c71143a6fffd65e8dfdc50c99a2f1f314cdcc71359e235f1d7dc2b5f38ef7b970843163c03f9dd40a8015efdc8791956a3f3cedd9ea64f8efa7a0815a70381d71467817bd04ca529aede07ff60d176aed0f855a2eaea89eaeaca89358c081826a0812a5bca28be1373f086dbdba7e43e203212c9fed21474ba19a055ffcc179412e893a744832298c5fe24cc6b18667f49b34dfb12379267419a9cb9403d8167d8d1e91d2811a043b29243b069b37587847dc6fcddb1831bd1cc2567ca033ac40f74ab6955f683b12e4e8254e4ea760d38b3f46791c5c4cb12bc7ccb0ed1865f25d601c303f81fb1fa1db48533d3d6b288e4d9a4dff8ec21c96f578399710c825fe7e32f93a8c0743f9ebd54cc151c761cb6638eba3a1fea6b9a972aa261b137d015861e14c59ec3a6f4c6d8e19e6463fa1e4304f49e43ae065e3fb196f76d9b879c7200862ead18dea5fb6a17acea3338870bde66449891b3eb051da407e7105cda20d73591139e9b2a2c729060c4a9fce5c0b6eacb9362ddcd774a0f2e147c30707a2cb6680a249ea9c7224392cbc0a9d58acdc4ba5623c498c72d7bac4f3013d0938bcda4f45166657e1f0d79d508b177852afd0abb90ade1d682726f42008b46ad7f8abdb18117f72641390f086b6e1498be69548527e6ada2b38b9fe121ef670af7437d32536d5cf5c4ab19dd99771582d038104b7e039a376f7acbbeadb34f945beb9d7ca0e4e3d5c5e4eb1d8526ebd13dacb1ba35735c6d04a4555acf4bf117626500d77b38189dd4888041225acbe3874a4c0f607fe6745f9355b3fa188f1d65c09f389af1b9d6232aa79447919c550f6f31fec35481cb922de2db5b4da2f81948617028e321706a3a778c1938c443bb00e5b0ff06ad8ab9b1ab0c11477673f85df9561dbea45d5f9781ebe317a0710ae5461e34fe6f1b1aa9b4e67b14910984802c2a7e38193bc7bdc8ba3e4e3d1d933bfb580f5b3e87a2a06517051410fe1b4ff1ea0ade824f338515456a57c7a916a74388ee8f1281f9ade0ae2a2613a0612c469df792b8df4cae4fc25c1cadba95a807ce61e5a5303faaf9e14653996b5a8adc34fd475ef1499094babaf1f3f07da9a390b1d9fc9a08327987adfe9564863fbdfa8f6b46a8841583099afb7870118face76347e40b6fd8cd15582ae8e23be9a0219bc3e4e4546a30d3bbbbd1686086876be0e4c859be71fb58f4fab3d28c0b4f7e75ad1edb7f88946fb40cfa5786a0fcba1303c8347ecee93d46d140bb5f69531d666548b109ce764bead7c87bd4c876494de82db6e5073a6c94f7c099a40d7a31c4a04b69c9fccf3c7dd56f5544776c53b4df7953981d55a96a6dcff9904a90842e5bafec8840c2d255bf5ad61c460f98feb82a10fa1c099f62776798236c5ca7f1e46ebdb2b144d8713e56c772f2c3b860ea5b03a8854bc6e6590d63cc0ea54f10b73ba241bf74b635551a2aaca9687ac5269fd368b26d70a737f267685998a3f7d2637914909c746495d24c498635ef97ac66a400894c09f73488eb7cf779237db2ac14e22658be28ae988cec4a671653b575fdea44f7de69cb7e396821e7c661739f9f028a9262bd80ebf9ce8c4a9382c6b03e7d8085e906cf84ca20173fc57be19361a83a7e3775f5b013a9a04b1a506fc59802cfc3cacfb635beb0b76395cba743c36279ba3b4f2c8ba4adb5b8763fb96d7ca333a12de3cefa91c2c96599919a4dfe8408acb99105ee54b79f227b6cb7e337bab04989857fe4f4437ddfabb7b65543b5f39cb2023d46789eb7d989af779e5b8d28385a85b0da2abe07f0c2bb4255fcea03188527a307d409159e90166fac6a070ba05b3e4dbfd3a2bfcc9ee6ed016c0f665be8133b7dc1d86044db0f9db40fb0e9f8bc2e4db5382a8b4f815b4e8434ad0dfbc51a5e9b145e1596cbf4670b7e05dfdafbb0cf3ddee28d76a82428e8aba4364e84bac379298df2932e69bb5d045516efc33ae6cc3947ceb09ed371667212a831b5485eafce8488188ea4e27d0cdf7ddd348abff777f4a13bbc716b6a5944ee727965690e209b49eb962c039975f939ed5c6e4c400d887759433d3ad716da0cb446113c7727a64b58c3f8a0f81189f98005233a81366aee73cec85228ebcfd5ee3c3fb44db76ba243f2842b7b5fc746ae51b0bc4bd4fc9fd833565ea852b92b224f6990318ad8c7d9437e20e2a1f20e818f9057c5abaaa2e5c15b94945cd424c28a5fa385dadfe4907b274d842707db3697a5ae6c8f542e5ecc07fe47350d1014670212efe81fb7c73e8450df814ef6232f7490f63ccf07480f884a66eaffc28fea448d7b401cdae10e7c0c7f9a7b15331969fc8cb36396773de191931c750f6ce5caaf29768ebb27dacc738056a8125b4772bf87ae10a8a309b9bd655043cfc3159494368c5ab8cadb7f671e9626bd263e31181a604b506a03b439a7ffe4355892477e2bdf338c62c3922f7d3c9a56c7103d911948a84b5ae2dbb16a3761add053a0f967e6b5bc94211b6547153267c6ee1cad0d974a71088583735e4f63d33156dadd54c2faf89114a127b97b94cc2a22ef303f459d04fc0b53ace5918d47ff33a558bd71a75f355fbd06bbccf4e02c3c0a4b63d0cc949801d63a64cb2d32373b2c7b274ab2db4682142c8b21d84c481f5ef21e4b5e3603451bf94774d0ef47f63fa6abb78d21c193cbe004d4355231dfd03003da4ea2a4c88bf677cf9754f0c47ef82e20975baaecb0232df880bd7d1de1321549462ec8d5df3e780ffa72eba8a8df7fcf398ec230513ca9d6123f8b9d8178560daf975111955a2bca3423eeefc527be3a8543eb90a5ec02f35a7c64b7dd59a72da0074634e01d2abf3637add77c7350f12b011b2b244613c3f638dfbc036c45541590a6f070534b13f4d4ec0995a082337438d04ea53f492070e201cdbb1dc5bd194d4919f911dfa7241c8d5792d43c457d5de1667c62ec09f08cb58f735e5e35efed184a5001018c10f8cb64b0a7b76814be117fae204a52008dbefcec9fc34c0e5be77fc8b5b5cd077115afde18405054e5d291aa8eb1619c049a60576b87867936b8c9b296888a860348e53c15f7341d8f1acdd0dde230755b4ce860f9f650fe40af6413640b81e4f631c981c11a2e1d18406f1ec93ae097d4c4c159ab6c4e6f527e80a8a7faff91d410de44438db1c7e9d2f17cad242fa9c3179c1a3aa81f7361649572c715c25a1f6cd5ace82c00ab2342b", "03a035938eb02c1b060c7442f4e029a2ea4ed6c5773a5dee3e61d7e4c30e09f2", "c6962319dcdb240d41901812185904eaacda42caf02c1d518d9f5285f9879cb0", 0, "", 1405243945822387, "91f8423fc57709d07552f64dd3ec296edf561ffc359a4acea010bb6a1bbf8384", "1761831c3fab98effcd6eb6e088e4a1d9af8c432e4ee220fb678962019390ac2", "5181ef8175c3dd3af6acbfdb08b566c2fefcdba50a0498dfad39ae0246d89853", "bd5b017be66d21dc40d06f820dce81cd226ea7f7deb6a71a128e0aa5efce9153", "827774bbdc4701eebe2ad342d1af17616c38f64fc401b8cf81001144e03b9fe0", "fb0a1e19636fd2e919cf66d63e0b5b9b26e0f364ccf4aa7dacf630a52c3ef00b"]
 ]
diff --git a/src/test/key_tests.cpp b/src/test/key_tests.cpp
index 959bb25da4c..56bf05983a4 100644
--- a/src/test/key_tests.cpp
+++ b/src/test/key_tests.cpp
@@ -202,9 +202,9 @@ BOOST_AUTO_TEST_CASE(zc_address_test)
             BOOST_CHECK(sk_string[1] == 'K');
 
             auto spendingkey2 = keyIO.DecodeSpendingKey(sk_string);
-            BOOST_CHECK(IsValidSpendingKey(spendingkey2));
-            BOOST_ASSERT(std::get_if<SproutSpendingKey>(&spendingkey2) != nullptr);
-            auto sk2 = std::get<SproutSpendingKey>(spendingkey2);
+            BOOST_CHECK(spendingkey2.has_value());
+            BOOST_ASSERT(std::get_if<SproutSpendingKey>(&spendingkey2.value()) != nullptr);
+            auto sk2 = std::get<SproutSpendingKey>(spendingkey2.value());
             BOOST_CHECK(sk.inner() == sk2.inner());
         }
         {
@@ -216,10 +216,10 @@ BOOST_AUTO_TEST_CASE(zc_address_test)
             BOOST_CHECK(addr_string[1] == 'c');
 
             auto paymentaddr2 = keyIO.DecodePaymentAddress(addr_string);
-            BOOST_ASSERT(IsValidPaymentAddress(paymentaddr2));
+            BOOST_ASSERT(paymentaddr2.has_value());
 
-            BOOST_ASSERT(std::get_if<SproutPaymentAddress>(&paymentaddr2) != nullptr);
-            auto addr2 = std::get<SproutPaymentAddress>(paymentaddr2);
+            BOOST_ASSERT(std::get_if<SproutPaymentAddress>(&paymentaddr2.value()) != nullptr);
+            auto addr2 = std::get<SproutPaymentAddress>(paymentaddr2.value());
             BOOST_CHECK(addr.a_pk == addr2.a_pk);
             BOOST_CHECK(addr.pk_enc == addr2.pk_enc);
         }
@@ -240,23 +240,23 @@ BOOST_AUTO_TEST_CASE(zs_address_test)
             BOOST_CHECK(sk_string.compare(0, 27, Params().Bech32HRP(CChainParams::SAPLING_EXTENDED_SPEND_KEY)) == 0);
 
             auto spendingkey2 = keyIO.DecodeSpendingKey(sk_string);
-            BOOST_CHECK(IsValidSpendingKey(spendingkey2));
+            BOOST_CHECK(spendingkey2.has_value());
 
-            BOOST_ASSERT(std::get_if<SaplingExtendedSpendingKey>(&spendingkey2) != nullptr);
-            auto sk2 = std::get<SaplingExtendedSpendingKey>(spendingkey2);
+            BOOST_ASSERT(std::get_if<SaplingExtendedSpendingKey>(&spendingkey2.value()) != nullptr);
+            auto sk2 = std::get<SaplingExtendedSpendingKey>(spendingkey2.value());
             BOOST_CHECK(sk == sk2);
         }
         {
-            auto addr = sk.DefaultAddress();
+            auto addr = sk.ToXFVK().DefaultAddress();
 
             std::string addr_string = keyIO.EncodePaymentAddress(addr);
             BOOST_CHECK(addr_string.compare(0, 15, Params().Bech32HRP(CChainParams::SAPLING_PAYMENT_ADDRESS)) == 0);
 
             auto paymentaddr2 = keyIO.DecodePaymentAddress(addr_string);
-            BOOST_CHECK(IsValidPaymentAddress(paymentaddr2));
+            BOOST_CHECK(paymentaddr2.has_value());
 
-            BOOST_ASSERT(std::get_if<SaplingPaymentAddress>(&paymentaddr2) != nullptr);
-            auto addr2 = std::get<SaplingPaymentAddress>(paymentaddr2);
+            BOOST_ASSERT(std::get_if<SaplingPaymentAddress>(&paymentaddr2.value()) != nullptr);
+            auto addr2 = std::get<SaplingPaymentAddress>(paymentaddr2.value());
             BOOST_CHECK(addr == addr2);
         }
     }
diff --git a/src/test/limitedmap_tests.cpp b/src/test/limitedmap_tests.cpp
index faaddffad8a..e3531486aa3 100644
--- a/src/test/limitedmap_tests.cpp
+++ b/src/test/limitedmap_tests.cpp
@@ -47,7 +47,7 @@ BOOST_AUTO_TEST_CASE(limitedmap_test)
         // make sure the item is present
         BOOST_CHECK(map.count(i) == 1);
 
-        // use the iterator to check for the expected key adn value
+        // use the iterator to check for the expected key and value
         BOOST_CHECK(it->first == i);
         BOOST_CHECK(it->second == i + 1);
         
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index 82f104fb4bc..a2c674b8d5c 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -221,7 +221,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
             equi eq(1);
             eq.setstate(curr_state.state);
 
-            // Intialization done, start algo driver.
+            // Initialization done, start algo driver.
             eq.digit0(0);
             eq.xfull = eq.bfull = eq.hfull = 0;
             eq.showbsizes(0);
diff --git a/src/test/multisig_tests.cpp b/src/test/multisig_tests.cpp
index 2aabbb3d220..2986a83595a 100644
--- a/src/test/multisig_tests.cpp
+++ b/src/test/multisig_tests.cpp
@@ -49,7 +49,7 @@ BOOST_DATA_TEST_CASE(multisig_verify, boost::unit_test::data::xrange(static_cast
     CKey key[4];
     CAmount amount = 0;
     for (int i = 0; i < 4; i++)
-        key[i].MakeNewKey(true);
+        key[i] = CKey::TestOnlyRandomKey(true);
 
     CScript a_and_b;
     a_and_b << OP_2 << ToByteVector(key[0].GetPubKey()) << ToByteVector(key[1].GetPubKey()) << OP_2 << OP_CHECKMULTISIG;
@@ -149,7 +149,7 @@ BOOST_AUTO_TEST_CASE(multisig_IsStandard)
 {
     CKey key[4];
     for (int i = 0; i < 4; i++)
-        key[i].MakeNewKey(true);
+        key[i] = CKey::TestOnlyRandomKey(true);
 
     txnouttype whichType;
 
@@ -191,7 +191,7 @@ BOOST_DATA_TEST_CASE(multisig_Sign, boost::unit_test::data::xrange(static_cast<i
     CKey key[4];
     for (int i = 0; i < 4; i++)
     {
-        key[i].MakeNewKey(true);
+        key[i] = CKey::TestOnlyRandomKey(true);
         keystore.AddKey(key[i]);
     }
 
diff --git a/src/test/sanity_tests.cpp b/src/test/sanity_tests.cpp
index 41813fdd25a..c7ce9af4cd9 100644
--- a/src/test/sanity_tests.cpp
+++ b/src/test/sanity_tests.cpp
@@ -14,7 +14,7 @@ BOOST_AUTO_TEST_CASE(basic_sanity)
 {
   BOOST_CHECK_MESSAGE(glibc_sanity_test() == true, "libc sanity test");
   BOOST_CHECK_MESSAGE(glibcxx_sanity_test() == true, "stdlib sanity test");
-  BOOST_CHECK_MESSAGE(ECC_InitSanityCheck() == true, "ECC sanity test");
+  BOOST_CHECK_MESSAGE(CKey::ECC_InitSanityCheck() == true, "ECC sanity test");
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp
index 027a3bf1739..6fe0a0bb178 100644
--- a/src/test/script_P2SH_tests.cpp
+++ b/src/test/script_P2SH_tests.cpp
@@ -67,7 +67,7 @@ BOOST_DATA_TEST_CASE(sign, boost::unit_test::data::xrange(static_cast<int>(Conse
     CKey key[4];
     for (int i = 0; i < 4; i++)
     {
-        key[i].MakeNewKey(true);
+        key[i] = CKey::TestOnlyRandomKey(true);
         keystore.AddKey(key[i]);
     }
 
@@ -170,7 +170,7 @@ BOOST_DATA_TEST_CASE(set, boost::unit_test::data::xrange(static_cast<int>(Consen
     std::vector<CPubKey> keys;
     for (int i = 0; i < 4; i++)
     {
-        key[i].MakeNewKey(true);
+        key[i] = CKey::TestOnlyRandomKey(true);
         keystore.AddKey(key[i]);
         keys.push_back(key[i].GetPubKey());
     }
@@ -282,7 +282,7 @@ BOOST_DATA_TEST_CASE(AreInputsStandard, boost::unit_test::data::xrange(static_ca
     vector<CPubKey> keys;
     for (int i = 0; i < 6; i++)
     {
-        key[i].MakeNewKey(true);
+        key[i] = CKey::TestOnlyRandomKey(true);
         keystore.AddKey(key[i]);
     }
     for (int i = 0; i < 3; i++)
diff --git a/src/test/script_standard_tests.cpp b/src/test/script_standard_tests.cpp
index 0196b4b5b96..2a4ee144361 100644
--- a/src/test/script_standard_tests.cpp
+++ b/src/test/script_standard_tests.cpp
@@ -22,7 +22,7 @@ BOOST_AUTO_TEST_CASE(script_standard_Solver_success)
     CKey keys[3];
     CPubKey pubkeys[3];
     for (int i = 0; i < 3; i++) {
-        keys[i].MakeNewKey(true);
+        keys[i] = CKey::TestOnlyRandomKey(true);
         pubkeys[i] = keys[i].GetPubKey();
     }
 
@@ -103,9 +103,8 @@ BOOST_AUTO_TEST_CASE(script_standard_Solver_success)
 
 BOOST_AUTO_TEST_CASE(script_standard_Solver_failure)
 {
-    CKey key;
+    CKey key = CKey::TestOnlyRandomKey(true);
     CPubKey pubkey;
-    key.MakeNewKey(true);
     pubkey = key.GetPubKey();
 
     CScript s;
@@ -165,9 +164,8 @@ BOOST_AUTO_TEST_CASE(script_standard_Solver_failure)
 
 BOOST_AUTO_TEST_CASE(script_standard_ExtractDestination)
 {
-    CKey key;
+    CKey key = CKey::TestOnlyRandomKey(true);
     CPubKey pubkey;
-    key.MakeNewKey(true);
     pubkey = key.GetPubKey();
 
     CScript s;
@@ -221,7 +219,7 @@ BOOST_AUTO_TEST_CASE(script_standard_ExtractDestinations)
     CKey keys[3];
     CPubKey pubkeys[3];
     for (int i = 0; i < 3; i++) {
-        keys[i].MakeNewKey(true);
+        keys[i] = CKey::TestOnlyRandomKey(true);
         pubkeys[i] = keys[i].GetPubKey();
     }
 
@@ -297,7 +295,7 @@ BOOST_AUTO_TEST_CASE(script_standard_GetScriptFor_)
     CKey keys[3];
     CPubKey pubkeys[3];
     for (int i = 0; i < 3; i++) {
-        keys[i].MakeNewKey(true);
+        keys[i] = CKey::TestOnlyRandomKey(true);
         pubkeys[i] = keys[i].GetPubKey();
     }
 
@@ -343,12 +341,11 @@ BOOST_AUTO_TEST_CASE(script_standard_IsMine)
     CKey keys[2];
     CPubKey pubkeys[2];
     for (int i = 0; i < 2; i++) {
-        keys[i].MakeNewKey(true);
+        keys[i] = CKey::TestOnlyRandomKey(true);
         pubkeys[i] = keys[i].GetPubKey();
     }
 
-    CKey uncompressedKey;
-    uncompressedKey.MakeNewKey(false);
+    CKey uncompressedKey = CKey::TestOnlyRandomKey(false);
     CPubKey uncompressedPubkey = uncompressedKey.GetPubKey();
 
     CScript scriptPubKey;
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 6ed81ade652..5ce70486a24 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -701,10 +701,9 @@ BOOST_DATA_TEST_CASE(script_CHECKMULTISIG12, boost::unit_test::data::xrange(stat
     uint32_t consensusBranchId = NetworkUpgradeInfo[sample].nBranchId;
 
     ScriptError err;
-    CKey key1, key2, key3;
-    key1.MakeNewKey(true);
-    key2.MakeNewKey(false);
-    key3.MakeNewKey(true);
+    CKey key1 = CKey::TestOnlyRandomKey(true);
+    CKey key2 = CKey::TestOnlyRandomKey(false);
+    CKey key3 = CKey::TestOnlyRandomKey(true);
 
     CScript scriptPubKey12;
     scriptPubKey12 << OP_1 << ToByteVector(key1.GetPubKey()) << ToByteVector(key2.GetPubKey()) << OP_2 << OP_CHECKMULTISIG;
@@ -734,11 +733,10 @@ BOOST_DATA_TEST_CASE(script_CHECKMULTISIG23, boost::unit_test::data::xrange(stat
     uint32_t consensusBranchId = NetworkUpgradeInfo[sample].nBranchId;
 
     ScriptError err;
-    CKey key1, key2, key3, key4;
-    key1.MakeNewKey(true);
-    key2.MakeNewKey(false);
-    key3.MakeNewKey(true);
-    key4.MakeNewKey(false);
+    CKey key1 = CKey::TestOnlyRandomKey(true);
+    CKey key2 = CKey::TestOnlyRandomKey(false);
+    CKey key3 = CKey::TestOnlyRandomKey(true);
+    CKey key4 = CKey::TestOnlyRandomKey(false);
 
     CScript scriptPubKey23;
     scriptPubKey23 << OP_2 << ToByteVector(key1.GetPubKey()) << ToByteVector(key2.GetPubKey()) << ToByteVector(key3.GetPubKey()) << OP_3 << OP_CHECKMULTISIG;
@@ -812,8 +810,7 @@ BOOST_DATA_TEST_CASE(script_combineSigs, boost::unit_test::data::xrange(static_c
     vector<CPubKey> pubkeys;
     for (int i = 0; i < 3; i++)
     {
-        CKey key;
-        key.MakeNewKey(i%2 == 1);
+        CKey key = CKey::TestOnlyRandomKey(i%2 == 1);
         keys.push_back(key);
         pubkeys.push_back(key.GetPubKey());
         keystore.AddKey(key);
diff --git a/src/test/serialize_tests.cpp b/src/test/serialize_tests.cpp
index b00fa69a480..ea82556115c 100644
--- a/src/test/serialize_tests.cpp
+++ b/src/test/serialize_tests.cpp
@@ -65,7 +65,7 @@ class CSerializeMethodsTestSingle
                 boolval == rhs.boolval && \
                 stringval == rhs.stringval && \
                 strcmp(charstrval, rhs.charstrval) == 0 && \
-                txval == rhs.txval;
+                txval.GetHash() == rhs.txval.GetHash();
     }
 };
 
@@ -300,8 +300,8 @@ static bool isCanonicalException(const std::ios_base::failure& ex)
 
     // The string returned by what() can be different for different platforms.
     // Instead of directly comparing the ex.what() with an expected string,
-    // create an instance of exception to see if ex.what() matches 
-    // the expected explanatory string returned by the exception instance. 
+    // create an instance of exception to see if ex.what() matches
+    // the expected explanatory string returned by the exception instance.
     return strcmp(expectedException.what(), ex.what()) == 0;
 }
 
diff --git a/src/test/sigopcount_tests.cpp b/src/test/sigopcount_tests.cpp
index b4c6aee8068..58b88e686ba 100644
--- a/src/test/sigopcount_tests.cpp
+++ b/src/test/sigopcount_tests.cpp
@@ -47,8 +47,7 @@ BOOST_AUTO_TEST_CASE(GetSigOpCount)
     std::vector<CPubKey> keys;
     for (int i = 0; i < 3; i++)
     {
-        CKey k;
-        k.MakeNewKey(true);
+        CKey k = CKey::TestOnlyRandomKey(true);
         keys.push_back(k.GetPubKey());
     }
     CScript s2 = GetScriptForMultisig(1, keys);
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 301aa93b141..f3360fe19fb 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -78,6 +78,7 @@ BasicTestingSetup::BasicTestingSetup(const std::string& chainName)
     fCheckBlockIndex = true;
     SelectParams(chainName);
     noui_connect();
+    TestSetIBD(false);
 }
 
 BasicTestingSetup::~BasicTestingSetup()
@@ -129,7 +130,7 @@ TestingSetup::~TestingSetup()
 TestChain100Setup::TestChain100Setup() : TestingSetup(CBaseChainParams::REGTEST)
 {
     // Generate a 100-block chain:
-    coinbaseKey.MakeNewKey(true);
+    coinbaseKey = CKey::TestOnlyRandomKey(true);
     CScript scriptPubKey = CScript() <<  ToByteVector(coinbaseKey.GetPubKey()) << OP_CHECKSIG;
     for (int i = 0; i < COINBASE_MATURITY; i++)
     {
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index dfedf1be212..2c275849845 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -270,7 +270,7 @@ SetupDummyInputs(CBasicKeyStore& keystoreRet, CCoinsViewCache& coinsRet)
     CKey key[4];
     for (int i = 0; i < 4; i++)
     {
-        key[i].MakeNewKey(i % 2);
+        key[i] = CKey::TestOnlyRandomKey(i % 2);
         keystoreRet.AddKey(key[i]);
     }
 
@@ -639,8 +639,7 @@ BOOST_AUTO_TEST_CASE(test_big_overwinter_transaction) {
     mtx.nVersion = OVERWINTER_TX_VERSION;
     mtx.nVersionGroupId = OVERWINTER_VERSION_GROUP_ID;
 
-    CKey key;
-    key.MakeNewKey(false);
+    CKey key = CKey::TestOnlyRandomKey(false);
     CBasicKeyStore keystore;
     keystore.AddKeyPubKey(key, key.GetPubKey());
     CKeyID hash = key.GetPubKey().GetID();
@@ -731,8 +730,7 @@ BOOST_AUTO_TEST_CASE(test_IsStandard)
     t.vin[0].scriptSig << std::vector<unsigned char>(65, 0);
     t.vout.resize(1);
     t.vout[0].nValue = 90*CENT;
-    CKey key;
-    key.MakeNewKey(true);
+    CKey key = CKey::TestOnlyRandomKey(true);
     t.vout[0].scriptPubKey = GetScriptForDestination(key.GetPubKey().GetID());
 
     string reason;
@@ -826,8 +824,7 @@ BOOST_AUTO_TEST_CASE(test_IsStandardV2)
     t.vin[0].scriptSig << std::vector<unsigned char>(65, 0);
     t.vout.resize(1);
     t.vout[0].nValue = 90*CENT;
-    CKey key;
-    key.MakeNewKey(true);
+    CKey key = CKey::TestOnlyRandomKey(true);
     t.vout[0].scriptPubKey = GetScriptForDestination(key.GetPubKey().GetID());
 
     string reason;
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
index 0e75189db7d..28ee6b97d85 100644
--- a/src/test/util_tests.cpp
+++ b/src/test/util_tests.cpp
@@ -492,4 +492,133 @@ BOOST_AUTO_TEST_CASE(test_ParseFixedPoint)
     BOOST_CHECK(!ParseFixedPoint("1.", 8, &amount));
 }
 
+BOOST_AUTO_TEST_CASE(test_ParseArbitraryInt)
+{
+    // Negation not allowed.
+    BOOST_CHECK(!ParseArbitraryInt("-1"));
+
+    // no legal digits
+    BOOST_CHECK(!ParseArbitraryInt(""));
+    BOOST_CHECK(!ParseArbitraryInt(" "));
+
+    // Hex not allowed (only decimal).
+    BOOST_CHECK(!ParseArbitraryInt("ab"));
+    BOOST_CHECK(!ParseArbitraryInt("0xab"));
+
+    // Decimal point not allowed.
+    BOOST_CHECK(!ParseArbitraryInt("1."));
+
+    std::optional<std::vector<unsigned char>> v;
+
+    // simple success case
+    v = ParseArbitraryInt("1");
+    BOOST_CHECK(v.has_value());
+    BOOST_CHECK_EQUAL(v->size(), 1);
+    BOOST_CHECK_EQUAL((*v)[0], 1);
+
+    // Leading and trailing whitespace (spaces and tabs) is allowed.
+    v = ParseArbitraryInt(" 1");
+    BOOST_CHECK(v.has_value());
+    BOOST_CHECK_EQUAL(v->size(), 1);
+    BOOST_CHECK_EQUAL((*v)[0], 1);
+    v = ParseArbitraryInt("2 ");
+    BOOST_CHECK(v.has_value());
+    BOOST_CHECK_EQUAL(v->size(), 1);
+    BOOST_CHECK_EQUAL((*v)[0], 2);
+    v = ParseArbitraryInt(" \t3 ");
+    BOOST_CHECK(v.has_value());
+    BOOST_CHECK_EQUAL(v->size(), 1);
+    BOOST_CHECK_EQUAL((*v)[0], 3);
+
+    // Leading zeros have no effect, does not mean octal
+    v = ParseArbitraryInt("010\t");
+    BOOST_CHECK(v.has_value());
+    BOOST_CHECK_EQUAL(v->size(), 1);
+    BOOST_CHECK_EQUAL((*v)[0], 10);
+
+    v = ParseArbitraryInt("                 255\t");
+    BOOST_CHECK(v.has_value());
+    BOOST_CHECK_EQUAL(v->size(), 1);
+    BOOST_CHECK_EQUAL((*v)[0], 255);
+
+    v = ParseArbitraryInt("\t 256");
+    BOOST_CHECK(v.has_value());
+    BOOST_CHECK_EQUAL(v->size(), 2);
+    BOOST_CHECK_EQUAL((*v)[0], 0);
+    BOOST_CHECK_EQUAL((*v)[1], 1);
+
+    v = ParseArbitraryInt("257 \t");
+    BOOST_CHECK(v.has_value());
+    BOOST_CHECK_EQUAL(v->size(), 2);
+    BOOST_CHECK_EQUAL((*v)[0], 1);
+    BOOST_CHECK_EQUAL((*v)[1], 1);
+
+    v = ParseArbitraryInt("65535");
+    BOOST_CHECK(v.has_value());
+    BOOST_CHECK_EQUAL(v->size(), 2);
+    BOOST_CHECK_EQUAL((*v)[0], 255);
+    BOOST_CHECK_EQUAL((*v)[1], 255);
+
+    v = ParseArbitraryInt("65536");
+    BOOST_CHECK(v.has_value());
+    BOOST_CHECK_EQUAL(v->size(), 3);
+    BOOST_CHECK_EQUAL((*v)[0], 0);
+    BOOST_CHECK_EQUAL((*v)[1], 0);
+    BOOST_CHECK_EQUAL((*v)[2], 1);
+
+    // This decimal string came from:
+    // $ echo 16i 102030405060708090A0B0C0D0E0F0F1F2F3F4F5F6F7 p | dc
+    v = ParseArbitraryInt("6033354224708459019450009057293028077350189222196983");
+    BOOST_CHECK(v.has_value());
+    BOOST_CHECK_EQUAL(v->size(), 22);
+    BOOST_CHECK_EQUAL((*v)[0], 0xf7);
+    BOOST_CHECK_EQUAL((*v)[1], 0xf6);
+    BOOST_CHECK_EQUAL((*v)[2], 0xf5);
+    BOOST_CHECK_EQUAL((*v)[3], 0xf4);
+    BOOST_CHECK_EQUAL((*v)[4], 0xf3);
+    BOOST_CHECK_EQUAL((*v)[5], 0xf2);
+    BOOST_CHECK_EQUAL((*v)[6], 0xf1);
+    BOOST_CHECK_EQUAL((*v)[7], 0xf0);
+    BOOST_CHECK_EQUAL((*v)[8], 0xe0);
+    BOOST_CHECK_EQUAL((*v)[9], 0xd0);
+    BOOST_CHECK_EQUAL((*v)[10], 0xc0);
+    BOOST_CHECK_EQUAL((*v)[11], 0xb0);
+    BOOST_CHECK_EQUAL((*v)[12], 0xa0);
+    BOOST_CHECK_EQUAL((*v)[13], 0x90);
+    BOOST_CHECK_EQUAL((*v)[14], 0x80);
+    BOOST_CHECK_EQUAL((*v)[15], 0x70);
+    BOOST_CHECK_EQUAL((*v)[16], 0x60);
+    BOOST_CHECK_EQUAL((*v)[17], 0x50);
+    BOOST_CHECK_EQUAL((*v)[18], 0x40);
+    BOOST_CHECK_EQUAL((*v)[19], 0x30);
+    BOOST_CHECK_EQUAL((*v)[20], 0x20);
+    BOOST_CHECK_EQUAL((*v)[21], 0x10);
+}
+
+BOOST_AUTO_TEST_CASE(test_ArbitraryIntStr)
+{
+    BOOST_CHECK_EQUAL(ArbitraryIntStr({}), "0");
+    BOOST_CHECK_EQUAL(ArbitraryIntStr({0}), "0");
+    BOOST_CHECK_EQUAL(ArbitraryIntStr({0, 0}), "0");
+    BOOST_CHECK_EQUAL(ArbitraryIntStr({0, 0, 0}), "0");
+    BOOST_CHECK_EQUAL(ArbitraryIntStr({0, 0, 0, 0}), "0");
+
+    BOOST_CHECK_EQUAL(ArbitraryIntStr({1}), "1");
+    BOOST_CHECK_EQUAL(ArbitraryIntStr({2}), "2");
+    BOOST_CHECK_EQUAL(ArbitraryIntStr({10}), "10");
+    BOOST_CHECK_EQUAL(ArbitraryIntStr({100}), "100");
+
+    BOOST_CHECK_EQUAL(ArbitraryIntStr({0xff}), "255");
+    BOOST_CHECK_EQUAL(ArbitraryIntStr({0x00, 0x01}), "256");
+    BOOST_CHECK_EQUAL(ArbitraryIntStr({0xff, 0x01}), "511");
+    BOOST_CHECK_EQUAL(ArbitraryIntStr({0x00, 0x02}), "512");
+
+    BOOST_CHECK_EQUAL(
+        ArbitraryIntStr({0xff, 0xff, 0xff, 0xff}),
+        "4294967295");
+    BOOST_CHECK_EQUAL(
+        ArbitraryIntStr({0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}),
+        "309485009821345068724781055");
+}
+
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
index acfbe45fa64..21f7467659a 100644
--- a/src/torcontrol.cpp
+++ b/src/torcontrol.cpp
@@ -360,7 +360,7 @@ static std::map<std::string,std::string> ParseTorReplyMapping(const std::string
 
 /** Read full contents of a file and return them in a std::string.
  * Returns a pair <status, string>.
- * If an error occured, status will be false, otherwise status will be true and the data will be returned in string.
+ * If an error occurred, status will be false, otherwise status will be true and the data will be returned in string.
  *
  * @param maxsize Puts a maximum size limit on the file that is read. If the file is larger than this, truncated data
  *         (with len > maxsize) will be returned.
diff --git a/src/transaction_builder.cpp b/src/transaction_builder.cpp
index 6b67b659abc..32507bfb153 100644
--- a/src/transaction_builder.cpp
+++ b/src/transaction_builder.cpp
@@ -15,6 +15,106 @@
 #include <librustzcash.h>
 #include <rust/ed25519.h>
 
+uint256 ProduceZip244SignatureHash(
+    const CTransaction& tx,
+    const orchard::UnauthorizedBundle& orchardBundle)
+{
+    uint256 dataToBeSigned;
+    PrecomputedTransactionData local(tx);
+    if (!zcash_builder_zip244_shielded_signature_digest(
+        local.preTx.release(),
+        orchardBundle.inner.get(),
+        dataToBeSigned.begin()))
+    {
+        throw std::logic_error("ZIP 225 signature hash failed");
+    }
+    return dataToBeSigned;
+}
+
+namespace orchard {
+
+Builder::Builder(
+    bool spendsEnabled,
+    bool outputsEnabled,
+    uint256 anchor) : inner(nullptr, orchard_builder_free)
+{
+    inner.reset(orchard_builder_new(spendsEnabled, outputsEnabled, anchor.IsNull() ? nullptr : anchor.begin()));
+}
+
+bool Builder::AddSpend(orchard::SpendInfo spendInfo)
+{
+    if (!inner) {
+        throw std::logic_error("orchard::Builder has already been used");
+    }
+
+    if (orchard_builder_add_spend(
+        inner.get(),
+        spendInfo.inner.release()))
+    {
+        hasActions = true;
+        return true;
+    } else {
+        return false;
+    }
+}
+
+void Builder::AddOutput(
+    const std::optional<uint256>& ovk,
+    const libzcash::OrchardRawAddress& to,
+    CAmount value,
+    const std::optional<std::array<unsigned char, ZC_MEMO_SIZE>>& memo)
+{
+    if (!inner) {
+        throw std::logic_error("orchard::Builder has already been used");
+    }
+
+    orchard_builder_add_recipient(
+        inner.get(),
+        ovk.has_value() ? ovk->begin() : nullptr,
+        to.inner.get(),
+        value,
+        memo.has_value() ? memo->data() : nullptr);
+
+    hasActions = true;
+}
+
+std::optional<UnauthorizedBundle> Builder::Build() {
+    if (!inner) {
+        throw std::logic_error("orchard::Builder has already been used");
+    }
+
+    auto bundle = orchard_builder_build(inner.release());
+    if (bundle == nullptr) {
+        return std::nullopt;
+    } else {
+        return UnauthorizedBundle(bundle);
+    }
+}
+
+std::optional<OrchardBundle> UnauthorizedBundle::ProveAndSign(
+    const std::vector<libzcash::OrchardSpendingKey>& keys,
+    uint256 sighash)
+{
+    if (!inner) {
+        throw std::logic_error("orchard::UnauthorizedBundle has already been used");
+    }
+
+    std::vector<const OrchardSpendingKeyPtr*> pKeys;
+    for (const auto& key : keys) {
+        pKeys.push_back(key.inner.get());
+    }
+
+    auto authorizedBundle = orchard_unauthorized_bundle_prove_and_sign(
+        inner.release(), pKeys.data(), pKeys.size(), sighash.begin());
+    if (authorizedBundle == nullptr) {
+        return std::nullopt;
+    } else {
+        return OrchardBundle(authorizedBundle);
+    }
+}
+
+} // namespace orchard
+
 SpendDescriptionInfo::SpendDescriptionInfo(
     libzcash::SaplingExpandedSpendingKey expsk,
     libzcash::SaplingNote note,
@@ -126,12 +226,12 @@ TransactionBuilderResult::TransactionBuilderResult(const CTransaction& tx) : may
 
 TransactionBuilderResult::TransactionBuilderResult(const std::string& error) : maybeError(error) {}
 
-bool TransactionBuilderResult::IsTx() { return maybeTx != std::nullopt; }
+bool TransactionBuilderResult::IsTx() { return maybeTx.has_value(); }
 
-bool TransactionBuilderResult::IsError() { return maybeError != std::nullopt; }
+bool TransactionBuilderResult::IsError() { return maybeError.has_value(); }
 
 CTransaction TransactionBuilderResult::GetTxOrThrow() {
-    if (maybeTx) {
+    if (maybeTx.has_value()) {
         return maybeTx.value();
     } else {
         throw JSONRPCError(RPC_WALLET_ERROR, "Failed to build transaction: " + GetError());
@@ -139,7 +239,7 @@ CTransaction TransactionBuilderResult::GetTxOrThrow() {
 }
 
 std::string TransactionBuilderResult::GetError() {
-    if (maybeError) {
+    if (maybeError.has_value()) {
         return maybeError.value();
     } else {
         // This can only happen if isTx() is true in which case we should not call getError()
@@ -150,10 +250,10 @@ std::string TransactionBuilderResult::GetError() {
 TransactionBuilder::TransactionBuilder(
     const Consensus::Params& consensusParams,
     int nHeight,
+    std::optional<uint256> orchardAnchor,
     CKeyStore* keystore,
     CCoinsViewCache* coinsView,
     CCriticalSection* cs_coinsView) :
-    usingSprout(std::nullopt),
     consensusParams(consensusParams),
     nHeight(nHeight),
     keystore(keystore),
@@ -161,6 +261,11 @@ TransactionBuilder::TransactionBuilder(
     cs_coinsView(cs_coinsView)
 {
     mtx = CreateNewContextualCMutableTransaction(consensusParams, nHeight);
+
+    // Ignore the Orchard anchor if we can't use it yet.
+    if (orchardAnchor.has_value() && mtx.nVersion >= ZIP225_MIN_TX_VERSION) {
+        orchardBuilder = orchard::Builder(true, true, orchardAnchor.value());
+    }
 }
 
 // This exception is thrown in certain scenarios when building JoinSplits fails.
@@ -174,7 +279,6 @@ struct JSDescException : public std::exception
     std::string msg;
 };
 
-
 void TransactionBuilder::SetExpiryHeight(uint32_t nExpiryHeight)
 {
     if (nExpiryHeight < nHeight || nExpiryHeight <= 0 || nExpiryHeight >= TX_EXPIRY_HEIGHT_THRESHOLD) {
@@ -183,6 +287,59 @@ void TransactionBuilder::SetExpiryHeight(uint32_t nExpiryHeight)
     mtx.nExpiryHeight = nExpiryHeight;
 }
 
+bool TransactionBuilder::SupportsOrchard() const {
+    return orchardBuilder.has_value();
+}
+
+bool TransactionBuilder::AddOrchardSpend(
+    libzcash::OrchardSpendingKey sk,
+    orchard::SpendInfo spendInfo)
+{
+    if (!orchardBuilder.has_value()) {
+        // Try to give a useful error.
+        if (!(jsInputs.empty() && jsOutputs.empty())) {
+            throw std::runtime_error("TransactionBuilder cannot spend Orchard notes in a Sprout transaction");
+        } else if (mtx.nVersion < ZIP225_MIN_TX_VERSION) {
+            throw std::runtime_error("TransactionBuilder cannot spend Orchard notes before NU5 activation");
+        } else {
+            throw std::runtime_error("TransactionBuilder cannot spend Orchard notes without Orchard anchor");
+        }
+    }
+
+    auto fromAddr = spendInfo.FromAddress();
+    auto value = spendInfo.Value();
+    auto res = orchardBuilder.value().AddSpend(std::move(spendInfo));
+    if (res) {
+        orchardSpendingKeys.push_back(sk);
+        if (!firstOrchardSpendAddr.has_value()) {
+            firstOrchardSpendAddr = fromAddr;
+        }
+        valueBalanceOrchard += value;
+    }
+    return res;
+}
+
+void TransactionBuilder::AddOrchardOutput(
+    const std::optional<uint256>& ovk,
+    const libzcash::OrchardRawAddress& to,
+    CAmount value,
+    const std::optional<std::array<unsigned char, ZC_MEMO_SIZE>>& memo)
+{
+    if (!orchardBuilder.has_value()) {
+        // Try to give a useful error.
+        if (!(jsInputs.empty() && jsOutputs.empty())) {
+            throw std::runtime_error("TransactionBuilder cannot add Orchard output to Sprout transaction");
+        } else if (mtx.nVersion < ZIP225_MIN_TX_VERSION) {
+            throw std::runtime_error("TransactionBuilder cannot add Orchard output before NU5 activation");
+        } else {
+            throw std::runtime_error("TransactionBuilder cannot add Orchard output without Orchard anchor");
+        }
+    }
+
+    orchardBuilder.value().AddOutput(ovk, to, value, memo);
+    valueBalanceOrchard -= value;
+}
+
 void TransactionBuilder::AddSaplingSpend(
     libzcash::SaplingExpandedSpendingKey expsk,
     libzcash::SaplingNote note,
@@ -216,7 +373,7 @@ void TransactionBuilder::AddSaplingOutput(
 
     libzcash::Zip212Enabled zip_212_enabled = libzcash::Zip212Enabled::BeforeZip212;
     // We use nHeight = chainActive.Height() + 1 since the output will be included in the next block
-    if (Params().GetConsensus().NetworkUpgradeActive(nHeight, Consensus::UPGRADE_CANOPY)) {
+    if (consensusParams.NetworkUpgradeActive(nHeight, Consensus::UPGRADE_CANOPY)) {
         zip_212_enabled = libzcash::Zip212Enabled::AfterZip212;
     }
 
@@ -280,29 +437,36 @@ void TransactionBuilder::SetFee(CAmount fee)
     this->fee = fee;
 }
 
-void TransactionBuilder::SendChangeTo(libzcash::SaplingPaymentAddress changeAddr, uint256 ovk)
-{
-    saplingChangeAddr = std::make_pair(ovk, changeAddr);
-    sproutChangeAddr = std::nullopt;
+// TODO: remove support for transparent change?
+void TransactionBuilder::SendChangeTo(
+        const libzcash::RecipientAddress& changeAddr,
+        const uint256& ovk) {
     tChangeAddr = std::nullopt;
-}
-
-void TransactionBuilder::SendChangeTo(libzcash::SproutPaymentAddress changeAddr)
-{
-    sproutChangeAddr = changeAddr;
+    orchardChangeAddr = std::nullopt;
     saplingChangeAddr = std::nullopt;
-    tChangeAddr = std::nullopt;
-}
+    sproutChangeAddr = std::nullopt;
 
-void TransactionBuilder::SendChangeTo(CTxDestination& changeAddr)
-{
-    if (!IsValidDestination(changeAddr)) {
-        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid change address, not a valid taddr.");
-    }
+    std::visit(match {
+        [&](const CKeyID& keyId) {
+            tChangeAddr = keyId;
+        },
+        [&](const CScriptID& scriptId) {
+            tChangeAddr = scriptId;
+        },
+        [&](const libzcash::SaplingPaymentAddress& changeDest) {
+            saplingChangeAddr = std::make_pair(ovk, changeDest);
+        },
+        [&](const libzcash::OrchardRawAddress& changeDest) {
+            orchardChangeAddr = std::make_pair(ovk, changeDest);
+        }
+    }, changeAddr);
+}
 
-    tChangeAddr = changeAddr;
+void TransactionBuilder::SendChangeToSprout(const libzcash::SproutPaymentAddress& zaddr) {
+    tChangeAddr = std::nullopt;
+    orchardChangeAddr = std::nullopt;
     saplingChangeAddr = std::nullopt;
-    sproutChangeAddr = std::nullopt;
+    sproutChangeAddr = zaddr;
 }
 
 TransactionBuilderResult TransactionBuilder::Build()
@@ -312,7 +476,7 @@ TransactionBuilderResult TransactionBuilder::Build()
     //
 
     // Valid change
-    CAmount change = mtx.valueBalanceSapling - fee;
+    CAmount change = mtx.valueBalanceSapling + valueBalanceOrchard - fee;
     for (auto jsInput : jsInputs) {
         change += jsInput.note.value();
     }
@@ -338,13 +502,18 @@ TransactionBuilderResult TransactionBuilder::Build()
         // was set, send change to the first Sapling address given as input
         // if any; otherwise the first Sprout address given as input.
         // (A t-address can only be used as the change address if explicitly set.)
-        if (saplingChangeAddr) {
+        if (orchardChangeAddr) {
+            AddOrchardOutput(orchardChangeAddr->first, orchardChangeAddr->second, change, std::nullopt);
+        } else if (saplingChangeAddr) {
             AddSaplingOutput(saplingChangeAddr->first, saplingChangeAddr->second, change);
         } else if (sproutChangeAddr) {
             AddSproutOutput(sproutChangeAddr.value(), change);
         } else if (tChangeAddr) {
             // tChangeAddr has already been validated.
             AddTransparentOutput(tChangeAddr.value(), change);
+        } else if (firstOrchardSpendAddr.has_value()) {
+            auto ovk = orchardSpendingKeys[0].ToFullViewingKey().ToInternalOutgoingViewingKey();
+            AddOrchardOutput(ovk, firstOrchardSpendAddr.value(), change, std::nullopt);
         } else if (!spends.empty()) {
             auto fvk = spends[0].expsk.full_viewing_key();
             auto note = spends[0].note;
@@ -358,6 +527,20 @@ TransactionBuilderResult TransactionBuilder::Build()
         }
     }
 
+    //
+    // Orchard
+    //
+
+    std::optional<orchard::UnauthorizedBundle> orchardBundle;
+    if (orchardBuilder.has_value() && orchardBuilder->HasActions()) {
+        auto bundle = orchardBuilder->Build();
+        if (bundle.has_value()) {
+            orchardBundle = std::move(bundle);
+        } else {
+            return TransactionBuilderResult("Failed to build Orchard bundle");
+        }
+    }
+
     //
     // Sapling spends and outputs
     //
@@ -447,14 +630,29 @@ TransactionBuilderResult TransactionBuilder::Build()
 
     // Empty output script.
     uint256 dataToBeSigned;
-    CScript scriptCode;
     try {
-        dataToBeSigned = SignatureHash(scriptCode, mtx, NOT_AN_INPUT, SIGHASH_ALL, 0, consensusBranchId);
+        if (orchardBundle.has_value()) {
+            // Orchard is only usable with v5+ transactions.
+            dataToBeSigned = ProduceZip244SignatureHash(mtx, orchardBundle.value());
+        } else {
+            CScript scriptCode;
+            dataToBeSigned = SignatureHash(scriptCode, mtx, NOT_AN_INPUT, SIGHASH_ALL, 0, consensusBranchId);
+        }
     } catch (std::logic_error ex) {
         librustzcash_sapling_proving_ctx_free(ctx);
         return TransactionBuilderResult("Could not construct signature hash: " + std::string(ex.what()));
     }
 
+    if (orchardBundle.has_value()) {
+        auto authorizedBundle = orchardBundle.value().ProveAndSign(
+            orchardSpendingKeys, dataToBeSigned);
+        if (authorizedBundle.has_value()) {
+            mtx.orchardBundle = authorizedBundle.value();
+        } else {
+            return TransactionBuilderResult("Failed to create Orchard proof or signatures");
+        }
+    }
+
     // Create Sapling spendAuth and binding signatures
     for (size_t i = 0; i < spends.size(); i++) {
         librustzcash_sapling_spend_sig(
@@ -511,17 +709,14 @@ TransactionBuilderResult TransactionBuilder::Build()
 
 void TransactionBuilder::CheckOrSetUsingSprout()
 {
-    if (usingSprout.has_value()) {
-        if (!usingSprout.value()) {
-            throw JSONRPCError(RPC_WALLET_ERROR, "Can't use Sprout with a v5 transaction.");
-        }
+    if (orchardBuilder.has_value()) {
+        throw JSONRPCError(RPC_WALLET_ERROR, "Can't use Sprout with a v5 transaction.");
     } else {
-        usingSprout = true;
-
         // Switch if necessary to a Sprout-supporting transaction format.
-        auto txVersionInfo = CurrentTxVersionInfo(consensusParams, nHeight, usingSprout.value());
+        auto txVersionInfo = CurrentTxVersionInfo(consensusParams, nHeight, true);
         mtx.nVersionGroupId = txVersionInfo.nVersionGroupId;
         mtx.nVersion        = txVersionInfo.nVersion;
+        mtx.nConsensusBranchId = std::nullopt;
     }
 }
 
diff --git a/src/transaction_builder.h b/src/transaction_builder.h
index 9873010fdc8..081c0cb49bb 100644
--- a/src/transaction_builder.h
+++ b/src/transaction_builder.h
@@ -21,8 +21,161 @@
 
 #include <optional>
 
+#include <rust/builder.h>
+
 #define NO_MEMO {{0xF6}}
 
+class OrchardWallet;
+namespace orchard { class UnauthorizedBundle; }
+
+uint256 ProduceZip244SignatureHash(
+    const CTransaction& tx,
+    const orchard::UnauthorizedBundle& orchardBundle);
+
+namespace orchard {
+
+/// The information necessary to spend an Orchard note.
+class SpendInfo
+{
+private:
+    /// Memory is allocated by Rust.
+    std::unique_ptr<OrchardSpendInfoPtr, decltype(&orchard_spend_info_free)> inner;
+    libzcash::OrchardRawAddress from;
+    uint64_t noteValue;
+
+    // SpendInfo() : inner(nullptr, orchard_spend_info_free) {}
+    SpendInfo(
+        OrchardSpendInfoPtr* spendInfo,
+        libzcash::OrchardRawAddress fromIn,
+        uint64_t noteValueIn
+    ) : inner(spendInfo, orchard_spend_info_free), from(fromIn), noteValue(noteValueIn) {}
+
+    friend class Builder;
+    friend class ::OrchardWallet;
+
+public:
+    // SpendInfo should never be copied
+    SpendInfo(const SpendInfo&) = delete;
+    SpendInfo& operator=(const SpendInfo&) = delete;
+    SpendInfo(SpendInfo&& spendInfo) :
+        inner(std::move(spendInfo.inner)), from(std::move(spendInfo.from)), noteValue(std::move(spendInfo.noteValue)) {}
+    SpendInfo& operator=(SpendInfo&& spendInfo)
+    {
+        if (this != &spendInfo) {
+            inner = std::move(spendInfo.inner);
+            from = std::move(spendInfo.from);
+            noteValue = std::move(spendInfo.noteValue);
+        }
+        return *this;
+    }
+
+    inline libzcash::OrchardRawAddress FromAddress() const { return from; };
+    inline uint64_t Value() const { return noteValue; };
+};
+
+/// A builder that constructs an `UnauthorizedBundle` from a set of notes to be spent,
+/// and recipients to receive funds.
+class Builder {
+private:
+    /// The Orchard builder. Memory is allocated by Rust. If this is `nullptr` then
+    /// `Builder::Build` has been called, and all subsequent operations will throw an
+    /// exception.
+    std::unique_ptr<OrchardBuilderPtr, decltype(&orchard_builder_free)> inner;
+    bool hasActions;
+
+    Builder() : inner(nullptr, orchard_builder_free), hasActions(false) { }
+
+public:
+    Builder(bool spendsEnabled, bool outputsEnabled, uint256 anchor);
+
+    // Builder should never be copied
+    Builder(const Builder&) = delete;
+    Builder& operator=(const Builder&) = delete;
+    Builder(Builder&& builder) : inner(std::move(builder.inner)) {}
+    Builder& operator=(Builder&& builder)
+    {
+        if (this != &builder) {
+            inner = std::move(builder.inner);
+        }
+        return *this;
+    }
+
+    /// Adds a note to be spent in this bundle.
+    ///
+    /// Returns `false` if the given Merkle path does not have the required anchor
+    /// for the given note.
+    bool AddSpend(orchard::SpendInfo spendInfo);
+
+    /// Adds an address which will receive funds in this bundle.
+    void AddOutput(
+        const std::optional<uint256>& ovk,
+        const libzcash::OrchardRawAddress& to,
+        CAmount value,
+        const std::optional<std::array<unsigned char, ZC_MEMO_SIZE>>& memo);
+
+    /// Returns `true` if any spends or outputs have been added to this builder. This can
+    /// be used to avoid calling `Build()` and creating a dummy Orchard bundle.
+    bool HasActions() {
+        return hasActions;
+    }
+
+    /// Builds a bundle containing the given spent notes and recipients.
+    ///
+    /// Returns `std::nullopt` if an error occurs.
+    ///
+    /// Calling this method invalidates this object; in particular, if an error occurs
+    /// this builder must be discarded and a new builder created. Subsequent usage of this
+    /// object in any way will cause an exception. This emulates Rust's compile-time move
+    /// semantics at runtime.
+    std::optional<UnauthorizedBundle> Build();
+};
+
+/// An unauthorized Orchard bundle, ready for its proof to be created and signatures
+/// applied.
+class UnauthorizedBundle {
+private:
+    /// An optional Orchard bundle (with `nullptr` corresponding to `None`).
+    /// Memory is allocated by Rust.
+    std::unique_ptr<OrchardUnauthorizedBundlePtr, decltype(&orchard_unauthorized_bundle_free)> inner;
+
+    UnauthorizedBundle() : inner(nullptr, orchard_unauthorized_bundle_free) {}
+    UnauthorizedBundle(OrchardUnauthorizedBundlePtr* bundle) : inner(bundle, orchard_unauthorized_bundle_free) {}
+    friend class Builder;
+    // The parentheses here are necessary to avoid the following compilation error:
+    //     error: C++ requires a type specifier for all declarations
+    //             friend uint256 ::ProduceZip244SignatureHash(
+    //             ~~~~~~           ^
+    friend uint256 (::ProduceZip244SignatureHash(
+        const CTransaction& tx,
+        const UnauthorizedBundle& orchardBundle));
+
+public:
+    // UnauthorizedBundle should never be copied
+    UnauthorizedBundle(const UnauthorizedBundle&) = delete;
+    UnauthorizedBundle& operator=(const UnauthorizedBundle&) = delete;
+    UnauthorizedBundle(UnauthorizedBundle&& bundle) : inner(std::move(bundle.inner)) {}
+    UnauthorizedBundle& operator=(UnauthorizedBundle&& bundle)
+    {
+        if (this != &bundle) {
+            inner = std::move(bundle.inner);
+        }
+        return *this;
+    }
+
+    /// Adds proofs and signatures to this bundle.
+    ///
+    /// Returns `std::nullopt` if an error occurs.
+    ///
+    /// Calling this method invalidates this object; in particular, if an error occurs
+    /// this bundle must be discarded and a new bundle built. Subsequent usage of this
+    /// object in any way will cause an exception. This emulates Rust's compile-time
+    /// move semantics at runtime.
+    std::optional<OrchardBundle> ProveAndSign(
+        const std::vector<libzcash::OrchardSpendingKey>& keys, uint256 sighash);
+};
+
+} // namespace orchard
+
 struct SpendDescriptionInfo {
     libzcash::SaplingExpandedSpendingKey expsk;
     libzcash::SaplingNote note;
@@ -107,7 +260,6 @@ class TransactionBuilderResult {
 class TransactionBuilder
 {
 private:
-    std::optional<bool> usingSprout;
     Consensus::Params consensusParams;
     int nHeight;
     const CKeyStore* keystore;
@@ -115,7 +267,11 @@ class TransactionBuilder
     CCriticalSection* cs_coinsView;
     CMutableTransaction mtx;
     CAmount fee = 10000;
+    std::optional<orchard::Builder> orchardBuilder;
+    CAmount valueBalanceOrchard = 0;
 
+    std::vector<libzcash::OrchardSpendingKey> orchardSpendingKeys;
+    std::optional<libzcash::OrchardRawAddress> firstOrchardSpendAddr;
     std::vector<SpendDescriptionInfo> spends;
     std::vector<OutputDescriptionInfo> outputs;
     std::vector<libzcash::JSInput> jsInputs;
@@ -123,6 +279,7 @@ class TransactionBuilder
     std::vector<TransparentInputInfo> tIns;
 
     std::optional<std::pair<uint256, libzcash::SaplingPaymentAddress>> saplingChangeAddr;
+    std::optional<std::pair<uint256, libzcash::OrchardRawAddress>> orchardChangeAddr;
     std::optional<libzcash::SproutPaymentAddress> sproutChangeAddr;
     std::optional<CTxDestination> tChangeAddr;
 
@@ -131,14 +288,72 @@ class TransactionBuilder
     TransactionBuilder(
         const Consensus::Params& consensusParams,
         int nHeight,
+        std::optional<uint256> orchardAnchor,
         CKeyStore* keyStore = nullptr,
         CCoinsViewCache* coinsView = nullptr,
         CCriticalSection* cs_coinsView = nullptr);
 
+    // TransactionBuilder should never be copied
+    TransactionBuilder(const TransactionBuilder&) = delete;
+    TransactionBuilder& operator=(const TransactionBuilder&) = delete;
+    TransactionBuilder(TransactionBuilder&& builder) :
+        consensusParams(std::move(builder.consensusParams)),
+        nHeight(std::move(builder.nHeight)),
+        keystore(std::move(builder.keystore)),
+        coinsView(std::move(builder.coinsView)),
+        cs_coinsView(std::move(builder.cs_coinsView)),
+        mtx(std::move(builder.mtx)),
+        fee(std::move(builder.fee)),
+        orchardBuilder(std::move(builder.orchardBuilder)),
+        valueBalanceOrchard(std::move(builder.valueBalanceOrchard)),
+        spends(std::move(builder.spends)),
+        outputs(std::move(builder.outputs)),
+        jsInputs(std::move(builder.jsInputs)),
+        jsOutputs(std::move(builder.jsOutputs)),
+        tIns(std::move(builder.tIns)),
+        saplingChangeAddr(std::move(builder.saplingChangeAddr)),
+        sproutChangeAddr(std::move(builder.sproutChangeAddr)),
+        tChangeAddr(std::move(builder.tChangeAddr)) {}
+    TransactionBuilder& operator=(TransactionBuilder&& builder)
+    {
+        if (this != &builder) {
+            consensusParams = std::move(builder.consensusParams);
+            nHeight = std::move(builder.nHeight);
+            keystore = std::move(builder.keystore);
+            coinsView = std::move(builder.coinsView);
+            cs_coinsView = std::move(builder.cs_coinsView);
+            mtx = std::move(builder.mtx);
+            fee = std::move(builder.fee);
+            orchardBuilder = std::move(builder.orchardBuilder);
+            valueBalanceOrchard = std::move(builder.valueBalanceOrchard);
+            spends = std::move(builder.spends);
+            outputs = std::move(builder.outputs);
+            jsInputs = std::move(builder.jsInputs);
+            jsOutputs = std::move(builder.jsOutputs);
+            tIns = std::move(builder.tIns);
+            saplingChangeAddr = std::move(builder.saplingChangeAddr);
+            sproutChangeAddr = std::move(builder.sproutChangeAddr);
+            tChangeAddr = std::move(builder.tChangeAddr);
+        }
+        return *this;
+    }
+
     void SetExpiryHeight(uint32_t nExpiryHeight);
 
     void SetFee(CAmount fee);
 
+    bool SupportsOrchard() const;
+
+    bool AddOrchardSpend(
+        libzcash::OrchardSpendingKey sk,
+        orchard::SpendInfo spendInfo);
+
+    void AddOrchardOutput(
+        const std::optional<uint256>& ovk,
+        const libzcash::OrchardRawAddress& to,
+        CAmount value,
+        const std::optional<std::array<unsigned char, ZC_MEMO_SIZE>>& memo);
+
     // Throws if the anchor does not match the anchor used by
     // previously-added Sapling spends.
     void AddSaplingSpend(
@@ -170,11 +385,8 @@ class TransactionBuilder
 
     void AddTransparentOutput(const CTxDestination& to, CAmount value);
 
-    void SendChangeTo(libzcash::SaplingPaymentAddress changeAddr, uint256 ovk);
-
-    void SendChangeTo(libzcash::SproutPaymentAddress);
-
-    void SendChangeTo(CTxDestination& changeAddr);
+    void SendChangeTo(const libzcash::RecipientAddress& changeAddr, const uint256& ovk);
+    void SendChangeToSprout(const libzcash::SproutPaymentAddress& changeAddr);
 
     TransactionBuilderResult Build();
 
diff --git a/src/txdb.cpp b/src/txdb.cpp
index 94db4f95594..965a9adf4d6 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -81,9 +81,9 @@ bool CCoinsViewDB::GetSaplingAnchorAt(const uint256 &rt, SaplingMerkleTree &tree
     return read;
 }
 
-bool CCoinsViewDB::GetOrchardAnchorAt(const uint256 &rt, OrchardMerkleTree &tree) const {
-    if (rt == OrchardMerkleTree::empty_root()) {
-        OrchardMerkleTree new_tree;
+bool CCoinsViewDB::GetOrchardAnchorAt(const uint256 &rt, OrchardMerkleFrontier &tree) const {
+    if (rt == OrchardMerkleFrontier::empty_root()) {
+        OrchardMerkleFrontier new_tree;
         tree = new_tree;
         return true;
     }
@@ -141,7 +141,7 @@ uint256 CCoinsViewDB::GetBestAnchor(ShieldedType type) const {
             break;
         case ORCHARD:
             if (!db.Read(DB_BEST_ORCHARD_ANCHOR, hashBestAnchor))
-                return OrchardMerkleTree::empty_root();
+                return OrchardMerkleFrontier::empty_root();
             break;
         default:
             throw runtime_error("Unknown shielded type");
@@ -291,7 +291,7 @@ bool CCoinsViewDB::BatchWrite(CCoinsMap &mapCoins,
 
     ::BatchWriteAnchors<CAnchorsSproutMap, CAnchorsSproutMap::iterator, CAnchorsSproutCacheEntry, SproutMerkleTree>(batch, mapSproutAnchors, DB_SPROUT_ANCHOR);
     ::BatchWriteAnchors<CAnchorsSaplingMap, CAnchorsSaplingMap::iterator, CAnchorsSaplingCacheEntry, SaplingMerkleTree>(batch, mapSaplingAnchors, DB_SAPLING_ANCHOR);
-    ::BatchWriteAnchors<CAnchorsOrchardMap, CAnchorsOrchardMap::iterator, CAnchorsOrchardCacheEntry, OrchardMerkleTree>(batch, mapOrchardAnchors, DB_ORCHARD_ANCHOR);
+    ::BatchWriteAnchors<CAnchorsOrchardMap, CAnchorsOrchardMap::iterator, CAnchorsOrchardCacheEntry, OrchardMerkleFrontier>(batch, mapOrchardAnchors, DB_ORCHARD_ANCHOR);
 
     ::BatchWriteNullifiers(batch, mapSproutNullifiers, DB_NULLIFIER);
     ::BatchWriteNullifiers(batch, mapSaplingNullifiers, DB_SAPLING_NULLIFIER);
diff --git a/src/txdb.h b/src/txdb.h
index 00015010337..7d51c0a759a 100644
--- a/src/txdb.h
+++ b/src/txdb.h
@@ -83,7 +83,7 @@ class CCoinsViewDB : public CCoinsView
 
     bool GetSproutAnchorAt(const uint256 &rt, SproutMerkleTree &tree) const;
     bool GetSaplingAnchorAt(const uint256 &rt, SaplingMerkleTree &tree) const;
-    bool GetOrchardAnchorAt(const uint256 &rt, OrchardMerkleTree &tree) const;
+    bool GetOrchardAnchorAt(const uint256 &rt, OrchardMerkleFrontier &tree) const;
     bool GetNullifier(const uint256 &nf, ShieldedType type) const;
     bool GetCoins(const uint256 &txid, CCoins &coins) const;
     bool HaveCoins(const uint256 &txid) const;
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 25b0d37cbc5..2feca7448c8 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -387,6 +387,14 @@ void CTxMemPool::removeWithAnchor(const uint256 &invalidRoot, ShieldedType type)
                     }
                 }
             break;
+            case ORCHARD:
+            {
+                auto anchor = tx.GetOrchardBundle().GetAnchor();
+                if (anchor == invalidRoot) {
+                    transactionsToRemove.push_back(tx);
+                }
+                break;
+            }
             default:
                 throw runtime_error("Unknown shielded type");
             break;
@@ -408,7 +416,7 @@ void CTxMemPool::removeConflicts(const CTransaction &tx, std::list<CTransaction>
         std::map<COutPoint, CInPoint>::iterator it = mapNextTx.find(txin.prevout);
         if (it != mapNextTx.end()) {
             const CTransaction &txConflict = *it->second.ptx;
-            if (txConflict != tx)
+            if (txConflict.GetHash() != tx.GetHash())
             {
                 remove(txConflict, removed, true);
             }
@@ -420,7 +428,7 @@ void CTxMemPool::removeConflicts(const CTransaction &tx, std::list<CTransaction>
             std::map<uint256, const CTransaction*>::iterator it = mapSproutNullifiers.find(nf);
             if (it != mapSproutNullifiers.end()) {
                 const CTransaction &txConflict = *it->second;
-                if (txConflict != tx) {
+                if (txConflict.GetHash() != tx.GetHash()) {
                     remove(txConflict, removed, true);
                 }
             }
@@ -430,7 +438,7 @@ void CTxMemPool::removeConflicts(const CTransaction &tx, std::list<CTransaction>
         std::map<uint256, const CTransaction*>::iterator it = mapSaplingNullifiers.find(spendDescription.nullifier);
         if (it != mapSaplingNullifiers.end()) {
             const CTransaction &txConflict = *it->second;
-            if (txConflict != tx) {
+            if (txConflict.GetHash() != tx.GetHash()) {
                 remove(txConflict, removed, true);
             }
         }
@@ -439,7 +447,7 @@ void CTxMemPool::removeConflicts(const CTransaction &tx, std::list<CTransaction>
         std::map<uint256, const CTransaction*>::iterator it = mapOrchardNullifiers.find(orchardNullifier);
         if (it != mapOrchardNullifiers.end()) {
             const CTransaction &txConflict = *it->second;
-            if (txConflict != tx) {
+            if (txConflict.GetHash() != tx.GetHash()) {
                 remove(txConflict, removed, true);
             }
         }
diff --git a/src/uint256.cpp b/src/uint256.cpp
index 8c27e057021..1e9558ac8c7 100644
--- a/src/uint256.cpp
+++ b/src/uint256.cpp
@@ -64,6 +64,13 @@ std::string base_blob<BITS>::ToString() const
     return (GetHex());
 }
 
+// Explicit instantiations for base_blob<88>
+template base_blob<88>::base_blob(const std::vector<unsigned char>&);
+template std::string base_blob<88>::GetHex() const;
+template std::string base_blob<88>::ToString() const;
+template void base_blob<88>::SetHex(const char*);
+template void base_blob<88>::SetHex(const std::string&);
+
 // Explicit instantiations for base_blob<160>
 template base_blob<160>::base_blob(const std::vector<unsigned char>&);
 template std::string base_blob<160>::GetHex() const;
diff --git a/src/uint256.h b/src/uint256.h
index 8d98a0e5278..cf150f2c5a7 100644
--- a/src/uint256.h
+++ b/src/uint256.h
@@ -101,15 +101,6 @@ class base_blob
     }
 };
 
-/** 88-bit opaque blob.
- */
-class blob88 : public base_blob<88> {
-public:
-    blob88() {}
-    blob88(const base_blob<88>& b) : base_blob<88>(b) {}
-    explicit blob88(const std::vector<unsigned char>& vch) : base_blob<88>(vch) {}
-};
-
 /** 160-bit opaque blob.
  * @note This type is called uint160 for historical reasons only. It is an opaque
  * blob of 160 bits and has no integer operations.
diff --git a/src/util/match.h b/src/util/match.h
new file mode 100644
index 00000000000..d966ae4dac3
--- /dev/null
+++ b/src/util/match.h
@@ -0,0 +1,24 @@
+// Copyright (c) 2021 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+#ifndef ZCASH_UTIL_MATCH_H
+#define ZCASH_UTIL_MATCH_H
+
+// Helper for using `std::visit` with Rust-style match syntax.
+//
+// This can be used in place of defining an explicit visitor. `std::visit` requires an
+// exhaustive match; to emulate Rust's catch-all binding, use an `(auto arg)` template
+// operator().
+//
+// Care must be taken that implicit conversions are handled correctly. For instance, a
+// `(double arg)` operator() *will also* bind to `int` and `long`, if there isn't an
+// earlier satisfying match.
+//
+// This corresponds to visitor example #4 in the `std::visit` documentation:
+// https://en.cppreference.com/w/cpp/utility/variant/visit
+template<class... Ts> struct match : Ts... { using Ts::operator()...; };
+// explicit deduction guide (not needed as of C++20)
+template<class... Ts> match(Ts...) -> match<Ts...>;
+
+#endif // ZCASH_UTIL_MATCH_H
diff --git a/src/utilstrencodings.cpp b/src/utilstrencodings.cpp
index 0b6332a6350..215e2aa3749 100644
--- a/src/utilstrencodings.cpp
+++ b/src/utilstrencodings.cpp
@@ -506,3 +506,60 @@ bool ParseFixedPoint(const std::string &val, int decimals, int64_t *amount_out)
     return true;
 }
 
+/// Parse the decimal string into a little-endian byte vector.
+std::optional<std::vector<uint8_t>> ParseArbitraryInt(const std::string& num_string)
+{
+    std::vector<unsigned char> result;
+    const size_t start = num_string.find_first_not_of(WHITESPACE);
+    if (start == std::string::npos) return std::nullopt;
+    const size_t end = num_string.find_last_not_of(WHITESPACE);
+    assert(end != std::string::npos);
+    for (char c : num_string.substr(start, end-start+1)) {
+        if (c < '0' || c > '9') {
+            return std::nullopt;
+        }
+        uint16_t v = c - '0';
+        for (auto& r : result) {
+            v += r * 10;
+            r = v & 0xFF;   // store low byte of the value
+            v >>= 8;        // carry to the next result position
+        }
+        if (v > 0) result.push_back(v);
+    }
+    return result;
+}
+
+std::string ArbitraryIntStr(std::vector<uint8_t> bytes)
+{
+    // Only serialize up to the most significant non-zero byte.
+    size_t end = bytes.size();
+    for (; end > 0  && bytes[end - 1] == 0; --end) {}
+
+    std::string result;
+    while (end > 0) {
+        // "Divide" bytes by 10.
+        uint16_t rem = 0;
+        for (int i = end - 1; i >= 0; --i) {
+            uint16_t tmp = rem * 256 + bytes[i];
+            rem = tmp % 10;
+            auto b = tmp / 10;
+            assert(b < 256);
+            bytes[i] = b;
+        }
+
+        // Write out the remainder as the next lowest digit.
+        result = tfm::format("%d%s", rem, result);
+
+        // If we've moved all the bits out of the MSB, drop it.
+        if (bytes[end - 1] == 0) {
+            end--;
+        }
+    }
+
+    // Handle the all-zero bytes case.
+    if (result.empty()) {
+        return "0";
+    } else {
+        return result;
+    }
+}
diff --git a/src/utilstrencodings.h b/src/utilstrencodings.h
index d756db70c3a..22cd6b67fe9 100644
--- a/src/utilstrencodings.h
+++ b/src/utilstrencodings.h
@@ -12,6 +12,9 @@
 #include <stdint.h>
 #include <string>
 #include <vector>
+#include <optional>
+
+constexpr char WHITESPACE[] = " \t";
 
 #define BEGIN(a)            ((char*)&(a))
 #define END(a)              ((char*)&((&(a))[1]))
@@ -164,4 +167,10 @@ bool ConvertBits(const O& outfn, I it, I end) {
     return true;
 }
 
+std::optional<std::vector<uint8_t>> ParseArbitraryInt(const std::string& s);
+/**
+ * Serializes the given little-endian byte iterator to a decimal string.
+ */
+std::string ArbitraryIntStr(std::vector<uint8_t> i);
+
 #endif // BITCOIN_UTILSTRENCODINGS_H
diff --git a/src/utiltest.cpp b/src/utiltest.cpp
index 26d0cfb3ed2..10adc00db52 100644
--- a/src/utiltest.cpp
+++ b/src/utiltest.cpp
@@ -8,6 +8,7 @@
 #include "transaction_builder.h"
 
 #include <array>
+#include <optional>
 
 #include <rust/ed25519.h>
 
@@ -316,8 +317,8 @@ void RegtestDeactivateNU5() {
 }
 
 libzcash::SaplingExtendedSpendingKey GetTestMasterSaplingSpendingKey() {
-    std::vector<unsigned char, secure_allocator<unsigned char>> rawSeed(32);
-    HDSeed seed(rawSeed);
+    SecureString mnemonic("abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon art");
+    auto seed{MnemonicSeed::ForPhrase(English, mnemonic).value()};
     return libzcash::SaplingExtendedSpendingKey::Master(seed);
 }
 
@@ -346,9 +347,9 @@ CWalletTx GetValidSaplingReceive(const Consensus::Params& consensusParams,
     auto scriptPubKey = GetScriptForDestination(tsk.GetPubKey().GetID());
     // To zaddr
     auto fvk = sk.expsk.full_viewing_key();
-    auto pa = sk.DefaultAddress();
+    auto pa = sk.ToXFVK().DefaultAddress();
 
-    auto builder = TransactionBuilder(consensusParams, 1, &keyStore);
+    auto builder = TransactionBuilder(consensusParams, 1, std::nullopt, &keyStore);
     builder.SetFee(0);
     builder.AddTransparentInput(COutPoint(), scriptPubKey, value);
     builder.AddSaplingOutput(fvk.ovk, pa, value, {});
@@ -357,3 +358,27 @@ CWalletTx GetValidSaplingReceive(const Consensus::Params& consensusParams,
     CWalletTx wtx {NULL, tx};
     return wtx;
 }
+
+
+
+void LoadProofParameters() {
+    fs::path sapling_spend = ZC_GetParamsDir() / "sapling-spend.params";
+    fs::path sapling_output = ZC_GetParamsDir() / "sapling-output.params";
+    fs::path sprout_groth16 = ZC_GetParamsDir() / "sprout-groth16.params";
+
+    static_assert(
+        sizeof(fs::path::value_type) == sizeof(codeunit),
+        "librustzcash not configured correctly");
+    auto sapling_spend_str = sapling_spend.native();
+    auto sapling_output_str = sapling_output.native();
+    auto sprout_groth16_str = sprout_groth16.native();
+
+    librustzcash_init_zksnark_params(
+        reinterpret_cast<const codeunit*>(sapling_spend_str.c_str()),
+        sapling_spend_str.length(),
+        reinterpret_cast<const codeunit*>(sapling_output_str.c_str()),
+        sapling_output_str.length(),
+        reinterpret_cast<const codeunit*>(sprout_groth16_str.c_str()),
+        sprout_groth16_str.length()
+    );
+}
diff --git a/src/utiltest.h b/src/utiltest.h
index 3f905a66ffe..d289d0dd549 100644
--- a/src/utiltest.h
+++ b/src/utiltest.h
@@ -76,4 +76,6 @@ CWalletTx GetValidSaplingReceive(const Consensus::Params& consensusParams,
                                  const libzcash::SaplingExtendedSpendingKey &sk,
                                  CAmount value);
 
+void LoadProofParameters();
+
 #endif // ZCASH_UTILTEST_H
diff --git a/src/validationinterface.h b/src/validationinterface.h
index ae129c1796d..4dce6df3c4d 100644
--- a/src/validationinterface.h
+++ b/src/validationinterface.h
@@ -42,7 +42,7 @@ class CValidationInterface {
     virtual void Inventory(const uint256 &hash) {}
     virtual void ResendWalletTransactions(int64_t nBestBlockTime) {}
     virtual void BlockChecked(const CBlock&, const CValidationState&) {}
-    virtual void GetAddressForMining(MinerAddress&) {};
+    virtual void GetAddressForMining(std::optional<MinerAddress>&) {};
     virtual void ResetRequestCount(const uint256 &hash) {};
     friend void ::RegisterValidationInterface(CValidationInterface*);
     friend void ::UnregisterValidationInterface(CValidationInterface*);
@@ -67,7 +67,7 @@ struct CMainSignals {
     /** Notifies listeners of a block validation result */
     boost::signals2::signal<void (const CBlock&, const CValidationState&)> BlockChecked;
     /** Notifies listeners that an address for mining is required (coinbase) */
-    boost::signals2::signal<void (MinerAddress&)> AddressForMining;
+    boost::signals2::signal<void (std::optional<MinerAddress>&)> AddressForMining;
     /** Notifies listeners that a block has been successfully mined */
     boost::signals2::signal<void (const uint256 &)> BlockFound;
 };
diff --git a/src/version.h b/src/version.h
index d66ae7a5672..2ebe88c0398 100644
--- a/src/version.h
+++ b/src/version.h
@@ -9,7 +9,7 @@
  * network protocol versioning
  */
 
-static const int PROTOCOL_VERSION = 170013;
+static const int PROTOCOL_VERSION = 170015;
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
diff --git a/src/wallet/asyncrpcoperation_common.cpp b/src/wallet/asyncrpcoperation_common.cpp
index 97f697a4ef6..6ca22497764 100644
--- a/src/wallet/asyncrpcoperation_common.cpp
+++ b/src/wallet/asyncrpcoperation_common.cpp
@@ -6,25 +6,6 @@
 
 extern UniValue signrawtransaction(const UniValue& params, bool fHelp);
 
-UniValue SendTransaction(CTransaction& tx, std::optional<std::reference_wrapper<CReserveKey>> reservekey, bool testmode) {
-    UniValue o(UniValue::VOBJ);
-    // Send the transaction
-    if (!testmode) {
-        CWalletTx wtx(pwalletMain, tx);
-        if (!pwalletMain->CommitTransaction(wtx, reservekey)) {
-            // More details in debug.log
-            throw JSONRPCError(RPC_WALLET_ERROR, "SendTransaction: CommitTransaction failed");
-        }
-        o.pushKV("txid", tx.GetHash().ToString());
-    } else {
-        // Test mode does not send the transaction to the network.
-        o.pushKV("test", 1);
-        o.pushKV("txid", tx.GetHash().ToString());
-        o.pushKV("hex", EncodeHexTx(tx));
-    }
-    return o;
-}
-
 std::pair<CTransaction, UniValue> SignSendRawTransaction(UniValue obj, std::optional<std::reference_wrapper<CReserveKey>> reservekey, bool testmode) {
     // Sign the raw transaction
     UniValue rawtxnValue = find_value(obj, "rawtxn");
@@ -53,7 +34,9 @@ std::pair<CTransaction, UniValue> SignSendRawTransaction(UniValue obj, std::opti
     CTransaction tx;
     stream >> tx;
 
-    UniValue sendResult = SendTransaction(tx, reservekey, testmode);
+    // Recipient mappings are not available when sending a raw transaction.
+    std::vector<RecipientMapping> recipientMappings;
+    UniValue sendResult = SendTransaction(tx, recipientMappings, reservekey, testmode);
 
     return std::make_pair(tx, sendResult);
 }
diff --git a/src/wallet/asyncrpcoperation_common.h b/src/wallet/asyncrpcoperation_common.h
index 8b9f1959b57..b24b6d8b0c8 100644
--- a/src/wallet/asyncrpcoperation_common.h
+++ b/src/wallet/asyncrpcoperation_common.h
@@ -5,7 +5,9 @@
 #ifndef ZCASH_WALLET_ASYNCRPCOPERATION_COMMON_H
 #define ZCASH_WALLET_ASYNCRPCOPERATION_COMMON_H
 
+#include "core_io.h"
 #include "primitives/transaction.h"
+#include "rpc/protocol.h"
 #include "univalue.h"
 #include "wallet.h"
 
@@ -13,19 +15,48 @@
 
 /**
  * Sends a given transaction.
- * 
- * If testmode is false, commit the transaction to the wallet, 
+ *
+ * If testmode is false, commit the transaction to the wallet,
  * return {"txid": tx.GetHash().ToString()}
- * 
+ *
  * If testmode is true, do not commit the transaction,
  * return {"test": 1, "txid": tx.GetHash().ToString(), "hex": EncodeHexTx(tx)}
  */
-UniValue SendTransaction(CTransaction& tx, std::optional<std::reference_wrapper<CReserveKey>> reservekey, bool testmode);
+template <typename RecipientMapping>
+UniValue SendTransaction(
+        const CTransaction& tx,
+        const std::vector<RecipientMapping>& recipients,
+        std::optional<std::reference_wrapper<CReserveKey>> reservekey,
+        bool testmode)
+{
+    UniValue o(UniValue::VOBJ);
+    // Send the transaction
+    if (!testmode) {
+        CWalletTx wtx(pwalletMain, tx);
+        // save the mapping from (receiver, txid) to UA
+        if (!pwalletMain->SaveRecipientMappings(tx.GetHash(), recipients)) {
+            // More details in debug.log
+            throw JSONRPCError(RPC_WALLET_ERROR, "SendTransaction: SaveRecipientMappings failed");
+        }
+        if (!pwalletMain->CommitTransaction(wtx, reservekey)) {
+            // More details in debug.log
+            throw JSONRPCError(RPC_WALLET_ERROR, "SendTransaction: CommitTransaction failed");
+        }
+        o.pushKV("txid", tx.GetHash().ToString());
+    } else {
+        // Test mode does not send the transaction to the network nor save the recipient mappings.
+        o.pushKV("test", 1);
+        o.pushKV("txid", tx.GetHash().ToString());
+        o.pushKV("hex", EncodeHexTx(tx));
+    }
+    return o;
+}
+
 
 /**
  * Sign and send a raw transaction.
  * Raw transaction as hex string should be in object field "rawtxn"
- * 
+ *
  * Returns a pair of (the parsed transaction, and the result of sending)
  */
 std::pair<CTransaction, UniValue> SignSendRawTransaction(UniValue obj, std::optional<std::reference_wrapper<CReserveKey>> reservekey, bool testmode);
diff --git a/src/wallet/asyncrpcoperation_mergetoaddress.cpp b/src/wallet/asyncrpcoperation_mergetoaddress.cpp
index f6faaa473a8..1e69bec4d08 100644
--- a/src/wallet/asyncrpcoperation_mergetoaddress.cpp
+++ b/src/wallet/asyncrpcoperation_mergetoaddress.cpp
@@ -22,6 +22,7 @@
 #include "timedata.h"
 #include "transaction_builder.h"
 #include "util.h"
+#include "util/match.h"
 #include "utilmoneystr.h"
 #include "utiltime.h"
 #include "wallet.h"
@@ -67,7 +68,7 @@ AsyncRPCOperation_mergetoaddress::AsyncRPCOperation_mergetoaddress(
     CAmount fee,
     UniValue contextInfo) :
     tx_(contextualTx), utxoInputs_(utxoInputs), sproutNoteInputs_(sproutNoteInputs),
-    saplingNoteInputs_(saplingNoteInputs), recipient_(recipient), fee_(fee), contextinfo_(contextInfo)
+    saplingNoteInputs_(saplingNoteInputs), memo_(recipient.second), fee_(fee), contextinfo_(contextInfo)
 {
     if (fee < 0 || fee > MAX_MONEY) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Fee is out of range");
@@ -77,10 +78,6 @@ AsyncRPCOperation_mergetoaddress::AsyncRPCOperation_mergetoaddress(
         throw JSONRPCError(RPC_INVALID_PARAMETER, "No inputs");
     }
 
-    if (std::get<0>(recipient).size() == 0) {
-        throw JSONRPCError(RPC_INVALID_PARAMETER, "Recipient parameter missing");
-    }
-
     if (sproutNoteInputs.size() > 0 && saplingNoteInputs.size() > 0) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot send from both Sprout and Sapling addresses using z_mergetoaddress");
     }
@@ -92,23 +89,36 @@ AsyncRPCOperation_mergetoaddress::AsyncRPCOperation_mergetoaddress(
     isUsingBuilder_ = false;
     if (builder) {
         isUsingBuilder_ = true;
-        builder_ = builder.value();
+        builder_ = std::move(builder.value());
     }
 
     KeyIO keyIO(Params());
-    toTaddr_ = keyIO.DecodeDestination(std::get<0>(recipient));
-    isToTaddr_ = IsValidDestination(toTaddr_);
+    isToTaddr_ = false;
     isToZaddr_ = false;
 
-    if (!isToTaddr_) {
-        auto address = keyIO.DecodePaymentAddress(std::get<0>(recipient));
-        if (IsValidPaymentAddress(address)) {
+    std::visit(match {
+        [&](const CKeyID& keyId) {
+            toTaddr_ = keyId;
+            isToTaddr_ = true;
+        },
+        [&](const CScriptID& scriptId) {
+            toTaddr_ = scriptId;
+            isToTaddr_ = true;
+        },
+        [&](const libzcash::SproutPaymentAddress& addr) {
+            toPaymentAddress_ = addr;
             isToZaddr_ = true;
-            toPaymentAddress_ = address;
-        } else {
-            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid recipient address");
-        }
-    }
+        },
+        [&](const libzcash::SaplingPaymentAddress& addr) {
+            toPaymentAddress_ = addr;
+            isToZaddr_ = true;
+        },
+        [&](const libzcash::UnifiedAddress& addr) {
+            throw JSONRPCError(
+                    RPC_INVALID_ADDRESS_OR_KEY,
+                    "z_mergetoaddress does not yet support sending to unified addresses");
+        },
+    }, recipient.first);
 
     // Log the context info i.e. the call parameters to z_mergetoaddress
     if (LogAcceptCategory("zrpcunsafe")) {
@@ -331,9 +341,7 @@ bool AsyncRPCOperation_mergetoaddress::main_impl()
         if (isToTaddr_) {
             builder_.AddTransparentOutput(toTaddr_, sendAmount);
         } else {
-            std::string zaddr = std::get<0>(recipient_);
-            std::string memo = std::get<1>(recipient_);
-            std::array<unsigned char, ZC_MEMO_SIZE> hexMemo = get_memo_from_hex_string(memo);
+            std::array<unsigned char, ZC_MEMO_SIZE> hexMemo = get_memo_from_hex_string(memo_);
             auto saplingPaymentAddress = std::get_if<libzcash::SaplingPaymentAddress>(&toPaymentAddress_);
             if (saplingPaymentAddress == nullptr) {
                 // This should never happen as we have already determined that the payment is to sapling
@@ -356,7 +364,9 @@ bool AsyncRPCOperation_mergetoaddress::main_impl()
         // Build the transaction
         tx_ = builder_.Build().GetTxOrThrow();
 
-        UniValue sendResult = SendTransaction(tx_, std::nullopt, testmode);
+        // TODO: update this when unified address support is added
+        std::vector<RecipientMapping> recipientMappings;
+        UniValue sendResult = SendTransaction(tx_, recipientMappings, std::nullopt, testmode);
         set_result(sendResult);
 
         return true;
@@ -385,14 +395,11 @@ bool AsyncRPCOperation_mergetoaddress::main_impl()
      * END SCENARIO #1
      */
 
-
     // Prepare raw transaction to handle JoinSplits
     CMutableTransaction mtx(tx_);
     ed25519_generate_keypair(&joinSplitPrivKey_, &joinSplitPubKey_);
     mtx.joinSplitPubKey = joinSplitPubKey_;
     tx_ = CTransaction(mtx);
-    std::string hexMemo = std::get<1>(recipient_);
-
 
     /**
      * SCENARIO #2
@@ -408,8 +415,8 @@ bool AsyncRPCOperation_mergetoaddress::main_impl()
         info.vpub_new = 0;
 
         JSOutput jso = JSOutput(std::get<libzcash::SproutPaymentAddress>(toPaymentAddress_), sendAmount);
-        if (hexMemo.size() > 0) {
-            jso.memo = get_memo_from_hex_string(hexMemo);
+        if (memo_.size() > 0) {
+            jso.memo = get_memo_from_hex_string(memo_);
         }
         info.vjsout.push_back(jso);
 
@@ -697,8 +704,8 @@ bool AsyncRPCOperation_mergetoaddress::main_impl()
             if (isToZaddr_ && vpubNewProcessed) {
                 outputType = "target";
                 jso.addr = std::get<libzcash::SproutPaymentAddress>(toPaymentAddress_);
-                if (!hexMemo.empty()) {
-                    jso.memo = get_memo_from_hex_string(hexMemo);
+                if (!memo_.empty()) {
+                    jso.memo = get_memo_from_hex_string(memo_);
                 }
             }
             info.vjsout.push_back(jso);
diff --git a/src/wallet/asyncrpcoperation_mergetoaddress.h b/src/wallet/asyncrpcoperation_mergetoaddress.h
index 90c20955d11..044eb855a61 100644
--- a/src/wallet/asyncrpcoperation_mergetoaddress.h
+++ b/src/wallet/asyncrpcoperation_mergetoaddress.h
@@ -34,7 +34,7 @@ typedef std::tuple<JSOutPoint, SproutNote, CAmount, SproutSpendingKey> MergeToAd
 typedef std::tuple<SaplingOutPoint, SaplingNote, CAmount, SaplingExpandedSpendingKey> MergeToAddressInputSaplingNote;
 
 // A recipient is a tuple of address, memo (optional if zaddr)
-typedef std::tuple<std::string, std::string> MergeToAddressRecipient;
+typedef std::pair<libzcash::PaymentAddress, std::string> MergeToAddressRecipient;
 
 // Package of info which is passed to perform_joinsplit methods.
 struct MergeToAddressJSInfo {
@@ -89,11 +89,11 @@ class AsyncRPCOperation_mergetoaddress : public AsyncRPCOperation
     uint32_t consensusBranchId_;
     CAmount fee_;
     int mindepth_;
-    MergeToAddressRecipient recipient_;
     bool isToTaddr_;
     bool isToZaddr_;
     CTxDestination toTaddr_;
     PaymentAddress toPaymentAddress_;
+    std::string memo_;
 
     Ed25519VerificationKey joinSplitPubKey_;
     Ed25519SigningKey joinSplitPrivKey_;
diff --git a/src/wallet/asyncrpcoperation_saplingmigration.cpp b/src/wallet/asyncrpcoperation_saplingmigration.cpp
index 6671298c7d1..9d9c78080a8 100644
--- a/src/wallet/asyncrpcoperation_saplingmigration.cpp
+++ b/src/wallet/asyncrpcoperation_saplingmigration.cpp
@@ -80,12 +80,13 @@ bool AsyncRPCOperation_saplingmigration::main_impl() {
 
     std::vector<SproutNoteEntry> sproutEntries;
     std::vector<SaplingNoteEntry> saplingEntries;
+    std::vector<OrchardNoteMetadata> orchardEntries;
     {
         LOCK2(cs_main, pwalletMain->cs_wallet);
         // We set minDepth to 11 to avoid unconfirmed notes and in anticipation of specifying
         // an anchor at height N-10 for each Sprout JoinSplit description
         // Consider, should notes be sorted?
-        pwalletMain->GetFilteredNotes(sproutEntries, saplingEntries, "", 11);
+        pwalletMain->GetFilteredNotes(sproutEntries, saplingEntries, orchardEntries, std::nullopt, 11);
     }
     CAmount availableFunds = 0;
     for (const SproutNoteEntry& sproutEntry : sproutEntries) {
@@ -111,7 +112,7 @@ bool AsyncRPCOperation_saplingmigration::main_impl() {
     CCoinsViewCache coinsView(pcoinsTip);
     do {
         CAmount amountToSend = chooseAmount(availableFunds);
-        auto builder = TransactionBuilder(consensusParams, targetHeight_, pwalletMain, &coinsView, &cs_main);
+        auto builder = TransactionBuilder(consensusParams, targetHeight_, std::nullopt, pwalletMain, &coinsView, &cs_main);
         builder.SetExpiryHeight(targetHeight_ + MIGRATION_EXPIRY_DELTA);
         LogPrint("zrpcunsafe", "%s: Beginning creating transaction with Sapling output amount=%s\n", getId(), FormatMoney(amountToSend - DEFAULT_FEE));
         std::vector<SproutNoteEntry> fromNotes;
@@ -122,6 +123,7 @@ bool AsyncRPCOperation_saplingmigration::main_impl() {
             fromNoteAmount += sproutEntry.note.value();
         }
         availableFunds -= fromNoteAmount;
+        std::optional<libzcash::SproutPaymentAddress> changeAddr;
         for (const SproutNoteEntry& sproutEntry : fromNotes) {
             std::string data(sproutEntry.memo.begin(), sproutEntry.memo.end());
             LogPrint("zrpcunsafe", "%s: Adding Sprout note input (txid=%s, vJoinSplit=%d, jsoutindex=%d, amount=%s, memo=%s)\n",
@@ -142,11 +144,17 @@ bool AsyncRPCOperation_saplingmigration::main_impl() {
             std::vector<std::optional<SproutWitness>> vInputWitnesses;
             pwalletMain->GetSproutNoteWitnesses(vOutPoints, vInputWitnesses, inputAnchor);
             builder.AddSproutInput(sproutSk, sproutEntry.note, vInputWitnesses[0].value());
+            // Send change to the address of the first input
+            if (!changeAddr.has_value()) {
+                changeAddr = sproutSk.address();
+            }
         }
+        assert(changeAddr.has_value());
         // The amount chosen *includes* the default fee for this transaction, i.e.
         // the value of the Sapling output will be 0.00001 ZEC less.
         builder.SetFee(DEFAULT_FEE);
         builder.AddSaplingOutput(ovkForShieldingFromTaddr(seed), migrationDestAddress, amountToSend - DEFAULT_FEE);
+        builder.SendChangeToSprout(changeAddr.value());
         CTransaction tx = builder.Build().GetTxOrThrow();
         if (isCancelled()) {
             LogPrint("zrpcunsafe", "%s: Canceled. Stopping.\n", getId());
@@ -191,37 +199,22 @@ CAmount AsyncRPCOperation_saplingmigration::chooseAmount(const CAmount& availabl
     return amount;
 }
 
-// Unless otherwise specified, the migration destination address is the address for Sapling account 0
+// Unless otherwise specified, the migration destination address is the
+// default address for the key at m/32'/coin_type'/0x7FFFFFFF'/0'
 libzcash::SaplingPaymentAddress AsyncRPCOperation_saplingmigration::getMigrationDestAddress(const HDSeed& seed) {
     KeyIO keyIO(Params());
     if (mapArgs.count("-migrationdestaddress")) {
         std::string migrationDestAddress = mapArgs["-migrationdestaddress"];
         auto address = keyIO.DecodePaymentAddress(migrationDestAddress);
-        auto saplingAddress = std::get_if<libzcash::SaplingPaymentAddress>(&address);
-        assert(saplingAddress != nullptr); // This is checked in init.cpp
+        assert(address.has_value()); // This is checked in init.cpp
+        auto saplingAddress = std::get_if<libzcash::SaplingPaymentAddress>(&address.value());
+        assert(saplingAddress != nullptr); // This is also checked in init.cpp
         return *saplingAddress;
     }
-    // Derive the address for Sapling account 0
-    auto m = libzcash::SaplingExtendedSpendingKey::Master(seed);
-    uint32_t bip44CoinType = Params().BIP44CoinType();
 
-    // We use a fixed keypath scheme of m/32'/coin_type'/account'
-    // Derive m/32'
-    auto m_32h = m.Derive(32 | ZIP32_HARDENED_KEY_LIMIT);
-    // Derive m/32'/coin_type'
-    auto m_32h_cth = m_32h.Derive(bip44CoinType | ZIP32_HARDENED_KEY_LIMIT);
-
-    // Derive m/32'/coin_type'/0'
-    libzcash::SaplingExtendedSpendingKey xsk = m_32h_cth.Derive(0 | ZIP32_HARDENED_KEY_LIMIT);
-
-    libzcash::SaplingPaymentAddress toAddress = xsk.DefaultAddress();
-
-    if (!HaveSpendingKeyForPaymentAddress(pwalletMain)(toAddress)) {
-        // Sapling account 0 must be the first address returned by GenerateNewSaplingZKey
-        assert(pwalletMain->GenerateNewSaplingZKey() == toAddress);
-    }
-
-    return toAddress;
+    // TODO: move off of legacy addresses.
+    auto generated = pwalletMain->GenerateLegacySaplingZKey(0);
+    return generated.first;
 }
 
 void AsyncRPCOperation_saplingmigration::cancel() {
diff --git a/src/wallet/asyncrpcoperation_sendmany.cpp b/src/wallet/asyncrpcoperation_sendmany.cpp
index 155afd70087..8a22cecfef4 100644
--- a/src/wallet/asyncrpcoperation_sendmany.cpp
+++ b/src/wallet/asyncrpcoperation_sendmany.cpp
@@ -21,6 +21,7 @@
 #include "transaction_builder.h"
 #include "timedata.h"
 #include "util.h"
+#include "util/match.h"
 #include "utilmoneystr.h"
 #include "wallet.h"
 #include "walletdb.h"
@@ -35,85 +36,101 @@
 #include <chrono>
 #include <thread>
 #include <string>
+#include <utility>
 #include <variant>
 
 #include <rust/ed25519.h>
 
 using namespace libzcash;
 
-int find_output(UniValue obj, int n) {
-    UniValue outputMapValue = find_value(obj, "outputmap");
-    if (!outputMapValue.isArray()) {
-        throw JSONRPCError(RPC_WALLET_ERROR, "Missing outputmap for JoinSplit operation");
-    }
-
-    UniValue outputMap = outputMapValue.get_array();
-    assert(outputMap.size() == ZC_NUM_JS_OUTPUTS);
-    for (size_t i = 0; i < outputMap.size(); i++) {
-        if (outputMap[i].get_int() == n) {
-            return i;
-        }
-    }
-
-    throw std::logic_error("n is not present in outputmap");
-}
-
 AsyncRPCOperation_sendmany::AsyncRPCOperation_sendmany(
-        std::optional<TransactionBuilder> builder,
-        CMutableTransaction contextualTx,
-        std::string fromAddress,
-        std::vector<SendManyRecipient> tOutputs,
-        std::vector<SendManyRecipient> zOutputs,
+        TransactionBuilder builder,
+        ZTXOSelector ztxoSelector,
+        std::vector<SendManyRecipient> recipients,
         int minDepth,
+        TransactionStrategy strategy,
         CAmount fee,
         UniValue contextInfo) :
-        tx_(contextualTx), fromaddress_(fromAddress), t_outputs_(tOutputs), z_outputs_(zOutputs), mindepth_(minDepth), fee_(fee), contextinfo_(contextInfo)
+        builder_(std::move(builder)), ztxoSelector_(ztxoSelector), recipients_(recipients),
+        mindepth_(minDepth), strategy_(strategy), fee_(fee),
+        contextinfo_(contextInfo)
 {
     assert(fee_ >= 0);
-
-    if (minDepth < 0) {
-        throw JSONRPCError(RPC_INVALID_PARAMETER, "Minconf cannot be negative");
-    }
-
-    if (fromAddress.size() == 0) {
-        throw JSONRPCError(RPC_INVALID_PARAMETER, "From address parameter missing");
-    }
-
-    if (tOutputs.size() == 0 && zOutputs.size() == 0) {
-        throw JSONRPCError(RPC_INVALID_PARAMETER, "No recipients");
-    }
-
-    isUsingBuilder_ = false;
-    if (builder) {
-        isUsingBuilder_ = true;
-        builder_ = builder.value();
-    }
-
-    KeyIO keyIO(Params());
-
-    useanyutxo_ = fromAddress == "ANY_TADDR";
-    fromtaddr_ = keyIO.DecodeDestination(fromAddress);
-    isfromtaddr_ = useanyutxo_ || IsValidDestination(fromtaddr_);
-    isfromzaddr_ = false;
-
-    if (!isfromtaddr_) {
-        auto address = keyIO.DecodePaymentAddress(fromAddress);
-        if (IsValidPaymentAddress(address)) {
-            // We don't need to lock on the wallet as spending key related methods are thread-safe
-            if (!std::visit(HaveSpendingKeyForPaymentAddress(pwalletMain), address)) {
-                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid from address, no spending key found for zaddr");
+    assert(mindepth_ >= 0);
+    assert(!recipients_.empty());
+    assert(ztxoSelector.RequireSpendingKeys());
+
+    sendFromAccount_ = pwalletMain->FindAccountForSelector(ztxoSelector_).value_or(ZCASH_LEGACY_ACCOUNT);
+
+    // Determine the target totals and recipient pools
+    for (const SendManyRecipient& recipient : recipients_) {
+        std::visit(match {
+            [&](const CKeyID& addr) {
+                transparentRecipients_ += 1;
+                txOutputAmounts_.t_outputs_total += recipient.amount;
+                recipientPools_.insert(OutputPool::Transparent);
+            },
+            [&](const CScriptID& addr) {
+                transparentRecipients_ += 1;
+                txOutputAmounts_.t_outputs_total += recipient.amount;
+                recipientPools_.insert(OutputPool::Transparent);
+            },
+            [&](const libzcash::SaplingPaymentAddress& addr) {
+                txOutputAmounts_.sapling_outputs_total += recipient.amount;
+                recipientPools_.insert(OutputPool::Sapling);
+                if (!(ztxoSelector_.SelectsSapling() || strategy_.AllowRevealedAmounts())) {
+                    if (ztxoSelector_.SelectsSprout()) {
+                        throw JSONRPCError(
+                            RPC_INVALID_PARAMETER,
+                            "Sending from the Sprout shielded pool to the Sapling "
+                            "shielded pool is not enabled by default because it will "
+                            "publicly reveal the transaction amount. THIS MAY AFFECT YOUR PRIVACY. "
+                            "Resubmit with the `privacyPolicy` parameter set to `AllowRevealedAmounts` "
+                            "or weaker if you wish to allow this transaction to proceed anyway.");
+                    }
+                    if (builder_.SupportsOrchard() && ztxoSelector_.SelectsOrchard()) {
+                        throw JSONRPCError(
+                            RPC_INVALID_PARAMETER,
+                            "Sending from the Orchard shielded pool to the Sapling "
+                            "shielded pool is not enabled by default because it will "
+                            "publicly reveal the transaction amount. THIS MAY AFFECT YOUR PRIVACY. "
+                            "Resubmit with the `privacyPolicy` parameter set to `AllowRevealedAmounts` "
+                            "or weaker if you wish to allow this transaction to proceed anyway.");
+                    }
+                    // If the source selects transparent then we don't show an
+                    // error because we are necessarily revealing information.
+                }
+            },
+            [&](const libzcash::OrchardRawAddress& addr) {
+                txOutputAmounts_.orchard_outputs_total += recipient.amount;
+                recipientPools_.insert(OutputPool::Orchard);
+                // No transaction allows sends from Sprout to Orchard.
+                assert(!ztxoSelector_.SelectsSprout());
+                if (!((builder_.SupportsOrchard() && ztxoSelector_.SelectsOrchard()) || strategy_.AllowRevealedAmounts())) {
+                    if (ztxoSelector_.SelectsSapling()) {
+                        throw JSONRPCError(
+                            RPC_INVALID_PARAMETER,
+                            "Sending from the Sapling shielded pool to the Orchard "
+                            "shielded pool is not enabled by default because it will "
+                            "publicly reveal the transaction amount. THIS MAY AFFECT YOUR PRIVACY. "
+                            "Resubmit with the `privacyPolicy` parameter set to `AllowRevealedAmounts` "
+                            "or weaker if you wish to allow this transaction to proceed anyway.");
+                    }
+                    // If the source selects transparent then we don't show an
+                    // error because we are necessarily revealing information.
+                }
             }
-
-            isfromzaddr_ = true;
-            frompaymentaddress_ = address;
-            spendingkey_ = std::visit(GetSpendingKeyForPaymentAddress(pwalletMain), address).value();
-        } else {
-            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid from address");
-        }
+        }, recipient.address);
     }
 
-    if (isfromzaddr_ && minDepth==0) {
-        throw JSONRPCError(RPC_INVALID_PARAMETER, "Minconf cannot be zero when sending from zaddr");
+    if (recipientPools_.count(OutputPool::Transparent) && !strategy_.AllowRevealedRecipients()) {
+        throw JSONRPCError(
+            RPC_INVALID_PARAMETER,
+            "This transaction would have transparent recipients, which is not "
+            "enabled by default because it will publicly reveal transaction "
+            "recipients and amounts. THIS MAY AFFECT YOUR PRIVACY. Resubmit "
+            "with the `privacyPolicy` parameter set to `AllowRevealedRecipients` "
+            "or weaker if you wish to allow this transaction to proceed anyway.");
     }
 
     // Log the context info i.e. the call parameters to z_sendmany
@@ -122,9 +139,6 @@ AsyncRPCOperation_sendmany::AsyncRPCOperation_sendmany(
     } else {
         LogPrint("zrpc", "%s: z_sendmany initialized\n", getId());
     }
-
-    // Enable payment disclosure if requested
-    paymentDisclosureMode = fExperimentalPaymentDisclosure;
 }
 
 AsyncRPCOperation_sendmany::~AsyncRPCOperation_sendmany() {
@@ -143,8 +157,9 @@ void AsyncRPCOperation_sendmany::main() {
     GenerateBitcoins(false, 0, Params());
 #endif
 
+    std::optional<uint256> txid;
     try {
-        success = main_impl();
+        txid = main_impl();
     } catch (const UniValue& objError) {
         int code = find_value(objError, "code").get_int();
         std::string message = find_value(objError, "message").get_str();
@@ -170,1037 +185,553 @@ void AsyncRPCOperation_sendmany::main() {
 
     stop_execution_clock();
 
-    if (success) {
+    if (txid.has_value()) {
         set_state(OperationStatus::SUCCESS);
     } else {
         set_state(OperationStatus::FAILED);
     }
 
     std::string s = strprintf("%s: z_sendmany finished (status=%s", getId(), getStateAsString());
-    if (success) {
-        s += strprintf(", txid=%s)\n", tx_.GetHash().ToString());
+    if (txid.has_value()) {
+        s += strprintf(", txid=%s)\n", txid.value().ToString());
     } else {
         s += strprintf(", error=%s)\n", getErrorMessage());
     }
     LogPrintf("%s",s);
-
-    // !!! Payment disclosure START
-    if (success && paymentDisclosureMode && paymentDisclosureData_.size()>0) {
-        uint256 txidhash = tx_.GetHash();
-        std::shared_ptr<PaymentDisclosureDB> db = PaymentDisclosureDB::sharedInstance();
-        for (PaymentDisclosureKeyInfo p : paymentDisclosureData_) {
-            p.first.hash = txidhash;
-            if (!db->Put(p.first, p.second)) {
-                LogPrint("paymentdisclosure", "%s: Payment Disclosure: Error writing entry to database for key %s\n", getId(), p.first.ToString());
-            } else {
-                LogPrint("paymentdisclosure", "%s: Payment Disclosure: Successfully added entry to database for key %s\n", getId(), p.first.ToString());
-            }
-        }
-    }
-    // !!! Payment disclosure END
 }
 
-struct TxValues {
-    CAmount t_inputs_total{0};
-    CAmount z_inputs_total{0};
-    CAmount t_outputs_total{0};
-    CAmount z_outputs_total{0};
-    CAmount targetAmount{0};
-    bool selectedUTXOCoinbase{false};
-};
-
+// Construct and send the transaction, returning the resulting txid.
+// Errors in transaction construction will throw.
+//
 // Notes:
-// 1. #1159 Currently there is no limit set on the number of joinsplits, so size of tx could be invalid.
-// 2. #1360 Note selection is not optimal
-// 3. #1277 Spendable notes are not locked, so an operation running in parallel could also try to use them
-bool AsyncRPCOperation_sendmany::main_impl() {
-
-    assert(isfromtaddr_ != isfromzaddr_);
-
-    bool isSingleZaddrOutput = (t_outputs_.size()==0 && z_outputs_.size()==1);
-    bool isMultipleZaddrOutput = (t_outputs_.size()==0 && z_outputs_.size()>=1);
-    bool isPureTaddrOnlyTx = (isfromtaddr_ && z_outputs_.size() == 0);
-    CAmount minersFee = fee_;
-    TxValues txValues;
-
-    // First calculate the target
-    for (SendManyRecipient & t : t_outputs_) {
-        txValues.t_outputs_total += t.amount;
-    }
-
-    for (SendManyRecipient & t : z_outputs_) {
-        txValues.z_outputs_total += t.amount;
-    }
-
-    CAmount sendAmount = txValues.z_outputs_total + txValues.t_outputs_total;
-    txValues.targetAmount = sendAmount + minersFee;
-
-    // When spending coinbase utxos, you can only specify a single zaddr as the change must go somewhere
-    // and if there are multiple zaddrs, we don't know where to send it.
-    if (isfromtaddr_) {
-        // Only select coinbase if we are spending from a single t-address to a single z-address.
-        if (!useanyutxo_ && isSingleZaddrOutput) {
-            bool b = find_utxos(true, txValues);
-            if (!b) {
-                throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, "Insufficient transparent funds, no UTXOs found for taddr from address.");
-            }
+// 1. #1159 Currently there is no limit set on the number of elements, which could
+//     make the tx too large.
+// 2. #1360 Note selection is not optimal.
+// 3. #1277 Spendable notes are not locked, so an operation running in parallel
+//    could also try to use them.
+// 4. #1614 Anchors are chosen at the most recent block; this is unreliable and leaks
+//    information in case of rollback.
+// 5. #3615 There is no padding of inputs or outputs, which may leak information.
+//
+// At least 4. and 5. differ from the Rust transaction builder.
+uint256 AsyncRPCOperation_sendmany::main_impl() {
+    CAmount sendAmount = (
+        txOutputAmounts_.orchard_outputs_total +
+        txOutputAmounts_.sapling_outputs_total +
+        txOutputAmounts_.t_outputs_total);
+    CAmount targetAmount = sendAmount + fee_;
+
+    builder_.SetFee(fee_);
+
+    // Allow transparent coinbase inputs if there are no transparent
+    // recipients.
+    bool allowTransparentCoinbase = transparentRecipients_ == 0;
+
+    // Set the dust threshold so that we can select enough inputs to avoid
+    // creating dust change amounts.
+    CAmount dustThreshold{DefaultDustThreshold()};
+
+    // Find spendable inputs, and select a minimal set of them that
+    // can supply the required target amount.
+    SpendableInputs spendable;
+    {
+        LOCK2(cs_main, pwalletMain->cs_wallet);
+        spendable = pwalletMain->FindSpendableInputs(ztxoSelector_, allowTransparentCoinbase, mindepth_);
+    }
+    if (!spendable.LimitToAmount(targetAmount, dustThreshold, recipientPools_)) {
+        CAmount changeAmount{spendable.Total() - targetAmount};
+        if (changeAmount > 0 && changeAmount < dustThreshold) {
+            // TODO: we should provide the option for the caller to explicitly
+            // forego change (definitionally an amount below the dust amount)
+            // and send the extra to the recipient or the miner fee to avoid
+            // creating dust change, rather than prohibit them from sending
+            // entirely in this circumstance.
+            // (Daira disagrees, as this could leak information to the recipient)
+            throw JSONRPCError(
+                    RPC_WALLET_INSUFFICIENT_FUNDS,
+                    strprintf(
+                        "Insufficient funds: have %s, need %s more to avoid creating invalid change output %s "
+                        "(dust threshold is %s)",
+                        FormatMoney(spendable.Total()),
+                        FormatMoney(dustThreshold - changeAmount),
+                        FormatMoney(changeAmount),
+                        FormatMoney(dustThreshold)));
         } else {
-            bool b = find_utxos(false, txValues);
-            if (!b) {
-                if (isMultipleZaddrOutput) {
-                    throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, "Could not find any non-coinbase UTXOs to spend. Coinbase UTXOs can only be sent to a single zaddr recipient from a single taddr.");
-                } else {
-                    throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, "Could not find any non-coinbase UTXOs to spend.");
-                }
-            }
+            bool isFromUa = std::holds_alternative<libzcash::UnifiedAddress>(ztxoSelector_.GetPattern());
+            throw JSONRPCError(
+                    RPC_WALLET_INSUFFICIENT_FUNDS,
+                    strprintf(
+                        "Insufficient funds: have %s, need %s",
+                        FormatMoney(spendable.Total()), FormatMoney(targetAmount))
+                        + (allowTransparentCoinbase ? "" :
+                            "; note that coinbase outputs will not be selected if you specify "
+                            "ANY_TADDR or if any transparent recipients are included.")
+                        + ((!isFromUa || strategy_.AllowLinkingAccountAddresses()) ? "" :
+                            " (This transaction may require selecting transparent coins that were sent "
+                            "to multiple Unified Addresses, which is not enabled by default because "
+                            "it would create a public link between the transparent receivers of these "
+                            "addresses. THIS MAY AFFECT YOUR PRIVACY. Resubmit with the `privacyPolicy` "
+                            "parameter set to `AllowLinkingAccountAddresses` or weaker if you wish to "
+                            "allow this transaction to proceed anyway.)")
+                    );
         }
     }
 
-    if (isfromzaddr_ && !find_unspent_notes()) {
-        throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, "Insufficient funds, no unspent notes found for zaddr from address.");
-    }
-
-    // At least one of z_sprout_inputs_ and z_sapling_inputs_ must be empty by design
-    assert(z_sprout_inputs_.empty() || z_sapling_inputs_.empty());
-
-    for (SendManyInputJSOP & t : z_sprout_inputs_) {
-        txValues.z_inputs_total += t.amount;
+    if (!(spendable.utxos.empty() || strategy_.AllowRevealedSenders())) {
+        throw JSONRPCError(
+            RPC_INVALID_PARAMETER,
+            "This transaction requires selecting transparent coins, which is "
+            "not enabled by default because it will publicly reveal transaction "
+            "senders and amounts. THIS MAY AFFECT YOUR PRIVACY. Resubmit "
+            "with the `privacyPolicy` parameter set to `AllowRevealedSenders` "
+            "or weaker if you wish to allow this transaction to proceed anyway.");
     }
-    for (auto t : z_sapling_inputs_) {
-        txValues.z_inputs_total += t.note.value();
-    }
-
-    assert(!isfromtaddr_ || txValues.z_inputs_total == 0);
-    assert(!isfromzaddr_ || txValues.t_inputs_total == 0);
 
-    if (isfromzaddr_ && (txValues.z_inputs_total < txValues.targetAmount)) {
-        throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS,
-            strprintf("Insufficient shielded funds, have %s, need %s",
-            FormatMoney(txValues.z_inputs_total), FormatMoney(txValues.targetAmount)));
-    }
+    spendable.LogInputs(getId());
 
-    if (isfromtaddr_) {
-        LogPrint("zrpc", "%s: spending %s to send %s with fee %s\n",
-            getId(), FormatMoney(txValues.targetAmount), FormatMoney(sendAmount), FormatMoney(minersFee));
-    } else {
-        LogPrint("zrpcunsafe", "%s: spending %s to send %s with fee %s\n",
-            getId(), FormatMoney(txValues.targetAmount), FormatMoney(sendAmount), FormatMoney(minersFee));
-    }
-    LogPrint("zrpc", "%s: transparent input: %s (to choose from)\n", getId(), FormatMoney(txValues.t_inputs_total));
-    LogPrint("zrpcunsafe", "%s: private input: %s (to choose from)\n", getId(), FormatMoney(txValues.z_inputs_total));
-    LogPrint("zrpc", "%s: transparent output: %s\n", getId(), FormatMoney(txValues.t_outputs_total));
-    LogPrint("zrpcunsafe", "%s: private output: %s\n", getId(), FormatMoney(txValues.z_outputs_total));
-    LogPrint("zrpc", "%s: fee: %s\n", getId(), FormatMoney(minersFee));
-
-    KeyIO keyIO(Params());
-
-    /**
-     * SCENARIO #0
-     *
-     * Sprout not involved, so we just use the TransactionBuilder and we're done.
-     * We added the transparent inputs to the builder earlier.
-     */
-    if (isUsingBuilder_) {
-        builder_.SetFee(minersFee);
-
-        // Get various necessary keys
-        SaplingExpandedSpendingKey expsk;
-        uint256 ovk;
-        if (isfromzaddr_) {
-            auto sk = std::get<libzcash::SaplingExtendedSpendingKey>(spendingkey_);
-            expsk = sk.expsk;
-            ovk = expsk.full_viewing_key().ovk;
-        } else {
-            // Sending from a t-address, which we don't have an ovk for. Instead,
-            // generate a common one from the HD seed. This ensures the data is
-            // recoverable, while keeping it logically separate from the ZIP 32
-            // Sapling key hierarchy, which the user might not be using.
-            HDSeed seed = pwalletMain->GetHDSeedForRPC();
-            ovk = ovkForShieldingFromTaddr(seed);
+    CAmount t_inputs_total{0};
+    CAmount z_inputs_total{0};
+    for (const auto& t : spendable.utxos) {
+        t_inputs_total += t.Value();
+    }
+    for (const auto& t : spendable.sproutNoteEntries) {
+        z_inputs_total += t.note.value();
+    }
+    for (const auto& t : spendable.saplingNoteEntries) {
+        z_inputs_total += t.note.value();
+    }
+    for (const auto& t : spendable.orchardNoteMetadata) {
+        z_inputs_total += t.GetNoteValue();
+    }
+
+    if (z_inputs_total > 0 && mindepth_ == 0) {
+        throw JSONRPCError(
+                RPC_INVALID_PARAMETER,
+                "Minconf cannot be zero when sending from a shielded address");
+    }
+
+    // When spending transparent coinbase outputs, all inputs must be fully
+    // consumed, and they may only be sent to shielded recipients.
+    if (spendable.HasTransparentCoinbase()) {
+        if (t_inputs_total + z_inputs_total != targetAmount) {
+            throw JSONRPCError(
+                    RPC_WALLET_ERROR,
+                    strprintf(
+                        "When shielding coinbase funds, the wallet does not allow any change. "
+                        "The proposed transaction would result in %s in change.",
+                        FormatMoney(t_inputs_total - targetAmount)
+                        ));
+        }
+        if (txOutputAmounts_.t_outputs_total != 0) {
+            throw JSONRPCError(
+                    RPC_WALLET_ERROR,
+                    "Coinbase funds may only be sent to shielded recipients.");
+        }
+    }
+
+    LogPrint("zrpcunsafe", "%s: spending %s to send %s with fee %s\n",
+        getId(), FormatMoney(targetAmount), FormatMoney(sendAmount), FormatMoney(fee_));
+    LogPrint("zrpc", "%s: total transparent input: %s (to choose from)\n", getId(), FormatMoney(t_inputs_total));
+    LogPrint("zrpcunsafe", "%s: total shielded input: %s (to choose from)\n", getId(), FormatMoney(z_inputs_total));
+    LogPrint("zrpc", "%s: total transparent output: %s\n", getId(), FormatMoney(txOutputAmounts_.t_outputs_total));
+    LogPrint("zrpcunsafe", "%s: total shielded Sapling output: %s\n", getId(), FormatMoney(txOutputAmounts_.sapling_outputs_total));
+    LogPrint("zrpcunsafe", "%s: total shielded Orchard output: %s\n", getId(), FormatMoney(txOutputAmounts_.orchard_outputs_total));
+    LogPrint("zrpc", "%s: fee: %s\n", getId(), FormatMoney(fee_));
+
+    // Allow change to go to any pool for which we have recipients.
+    std::set<OutputPool> allowedChangeTypes = recipientPools_;
+
+    // We always allow shielded change when not sending from the legacy account.
+    if (sendFromAccount_ != ZCASH_LEGACY_ACCOUNT) {
+        allowedChangeTypes.insert(OutputPool::Sapling);
+    }
+
+    auto ovks = this->SelectOVKs(spendable);
+    auto allowChangeTypes = [&](const std::set<ReceiverType>& receiverTypes) {
+        for (ReceiverType rtype : receiverTypes) {
+            switch (rtype) {
+                case ReceiverType::P2PKH:
+                case ReceiverType::P2SH:
+                    allowedChangeTypes.insert(OutputPool::Transparent);
+                    break;
+                case ReceiverType::Sapling:
+                    allowedChangeTypes.insert(OutputPool::Sapling);
+                    break;
+                case ReceiverType::Orchard:
+                    if (builder_.SupportsOrchard()) {
+                        allowedChangeTypes.insert(OutputPool::Orchard);
+                    }
+                    break;
+            }
         }
+    };
+
+    std::visit(match {
+        [&](const CKeyID& keyId) {
+            allowedChangeTypes.insert(OutputPool::Transparent);
+            auto changeAddr = pwalletMain->GenerateChangeAddressForAccount(
+                    sendFromAccount_, allowedChangeTypes);
+            assert(changeAddr.has_value());
+            builder_.SendChangeTo(changeAddr.value(), ovks.first);
+        },
+        [&](const CScriptID& scriptId) {
+            allowedChangeTypes.insert(OutputPool::Transparent);
+            auto changeAddr = pwalletMain->GenerateChangeAddressForAccount(
+                    sendFromAccount_, allowedChangeTypes);
+            assert(changeAddr.has_value());
+            builder_.SendChangeTo(changeAddr.value(), ovks.first);
+        },
+        [&](const libzcash::SproutPaymentAddress& addr) {
+            // for Sprout, we return change to the originating address.
+            builder_.SendChangeToSprout(addr);
+        },
+        [&](const libzcash::SproutViewingKey& vk) {
+            // for Sprout, we return change to the originating address.
+            builder_.SendChangeToSprout(vk.address());
+        },
+        [&](const libzcash::SaplingPaymentAddress& addr) {
+            // for Sapling, if using a legacy address, return change to the
+            // originating address; otherwise return it to the Sapling internal
+            // address corresponding to the UFVK.
+            if (sendFromAccount_ == ZCASH_LEGACY_ACCOUNT) {
+                builder_.SendChangeTo(addr, ovks.first);
+            } else {
+                auto changeAddr = pwalletMain->GenerateChangeAddressForAccount(
+                        sendFromAccount_, allowedChangeTypes);
+                assert(changeAddr.has_value());
+                builder_.SendChangeTo(changeAddr.value(), ovks.first);
+            }
+        },
+        [&](const libzcash::SaplingExtendedFullViewingKey& fvk) {
+            // for Sapling, if using a legacy address, return change to the
+            // originating address; otherwise return it to the Sapling internal
+            // address corresponding to the UFVK.
+            if (sendFromAccount_ == ZCASH_LEGACY_ACCOUNT) {
+                builder_.SendChangeTo(fvk.DefaultAddress(), ovks.first);
+            } else {
+                auto changeAddr = pwalletMain->GenerateChangeAddressForAccount(
+                        sendFromAccount_, allowedChangeTypes);
+                assert(changeAddr.has_value());
+                builder_.SendChangeTo(changeAddr.value(), ovks.first);
+            }
+        },
+        [&](const libzcash::UnifiedAddress& ua) {
+            allowChangeTypes(ua.GetKnownReceiverTypes());
 
-        // Set change address if we are using transparent funds
-        // TODO: Should we just use fromtaddr_ as the change address?
-        CReserveKey keyChange(pwalletMain);
-        if (isfromtaddr_) {
-            LOCK2(cs_main, pwalletMain->cs_wallet);
-
-            EnsureWalletIsUnlocked();
-            CPubKey vchPubKey;
-            bool ret = keyChange.GetReservedKey(vchPubKey);
-            if (!ret) {
-                // should never fail, as we just unlocked
+            auto zufvk = pwalletMain->GetUFVKForAddress(ua);
+            if (!zufvk.has_value()) {
                 throw JSONRPCError(
-                    RPC_WALLET_KEYPOOL_RAN_OUT,
-                    "Could not generate a taddr to use as a change address");
+                        RPC_WALLET_ERROR,
+                        "Could not determine full viewing key for unified address.");
             }
 
-            CTxDestination changeAddr = vchPubKey.GetID();
-            builder_.SendChangeTo(changeAddr);
-        }
-
-        // Select Sapling notes
-        std::vector<SaplingOutPoint> ops;
-        std::vector<SaplingNote> notes;
-        CAmount sum = 0;
-        for (auto t : z_sapling_inputs_) {
-            ops.push_back(t.op);
-            notes.push_back(t.note);
-            sum += t.note.value();
-            if (sum >= txValues.targetAmount) {
-                break;
+            auto changeAddr = zufvk.value().GetChangeAddress(allowedChangeTypes);
+            if (!changeAddr.has_value()) {
+                throw JSONRPCError(
+                        RPC_WALLET_ERROR,
+                        "Could not generate a change address from the inferred full viewing key.");
             }
-        }
-
-        // Fetch Sapling anchor and witnesses
-        uint256 anchor;
-        std::vector<std::optional<SaplingWitness>> witnesses;
-        {
-            LOCK2(cs_main, pwalletMain->cs_wallet);
-            pwalletMain->GetSaplingNoteWitnesses(ops, witnesses, anchor);
-        }
-
-        // Add Sapling spends
-        for (size_t i = 0; i < notes.size(); i++) {
-            if (!witnesses[i]) {
-                throw JSONRPCError(RPC_WALLET_ERROR, "Missing witness for Sapling note");
+            builder_.SendChangeTo(changeAddr.value(), ovks.first);
+        },
+        [&](const libzcash::UnifiedFullViewingKey& fvk) {
+            allowChangeTypes(fvk.GetKnownReceiverTypes());
+            auto zufvk = ZcashdUnifiedFullViewingKey::FromUnifiedFullViewingKey(Params(), fvk);
+            auto changeAddr = zufvk.GetChangeAddress(allowedChangeTypes);
+            if (!changeAddr.has_value()) {
+                throw JSONRPCError(
+                        RPC_WALLET_ERROR,
+                        "Could not generate a change address from the specified full viewing key.");
             }
-            builder_.AddSaplingSpend(expsk, notes[i], anchor, witnesses[i].value());
-        }
-
-        // Add Sapling outputs
-        for (auto r : z_outputs_) {
-            auto address = r.address;
-            auto value = r.amount;
-            auto hexMemo = r.memo;
-
-            auto addr = keyIO.DecodePaymentAddress(address);
-            assert(std::get_if<libzcash::SaplingPaymentAddress>(&addr) != nullptr);
-            auto to = std::get<libzcash::SaplingPaymentAddress>(addr);
-
-            auto memo = get_memo_from_hex_string(hexMemo);
-
-            builder_.AddSaplingOutput(ovk, to, value, memo);
-        }
-
-        // Add transparent outputs
-        for (auto r : t_outputs_) {
-            auto outputAddress = r.address;
-            auto amount = r.amount;
-
-            auto address = keyIO.DecodeDestination(outputAddress);
-            builder_.AddTransparentOutput(address, amount);
-        }
-
-        // Build the transaction
-        tx_ = builder_.Build().GetTxOrThrow();
-
-        UniValue sendResult = SendTransaction(tx_, keyChange, testmode);
-        set_result(sendResult);
-
-        return true;
-    }
-    /**
-     * END SCENARIO #0
-     */
-
-
-    // Grab the current consensus branch ID
-    {
-        LOCK(cs_main);
-        consensusBranchId_ = CurrentEpochBranchId(chainActive.Height() + 1, Params().GetConsensus());
-    }
-
-    /**
-     * SCENARIO #1
-     *
-     * taddr -> taddrs
-     *
-     * There are no zaddrs or joinsplits involved.
-     */
-    if (isPureTaddrOnlyTx) {
-        add_taddr_outputs_to_tx();
-
-        CAmount funds = txValues.t_inputs_total;
-        CAmount fundsSpent = txValues.t_outputs_total + minersFee;
-        CAmount change = funds - fundsSpent;
-
-        CReserveKey keyChange(pwalletMain);
-        if (change > 0) {
-            add_taddr_change_output_to_tx(keyChange, change);
-
-            LogPrint("zrpc", "%s: transparent change in transaction output (amount=%s)\n",
-                    getId(),
-                    FormatMoney(change)
-                    );
-        }
-
-        UniValue obj(UniValue::VOBJ);
-        obj.pushKV("rawtxn", EncodeHexTx(tx_));
-        auto txAndResult = SignSendRawTransaction(obj, keyChange, testmode);
-        tx_ = txAndResult.first;
-        set_result(txAndResult.second);
-        return true;
-    }
-    /**
-     * END SCENARIO #1
-     */
-
-
-    // Prepare raw transaction to handle JoinSplits
-    CMutableTransaction mtx(tx_);
-    ed25519_generate_keypair(&joinSplitPrivKey_, &joinSplitPubKey_);
-    mtx.joinSplitPubKey = joinSplitPubKey_;
-    tx_ = CTransaction(mtx);
-
-    // Copy zinputs and zoutputs to more flexible containers
-    std::deque<SendManyInputJSOP> zInputsDeque; // zInputsDeque stores minimum numbers of notes for target amount
-    CAmount tmp = 0;
-    for (auto o : z_sprout_inputs_) {
-        zInputsDeque.push_back(o);
-        tmp += o.amount;
-        if (tmp >= txValues.targetAmount) {
+            builder_.SendChangeTo(changeAddr.value(), ovks.first);
+        },
+        [&](const AccountZTXOPattern& acct) {
+            allowChangeTypes(acct.GetReceiverTypes());
+            auto changeAddr = pwalletMain->GenerateChangeAddressForAccount(
+                        acct.GetAccountId(),
+                        allowedChangeTypes);
+
+            assert(changeAddr.has_value());
+            builder_.SendChangeTo(changeAddr.value(), ovks.first);
+        }
+    }, ztxoSelector_.GetPattern());
+
+    // Track the total of notes that we've added to the builder. This
+    // shouldn't strictly be necessary, given `spendable.LimitToAmount`
+    CAmount sum = 0;
+
+    // Create Sapling outpoints
+    std::vector<SaplingOutPoint> saplingOutPoints;
+    std::vector<SaplingNote> saplingNotes;
+    std::vector<SaplingExtendedSpendingKey> saplingKeys;
+
+    for (const auto& t : spendable.saplingNoteEntries) {
+        saplingOutPoints.push_back(t.op);
+        saplingNotes.push_back(t.note);
+
+        libzcash::SaplingExtendedSpendingKey saplingKey;
+        assert(pwalletMain->GetSaplingExtendedSpendingKey(t.address, saplingKey));
+        saplingKeys.push_back(saplingKey);
+
+        sum += t.note.value();
+        if (sum >= targetAmount) {
             break;
         }
     }
-    std::deque<SendManyRecipient> zOutputsDeque;
-    for (auto o : z_outputs_) {
-        zOutputsDeque.push_back(o);
-    }
 
-    // When spending notes, take a snapshot of note witnesses and anchors as the treestate will
-    // change upon arrival of new blocks which contain joinsplit transactions.  This is likely
-    // to happen as creating a chained joinsplit transaction can take longer than the block interval.
-    if (z_sprout_inputs_.size() > 0) {
+    // Fetch Sapling anchor and witnesses, and Orchard Merkle paths.
+    uint256 anchor;
+    std::vector<std::optional<SaplingWitness>> witnesses;
+    std::vector<std::pair<libzcash::OrchardSpendingKey, orchard::SpendInfo>> orchardSpendInfo;
+    {
         LOCK2(cs_main, pwalletMain->cs_wallet);
-        for (auto t : z_sprout_inputs_) {
-            JSOutPoint jso = t.point;
-            std::vector<JSOutPoint> vOutPoints = { jso };
-            uint256 inputAnchor;
-            std::vector<std::optional<SproutWitness>> vInputWitnesses;
-            pwalletMain->GetSproutNoteWitnesses(vOutPoints, vInputWitnesses, inputAnchor);
-            jsopWitnessAnchorMap[ jso.ToString() ] = WitnessAnchorData{ vInputWitnesses[0], inputAnchor };
-        }
+        pwalletMain->GetSaplingNoteWitnesses(saplingOutPoints, witnesses, anchor);
+        orchardSpendInfo = pwalletMain->GetOrchardSpendInfo(spendable.orchardNoteMetadata);
     }
 
-
-    /**
-     * SCENARIO #2
-     *
-     * taddr -> taddrs
-     *       -> zaddrs
-     *
-     * Note: Consensus rule states that coinbase utxos can only be sent to a zaddr.
-     *       Local wallet rule does not allow any change when sending coinbase utxos
-     *       since there is currently no way to specify a change address and we don't
-     *       want users accidentally sending excess funds to a recipient.
-     */
-    if (isfromtaddr_) {
-        add_taddr_outputs_to_tx();
-
-        CAmount funds = txValues.t_inputs_total;
-        CAmount fundsSpent = txValues.t_outputs_total + minersFee + txValues.z_outputs_total;
-        CAmount change = funds - fundsSpent;
-
-        CReserveKey keyChange(pwalletMain);
-        if (change > 0) {
-            if (txValues.selectedUTXOCoinbase) {
-                assert(isSingleZaddrOutput);
-                throw JSONRPCError(RPC_WALLET_ERROR, strprintf(
-                    "Change %s not allowed. When shielding coinbase funds, the wallet does not "
-                    "allow any change as there is currently no way to specify a change address "
-                    "in z_sendmany.", FormatMoney(change)));
-            } else {
-                add_taddr_change_output_to_tx(keyChange, change);
-                LogPrint("zrpc", "%s: transparent change in transaction output (amount=%s)\n",
-                        getId(),
-                        FormatMoney(change)
-                        );
-            }
-        }
-
-        // Create joinsplits, where each output represents a zaddr recipient.
-        UniValue obj(UniValue::VOBJ);
-        while (zOutputsDeque.size() > 0) {
-            AsyncJoinSplitInfo info;
-            info.vpub_old = 0;
-            info.vpub_new = 0;
-            int n = 0;
-            while (n++<ZC_NUM_JS_OUTPUTS && zOutputsDeque.size() > 0) {
-                SendManyRecipient smr = zOutputsDeque.front();
-                std::string address = smr.address;
-                CAmount value = smr.amount;
-                std::string hexMemo = smr.memo;
-                zOutputsDeque.pop_front();
-
-                PaymentAddress pa = keyIO.DecodePaymentAddress(address);
-                JSOutput jso = JSOutput(std::get<libzcash::SproutPaymentAddress>(pa), value);
-                if (hexMemo.size() > 0) {
-                    jso.memo = get_memo_from_hex_string(hexMemo);
-                }
-                info.vjsout.push_back(jso);
-
-                // Funds are removed from the value pool and enter the private pool
-                info.vpub_old += value;
-            }
-            obj = perform_joinsplit(info);
+    // Add Orchard spends
+    for (size_t i = 0; i < orchardSpendInfo.size(); i++) {
+        auto spendInfo = std::move(orchardSpendInfo[i]);
+        if (!builder_.AddOrchardSpend(
+            std::move(spendInfo.first),
+            std::move(spendInfo.second)))
+        {
+            throw JSONRPCError(
+                RPC_WALLET_ERROR,
+                "Failed to add Orchard note to transaction (check debug.log for details)"
+            );
         }
-
-        auto txAndResult = SignSendRawTransaction(obj, keyChange, testmode);
-        tx_ = txAndResult.first;
-        set_result(txAndResult.second);
-        return true;
-    }
-    /**
-     * END SCENARIO #2
-     */
-
-
-
-    /**
-     * SCENARIO #3
-     *
-     * zaddr -> taddrs
-     *       -> zaddrs
-     *
-     * Send to zaddrs by chaining JoinSplits together and immediately consuming any change
-     * Send to taddrs by creating dummy z outputs and accumulating value in a change note
-     * which is used to set vpub_new in the last chained joinsplit.
-     */
-    UniValue obj(UniValue::VOBJ);
-    CAmount jsChange = 0;   // this is updated after each joinsplit
-    int changeOutputIndex = -1; // this is updated after each joinsplit if jsChange > 0
-    bool vpubNewProcessed = false;  // updated when vpub_new for miner fee and taddr outputs is set in last joinsplit
-    CAmount vpubNewTarget = minersFee;
-    if (txValues.t_outputs_total > 0) {
-        add_taddr_outputs_to_tx();
-        vpubNewTarget += txValues.t_outputs_total;
     }
 
-    // Keep track of treestate within this transaction
-    // The SaltedTxidHasher is fine to use here; it salts the map keys automatically
-    // with randomness generated on construction.
-    boost::unordered_map<uint256, SproutMerkleTree, SaltedTxidHasher> intermediates;
-    std::vector<uint256> previousCommitments;
-
-    while (!vpubNewProcessed) {
-        AsyncJoinSplitInfo info;
-        info.vpub_old = 0;
-        info.vpub_new = 0;
-
-        CAmount jsInputValue = 0;
-        uint256 jsAnchor;
-        std::vector<std::optional<SproutWitness>> witnesses;
-
-        JSDescription prevJoinSplit;
-
-        // Keep track of previous JoinSplit and its commitments
-        if (tx_.vJoinSplit.size() > 0) {
-            prevJoinSplit = tx_.vJoinSplit.back();
-        }
-
-        // If there is no change, the chain has terminated so we can reset the tracked treestate.
-        if (jsChange==0 && tx_.vJoinSplit.size() > 0) {
-            intermediates.clear();
-            previousCommitments.clear();
-        }
-
-        //
-        // Consume change as the first input of the JoinSplit.
-        //
-        if (jsChange > 0) {
-            LOCK2(cs_main, pwalletMain->cs_wallet);
-
-            // Update tree state with previous joinsplit
-            SproutMerkleTree tree;
-            auto it = intermediates.find(prevJoinSplit.anchor);
-            if (it != intermediates.end()) {
-                tree = it->second;
-            } else if (!pcoinsTip->GetSproutAnchorAt(prevJoinSplit.anchor, tree)) {
-                throw JSONRPCError(RPC_WALLET_ERROR, "Could not find previous JoinSplit anchor");
-            }
-
-            assert(changeOutputIndex != -1);
-            std::optional<SproutWitness> changeWitness;
-            int n = 0;
-            for (const uint256& commitment : prevJoinSplit.commitments) {
-                tree.append(commitment);
-                previousCommitments.push_back(commitment);
-                if (!changeWitness && changeOutputIndex == n++) {
-                    changeWitness = tree.witness();
-                } else if (changeWitness) {
-                    changeWitness.value().append(commitment);
-                }
-            }
-            if (changeWitness) {
-                    witnesses.push_back(changeWitness);
-            }
-            jsAnchor = tree.root();
-            intermediates.insert(std::make_pair(tree.root(), tree));    // chained js are interstitial (found in between block boundaries)
-
-            // Decrypt the change note's ciphertext to retrieve some data we need
-            ZCNoteDecryption decryptor(std::get<libzcash::SproutSpendingKey>(spendingkey_).receiving_key());
-            auto hSig = ZCJoinSplit::h_sig(
-                prevJoinSplit.randomSeed,
-                prevJoinSplit.nullifiers,
-                tx_.joinSplitPubKey);
-            try {
-                SproutNotePlaintext plaintext = SproutNotePlaintext::decrypt(
-                        decryptor,
-                        prevJoinSplit.ciphertexts[changeOutputIndex],
-                        prevJoinSplit.ephemeralKey,
-                        hSig,
-                        (unsigned char) changeOutputIndex);
-
-                SproutNote note = plaintext.note(std::get<libzcash::SproutPaymentAddress>(frompaymentaddress_));
-                info.notes.push_back(note);
-
-                jsInputValue += plaintext.value();
-
-                LogPrint("zrpcunsafe", "%s: spending change (amount=%s)\n",
-                    getId(),
-                    FormatMoney(plaintext.value())
-                    );
-
-            } catch (const std::exception& e) {
-                throw JSONRPCError(RPC_WALLET_ERROR, strprintf("Error decrypting output note of previous JoinSplit: %s", e.what()));
-            }
-        }
-
-
-        //
-        // Consume spendable non-change notes
-        //
-        std::vector<SproutNote> vInputNotes;
-        std::vector<JSOutPoint> vOutPoints;
-        std::vector<std::optional<SproutWitness>> vInputWitnesses;
-        uint256 inputAnchor;
-        int numInputsNeeded = (jsChange>0) ? 1 : 0;
-        while (numInputsNeeded++ < ZC_NUM_JS_INPUTS && zInputsDeque.size() > 0) {
-            SendManyInputJSOP t = zInputsDeque.front();
-            JSOutPoint jso = t.point;
-            SproutNote note = t.note;
-            CAmount noteFunds = t.amount;
-            zInputsDeque.pop_front();
-
-            WitnessAnchorData wad = jsopWitnessAnchorMap[ jso.ToString() ];
-            vInputWitnesses.push_back(wad.witness);
-            if (inputAnchor.IsNull()) {
-                inputAnchor = wad.anchor;
-            } else if (inputAnchor != wad.anchor) {
-                throw JSONRPCError(RPC_WALLET_ERROR, "Selected input notes do not share the same anchor");
-            }
-
-            vOutPoints.push_back(jso);
-            vInputNotes.push_back(note);
-
-            jsInputValue += noteFunds;
-
-            int wtxHeight = -1;
-            int wtxDepth = -1;
-            {
-                LOCK2(cs_main, pwalletMain->cs_wallet);
-                const CWalletTx& wtx = pwalletMain->mapWallet[jso.hash];
-                // Zero-confirmation notes belong to transactions which have not yet been mined
-                if (mapBlockIndex.find(wtx.hashBlock) == mapBlockIndex.end()) {
-                    throw JSONRPCError(RPC_WALLET_ERROR, strprintf("mapBlockIndex does not contain block hash %s", wtx.hashBlock.ToString()));
-                }
-                wtxHeight = mapBlockIndex[wtx.hashBlock]->nHeight;
-                wtxDepth = wtx.GetDepthInMainChain();
-            }
-            LogPrint("zrpcunsafe", "%s: spending note (txid=%s, vJoinSplit=%d, jsoutindex=%d, amount=%s, height=%d, confirmations=%d)\n",
-                    getId(),
-                    jso.hash.ToString().substr(0, 10),
-                    jso.js,
-                    int(jso.n), // uint8_t
-                    FormatMoney(noteFunds),
-                    wtxHeight,
-                    wtxDepth
-                    );
-        }
-
-        // Add history of previous commitments to witness
-        if (vInputNotes.size() > 0) {
-
-            if (vInputWitnesses.size()==0) {
-                throw JSONRPCError(RPC_WALLET_ERROR, "Could not find witness for note commitment");
-            }
-
-            for (auto & optionalWitness : vInputWitnesses) {
-                if (!optionalWitness) {
-                    throw JSONRPCError(RPC_WALLET_ERROR, "Witness for note commitment is null");
-                }
-                SproutWitness w = *optionalWitness; // could use .value();
-                if (jsChange > 0) {
-                    for (const uint256& commitment : previousCommitments) {
-                        w.append(commitment);
-                    }
-                    if (jsAnchor != w.root()) {
-                        throw JSONRPCError(RPC_WALLET_ERROR, "Witness for spendable note does not have same anchor as change input");
-                    }
-                }
-                witnesses.push_back(w);
-            }
-
-            // The jsAnchor is null if this JoinSplit is at the start of a new chain
-            if (jsAnchor.IsNull()) {
-                jsAnchor = inputAnchor;
-            }
-
-            // Add spendable notes as inputs
-            std::copy(vInputNotes.begin(), vInputNotes.end(), std::back_inserter(info.notes));
-        }
-
-        // Find recipient to transfer funds to
-        std::string address, hexMemo;
-        CAmount value = 0;
-        if (zOutputsDeque.size() > 0) {
-            SendManyRecipient smr = zOutputsDeque.front();
-            address = smr.address;
-            value = smr.amount;
-            hexMemo = smr.memo;
-            zOutputsDeque.pop_front();
-        }
-
-        // Reset change
-        jsChange = 0;
-        CAmount outAmount = value;
-
-        // Set vpub_new in the last joinsplit (when there are no more notes to spend or zaddr outputs to satisfy)
-        if (zOutputsDeque.size() == 0 && zInputsDeque.size() == 0) {
-            assert(!vpubNewProcessed);
-            if (jsInputValue < vpubNewTarget) {
-                throw JSONRPCError(RPC_WALLET_ERROR,
-                    strprintf("Insufficient funds for vpub_new %s (miners fee %s, taddr outputs %s)",
-                    FormatMoney(vpubNewTarget), FormatMoney(minersFee), FormatMoney(txValues.t_outputs_total)));
-            }
-            outAmount += vpubNewTarget;
-            info.vpub_new += vpubNewTarget; // funds flowing back to public pool
-            vpubNewProcessed = true;
-            jsChange = jsInputValue - outAmount;
-            assert(jsChange >= 0);
-        }
-        else {
-            // This is not the last joinsplit, so compute change and any amount still due to the recipient
-            if (jsInputValue > outAmount) {
-                jsChange = jsInputValue - outAmount;
-            } else if (outAmount > jsInputValue) {
-                // Any amount due is owed to the recipient.  Let the miners fee get paid first.
-                CAmount due = outAmount - jsInputValue;
-                SendManyRecipient r(address, due, hexMemo);
-                zOutputsDeque.push_front(r);
-
-                // reduce the amount being sent right now to the value of all inputs
-                value = jsInputValue;
-            }
-        }
-
-        // create output for recipient
-        if (address.empty()) {
-            assert(value==0);
-            info.vjsout.push_back(JSOutput());  // dummy output while we accumulate funds into a change note for vpub_new
-        } else {
-            PaymentAddress pa = keyIO.DecodePaymentAddress(address);
-            // If we are here, we know we have no Sapling outputs.
-            JSOutput jso = JSOutput(std::get<libzcash::SproutPaymentAddress>(pa), value);
-            if (hexMemo.size() > 0) {
-                jso.memo = get_memo_from_hex_string(hexMemo);
-            }
-            info.vjsout.push_back(jso);
-        }
-
-        // create output for any change
-        if (jsChange>0) {
-            info.vjsout.push_back(JSOutput(std::get<libzcash::SproutPaymentAddress>(frompaymentaddress_), jsChange));
-
-            LogPrint("zrpcunsafe", "%s: generating note for change (amount=%s)\n",
-                    getId(),
-                    FormatMoney(jsChange)
+    // Add Sapling spends
+    for (size_t i = 0; i < saplingNotes.size(); i++) {
+        if (!witnesses[i]) {
+            throw JSONRPCError(
+                    RPC_WALLET_ERROR,
+                    strprintf(
+                        "Missing witness for Sapling note at outpoint %s",
+                        spendable.saplingNoteEntries[i].op.ToString())
                     );
         }
 
-        obj = perform_joinsplit(info, witnesses, jsAnchor);
-
-        if (jsChange > 0) {
-            changeOutputIndex = find_output(obj, 1);
-        }
+        builder_.AddSaplingSpend(saplingKeys[i].expsk, saplingNotes[i], anchor, witnesses[i].value());
     }
 
-    // Sanity check in case changes to code block above exits loop by invoking 'break'
-    assert(zInputsDeque.size() == 0);
-    assert(zOutputsDeque.size() == 0);
-    assert(vpubNewProcessed);
-
-    auto txAndResult = SignSendRawTransaction(obj, std::nullopt, testmode);
-    tx_ = txAndResult.first;
-    set_result(txAndResult.second);
-    return true;
-}
+    // Add outputs
+    for (const auto& r : recipients_) {
+        std::visit(match {
+            [&](const CKeyID& keyId) {
+                builder_.AddTransparentOutput(keyId, r.amount);
+            },
+            [&](const CScriptID& scriptId) {
+                builder_.AddTransparentOutput(scriptId, r.amount);
+            },
+            [&](const libzcash::SaplingPaymentAddress& addr) {
+                auto value = r.amount;
+                auto memo = get_memo_from_hex_string(r.memo.value_or(""));
 
+                builder_.AddSaplingOutput(ovks.second, addr, value, memo);
+            },
+            [&](const libzcash::OrchardRawAddress& addr) {
+                auto value = r.amount;
+                auto memo = r.memo.has_value() ? std::optional(get_memo_from_hex_string(r.memo.value())) : std::nullopt;
 
-bool AsyncRPCOperation_sendmany::find_utxos(bool fAcceptCoinbase, TxValues& txValues) {
-    std::set<CTxDestination> destinations;
-    if (!useanyutxo_) {
-        destinations.insert(fromtaddr_);
-    }
-    pwalletMain->AvailableCoins(
-            t_inputs_,
-            false,              // fOnlyConfirmed
-            nullptr,            // coinControl
-            true,               // fIncludeZeroValue
-            fAcceptCoinbase,    // fIncludeCoinBase
-            true,               // fOnlySpendable
-            mindepth_,          // nMinDepth
-            &destinations);     // onlyFilterByDests
-    if (t_inputs_.empty()) return false;
-
-    // sort in ascending order, so smaller utxos appear first
-    std::sort(t_inputs_.begin(), t_inputs_.end(), [](const COutput& i, const COutput& j) -> bool {
-        return i.Value() < j.Value();
-    });
-
-    // Load transparent inputs
-    load_inputs(txValues);
-
-    return t_inputs_.size() > 0;
-}
-
-bool AsyncRPCOperation_sendmany::load_inputs(TxValues& txValues) {
-    // If from address is a taddr, select UTXOs to spend
-    CAmount selectedUTXOAmount = 0;
-    // Get dust threshold
-    CKey secret;
-    secret.MakeNewKey(true);
-    CScript scriptPubKey = GetScriptForDestination(secret.GetPubKey().GetID());
-    CTxOut out(CAmount(1), scriptPubKey);
-    CAmount dustThreshold = out.GetDustThreshold(minRelayTxFee);
-    CAmount dustChange = -1;
-
-    std::vector<COutput> selectedTInputs;
-    for (const COutput& out : t_inputs_) {
-        if (out.fIsCoinbase) {
-            txValues.selectedUTXOCoinbase = true;
-        }
-        selectedUTXOAmount += out.Value();
-        selectedTInputs.emplace_back(out);
-        if (selectedUTXOAmount >= txValues.targetAmount) {
-            // Select another utxo if there is change less than the dust threshold.
-            dustChange = selectedUTXOAmount - txValues.targetAmount;
-            if (dustChange == 0 || dustChange >= dustThreshold) {
-                break;
+                builder_.AddOrchardOutput(ovks.second, addr, value, memo);
             }
-        }
+        }, r.address);
     }
 
-    t_inputs_ = selectedTInputs;
-    txValues.t_inputs_total = selectedUTXOAmount;
+    // Add transparent utxos
+    for (const auto& out : spendable.utxos) {
+        const CTxOut& txOut = out.tx->vout[out.i];
+        builder_.AddTransparentInput(COutPoint(out.tx->GetHash(), out.i), txOut.scriptPubKey, txOut.nValue);
 
-    if (txValues.t_inputs_total < txValues.targetAmount) {
-        throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS,
-                           strprintf("Insufficient transparent funds, have %s, need %s",
-                                     FormatMoney(txValues.t_inputs_total), FormatMoney(txValues.targetAmount)));
-    }
-
-    // If there is transparent change, is it valid or is it dust?
-    if (dustChange < dustThreshold && dustChange != 0) {
-        throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS,
-                           strprintf("Insufficient transparent funds, have %s, need %s more to avoid creating invalid change output %s (dust threshold is %s)",
-                                     FormatMoney(txValues.t_inputs_total), FormatMoney(dustThreshold - dustChange), FormatMoney(dustChange), FormatMoney(dustThreshold)));
-    }
-
-    // update the transaction with these inputs
-    if (isUsingBuilder_) {
-        for (const auto& out : t_inputs_) {
-            const CTxOut& txOut = out.tx->vout[out.i];
-            builder_.AddTransparentInput(COutPoint(out.tx->GetHash(), out.i), txOut.scriptPubKey, txOut.nValue);
-        }
-    } else {
-        CMutableTransaction rawTx(tx_);
-        for (const auto& out : t_inputs_) {
-            rawTx.vin.push_back(CTxIn(COutPoint(out.tx->GetHash(), out.i)));
+        sum += txOut.nValue;
+        if (sum >= targetAmount) {
+            break;
         }
-        tx_ = CTransaction(rawTx);
-    }
-    return true;
-}
-
-bool AsyncRPCOperation_sendmany::find_unspent_notes() {
-    std::vector<SproutNoteEntry> sproutEntries;
-    std::vector<SaplingNoteEntry> saplingEntries;
-    pwalletMain->GetFilteredNotes(sproutEntries, saplingEntries, fromaddress_, mindepth_);
-
-    // If using the TransactionBuilder, we only want Sapling notes.
-    // If not using it, we only want Sprout notes.
-    // TODO: Refactor `GetFilteredNotes()` so we only fetch what we need.
-    if (isUsingBuilder_) {
-        sproutEntries.clear();
-    } else {
-        saplingEntries.clear();
-    }
-
-    for (SproutNoteEntry & entry : sproutEntries) {
-        z_sprout_inputs_.push_back(SendManyInputJSOP(entry.jsop, entry.note, CAmount(entry.note.value())));
-        std::string data(entry.memo.begin(), entry.memo.end());
-        LogPrint("zrpcunsafe", "%s: found unspent Sprout note (txid=%s, vJoinSplit=%d, jsoutindex=%d, amount=%s, memo=%s)\n",
-            getId(),
-            entry.jsop.hash.ToString().substr(0, 10),
-            entry.jsop.js,
-            int(entry.jsop.n),  // uint8_t
-            FormatMoney(entry.note.value()),
-            HexStr(data).substr(0, 10)
-            );
-    }
-
-    for (auto entry : saplingEntries) {
-        z_sapling_inputs_.push_back(entry);
-        std::string data(entry.memo.begin(), entry.memo.end());
-        LogPrint("zrpcunsafe", "%s: found unspent Sapling note (txid=%s, vShieldedSpend=%d, amount=%s, memo=%s)\n",
-            getId(),
-            entry.op.hash.ToString().substr(0, 10),
-            entry.op.n,
-            FormatMoney(entry.note.value()),
-            HexStr(data).substr(0, 10));
     }
 
-    if (z_sprout_inputs_.empty() && z_sapling_inputs_.empty()) {
-        return false;
-    }
-
-    // sort in descending order, so big notes appear first
-    std::sort(z_sprout_inputs_.begin(), z_sprout_inputs_.end(),
-        [](SendManyInputJSOP i, SendManyInputJSOP j) -> bool {
-            return i.amount > j.amount;
-        });
-    std::sort(z_sapling_inputs_.begin(), z_sapling_inputs_.end(),
-        [](SaplingNoteEntry i, SaplingNoteEntry j) -> bool {
-            return i.note.value() > j.note.value();
-        });
-
-    return true;
-}
-
-UniValue AsyncRPCOperation_sendmany::perform_joinsplit(AsyncJoinSplitInfo & info) {
-    std::vector<std::optional < SproutWitness>> witnesses;
-    uint256 anchor;
-    {
-        LOCK(cs_main);
-        anchor = pcoinsTip->GetBestAnchor(SPROUT);    // As there are no inputs, ask the wallet for the best anchor
-    }
-    return perform_joinsplit(info, witnesses, anchor);
-}
-
-
-UniValue AsyncRPCOperation_sendmany::perform_joinsplit(AsyncJoinSplitInfo & info, std::vector<JSOutPoint> & outPoints) {
-    std::vector<std::optional < SproutWitness>> witnesses;
-    uint256 anchor;
+    // Find Sprout witnesses
+    // When spending notes, take a snapshot of note witnesses and anchors as the treestate will
+    // change upon arrival of new blocks which contain joinsplit transactions.  This is likely
+    // to happen as creating a chained joinsplit transaction can take longer than the block interval.
+    // So, we need to take locks on cs_main and pwalletMain->cs_wallet so that the witnesses aren't
+    // updated.
+    //
+    // TODO: these locks would ideally be shared for selection of Sapling anchors and witnesses
+    // as well.
+    std::vector<std::optional<SproutWitness>> vSproutWitnesses;
     {
-        LOCK(cs_main);
-        pwalletMain->GetSproutNoteWitnesses(outPoints, witnesses, anchor);
-    }
-    return perform_joinsplit(info, witnesses, anchor);
-}
-
-UniValue AsyncRPCOperation_sendmany::perform_joinsplit(
-        AsyncJoinSplitInfo & info,
-        std::vector<std::optional < SproutWitness>> witnesses,
-        uint256 anchor)
-{
-    if (anchor.IsNull()) {
-        throw std::runtime_error("anchor is null");
-    }
-
-    if (!(witnesses.size() == info.notes.size())) {
-        throw runtime_error("number of notes and witnesses do not match");
-    }
-
-    for (size_t i = 0; i < witnesses.size(); i++) {
-        if (!witnesses[i]) {
-            throw runtime_error("joinsplit input could not be found in tree");
+        LOCK2(cs_main, pwalletMain->cs_wallet);
+        std::vector<JSOutPoint> vOutPoints;
+        for (const auto& t : spendable.sproutNoteEntries) {
+            vOutPoints.push_back(t.jsop);
         }
-        info.vjsin.push_back(JSInput(*witnesses[i], info.notes[i], std::get<libzcash::SproutSpendingKey>(spendingkey_)));
-    }
-
-    // Make sure there are two inputs and two outputs
-    while (info.vjsin.size() < ZC_NUM_JS_INPUTS) {
-        info.vjsin.push_back(JSInput());
-    }
-
-    while (info.vjsout.size() < ZC_NUM_JS_OUTPUTS) {
-        info.vjsout.push_back(JSOutput());
-    }
 
-    if (info.vjsout.size() != ZC_NUM_JS_INPUTS || info.vjsin.size() != ZC_NUM_JS_OUTPUTS) {
-        throw runtime_error("unsupported joinsplit input/output counts");
+        // inputAnchor is not needed by builder_.AddSproutInput as it is for Sapling.
+        uint256 inputAnchor;
+        pwalletMain->GetSproutNoteWitnesses(vOutPoints, vSproutWitnesses, inputAnchor);
     }
 
-    CMutableTransaction mtx(tx_);
+    // Add Sprout spends
+    for (int i = 0; i < spendable.sproutNoteEntries.size(); i++) {
+        const auto& t = spendable.sproutNoteEntries[i];
+        libzcash::SproutSpendingKey sk;
+        assert(pwalletMain->GetSproutSpendingKey(t.address, sk));
 
-    LogPrint("zrpcunsafe", "%s: creating joinsplit at index %d (vpub_old=%s, vpub_new=%s, in[0]=%s, in[1]=%s, out[0]=%s, out[1]=%s)\n",
-            getId(),
-            tx_.vJoinSplit.size(),
-            FormatMoney(info.vpub_old), FormatMoney(info.vpub_new),
-            FormatMoney(info.vjsin[0].note.value()), FormatMoney(info.vjsin[1].note.value()),
-            FormatMoney(info.vjsout[0].value), FormatMoney(info.vjsout[1].value)
-            );
+        builder_.AddSproutInput(sk, t.note, vSproutWitnesses[i].value());
 
-    // Generate the proof, this can take over a minute.
-    std::array<libzcash::JSInput, ZC_NUM_JS_INPUTS> inputs
-            {info.vjsin[0], info.vjsin[1]};
-    std::array<libzcash::JSOutput, ZC_NUM_JS_OUTPUTS> outputs
-            {info.vjsout[0], info.vjsout[1]};
-    std::array<size_t, ZC_NUM_JS_INPUTS> inputMap;
-    std::array<size_t, ZC_NUM_JS_OUTPUTS> outputMap;
-
-    uint256 esk; // payment disclosure - secret
-
-    assert(mtx.fOverwintered && (mtx.nVersion >= SAPLING_TX_VERSION));
-    JSDescription jsdesc = JSDescriptionInfo(
-            joinSplitPubKey_,
-            anchor,
-            inputs,
-            outputs,
-            info.vpub_old,
-            info.vpub_new
-    ).BuildRandomized(
-            inputMap,
-            outputMap,
-            !this->testmode,
-            &esk); // parameter expects pointer to esk, so pass in address
-    {
-        auto verifier = ProofVerifier::Strict();
-        if (!(verifier.VerifySprout(jsdesc, joinSplitPubKey_))) {
-            throw std::runtime_error("error verifying joinsplit");
+        sum += t.note.value();
+        if (sum >= targetAmount) {
+            break;
         }
     }
 
-    mtx.vJoinSplit.push_back(jsdesc);
-
-    // Empty output script.
-    CScript scriptCode;
-    CTransaction signTx(mtx);
-    uint256 dataToBeSigned = SignatureHash(scriptCode, signTx, NOT_AN_INPUT, SIGHASH_ALL, 0, consensusBranchId_);
-
-    // Add the signature
-    if (!ed25519_sign(
-        &joinSplitPrivKey_,
-        dataToBeSigned.begin(), 32,
-        &mtx.joinSplitSig))
-    {
-        throw std::runtime_error("ed25519_sign failed");
-    }
-
-    // Sanity check
-    if (!ed25519_verify(
-        &mtx.joinSplitPubKey,
-        &mtx.joinSplitSig,
-        dataToBeSigned.begin(), 32))
-    {
-        throw std::runtime_error("ed25519_verify failed");
-    }
-
-    CTransaction rawTx(mtx);
-    tx_ = rawTx;
+    // Build the transaction
+    auto buildResult = builder_.Build();
+    auto tx = buildResult.GetTxOrThrow();
 
-    CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
-    ss << rawTx;
+    UniValue sendResult = SendTransaction(tx, recipients_, std::nullopt, testmode);
+    set_result(sendResult);
 
-    std::string encryptedNote1;
-    std::string encryptedNote2;
-    {
-        CDataStream ss2(SER_NETWORK, PROTOCOL_VERSION);
-        ss2 << ((unsigned char) 0x00);
-        ss2 << jsdesc.ephemeralKey;
-        ss2 << jsdesc.ciphertexts[0];
-        ss2 << ZCJoinSplit::h_sig(jsdesc.randomSeed, jsdesc.nullifiers, joinSplitPubKey_);
-
-        encryptedNote1 = HexStr(ss2.begin(), ss2.end());
-    }
-    {
-        CDataStream ss2(SER_NETWORK, PROTOCOL_VERSION);
-        ss2 << ((unsigned char) 0x01);
-        ss2 << jsdesc.ephemeralKey;
-        ss2 << jsdesc.ciphertexts[1];
-        ss2 << ZCJoinSplit::h_sig(jsdesc.randomSeed, jsdesc.nullifiers, joinSplitPubKey_);
-
-        encryptedNote2 = HexStr(ss2.begin(), ss2.end());
-    }
-
-    UniValue arrInputMap(UniValue::VARR);
-    UniValue arrOutputMap(UniValue::VARR);
-    for (size_t i = 0; i < ZC_NUM_JS_INPUTS; i++) {
-        arrInputMap.push_back(static_cast<uint64_t>(inputMap[i]));
-    }
-    for (size_t i = 0; i < ZC_NUM_JS_OUTPUTS; i++) {
-        arrOutputMap.push_back(static_cast<uint64_t>(outputMap[i]));
-    }
-
-    KeyIO keyIO(Params());
-
-    // !!! Payment disclosure START
-    size_t js_index = tx_.vJoinSplit.size() - 1;
-    uint256 placeholder;
-    for (int i = 0; i < ZC_NUM_JS_OUTPUTS; i++) {
-        uint8_t mapped_index = outputMap[i];
-        // placeholder for txid will be filled in later when tx has been finalized and signed.
-        PaymentDisclosureKey pdKey = {placeholder, js_index, mapped_index};
-        JSOutput output = outputs[mapped_index];
-        libzcash::SproutPaymentAddress zaddr = output.addr;  // randomized output
-        PaymentDisclosureInfo pdInfo = {PAYMENT_DISCLOSURE_VERSION_EXPERIMENTAL, esk, joinSplitPrivKey_, zaddr};
-        paymentDisclosureData_.push_back(PaymentDisclosureKeyInfo(pdKey, pdInfo));
-
-        LogPrint("paymentdisclosure", "%s: Payment Disclosure: js=%d, n=%d, zaddr=%s\n", getId(), js_index, int(mapped_index), keyIO.EncodePaymentAddress(zaddr));
-    }
-    // !!! Payment disclosure END
-
-    UniValue obj(UniValue::VOBJ);
-    obj.pushKV("encryptednote1", encryptedNote1);
-    obj.pushKV("encryptednote2", encryptedNote2);
-    obj.pushKV("rawtxn", HexStr(ss.begin(), ss.end()));
-    obj.pushKV("inputmap", arrInputMap);
-    obj.pushKV("outputmap", arrOutputMap);
-    return obj;
+    return tx.GetHash();
 }
 
-void AsyncRPCOperation_sendmany::add_taddr_outputs_to_tx() {
-
-    CMutableTransaction rawTx(tx_);
-
-    KeyIO keyIO(Params());
-
-    for (SendManyRecipient & r : t_outputs_) {
-        std::string outputAddress = r.address;
-        CAmount nAmount = r.amount;
-
-        CTxDestination address = keyIO.DecodeDestination(outputAddress);
-        if (!IsValidDestination(address)) {
-            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid output address, not a valid taddr.");
-        }
-
-        CScript scriptPubKey = GetScriptForDestination(address);
-
-        CTxOut out(nAmount, scriptPubKey);
-        rawTx.vout.push_back(out);
+std::pair<uint256, uint256> AsyncRPCOperation_sendmany::SelectOVKs(const SpendableInputs& spendable) const {
+    uint256 internalOVK;
+    uint256 externalOVK;
+    if (!spendable.orchardNoteMetadata.empty()) {
+        std::optional<OrchardFullViewingKey> fvk;
+        std::visit(match {
+            [&](const UnifiedAddress& addr) {
+                auto ufvk = pwalletMain->GetUFVKForAddress(addr);
+                // This is safe because spending key checks will have ensured that we
+                // have a UFVK corresponding to this address, and Orchard notes will
+                // not have been selected if the UFVK does not contain an Orchard key.
+                fvk = ufvk.value().GetOrchardKey().value();
+            },
+            [&](const UnifiedFullViewingKey& ufvk) {
+                // Orchard notes will not have been selected if the UFVK does not contain
+                // an Orchard key.
+                fvk = ufvk.GetOrchardKey().value();
+            },
+            [&](const AccountZTXOPattern& acct) {
+                // By definition, we have a UFVK for every known account.
+                auto ufvk = pwalletMain->GetUnifiedFullViewingKeyByAccount(acct.GetAccountId());
+                // Orchard notes will not have been selected if the UFVK does not contain
+                // an Orchard key.
+                fvk = ufvk.value().GetOrchardKey().value();
+            },
+            [&](const auto& other) {
+                throw std::runtime_error("SelectOVKs: Selector cannot select Orchard notes.");
+            }
+        }, this->ztxoSelector_.GetPattern());
+        assert(fvk.has_value());
+
+        internalOVK = fvk.value().ToInternalOutgoingViewingKey();
+        externalOVK = fvk.value().ToExternalOutgoingViewingKey();
+    } else if (!spendable.saplingNoteEntries.empty()) {
+        std::optional<SaplingDiversifiableFullViewingKey> dfvk;
+        std::visit(match {
+            [&](const libzcash::SaplingPaymentAddress& addr) {
+                libzcash::SaplingExtendedSpendingKey extsk;
+                assert(pwalletMain->GetSaplingExtendedSpendingKey(addr, extsk));
+                dfvk = extsk.ToXFVK();
+            },
+            [&](const UnifiedAddress& addr) {
+                auto ufvk = pwalletMain->GetUFVKForAddress(addr);
+                // This is safe because spending key checks will have ensured that we
+                // have a UFVK corresponding to this address, and Sapling notes will
+                // not have been selected if the UFVK does not contain a Sapling key.
+                dfvk = ufvk.value().GetSaplingKey().value();
+            },
+            [&](const UnifiedFullViewingKey& ufvk) {
+                // Sapling notes will not have been selected if the UFVK does not contain
+                // a Sapling key.
+                dfvk = ufvk.GetSaplingKey().value();
+            },
+            [&](const AccountZTXOPattern& acct) {
+                // By definition, we have a UFVK for every known account.
+                auto ufvk = pwalletMain->GetUnifiedFullViewingKeyByAccount(acct.GetAccountId());
+                // Sapling notes will not have been selected if the UFVK does not contain
+                // a Sapling key.
+                dfvk = ufvk.value().GetSaplingKey().value();
+            },
+            [&](const auto& other) {
+                throw std::runtime_error("SelectOVKs: Selector cannot select Sapling notes.");
+            }
+        }, this->ztxoSelector_.GetPattern());
+        assert(dfvk.has_value());
+
+        auto ovks = dfvk.value().GetOVKs();
+        internalOVK = ovks.first;
+        externalOVK = ovks.second;
+    } else if (!spendable.utxos.empty()) {
+        std::optional<transparent::AccountPubKey> tfvk;
+        std::visit(match {
+            [&](const CKeyID& keyId) {
+                tfvk = pwalletMain->GetLegacyAccountKey().ToAccountPubKey();
+            },
+            [&](const CScriptID& keyId) {
+                tfvk = pwalletMain->GetLegacyAccountKey().ToAccountPubKey();
+            },
+            [&](const UnifiedAddress& addr) {
+                // This is safe because spending key checks will have ensured that we
+                // have a UFVK corresponding to this address, and transparent UTXOs will
+                // not have been selected if the UFVK does not contain a transparent key.
+                auto ufvk = pwalletMain->GetUFVKForAddress(addr);
+                tfvk = ufvk.value().GetTransparentKey().value();
+            },
+            [&](const UnifiedFullViewingKey& ufvk) {
+                // Transparent UTXOs will not have been selected if the UFVK does not contain
+                // a transparent key.
+                tfvk = ufvk.GetTransparentKey().value();
+            },
+            [&](const AccountZTXOPattern& acct) {
+                if (acct.GetAccountId() == ZCASH_LEGACY_ACCOUNT) {
+                    tfvk = pwalletMain->GetLegacyAccountKey().ToAccountPubKey();
+                } else {
+                    // By definition, we have a UFVK for every known account.
+                    auto ufvk = pwalletMain->GetUnifiedFullViewingKeyByAccount(acct.GetAccountId()).value();
+                    // Transparent UTXOs will not have been selected if the UFVK does not contain
+                    // a transparent key.
+                    tfvk = ufvk.GetTransparentKey().value();
+                }
+            },
+            [&](const auto& other) {
+                throw std::runtime_error("SelectOVKs: Selector cannot select transparent UTXOs.");
+            }
+        }, this->ztxoSelector_.GetPattern());
+        assert(tfvk.has_value());
+
+        auto ovks = tfvk.value().GetOVKsForShielding();
+        internalOVK = ovks.first;
+        externalOVK = ovks.second;
+    } else if (!spendable.sproutNoteEntries.empty()) {
+        // use the legacy transparent account OVKs when sending from Sprout
+        auto tfvk = pwalletMain->GetLegacyAccountKey().ToAccountPubKey();
+        auto ovks = tfvk.GetOVKsForShielding();
+        internalOVK = ovks.first;
+        externalOVK = ovks.second;
+    } else {
+        // This should be unreachable; it is left in place as a guard to ensure
+        // that when new input types are added to SpendableInputs in the future
+        // that we do not accidentally return the all-zeros OVK.
+        throw std::runtime_error("No spendable inputs.");
     }
 
-    tx_ = CTransaction(rawTx);
+    return std::make_pair(internalOVK, externalOVK);
 }
 
-void AsyncRPCOperation_sendmany::add_taddr_change_output_to_tx(CReserveKey& keyChange, CAmount amount) {
-
-    LOCK2(cs_main, pwalletMain->cs_wallet);
-
-    EnsureWalletIsUnlocked();
-    CPubKey vchPubKey;
-    bool ret = keyChange.GetReservedKey(vchPubKey);
-    if (!ret) {
-        throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Could not generate a taddr to use as a change address"); // should never fail, as we just unlocked
-    }
-    CScript scriptPubKey = GetScriptForDestination(vchPubKey.GetID());
-    CTxOut out(amount, scriptPubKey);
-
-    CMutableTransaction rawTx(tx_);
-    rawTx.vout.push_back(out);
-    tx_ = CTransaction(rawTx);
+/**
+ * Compute a dust threshold based upon a standard p2pkh txout.
+ */
+CAmount AsyncRPCOperation_sendmany::DefaultDustThreshold() {
+    CKey secret{CKey::TestOnlyRandomKey(true)};
+    CScript scriptPubKey = GetScriptForDestination(secret.GetPubKey().GetID());
+    CTxOut txout(CAmount(1), scriptPubKey);
+    // TODO: use a local for minRelayTxFee rather than a global
+    return txout.GetDustThreshold(minRelayTxFee);
 }
 
 std::array<unsigned char, ZC_MEMO_SIZE> AsyncRPCOperation_sendmany::get_memo_from_hex_string(std::string s) {
@@ -1216,7 +747,9 @@ std::array<unsigned char, ZC_MEMO_SIZE> AsyncRPCOperation_sendmany::get_memo_fro
     }
 
     if (rawMemo.size() > ZC_MEMO_SIZE) {
-        throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Memo size of %d is too big, maximum allowed is %d", rawMemo.size(), ZC_MEMO_SIZE));
+        throw JSONRPCError(
+                RPC_INVALID_PARAMETER,
+                strprintf("Memo size of %d bytes is too big, maximum allowed is %d bytes", rawMemo.size(), ZC_MEMO_SIZE));
     }
 
     // copy vector into boost array
@@ -1241,4 +774,3 @@ UniValue AsyncRPCOperation_sendmany::getStatus() const {
     obj.pushKV("params", contextinfo_ );
     return obj;
 }
-
diff --git a/src/wallet/asyncrpcoperation_sendmany.h b/src/wallet/asyncrpcoperation_sendmany.h
index 7bd92dfeaad..92b82d955d1 100644
--- a/src/wallet/asyncrpcoperation_sendmany.h
+++ b/src/wallet/asyncrpcoperation_sendmany.h
@@ -24,53 +24,31 @@
 #include <rust/ed25519/types.h>
 
 using namespace libzcash;
-class TxValues;
 
-class SendManyRecipient {
+class SendManyRecipient : public RecipientMapping {
 public:
-    std::string address;
     CAmount amount;
-    std::string memo;
+    std::optional<std::string> memo;
 
-    SendManyRecipient(std::string address_, CAmount amount_, std::string memo_) :
-        address(address_), amount(amount_), memo(memo_) {}
+    SendManyRecipient(std::optional<libzcash::UnifiedAddress> ua_, libzcash::RecipientAddress address_, CAmount amount_, std::optional<std::string> memo_) :
+        RecipientMapping(ua_, address_), amount(amount_), memo(memo_) {}
 };
 
-class SendManyInputJSOP {
+class TxOutputAmounts {
 public:
-    JSOutPoint point;
-    SproutNote note;
-    CAmount amount;
-
-    SendManyInputJSOP(JSOutPoint point_, SproutNote note_, CAmount amount_) :
-        point(point_), note(note_), amount(amount_) {}
-};
-
-// Package of info which is passed to perform_joinsplit methods.
-struct AsyncJoinSplitInfo
-{
-    std::vector<JSInput> vjsin;
-    std::vector<JSOutput> vjsout;
-    std::vector<SproutNote> notes;
-    CAmount vpub_old = 0;
-    CAmount vpub_new = 0;
-};
-
-// A struct to help us track the witness and anchor for a given JSOutPoint
-struct WitnessAnchorData {
-	std::optional<SproutWitness> witness;
-	uint256 anchor;
+    CAmount t_outputs_total{0};
+    CAmount sapling_outputs_total{0};
+    CAmount orchard_outputs_total{0};
 };
 
 class AsyncRPCOperation_sendmany : public AsyncRPCOperation {
 public:
     AsyncRPCOperation_sendmany(
-        std::optional<TransactionBuilder> builder,
-        CMutableTransaction contextualTx,
-        std::string fromAddress,
-        std::vector<SendManyRecipient> tOutputs,
-        std::vector<SendManyRecipient> zOutputs,
+        TransactionBuilder builder,
+        ZTXOSelector ztxoSelector,
+        std::vector<SendManyRecipient> recipients,
         int minDepth,
+        TransactionStrategy strategy,
         CAmount fee = DEFAULT_FEE,
         UniValue contextInfo = NullUniValue);
     virtual ~AsyncRPCOperation_sendmany();
@@ -85,67 +63,38 @@ class AsyncRPCOperation_sendmany : public AsyncRPCOperation {
 
     virtual UniValue getStatus() const;
 
-    bool testmode = false;  // Set to true to disable sending txs and generating proofs
-
-    bool paymentDisclosureMode = false; // Set to true to save esk for encrypted notes in payment disclosure database.
+    bool testmode{false};  // Set to true to disable sending txs and generating proofs
 
 private:
     friend class TEST_FRIEND_AsyncRPCOperation_sendmany;    // class for unit testing
 
+    TransactionBuilder builder_;
+    ZTXOSelector ztxoSelector_;
+    std::vector<SendManyRecipient> recipients_;
+    int mindepth_{1};
+    CAmount fee_;
     UniValue contextinfo_;     // optional data to include in return value from getStatus()
 
-    bool isUsingBuilder_; // Indicates that no Sprout addresses are involved
-    uint32_t consensusBranchId_;
-    CAmount fee_;
-    int mindepth_;
-    std::string fromaddress_;
-    bool useanyutxo_;
-    bool isfromtaddr_;
-    bool isfromzaddr_;
-    CTxDestination fromtaddr_;
-    PaymentAddress frompaymentaddress_;
-    SpendingKey spendingkey_;
-
-    Ed25519VerificationKey joinSplitPubKey_;
-    Ed25519SigningKey joinSplitPrivKey_;
-
-    // The key is the result string from calling JSOutPoint::ToString()
-    std::unordered_map<std::string, WitnessAnchorData> jsopWitnessAnchorMap;
-
-    std::vector<SendManyRecipient> t_outputs_;
-    std::vector<SendManyRecipient> z_outputs_;
-    std::vector<COutput> t_inputs_;
-    std::vector<SendManyInputJSOP> z_sprout_inputs_;
-    std::vector<SaplingNoteEntry> z_sapling_inputs_;
+    bool isfromsprout_{false};
+    bool isfromsapling_{false};
+    TransactionStrategy strategy_;
+    uint32_t transparentRecipients_{0};
+    AccountId sendFromAccount_;
+    std::set<OutputPool> recipientPools_;
+    TxOutputAmounts txOutputAmounts_;
 
-    TransactionBuilder builder_;
-    CTransaction tx_;
-
-    void add_taddr_change_output_to_tx(CReserveKey& keyChange, CAmount amount);
-    void add_taddr_outputs_to_tx();
-    bool find_unspent_notes();
-    bool find_utxos(bool fAcceptCoinbase, TxValues& txValues);
-    // Load transparent inputs into the transaction or the transactionBuilder (in case of have it)
-    bool load_inputs(TxValues& txValues);
-    std::array<unsigned char, ZC_MEMO_SIZE> get_memo_from_hex_string(std::string s);
-    bool main_impl();
-
-    // JoinSplit without any input notes to spend
-    UniValue perform_joinsplit(AsyncJoinSplitInfo &);
-
-    // JoinSplit with input notes to spend (JSOutPoints))
-    UniValue perform_joinsplit(AsyncJoinSplitInfo &, std::vector<JSOutPoint> & );
-
-    // JoinSplit where you have the witnesses and anchor
-    UniValue perform_joinsplit(
-        AsyncJoinSplitInfo & info,
-        std::vector<std::optional < SproutWitness>> witnesses,
-        uint256 anchor);
-
-    // payment disclosure!
-    std::vector<PaymentDisclosureKeyInfo> paymentDisclosureData_;
-};
+    /**
+     * Compute the internal and external OVKs to use in transaction construction, given
+     * the spendable inputs.
+     */
+    std::pair<uint256, uint256> SelectOVKs(const SpendableInputs& spendable) const;
 
+    static CAmount DefaultDustThreshold();
+
+    static std::array<unsigned char, ZC_MEMO_SIZE> get_memo_from_hex_string(std::string s);
+
+    uint256 main_impl();
+};
 
 // To test private methods, a friend class can act as a proxy
 class TEST_FRIEND_AsyncRPCOperation_sendmany {
@@ -154,52 +103,14 @@ class TEST_FRIEND_AsyncRPCOperation_sendmany {
 
     TEST_FRIEND_AsyncRPCOperation_sendmany(std::shared_ptr<AsyncRPCOperation_sendmany> ptr) : delegate(ptr) {}
 
-    CTransaction getTx() {
-        return delegate->tx_;
-    }
-
-    void setTx(CTransaction tx) {
-        delegate->tx_ = tx;
-    }
-
-    // Delegated methods
-
-    void add_taddr_change_output_to_tx(CReserveKey& keyChange, CAmount amount) {
-        delegate->add_taddr_change_output_to_tx(keyChange, amount);
-    }
-
-    void add_taddr_outputs_to_tx() {
-        delegate->add_taddr_outputs_to_tx();
-    }
-
-    bool find_unspent_notes() {
-        return delegate->find_unspent_notes();
-    }
-
     std::array<unsigned char, ZC_MEMO_SIZE> get_memo_from_hex_string(std::string s) {
         return delegate->get_memo_from_hex_string(s);
     }
 
-    bool main_impl() {
+    uint256 main_impl() {
         return delegate->main_impl();
     }
 
-    UniValue perform_joinsplit(AsyncJoinSplitInfo &info) {
-        return delegate->perform_joinsplit(info);
-    }
-
-    UniValue perform_joinsplit(AsyncJoinSplitInfo &info, std::vector<JSOutPoint> &v ) {
-        return delegate->perform_joinsplit(info, v);
-    }
-
-    UniValue perform_joinsplit(
-        AsyncJoinSplitInfo & info,
-        std::vector<std::optional < SproutWitness>> witnesses,
-        uint256 anchor)
-    {
-        return delegate->perform_joinsplit(info, witnesses, anchor);
-    }
-
     void set_state(OperationStatus state) {
         delegate->state_.store(state);
     }
diff --git a/src/wallet/asyncrpcoperation_shieldcoinbase.cpp b/src/wallet/asyncrpcoperation_shieldcoinbase.cpp
index 31098c40418..a93aadf8156 100644
--- a/src/wallet/asyncrpcoperation_shieldcoinbase.cpp
+++ b/src/wallet/asyncrpcoperation_shieldcoinbase.cpp
@@ -26,6 +26,7 @@
 #include "walletdb.h"
 #include "script/interpreter.h"
 #include "utiltime.h"
+#include "util/match.h"
 #include "zcash/IncrementalMerkleTree.hpp"
 #include "miner.h"
 #include "wallet/paymentdisclosuredb.h"
@@ -63,10 +64,10 @@ AsyncRPCOperation_shieldcoinbase::AsyncRPCOperation_shieldcoinbase(
         TransactionBuilder builder,
         CMutableTransaction contextualTx,
         std::vector<ShieldCoinbaseUTXO> inputs,
-        std::string toAddress,
+        PaymentAddress toAddress,
         CAmount fee,
         UniValue contextInfo) :
-        builder_(builder), tx_(contextualTx), inputs_(inputs), fee_(fee), contextinfo_(contextInfo)
+        builder_(std::move(builder)), tx_(contextualTx), inputs_(inputs), fee_(fee), contextinfo_(contextInfo)
 {
     assert(contextualTx.nVersion >= 2);  // transaction format version must support vJoinSplit
 
@@ -79,13 +80,23 @@ AsyncRPCOperation_shieldcoinbase::AsyncRPCOperation_shieldcoinbase(
     }
 
     //  Check the destination address is valid for this network i.e. not testnet being used on mainnet
-    KeyIO keyIO(Params());
-    auto address = keyIO.DecodePaymentAddress(toAddress);
-    if (IsValidPaymentAddress(address)) {
-        tozaddr_ = address;
-    } else {
-        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid to address");
-    }
+    std::visit(match {
+        [&](CKeyID addr) {
+            throw JSONRPCError(RPC_VERIFY_REJECTED, "Cannot shield coinbase output to a p2pkh address.");
+        },
+        [&](CScriptID addr) {
+            throw JSONRPCError(RPC_VERIFY_REJECTED, "Cannot shield coinbase output to a p2sh address.");
+        },
+        [&](libzcash::SaplingPaymentAddress addr) {
+            tozaddr_ = addr;
+        },
+        [&](libzcash::SproutPaymentAddress addr) {
+            tozaddr_ = addr;
+        },
+        [&](libzcash::UnifiedAddress addr) {
+            tozaddr_ = addr;
+        }
+    }, toAddress);
 
     // Log the context info
     if (LogAcceptCategory("zrpcunsafe")) {
@@ -202,6 +213,37 @@ bool AsyncRPCOperation_shieldcoinbase::main_impl() {
     return std::visit(ShieldToAddress(this, sendAmount), tozaddr_);
 }
 
+void ShieldToAddress::shieldToAddress(const libzcash::RecipientAddress& recipient, AsyncRPCOperation_shieldcoinbase *m_op) {
+    m_op->builder_.SetFee(m_op->fee_);
+
+    // Sending from a t-address, which we don't have an ovk for. Instead,
+    // generate a common one from the HD seed. This ensures the data is
+    // recoverable, while keeping it logically separate from the ZIP 32
+    // Sapling key hierarchy, which the user might not be using.
+    // FIXME: update to use the ZIP-316 OVK (#5511)
+    HDSeed seed = pwalletMain->GetHDSeedForRPC();
+    uint256 ovk = ovkForShieldingFromTaddr(seed);
+
+    // Add transparent inputs
+    for (auto t : m_op->inputs_) {
+        m_op->builder_.AddTransparentInput(COutPoint(t.txid, t.vout), t.scriptPubKey, t.amount);
+    }
+
+    // Send all value to the target recipient
+    m_op->builder_.SendChangeTo(recipient, ovk);
+
+    // Build the transaction
+    m_op->tx_ = m_op->builder_.Build().GetTxOrThrow();
+}
+
+bool ShieldToAddress::operator()(const CKeyID &addr) const {
+    return false;
+}
+
+bool ShieldToAddress::operator()(const CScriptID &addr) const {
+    return false;
+}
+
 bool ShieldToAddress::operator()(const libzcash::SproutPaymentAddress &zaddr) const {
     // update the transaction with these inputs
     CMutableTransaction rawTx(m_op->tx_);
@@ -231,44 +273,32 @@ bool ShieldToAddress::operator()(const libzcash::SproutPaymentAddress &zaddr) co
     return true;
 }
 
-
 bool ShieldToAddress::operator()(const libzcash::SaplingPaymentAddress &zaddr) const {
-    m_op->builder_.SetFee(m_op->fee_);
-
-    // Sending from a t-address, which we don't have an ovk for. Instead,
-    // generate a common one from the HD seed. This ensures the data is
-    // recoverable, while keeping it logically separate from the ZIP 32
-    // Sapling key hierarchy, which the user might not be using.
-    HDSeed seed = pwalletMain->GetHDSeedForRPC();
-    uint256 ovk = ovkForShieldingFromTaddr(seed);
-
-    // Add transparent inputs
-    for (auto t : m_op->inputs_) {
-        m_op->builder_.AddTransparentInput(COutPoint(t.txid, t.vout), t.scriptPubKey, t.amount);
-    }
+    ShieldToAddress::shieldToAddress(zaddr, m_op);
 
-    // Send all value to the target z-addr
-    m_op->builder_.SendChangeTo(zaddr, ovk);
-
-    // Build the transaction
-    m_op->tx_ = m_op->builder_.Build().GetTxOrThrow();
-
-    UniValue sendResult = SendTransaction(m_op->tx_, std::nullopt, m_op->testmode);
+    std::vector<RecipientMapping> recipientMappings;
+    UniValue sendResult = SendTransaction(m_op->tx_, recipientMappings, std::nullopt, m_op->testmode);
     m_op->set_result(sendResult);
 
     return true;
 }
 
 bool ShieldToAddress::operator()(const libzcash::UnifiedAddress &uaddr) const {
-    // TODO
-    return false;
-}
+    // TODO check if an Orchard address is present, send to it if so.
+    const auto receiver{uaddr.GetSaplingReceiver()};
+    if (receiver.has_value()) {
+        ShieldToAddress::shieldToAddress(receiver.value(), m_op);
 
-bool ShieldToAddress::operator()(const libzcash::InvalidEncoding& no) const {
+        std::vector<RecipientMapping> recipientMappings = {RecipientMapping(uaddr, receiver.value())};
+        UniValue sendResult = SendTransaction(m_op->tx_, recipientMappings, std::nullopt, m_op->testmode);
+        m_op->set_result(sendResult);
+
+        return true;
+    }
+    // This UA must contain a transparent address, which can't be the destination of coinbase shielding.
     return false;
 }
 
-
 UniValue AsyncRPCOperation_shieldcoinbase::perform_joinsplit(ShieldCoinbaseJSInfo & info) {
     uint32_t consensusBranchId;
     uint256 anchor;
diff --git a/src/wallet/asyncrpcoperation_shieldcoinbase.h b/src/wallet/asyncrpcoperation_shieldcoinbase.h
index badc7fa5a99..9decdcb47f5 100644
--- a/src/wallet/asyncrpcoperation_shieldcoinbase.h
+++ b/src/wallet/asyncrpcoperation_shieldcoinbase.h
@@ -45,7 +45,7 @@ class AsyncRPCOperation_shieldcoinbase : public AsyncRPCOperation {
         TransactionBuilder builder,
         CMutableTransaction contextualTx,
         std::vector<ShieldCoinbaseUTXO> inputs,
-        std::string toAddress,
+        PaymentAddress toAddress,
         CAmount fee = DEFAULT_FEE,
         UniValue contextInfo = NullUniValue);
     virtual ~AsyncRPCOperation_shieldcoinbase();
@@ -99,14 +99,17 @@ class ShieldToAddress
 private:
     AsyncRPCOperation_shieldcoinbase *m_op;
     CAmount sendAmount;
+
+    static void shieldToAddress(const libzcash::RecipientAddress& recipient, AsyncRPCOperation_shieldcoinbase *m_op);
 public:
     ShieldToAddress(AsyncRPCOperation_shieldcoinbase *op, CAmount sendAmount) :
         m_op(op), sendAmount(sendAmount) {}
 
+    bool operator()(const CKeyID &zaddr) const;
+    bool operator()(const CScriptID &zaddr) const;
     bool operator()(const libzcash::SproutPaymentAddress &zaddr) const;
     bool operator()(const libzcash::SaplingPaymentAddress &zaddr) const;
     bool operator()(const libzcash::UnifiedAddress &uaddr) const;
-    bool operator()(const libzcash::InvalidEncoding& no) const;
 };
 
 
diff --git a/src/wallet/crypter.cpp b/src/wallet/crypter.cpp
index 10aacb37188..5ef7cabf38a 100644
--- a/src/wallet/crypter.cpp
+++ b/src/wallet/crypter.cpp
@@ -130,21 +130,50 @@ static bool DecryptSecret(const CKeyingMaterial& vMasterKey, const std::vector<u
     return cKeyCrypter.Decrypt(vchCiphertext, *((CKeyingMaterial*)&vchPlaintext));
 }
 
-static bool DecryptHDSeed(
+static CKeyingMaterial EncryptMnemonicSeed(const MnemonicSeed& seed)
+{
+    CSecureDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
+    ss << seed;
+    CKeyingMaterial vchSecret(ss.begin(), ss.end());
+
+    return vchSecret;
+}
+
+static std::optional<MnemonicSeed> DecryptMnemonicSeed(
     const CKeyingMaterial& vMasterKey,
     const std::vector<unsigned char>& vchCryptedSecret,
-    const uint256& seedFp,
-    HDSeed& seed)
+    const uint256& seedFp)
 {
     CKeyingMaterial vchSecret;
 
     // Use seed's fingerprint as IV
     // TODO: Handle IV properly when we make encryption a supported feature
-    if(!DecryptSecret(vMasterKey, vchCryptedSecret, seedFp, vchSecret))
-        return false;
+    if (DecryptSecret(vMasterKey, vchCryptedSecret, seedFp, vchSecret)) {
+        CSecureDataStream ss(vchSecret, SER_NETWORK, PROTOCOL_VERSION);
+        auto seed = MnemonicSeed::Read(ss);
+        if (seed.Fingerprint() == seedFp) {
+            return seed;
+        }
+    }
+    return std::nullopt;
+}
 
-    seed = HDSeed(vchSecret);
-    return seed.Fingerprint() == seedFp;
+static std::optional<HDSeed> DecryptLegacyHDSeed(
+    const CKeyingMaterial& vMasterKey,
+    const std::vector<unsigned char>& vchCryptedSecret,
+    const uint256& seedFp)
+{
+    CKeyingMaterial vchSecret;
+
+    // Use seed's fingerprint as IV
+    // TODO: Handle IV properly when we make encryption a supported feature
+    if (DecryptSecret(vMasterKey, vchCryptedSecret, seedFp, vchSecret)) {
+        auto seed = HDSeed(vchSecret);
+        if (seed.Fingerprint() == seedFp) {
+            return seed;
+        }
+    }
+    return std::nullopt;
 }
 
 static bool DecryptKey(const CKeyingMaterial& vMasterKey, const std::vector<unsigned char>& vchCryptedSecret, const CPubKey& vchPubKey, CKey& key)
@@ -227,10 +256,21 @@ bool CCryptoKeyStore::Unlock(const CKeyingMaterial& vMasterKeyIn)
 
         bool keyPass = false;
         bool keyFail = false;
-        if (!cryptedHDSeed.first.IsNull()) {
-            HDSeed seed;
-            if (!DecryptHDSeed(vMasterKeyIn, cryptedHDSeed.second, cryptedHDSeed.first, seed))
-            {
+        if (!cryptedMnemonicSeed.first.IsNull()) {
+            // Check that we can successfully decrypt the mnemonic seed, if present
+            auto seed = DecryptMnemonicSeed(vMasterKeyIn, cryptedMnemonicSeed.second, cryptedMnemonicSeed.first);
+            if (!seed.has_value()) {
+                keyFail = true;
+            } else {
+                keyPass = true;
+            }
+        }
+        if (cryptedLegacySeed.has_value()) {
+            // Check that we can successfully decrypt the legacy seed, if present
+            auto seed = DecryptLegacyHDSeed(vMasterKeyIn,
+                                            cryptedLegacySeed.value().second,
+                                            cryptedLegacySeed.value().first);
+            if (!seed.has_value()) {
                 keyFail = true;
             } else {
                 keyPass = true;
@@ -295,71 +335,138 @@ bool CCryptoKeyStore::Unlock(const CKeyingMaterial& vMasterKeyIn)
     return true;
 }
 
-bool CCryptoKeyStore::SetHDSeed(const HDSeed& seed)
+//
+// Mnemonic HD seeds
+//
+
+bool CCryptoKeyStore::SetMnemonicSeed(const MnemonicSeed& seed)
 {
     {
         LOCK(cs_KeyStore);
         if (!fUseCrypto) {
-            return CBasicKeyStore::SetHDSeed(seed);
+            return CBasicKeyStore::SetMnemonicSeed(seed);
         }
 
         if (IsLocked())
             return false;
 
-        std::vector<unsigned char> vchCryptedSecret;
         // Use seed's fingerprint as IV
         // TODO: Handle this properly when we make encryption a supported feature
         auto seedFp = seed.Fingerprint();
-        if (!EncryptSecret(vMasterKey, seed.RawSeed(), seedFp, vchCryptedSecret))
+        CKeyingMaterial vchSecret = EncryptMnemonicSeed(seed);
+
+        std::vector<unsigned char> vchCryptedSecret;
+        if (!EncryptSecret(vMasterKey, vchSecret, seedFp, vchCryptedSecret))
             return false;
 
         // This will call into CWallet to store the crypted seed to disk
-        if (!SetCryptedHDSeed(seedFp, vchCryptedSecret))
+        if (!SetCryptedMnemonicSeed(seedFp, vchCryptedSecret))
             return false;
     }
     return true;
 }
 
-bool CCryptoKeyStore::SetCryptedHDSeed(
+bool CCryptoKeyStore::SetCryptedMnemonicSeed(
     const uint256& seedFp,
     const std::vector<unsigned char>& vchCryptedSecret)
 {
     LOCK(cs_KeyStore);
-    if (!fUseCrypto) {
+    if (!fUseCrypto || !cryptedMnemonicSeed.first.IsNull()) {
+        // Either wallet encryption is disabled, or the wallet already has an
+        // existing mnemonic. In either case, don't allow a new mnemonic.
         return false;
+    } else {
+        cryptedMnemonicSeed = std::make_pair(seedFp, vchCryptedSecret);
+        return true;
     }
+}
 
-    if (!cryptedHDSeed.first.IsNull()) {
-        // Don't allow an existing seed to be changed. We can maybe relax this
-        // restriction later once we have worked out the UX implications.
-        return false;
+bool CCryptoKeyStore::HaveMnemonicSeed() const
+{
+    LOCK(cs_KeyStore);
+    if (fUseCrypto) {
+        return !cryptedMnemonicSeed.second.empty();
+    } else {
+        return CBasicKeyStore::HaveMnemonicSeed();
     }
-
-    cryptedHDSeed = std::make_pair(seedFp, vchCryptedSecret);
-    return true;
 }
 
-bool CCryptoKeyStore::HaveHDSeed() const
+std::optional<MnemonicSeed> CCryptoKeyStore::GetMnemonicSeed() const
 {
     LOCK(cs_KeyStore);
-    if (!fUseCrypto)
-        return CBasicKeyStore::HaveHDSeed();
+    if (fUseCrypto) {
+        if (cryptedMnemonicSeed.second.empty()) {
+            return std::nullopt;
+        } else {
+            return DecryptMnemonicSeed(vMasterKey, cryptedMnemonicSeed.second, cryptedMnemonicSeed.first);
+        }
+    } else {
+        return CBasicKeyStore::GetMnemonicSeed();
+    }
+}
+
+//
+// Legacy HD seeds
+//
 
-    return !cryptedHDSeed.second.empty();
+bool CCryptoKeyStore::SetLegacyHDSeed(const HDSeed& seed)
+{
+    {
+        LOCK(cs_KeyStore);
+        if (!fUseCrypto) {
+            return CBasicKeyStore::SetLegacyHDSeed(seed);
+        }
+
+        if (IsLocked())
+            return false;
+
+        // Use seed's fingerprint as IV
+        // TODO: Handle this properly when we make encryption a supported feature
+        auto seedFp = seed.Fingerprint();
+        std::vector<unsigned char> vchCryptedSecret;
+        if (!EncryptSecret(vMasterKey, seed.RawSeed(), seedFp, vchCryptedSecret))
+            return false;
+
+        // This will call into CWallet to store the crypted seed to disk
+        if (!SetCryptedLegacyHDSeed(seedFp, vchCryptedSecret))
+            return false;
+    }
+    return true;
 }
 
-bool CCryptoKeyStore::GetHDSeed(HDSeed& seedOut) const
+bool CCryptoKeyStore::SetCryptedLegacyHDSeed(
+    const uint256& seedFp,
+    const std::vector<unsigned char>& vchCryptedSecret)
 {
     LOCK(cs_KeyStore);
-    if (!fUseCrypto)
-        return CBasicKeyStore::GetHDSeed(seedOut);
-
-    if (cryptedHDSeed.second.empty())
+    if (!fUseCrypto || cryptedLegacySeed.has_value()) {
+        // Either wallet encryption is disabled, or the wallet already has an
+        // existing legacy seed. In either case, don't allow a new seed.
         return false;
+    } else {
+        cryptedLegacySeed = std::make_pair(seedFp, vchCryptedSecret);
+        return true;
+    }
+}
 
-    return DecryptHDSeed(vMasterKey, cryptedHDSeed.second, cryptedHDSeed.first, seedOut);
+std::optional<HDSeed> CCryptoKeyStore::GetLegacyHDSeed() const {
+    LOCK(cs_KeyStore);
+    if (fUseCrypto) {
+        if (cryptedLegacySeed.has_value()) {
+            const auto cryptedPair = cryptedLegacySeed.value();
+            return DecryptLegacyHDSeed(vMasterKey, cryptedPair.second, cryptedPair.first);
+        } else {
+            return std::nullopt;
+        }
+    } else {
+        return CBasicKeyStore::GetLegacyHDSeed();
+    }
 }
 
+//
+// Transparent public keys
+//
+
 bool CCryptoKeyStore::AddKeyPubKey(const CKey& key, const CPubKey &pubkey)
 {
     LOCK(cs_KeyStore);
@@ -420,6 +527,10 @@ bool CCryptoKeyStore::GetPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) co
     return CBasicKeyStore::GetPubKey(address, vchPubKeyOut);
 }
 
+//
+// Sprout & Sapling keys
+//
+
 bool CCryptoKeyStore::AddSproutSpendingKey(const libzcash::SproutSpendingKey &sk)
 {
     LOCK(cs_KeyStore);
@@ -536,21 +647,38 @@ bool CCryptoKeyStore::EncryptKeys(CKeyingMaterial& vMasterKeyIn)
             return false;
 
         fUseCrypto = true;
-        if (!hdSeed.IsNull()) {
+        if (mnemonicSeed.has_value()) {
+            {
+                std::vector<unsigned char> vchCryptedSecret;
+                // Use seed's fingerprint as IV
+                // TODO: Handle this properly when we make encryption a supported feature
+                auto seedFp = mnemonicSeed.value().Fingerprint();
+                auto seedData = EncryptMnemonicSeed(mnemonicSeed.value());
+                if (!EncryptSecret(vMasterKeyIn, seedData, seedFp, vchCryptedSecret)) {
+                    return false;
+                }
+                // This will call into CWallet to store the crypted seed to disk
+                if (!SetCryptedMnemonicSeed(seedFp, vchCryptedSecret)) {
+                    return false;
+                }
+            }
+            mnemonicSeed = std::nullopt;
+        }
+        if (legacySeed.has_value()) {
             {
                 std::vector<unsigned char> vchCryptedSecret;
                 // Use seed's fingerprint as IV
                 // TODO: Handle this properly when we make encryption a supported feature
-                auto seedFp = hdSeed.Fingerprint();
-                if (!EncryptSecret(vMasterKeyIn, hdSeed.RawSeed(), seedFp, vchCryptedSecret)) {
+                auto seedFp = legacySeed.value().Fingerprint();
+                if (!EncryptSecret(vMasterKeyIn, legacySeed.value().RawSeed(), seedFp, vchCryptedSecret)) {
                     return false;
                 }
                 // This will call into CWallet to store the crypted seed to disk
-                if (!SetCryptedHDSeed(seedFp, vchCryptedSecret)) {
+                if (!SetCryptedLegacyHDSeed(seedFp, vchCryptedSecret)) {
                     return false;
                 }
             }
-            hdSeed = HDSeed();
+            legacySeed = std::nullopt;
         }
         for (KeyMap::value_type& mKey : mapKeys)
         {
diff --git a/src/wallet/crypter.h b/src/wallet/crypter.h
index f6cd738093b..434e97cbef2 100644
--- a/src/wallet/crypter.h
+++ b/src/wallet/crypter.h
@@ -131,7 +131,8 @@ friend class wallet_crypto::TestCrypter; // for test access to chKey/chIV
 class CCryptoKeyStore : public CBasicKeyStore
 {
 private:
-    std::pair<uint256, std::vector<unsigned char>> cryptedHDSeed;
+    std::pair<uint256, std::vector<unsigned char>> cryptedMnemonicSeed;
+    std::optional<std::pair<uint256, std::vector<unsigned char>>> cryptedLegacySeed;
     CryptedKeyMap mapCryptedKeys;
     CryptedSproutSpendingKeyMap mapCryptedSproutSpendingKeys;
     CryptedSaplingSpendingKeyMap mapCryptedSaplingSpendingKeys;
@@ -172,10 +173,14 @@ class CCryptoKeyStore : public CBasicKeyStore
 
     bool Lock();
 
-    virtual bool SetCryptedHDSeed(const uint256& seedFp, const std::vector<unsigned char> &vchCryptedSecret);
-    bool SetHDSeed(const HDSeed& seed);
-    bool HaveHDSeed() const;
-    bool GetHDSeed(HDSeed& seedOut) const;
+    bool SetMnemonicSeed(const MnemonicSeed& seed);
+    virtual bool SetCryptedMnemonicSeed(const uint256& seedFp, const std::vector<unsigned char> &vchCryptedSecret);
+    bool HaveMnemonicSeed() const;
+    std::optional<MnemonicSeed> GetMnemonicSeed() const;
+
+    bool SetLegacyHDSeed(const HDSeed& seed);
+    virtual bool SetCryptedLegacyHDSeed(const uint256& seedFp, const std::vector<unsigned char> &vchCryptedSecret);
+    std::optional<HDSeed> GetLegacyHDSeed() const;
 
     virtual bool AddCryptedKey(const CPubKey &vchPubKey, const std::vector<unsigned char> &vchCryptedSecret);
     bool AddKeyPubKey(const CKey& key, const CPubKey &pubkey);
@@ -230,7 +235,7 @@ class CCryptoKeyStore : public CBasicKeyStore
             mi++;
         }
     }
-    //! Sapling 
+    //! Sapling
     virtual bool AddCryptedSaplingSpendingKey(
         const libzcash::SaplingExtendedFullViewingKey &extfvk,
         const std::vector<unsigned char> &vchCryptedSecret);
diff --git a/src/wallet/gtest/test_note_selection.cpp b/src/wallet/gtest/test_note_selection.cpp
new file mode 100644
index 00000000000..4ed7bf84397
--- /dev/null
+++ b/src/wallet/gtest/test_note_selection.cpp
@@ -0,0 +1,503 @@
+#include <gtest/gtest.h>
+
+#include "primitives/transaction.h"
+#include "wallet/wallet.h"
+#include "zcash/Note.hpp"
+#include "zcash/address/sapling.hpp"
+#include "zcash/address/sprout.hpp"
+
+using namespace libzcash;
+
+void PrintTo(const OutputPool& pool, std::ostream* os) {
+    switch (pool) {
+        case OutputPool::Orchard: *os << "Orchard"; break;
+        case OutputPool::Sapling: *os << "Sapling"; break;
+        case OutputPool::Transparent: *os << "Transparent"; break;
+    }
+}
+
+CWalletTx FakeWalletTx()
+{
+    CMutableTransaction mtx;
+    mtx.vout.resize(1);
+    mtx.vout[0].nValue = 1;
+    return CWalletTx(nullptr, mtx);
+}
+
+SpendableInputs FakeSpendableInputs(
+    std::set<OutputPool> available,
+    bool includeSprout,
+    const CWalletTx* wtx)
+{
+    SpendableInputs inputs;
+
+    if (available.count(OutputPool::Orchard)) {
+        auto seed = MnemonicSeed::Random(0);
+        auto sk = libzcash::OrchardSpendingKey::ForAccount(seed, 0, 0);
+        libzcash::diversifier_index_t j(0);
+        auto address = sk.ToFullViewingKey().ToIncomingViewingKey().Address(j);
+        for (int i = 0; i < 10; i++) {
+            OrchardOutPoint op;
+            inputs.orchardNoteMetadata.push_back(OrchardNoteMetadata{
+                op, address, 1, {}});
+        }
+    }
+
+    if (available.count(OutputPool::Sapling)) {
+        for (int i = 0; i < 10; i++) {
+            SaplingOutPoint op;
+            libzcash::SaplingPaymentAddress address;
+            libzcash::SaplingNote note(address, 1, libzcash::Zip212Enabled::AfterZip212);
+            inputs.saplingNoteEntries.push_back(SaplingNoteEntry{
+                op, address, note, {}, 100});
+        }
+    }
+
+    if (available.count(OutputPool::Transparent)) {
+        for (int i = 0; i < 10; i++) {
+            COutput utxo(wtx, 0, 100, true);
+            inputs.utxos.push_back(utxo);
+        }
+    }
+
+    if (includeSprout) {
+        for (int i = 0; i < 10; i++) {
+            JSOutPoint jsop;
+            libzcash::SproutPaymentAddress address;
+            libzcash::SproutNote note(uint256(), 1, uint256(), uint256());
+            inputs.sproutNoteEntries.push_back(SproutNoteEntry{
+                jsop, address, note, {}, 100});
+        }
+    }
+
+    return inputs;
+}
+
+class SpendableInputsTest :
+    public ::testing::TestWithParam<std::tuple<
+        // Pools with available inputs
+        std::set<OutputPool>,
+        // Recipient pools
+        std::set<OutputPool>,
+        // List of expected pool selection orders
+        std::vector<std::vector<OutputPool>>>> {
+};
+
+TEST_P(SpendableInputsTest, OrderListIsSequentiallyIncreasing)
+{
+    // The list of selection orders encodes the "failover" as we exceed the
+    // funds available in the selected pools. For simplicity, we require these
+    // to be sequentially increasing in length.
+    auto order = std::get<2>(GetParam());
+    for (int i = 0; i < order.size(); i++) {
+        EXPECT_EQ(order[i].size(), i + 1);
+    }
+}
+
+TEST_P(SpendableInputsTest, SelectsSproutBeforeFirst)
+{
+    auto available = std::get<0>(GetParam());
+    auto recipientPools = std::get<1>(GetParam());
+    auto order = std::get<2>(GetParam());
+    auto wtx = FakeWalletTx();
+
+    bool canSelectSprout = !(recipientPools.count(OutputPool::Orchard));
+
+    // Create a set of inputs from Sprout and the available pools.
+    auto inputs = FakeSpendableInputs(available, true, &wtx);
+    EXPECT_EQ(inputs.Total(), 10 * (available.size() + 1));
+
+    // We have Sprout notes along with the expected notes.
+    EXPECT_EQ(inputs.sproutNoteEntries.size(), 10);
+    for (auto pool : available) {
+        switch (pool) {
+            case OutputPool::Orchard: EXPECT_EQ(inputs.orchardNoteMetadata.size(), 10); break;
+            case OutputPool::Sapling: EXPECT_EQ(inputs.saplingNoteEntries.size(), 10); break;
+            case OutputPool::Transparent: EXPECT_EQ(inputs.utxos.size(), 10); break;
+        }
+    }
+
+    // Limit to 5 zatoshis (which can be satisfied by any pool).
+    EXPECT_TRUE(inputs.LimitToAmount(5, 1, recipientPools));
+    EXPECT_EQ(inputs.Total(), 5);
+
+    if (canSelectSprout) {
+        // We only have Sprout notes.
+        EXPECT_EQ(inputs.sproutNoteEntries.size(), 5);
+        for (auto pool : order[0]) {
+            switch (pool) {
+                case OutputPool::Orchard: EXPECT_EQ(inputs.orchardNoteMetadata.size(), 0); break;
+                case OutputPool::Sapling: EXPECT_EQ(inputs.saplingNoteEntries.size(), 0); break;
+                case OutputPool::Transparent: EXPECT_EQ(inputs.utxos.size(), 0); break;
+            }
+        }
+    } else {
+        // We never have Sprout notes.
+        EXPECT_EQ(inputs.sproutNoteEntries.size(), 0);
+        for (auto pool : order[0]) {
+            switch (pool) {
+                case OutputPool::Orchard: EXPECT_EQ(inputs.orchardNoteMetadata.size(), 5); break;
+                case OutputPool::Sapling: EXPECT_EQ(inputs.saplingNoteEntries.size(), 5); break;
+                case OutputPool::Transparent: EXPECT_EQ(inputs.utxos.size(), 5); break;
+            }
+        }
+    }
+}
+
+TEST_P(SpendableInputsTest, SelectsSproutThenFirst)
+{
+    auto available = std::get<0>(GetParam());
+    auto recipientPools = std::get<1>(GetParam());
+    auto order = std::get<2>(GetParam());
+    auto wtx = FakeWalletTx();
+
+    bool canSelectSprout = !(recipientPools.count(OutputPool::Orchard));
+
+    // Create a set of inputs from Sprout and the available pools.
+    auto inputs = FakeSpendableInputs(available, true, &wtx);
+    EXPECT_EQ(inputs.Total(), 10 * (available.size() + 1));
+
+    // We have Sprout notes along with the expected notes.
+    EXPECT_EQ(inputs.sproutNoteEntries.size(), 10);
+    for (auto pool : available) {
+        switch (pool) {
+            case OutputPool::Orchard: EXPECT_EQ(inputs.orchardNoteMetadata.size(), 10); break;
+            case OutputPool::Sapling: EXPECT_EQ(inputs.saplingNoteEntries.size(), 10); break;
+            case OutputPool::Transparent: EXPECT_EQ(inputs.utxos.size(), 10); break;
+        }
+    }
+
+    // Limit to 14 zatoshis (which requires two pools). If we only have one pool
+    // available and can't select Sprout, we won't have sufficient funds.
+    auto sufficientFunds = inputs.LimitToAmount(14, 1, std::get<1>(GetParam()));
+    if (available.size() == 1 && !canSelectSprout) {
+        EXPECT_FALSE(sufficientFunds);
+        EXPECT_EQ(inputs.Total(), 10);
+
+        // We have no Sprout notes and all from the first pool in the first order.
+        EXPECT_EQ(inputs.sproutNoteEntries.size(), 0);
+        for (int i = 0; i < order[0].size(); i++) {
+            auto expected = i == 0 ? 10 : 0;
+            switch (order[0][i]) {
+                case OutputPool::Orchard: EXPECT_EQ(inputs.orchardNoteMetadata.size(), expected); break;
+                case OutputPool::Sapling: EXPECT_EQ(inputs.saplingNoteEntries.size(), expected); break;
+                case OutputPool::Transparent: EXPECT_EQ(inputs.utxos.size(), expected); break;
+            }
+        }
+    } else {
+        EXPECT_TRUE(sufficientFunds);
+        EXPECT_EQ(inputs.Total(), 14);
+
+        if (canSelectSprout) {
+            // We have all Sprout notes and some from the first pool in the
+            // first order.
+            EXPECT_EQ(inputs.sproutNoteEntries.size(), 10);
+            for (int i = 0; i < order[0].size(); i++) {
+                auto expected = i == 0 ? 4 : 0;
+                switch (order[0][i]) {
+                    case OutputPool::Orchard: EXPECT_EQ(inputs.orchardNoteMetadata.size(), expected); break;
+                    case OutputPool::Sapling: EXPECT_EQ(inputs.saplingNoteEntries.size(), expected); break;
+                    case OutputPool::Transparent: EXPECT_EQ(inputs.utxos.size(), expected); break;
+                }
+            }
+        } else {
+            // We have all notes from the first pool and some from the second,
+            // in the second order.
+            EXPECT_EQ(inputs.sproutNoteEntries.size(), 0);
+            for (int i = 0; i < order[1].size(); i++) {
+                auto expected = i == 0 ? 10 : i == 1 ? 4 : 0;
+                switch (order[1][i]) {
+                    case OutputPool::Orchard: EXPECT_EQ(inputs.orchardNoteMetadata.size(), expected); break;
+                    case OutputPool::Sapling: EXPECT_EQ(inputs.saplingNoteEntries.size(), expected); break;
+                    case OutputPool::Transparent: EXPECT_EQ(inputs.utxos.size(), expected); break;
+                }
+            }
+        }
+    }
+}
+
+TEST_P(SpendableInputsTest, SelectsFirstBeforeSecond)
+{
+    auto available = std::get<0>(GetParam());
+    auto recipientPools = std::get<1>(GetParam());
+    auto order = std::get<2>(GetParam());
+    auto wtx = FakeWalletTx();
+
+    // Create a set of inputs from the available pools.
+    auto inputs = FakeSpendableInputs(available, false, &wtx);
+    EXPECT_EQ(inputs.Total(), 10 * available.size());
+
+    // We have the expected notes.
+    EXPECT_EQ(inputs.sproutNoteEntries.size(), 0);
+    for (auto pool : available) {
+        switch (pool) {
+            case OutputPool::Orchard: EXPECT_EQ(inputs.orchardNoteMetadata.size(), 10); break;
+            case OutputPool::Sapling: EXPECT_EQ(inputs.saplingNoteEntries.size(), 10); break;
+            case OutputPool::Transparent: EXPECT_EQ(inputs.utxos.size(), 10); break;
+        }
+    }
+
+    // Limit to 8 zatoshis (which can be satisfied by any pool).
+    EXPECT_TRUE(inputs.LimitToAmount(8, 1, std::get<1>(GetParam())));
+    EXPECT_EQ(inputs.Total(), 8);
+
+    // We use the first order and only have the first pool selected.
+    EXPECT_EQ(inputs.sproutNoteEntries.size(), 0);
+    for (int i = 0; i < order[0].size(); i++) {
+        auto expected = i == 0 ? 8 : 0;
+        switch (order[0][i]) {
+            case OutputPool::Orchard: EXPECT_EQ(inputs.orchardNoteMetadata.size(), expected); break;
+            case OutputPool::Sapling: EXPECT_EQ(inputs.saplingNoteEntries.size(), expected); break;
+            case OutputPool::Transparent: EXPECT_EQ(inputs.utxos.size(), expected); break;
+        }
+    }
+}
+
+TEST_P(SpendableInputsTest, SelectsFirstThenSecond)
+{
+    auto available = std::get<0>(GetParam());
+    auto recipientPools = std::get<1>(GetParam());
+    auto order = std::get<2>(GetParam());
+    auto wtx = FakeWalletTx();
+
+    // Create a set of inputs from the available pools.
+    auto inputs = FakeSpendableInputs(available, false, &wtx);
+    EXPECT_EQ(inputs.Total(), 10 * available.size());
+
+    // We have the expected notes.
+    EXPECT_EQ(inputs.sproutNoteEntries.size(), 0);
+    for (auto pool : available) {
+        switch (pool) {
+            case OutputPool::Orchard: EXPECT_EQ(inputs.orchardNoteMetadata.size(), 10); break;
+            case OutputPool::Sapling: EXPECT_EQ(inputs.saplingNoteEntries.size(), 10); break;
+            case OutputPool::Transparent: EXPECT_EQ(inputs.utxos.size(), 10); break;
+        }
+    }
+
+    // Limit to 13 zatoshis (which requires two pools).
+    // If we only have one pool available, we won't have sufficient funds.
+    auto sufficientFunds = inputs.LimitToAmount(13, 1, std::get<1>(GetParam()));
+    if (available.size() == 1) {
+        EXPECT_FALSE(sufficientFunds);
+        EXPECT_EQ(inputs.Total(), 10);
+
+        // We have selected all of the available pool.
+        EXPECT_EQ(inputs.sproutNoteEntries.size(), 0);
+        for (int i = 0; i < order[0].size(); i++) {
+            switch (order[0][i]) {
+                case OutputPool::Orchard: EXPECT_EQ(inputs.orchardNoteMetadata.size(), 10); break;
+                case OutputPool::Sapling: EXPECT_EQ(inputs.saplingNoteEntries.size(), 10); break;
+                case OutputPool::Transparent: EXPECT_EQ(inputs.utxos.size(), 10); break;
+            }
+        }
+    } else {
+        EXPECT_TRUE(sufficientFunds);
+        EXPECT_EQ(inputs.Total(), 13);
+
+        // We have all of the first pool and some of the second.
+        EXPECT_EQ(inputs.sproutNoteEntries.size(), 0);
+        for (int i = 0; i < order[1].size(); i++) {
+            auto expected = i == 0 ? 10 : i == 1 ? 3 : 0;
+            switch (order[1][i]) {
+                case OutputPool::Orchard: EXPECT_EQ(inputs.orchardNoteMetadata.size(), expected); break;
+                case OutputPool::Sapling: EXPECT_EQ(inputs.saplingNoteEntries.size(), expected); break;
+                case OutputPool::Transparent: EXPECT_EQ(inputs.utxos.size(), expected); break;
+            }
+        }
+    }
+}
+
+TEST_P(SpendableInputsTest, SelectsSproutAndFirstThenSecond)
+{
+    auto available = std::get<0>(GetParam());
+    auto recipientPools = std::get<1>(GetParam());
+    auto order = std::get<2>(GetParam());
+    auto wtx = FakeWalletTx();
+
+    bool canSelectSprout = !(recipientPools.count(OutputPool::Orchard));
+
+    // Create a set of inputs from Sprout and the available pools.
+    auto inputs = FakeSpendableInputs(available, true, &wtx);
+    EXPECT_EQ(inputs.Total(), 10 * (available.size() + 1));
+
+    // We have Sprout notes along with the expected notes.
+    EXPECT_EQ(inputs.sproutNoteEntries.size(), 10);
+    for (auto pool : available) {
+        switch (pool) {
+            case OutputPool::Orchard: EXPECT_EQ(inputs.orchardNoteMetadata.size(), 10); break;
+            case OutputPool::Sapling: EXPECT_EQ(inputs.saplingNoteEntries.size(), 10); break;
+            case OutputPool::Transparent: EXPECT_EQ(inputs.utxos.size(), 10); break;
+        }
+    }
+
+    // Limit to 24 zatoshis. If we only have one pool available, or we have two
+    // pools but can't select Sprout, we won't have sufficient funds.
+    auto sufficientFunds = inputs.LimitToAmount(24, 1, std::get<1>(GetParam()));
+    if (available.size() == 1 || (available.size() == 2 && !canSelectSprout)) {
+        EXPECT_FALSE(sufficientFunds);
+        EXPECT_EQ(inputs.Total(), (canSelectSprout || available.size() == 2) ? 20 : 10);
+
+        // We have selected all of the available pool.
+        EXPECT_EQ(inputs.sproutNoteEntries.size(), canSelectSprout ? 10 : 0);
+        for (int i = 0; i < order[0].size(); i++) {
+            switch (order[0][i]) {
+                case OutputPool::Orchard: EXPECT_EQ(inputs.orchardNoteMetadata.size(), 10); break;
+                case OutputPool::Sapling: EXPECT_EQ(inputs.saplingNoteEntries.size(), 10); break;
+                case OutputPool::Transparent: EXPECT_EQ(inputs.utxos.size(), 10); break;
+            }
+        }
+    } else {
+        EXPECT_TRUE(sufficientFunds);
+        EXPECT_EQ(inputs.Total(), 24);
+
+        if (canSelectSprout) {
+            // We have all of Sprout and the first pool, and some of the second,
+            // in the second order.
+            EXPECT_EQ(inputs.sproutNoteEntries.size(), 10);
+            for (int i = 0; i < order[1].size(); i++) {
+                auto expected = i == 0 ? 10 : i == 1 ? 4 : 0;
+                switch (order[1][i]) {
+                    case OutputPool::Orchard: EXPECT_EQ(inputs.orchardNoteMetadata.size(), expected); break;
+                    case OutputPool::Sapling: EXPECT_EQ(inputs.saplingNoteEntries.size(), expected); break;
+                    case OutputPool::Transparent: EXPECT_EQ(inputs.utxos.size(), expected); break;
+                }
+            }
+        } else {
+            // We have all notes from the first and second pools and some from
+            // the third, in the third order.
+            EXPECT_EQ(inputs.sproutNoteEntries.size(), 0);
+            for (int i = 0; i < order[2].size(); i++) {
+                auto expected = i <= 1 ? 10 : i == 2 ? 4 : 0;
+                switch (order[2][i]) {
+                    case OutputPool::Orchard: EXPECT_EQ(inputs.orchardNoteMetadata.size(), expected); break;
+                    case OutputPool::Sapling: EXPECT_EQ(inputs.saplingNoteEntries.size(), expected); break;
+                    case OutputPool::Transparent: EXPECT_EQ(inputs.utxos.size(), expected); break;
+                }
+            }
+        }
+    }
+}
+
+TEST_P(SpendableInputsTest, OpportunisticShielding)
+{
+    auto available = std::get<0>(GetParam());
+    auto recipientPools = std::get<1>(GetParam());
+    auto order = std::get<2>(GetParam());
+    auto wtx = FakeWalletTx();
+
+    // If we don't have multiple pools of which one is transparent, this test
+    // doesn't apply.
+    if (!(available.size() > 1 && available.count(OutputPool::Transparent))) {
+        return;
+    }
+
+    // Create a set of inputs from the available pools.
+    auto inputs = FakeSpendableInputs(available, false, &wtx);
+    EXPECT_EQ(inputs.Total(), 10 * available.size());
+
+    // Remove notes from the shielded pools, so we have more transparent funds.
+    EXPECT_EQ(inputs.sproutNoteEntries.size(), 0);
+    for (auto pool : available) {
+        switch (pool) {
+            case OutputPool::Orchard:
+                while (inputs.orchardNoteMetadata.size() > 3) {
+                    inputs.orchardNoteMetadata.pop_back();
+                }
+                EXPECT_EQ(inputs.orchardNoteMetadata.size(), 3);
+                break;
+            case OutputPool::Sapling:
+                while (inputs.saplingNoteEntries.size() > 3) {
+                    inputs.saplingNoteEntries.pop_back();
+                }
+                EXPECT_EQ(inputs.saplingNoteEntries.size(), 3);
+                break;
+            case OutputPool::Transparent: EXPECT_EQ(inputs.utxos.size(), 10); break;
+        }
+    }
+
+    // Limit to 7 zatoshis. We can't satisfy this with two shielded pools, so we
+    // will trigger the opportunistic shielding logic, which causes us to select
+    // all transparent notes. Because transparent is sufficient to reach the
+    // target amount, we don't select any shielded notes.
+    EXPECT_TRUE(inputs.LimitToAmount(7, 1, std::get<1>(GetParam())));
+    EXPECT_EQ(inputs.Total(), 10);
+
+    EXPECT_EQ(inputs.orchardNoteMetadata.size(), 0);
+    EXPECT_EQ(inputs.saplingNoteEntries.size(), 0);
+    EXPECT_EQ(inputs.sproutNoteEntries.size(), 0);
+    EXPECT_EQ(inputs.utxos.size(), 10);
+}
+
+const std::set<OutputPool> SET_T({OutputPool::Transparent});
+const std::set<OutputPool> SET_S({OutputPool::Sapling});
+const std::set<OutputPool> SET_O({OutputPool::Orchard});
+const std::set<OutputPool> SET_TS({OutputPool::Transparent, OutputPool::Sapling});
+const std::set<OutputPool> SET_TO({OutputPool::Transparent, OutputPool::Orchard});
+const std::set<OutputPool> SET_SO({OutputPool::Sapling, OutputPool::Orchard});
+const std::set<OutputPool> SET_TSO({OutputPool::Transparent, OutputPool::Sapling, OutputPool::Orchard});
+
+const std::vector<OutputPool> VEC_T({OutputPool::Transparent});
+const std::vector<OutputPool> VEC_S({OutputPool::Sapling});
+const std::vector<OutputPool> VEC_O({OutputPool::Orchard});
+const std::vector<OutputPool> VEC_TS({OutputPool::Transparent, OutputPool::Sapling});
+const std::vector<OutputPool> VEC_TO({OutputPool::Transparent, OutputPool::Orchard});
+const std::vector<OutputPool> VEC_SO({OutputPool::Sapling, OutputPool::Orchard});
+const std::vector<OutputPool> VEC_TSO({OutputPool::Transparent, OutputPool::Sapling, OutputPool::Orchard});
+
+INSTANTIATE_TEST_CASE_P(
+    ExhaustiveCases,
+    SpendableInputsTest,
+    ::testing::Values(
+        //              Available | Recipients          | Order             // Rationale
+        //              ----------|---------------------|-------------------//----------
+        std::make_tuple(SET_T,      SET_T,   std::vector({VEC_T})),         // N/A
+        std::make_tuple(SET_T,      SET_S,   std::vector({VEC_T})),         // N/A
+        std::make_tuple(SET_T,      SET_O,   std::vector({VEC_T})),         // N/A
+        std::make_tuple(SET_T,      SET_TS,  std::vector({VEC_T})),         // N/A
+        std::make_tuple(SET_T,      SET_TO,  std::vector({VEC_T})),         // N/A
+        std::make_tuple(SET_T,      SET_SO,  std::vector({VEC_T})),         // N/A
+        std::make_tuple(SET_T,      SET_TSO, std::vector({VEC_T})),         // N/A
+        std::make_tuple(SET_S,      SET_T,   std::vector({VEC_S})),         // N/A
+        std::make_tuple(SET_S,      SET_S,   std::vector({VEC_S})),         // N/A
+        std::make_tuple(SET_S,      SET_O,   std::vector({VEC_S})),         // N/A
+        std::make_tuple(SET_S,      SET_TS,  std::vector({VEC_S})),         // N/A
+        std::make_tuple(SET_S,      SET_TO,  std::vector({VEC_S})),         // N/A
+        std::make_tuple(SET_S,      SET_SO,  std::vector({VEC_S})),         // N/A
+        std::make_tuple(SET_S,      SET_TSO, std::vector({VEC_S})),         // N/A
+        std::make_tuple(SET_O,      SET_T,   std::vector({VEC_O})),         // N/A
+        std::make_tuple(SET_O,      SET_S,   std::vector({VEC_O})),         // N/A
+        std::make_tuple(SET_O,      SET_O,   std::vector({VEC_O})),         // N/A
+        std::make_tuple(SET_O,      SET_TS,  std::vector({VEC_O})),         // N/A
+        std::make_tuple(SET_O,      SET_TO,  std::vector({VEC_O})),         // N/A
+        std::make_tuple(SET_O,      SET_SO,  std::vector({VEC_O})),         // N/A
+        std::make_tuple(SET_O,      SET_TSO, std::vector({VEC_O})),         // N/A
+        std::make_tuple(SET_TS,     SET_T,   std::vector({VEC_S, VEC_TS})), // Hide sender,    opportunistic shielding
+        std::make_tuple(SET_TS,     SET_S,   std::vector({VEC_S, VEC_TS})), // Fully shielded, opportunistic shielding
+        std::make_tuple(SET_TS,     SET_O,   std::vector({VEC_S, VEC_TS})), // Hide sender,    opportunistic shielding
+        std::make_tuple(SET_TS,     SET_TS,  std::vector({VEC_S, VEC_TS})), // Hide sender,    opportunistic shielding
+        std::make_tuple(SET_TS,     SET_TO,  std::vector({VEC_S, VEC_TS})), // Hide sender,    opportunistic shielding
+        std::make_tuple(SET_TS,     SET_SO,  std::vector({VEC_S, VEC_TS})), // Hide sender,    opportunistic shielding
+        std::make_tuple(SET_TS,     SET_TSO, std::vector({VEC_S, VEC_TS})), // Hide sender,    opportunistic shielding
+        std::make_tuple(SET_TO,     SET_T,   std::vector({VEC_O, VEC_TO})), // Hide sender,    opportunistic shielding
+        std::make_tuple(SET_TO,     SET_S,   std::vector({VEC_O, VEC_TO})), // Hide sender,    opportunistic shielding
+        std::make_tuple(SET_TO,     SET_O,   std::vector({VEC_O, VEC_TO})), // Fully shielded, opportunistic shielding
+        std::make_tuple(SET_TO,     SET_TS,  std::vector({VEC_O, VEC_TO})), // Hide sender,    opportunistic shielding
+        std::make_tuple(SET_TO,     SET_TO,  std::vector({VEC_O, VEC_TO})), // Hide sender,    opportunistic shielding
+        std::make_tuple(SET_TO,     SET_SO,  std::vector({VEC_O, VEC_TO})), // Hide sender,    opportunistic shielding
+        std::make_tuple(SET_TO,     SET_TSO, std::vector({VEC_O, VEC_TO})), // Hide sender,    opportunistic shielding
+        std::make_tuple(SET_SO,     SET_T,   std::vector({VEC_O, VEC_SO})), // Fewer pools,    opportunistic migration
+        std::make_tuple(SET_SO,     SET_S,   std::vector({VEC_S, VEC_SO})), // Fully shielded
+        std::make_tuple(SET_SO,     SET_O,   std::vector({VEC_O, VEC_SO})), // Fully shielded, opportunistic migration
+        std::make_tuple(SET_SO,     SET_TS,  std::vector({VEC_S, VEC_SO})), // Fewer pools
+        std::make_tuple(SET_SO,     SET_TO,  std::vector({VEC_O, VEC_SO})), // Fewer pools,    opportunistic migration
+        std::make_tuple(SET_SO,     SET_SO,  std::vector({VEC_S, VEC_SO})), // Opportunistic migration
+        std::make_tuple(SET_SO,     SET_TSO, std::vector({VEC_S, VEC_SO})), // Opportunistic migration
+        std::make_tuple(SET_TSO,    SET_T,   std::vector({VEC_O, VEC_SO, VEC_TSO})), // Fewer pools,             hide sender, opportunistic shielding
+        std::make_tuple(SET_TSO,    SET_S,   std::vector({VEC_S, VEC_SO, VEC_TSO})), // Fully shielded,          hide sender, opportunistic shielding
+        std::make_tuple(SET_TSO,    SET_O,   std::vector({VEC_O, VEC_SO, VEC_TSO})), // Fully shielded,          hide sender, opportunistic shielding
+        std::make_tuple(SET_TSO,    SET_TS,  std::vector({VEC_S, VEC_SO, VEC_TSO})), // Fewer pools,             hide sender, opportunistic shielding
+        std::make_tuple(SET_TSO,    SET_TO,  std::vector({VEC_O, VEC_SO, VEC_TSO})), // Fewer pools,             hide sender, opportunistic shielding
+        std::make_tuple(SET_TSO,    SET_SO,  std::vector({VEC_S, VEC_SO, VEC_TSO})), // Opportunistic migration, hide sender, opportunistic shielding
+        std::make_tuple(SET_TSO,    SET_TSO, std::vector({VEC_S, VEC_SO, VEC_TSO}))  // Opportunistic migration, hide sender, opportunistic shielding
+    )
+);
diff --git a/src/wallet/gtest/test_orchard_wallet.cpp b/src/wallet/gtest/test_orchard_wallet.cpp
new file mode 100644
index 00000000000..8d6c693f063
--- /dev/null
+++ b/src/wallet/gtest/test_orchard_wallet.cpp
@@ -0,0 +1,157 @@
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include "consensus/validation.h"
+#include "random.h"
+#include "transaction_builder.h"
+#include "utiltest.h"
+#include "wallet/orchard.h"
+#include "zcash/Address.hpp"
+
+#include "gtest/test_transaction_builder.h"
+
+#include <optional>
+
+using namespace libzcash;
+
+OrchardSpendingKey RandomOrchardSpendingKey() {
+    auto coinType = Params().BIP44CoinType() ;
+
+    auto seed = MnemonicSeed::Random(coinType);
+    return OrchardSpendingKey::ForAccount(seed, coinType, 0);
+}
+
+CTransaction FakeOrchardTx(const OrchardSpendingKey& sk, libzcash::diversifier_index_t j) {
+    CBasicKeyStore keystore;
+    CKey tsk = AddTestCKeyToKeyStore(keystore);
+    auto scriptPubKey = GetScriptForDestination(tsk.GetPubKey().GetID());
+
+    auto fvk = sk.ToFullViewingKey();
+    auto ivk = fvk.ToIncomingViewingKey();
+    auto recipient = ivk.Address(j);
+
+    TransactionBuilderCoinsViewDB fakeDB;
+    auto orchardAnchor = fakeDB.GetBestAnchor(ShieldedType::ORCHARD);
+
+    // Create a shielding transaction from transparent to Orchard
+    // 0.0005 t-ZEC in, 0.0004 z-ZEC out, default fee
+    auto builder = TransactionBuilder(Params().GetConsensus(), 1, orchardAnchor, &keystore);
+    builder.AddTransparentInput(COutPoint(uint256S("1234"), 0), scriptPubKey, 50000);
+    builder.AddOrchardOutput(std::nullopt, recipient, 40000, std::nullopt);
+
+    auto maybeTx = builder.Build();
+    EXPECT_TRUE(maybeTx.IsTx());
+    return maybeTx.GetTxOrThrow();
+}
+
+TEST(OrchardWalletTests, TxInvolvesMyNotes) {
+    auto consensusParams = RegtestActivateNU5();
+    OrchardWallet wallet;
+
+    // Add a new spending key to the wallet
+    auto sk = RandomOrchardSpendingKey();
+    wallet.AddSpendingKey(sk);
+
+    // Create a transaction sending to the default address for that
+    // spending key and add it to the wallet.
+    auto tx = FakeOrchardTx(sk, libzcash::diversifier_index_t(0));
+    wallet.AddNotesIfInvolvingMe(tx);
+
+    // Check that we detect the transaction as ours
+    EXPECT_TRUE(wallet.TxInvolvesMyNotes(tx.GetHash()));
+
+    // Create a transaction sending to a different diversified address
+    auto tx1 = FakeOrchardTx(sk, libzcash::diversifier_index_t(0xffffffffffffffff));
+    wallet.AddNotesIfInvolvingMe(tx1);
+
+    // Check that we also detect this transaction as ours
+    EXPECT_TRUE(wallet.TxInvolvesMyNotes(tx1.GetHash()));
+
+    // Now generate a new key, and send a transaction to it without adding
+    // the key to the wallet; it should not be detected as ours.
+    auto skNotOurs = RandomOrchardSpendingKey();
+    auto tx2 = FakeOrchardTx(skNotOurs, libzcash::diversifier_index_t(0));
+    wallet.AddNotesIfInvolvingMe(tx2);
+    EXPECT_FALSE(wallet.TxInvolvesMyNotes(tx2.GetHash()));
+
+    RegtestDeactivateNU5();
+}
+
+// This test is here instead of test_transaction_builder.cpp because it depends
+// on OrchardWallet, which only exists if the wallet is compiled in.
+TEST(TransactionBuilder, OrchardToOrchard) {
+    auto consensusParams = RegtestActivateNU5();
+    OrchardWallet wallet;
+
+    CBasicKeyStore keystore;
+    CKey tsk = AddTestCKeyToKeyStore(keystore);
+    auto scriptPubKey = GetScriptForDestination(tsk.GetPubKey().GetID());
+
+    auto sk = RandomOrchardSpendingKey();
+    wallet.AddSpendingKey(sk);
+
+    // Create a transaction sending to the default address for that
+    // spending key and add it to the wallet.
+    libzcash::diversifier_index_t j(0);
+    auto txRecv = FakeOrchardTx(sk, j);
+    wallet.AddNotesIfInvolvingMe(txRecv);
+
+    // Generate a recipient.
+    auto recipient = RandomOrchardSpendingKey()
+        .ToFullViewingKey()
+        .ToIncomingViewingKey()
+        .Address(j);
+
+    // Select the one note in the wallet for spending.
+    std::vector<OrchardNoteMetadata> notes;
+    wallet.GetFilteredNotes(
+        notes, sk.ToFullViewingKey().ToIncomingViewingKey(), true, true);
+    ASSERT_EQ(notes.size(), 1);
+
+    // If we attempt to get spend info now, it will fail because the note hasn't
+    // been witnessed in the Orchard commitment tree.
+    EXPECT_THROW(wallet.GetSpendInfo(notes), std::logic_error);
+
+    // Append the bundle to the wallet's commitment tree.
+    CBlock fakeBlock;
+    fakeBlock.vtx.resize(2);
+    fakeBlock.vtx[1] = txRecv;
+    ASSERT_TRUE(wallet.AppendNoteCommitments(2, fakeBlock));
+
+    // Now we can get spend info for the note.
+    auto spendInfo = wallet.GetSpendInfo(notes);
+    EXPECT_EQ(spendInfo[0].second.Value(), 40000);
+
+    // Get the root of the commitment tree.
+    OrchardMerkleFrontier tree;
+    tree.AppendBundle(txRecv.GetOrchardBundle());
+    auto orchardAnchor = tree.root();
+
+    // Create an Orchard-only transaction
+    // 0.0004 z-ZEC in, 0.00025 z-ZEC out, default fee, 0.00005 z-ZEC change
+    auto builder = TransactionBuilder(consensusParams, 2, orchardAnchor);
+    EXPECT_TRUE(builder.AddOrchardSpend(sk, std::move(spendInfo[0].second)));
+    builder.AddOrchardOutput(std::nullopt, recipient, 25000, std::nullopt);
+    auto maybeTx = builder.Build();
+    EXPECT_TRUE(maybeTx.IsTx());
+    if (maybeTx.IsError()) {
+        std::cerr << "Failed to build transaction: " << maybeTx.GetError() << std::endl;
+        GTEST_FAIL();
+    }
+    auto tx = maybeTx.GetTxOrThrow();
+
+    EXPECT_EQ(tx.vin.size(), 0);
+    EXPECT_EQ(tx.vout.size(), 0);
+    EXPECT_EQ(tx.vJoinSplit.size(), 0);
+    EXPECT_EQ(tx.vShieldedSpend.size(), 0);
+    EXPECT_EQ(tx.vShieldedOutput.size(), 0);
+    EXPECT_TRUE(tx.GetOrchardBundle().IsPresent());
+    EXPECT_EQ(tx.GetOrchardBundle().GetValueBalance(), 10000);
+
+    CValidationState state;
+    EXPECT_TRUE(ContextualCheckTransaction(tx, state, Params(), 3, true));
+    EXPECT_EQ(state.GetRejectReason(), "");
+
+    // Revert to default
+    RegtestDeactivateNU5();
+}
diff --git a/src/wallet/gtest/test_orchard_zkeys.cpp b/src/wallet/gtest/test_orchard_zkeys.cpp
new file mode 100644
index 00000000000..d8e910269b6
--- /dev/null
+++ b/src/wallet/gtest/test_orchard_zkeys.cpp
@@ -0,0 +1,35 @@
+// Copyright (c) 2021 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+#include <gtest/gtest.h>
+
+#include "zcash/address/mnemonic.h"
+#include "zcash/address/orchard.hpp"
+
+TEST(OrchardZkeysTest, IVKSerializationRoundtrip) {
+    auto seed = MnemonicSeed::Random(1); //testnet coin type
+    auto sk = libzcash::OrchardSpendingKey::ForAccount(seed, 1, 0);
+    auto fvk = sk.ToFullViewingKey();
+    auto ivk = fvk.ToIncomingViewingKey();
+
+    CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
+    ss << ivk;
+
+    auto ivk0 = libzcash::OrchardIncomingViewingKey::Read(ss);
+
+    ASSERT_EQ(ivk, ivk0);
+}
+
+TEST(OrchardZkeysTest, FVKSerializationRoundtrip) {
+    auto seed = MnemonicSeed::Random(1); //testnet coin type
+    auto sk = libzcash::OrchardSpendingKey::ForAccount(seed, 1, 0);
+    auto fvk = sk.ToFullViewingKey();
+
+    CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
+    ss << fvk;
+
+    auto fvk0 = libzcash::OrchardFullViewingKey::Read(ss);
+
+    ASSERT_EQ(fvk, fvk0);
+}
diff --git a/src/wallet/gtest/test_wallet.cpp b/src/wallet/gtest/test_wallet.cpp
index d4a1249cd8f..a1d5a8ffdf3 100644
--- a/src/wallet/gtest/test_wallet.cpp
+++ b/src/wallet/gtest/test_wallet.cpp
@@ -20,6 +20,7 @@
 #include <optional>
 
 using ::testing::Return;
+using namespace libzcash;
 
 ACTION(ThrowLogicError) {
     throw std::logic_error("Boom");
@@ -32,6 +33,7 @@ class MockWalletDB {
     MOCK_METHOD0(TxnAbort, bool());
 
     MOCK_METHOD1(WriteTx, bool(const CWalletTx& wtx));
+    MOCK_METHOD1(WriteOrchardWitnesses, bool(const OrchardWallet& wallet));
     MOCK_METHOD1(WriteWitnessCacheSize, bool(int64_t nWitnessCacheSize));
     MOCK_METHOD1(WriteBestBlock, bool(const CBlockLocator& loc));
 };
@@ -41,7 +43,11 @@ template void CWallet::SetBestChainINTERNAL<MockWalletDB>(
 
 class TestWallet : public CWallet {
 public:
-    TestWallet() : CWallet() { }
+    TestWallet(const CChainParams& params) : CWallet(params) { }
+
+    OrchardWallet& GetOrchardWallet() {
+        return orchardWallet;
+    }
 
     bool EncryptKeys(CKeyingMaterial& vMasterKeyIn) {
         return CCryptoKeyStore::EncryptKeys(vMasterKeyIn);
@@ -51,14 +57,19 @@ class TestWallet : public CWallet {
         return CCryptoKeyStore::Unlock(vMasterKeyIn);
     }
 
-    void IncrementNoteWitnesses(const CBlockIndex* pindex,
+    void IncrementNoteWitnesses(const Consensus::Params& consensus,
+                                const CBlockIndex* pindex,
                                 const CBlock* pblock,
                                 SproutMerkleTree& sproutTree,
-                                SaplingMerkleTree& saplingTree) {
-        CWallet::IncrementNoteWitnesses(pindex, pblock, sproutTree, saplingTree);
+                                SaplingMerkleTree& saplingTree,
+                                bool performOrchardWalletUpdates) {
+        CWallet::IncrementNoteWitnesses(
+                consensus, pindex, pblock, sproutTree, saplingTree, performOrchardWalletUpdates);
     }
-    void DecrementNoteWitnesses(const CBlockIndex* pindex) {
-        CWallet::DecrementNoteWitnesses(pindex);
+
+
+    void DecrementNoteWitnesses(const Consensus::Params& consensus, const CBlockIndex* pindex) {
+        CWallet::DecrementNoteWitnesses(consensus, pindex);
     }
     void SetBestChain(MockWalletDB& walletdb, const CBlockLocator& loc) {
         CWallet::SetBestChainINTERNAL(walletdb, loc);
@@ -97,10 +108,10 @@ std::pair<JSOutPoint, SaplingOutPoint> CreateValidBlock(TestWallet& wallet,
     noteData[jsoutpt] = nd;
     wtx.SetSproutNoteData(noteData);
     auto saplingNotes = SetSaplingNoteData(wtx);
-    wallet.AddToWallet(wtx, true, NULL);
+    wallet.LoadWalletTx(wtx);
 
     block.vtx.push_back(wtx);
-    wallet.IncrementNoteWitnesses(&index, &block, sproutTree, saplingTree);
+    wallet.IncrementNoteWitnesses(Params().GetConsensus(), &index, &block, sproutTree, saplingTree, true);
 
     return std::make_pair(jsoutpt, saplingNotes[0]);
 }
@@ -126,6 +137,37 @@ TEST(WalletTests, SetupDatadirLocationRunAsFirstTest) {
     mapArgs["-datadir"] = pathTemp.string();
 }
 
+TEST(WalletTests, WalletNetworkSerialization) {
+    SelectParams(CBaseChainParams::TESTNET);
+
+    // Get temporary and unique path for file.
+    // Note: / operator to append paths
+    fs::path pathTemp = fs::temp_directory_path() / fs::unique_path();
+    fs::create_directories(pathTemp);
+    mapArgs["-datadir"] = pathTemp.string();
+
+    // create a new testnet wallet and generate a seed
+    CWallet wallet(Params(), "wallet.dat");
+    wallet.InitLoadWallet(Params(), true);
+    wallet.Flush();
+
+    // Stay on TESTNET, make sure wallet can be successfully loaded.
+    {
+        CWallet restored(Params(), "wallet.dat");
+        bool fFirstRunRet;
+        EXPECT_EQ(restored.LoadWallet(fFirstRunRet), DB_LOAD_OK);
+    }
+
+    // now, switch to mainnet and attempt to restore the wallet
+    // using the same wallet.dat
+    SelectParams(CBaseChainParams::MAIN);
+    CWallet restored(Params(), "wallet.dat");
+
+    // load should fail due to being associated with the wrong network
+    bool fFirstRunRet;
+    EXPECT_EQ(restored.LoadWallet(fFirstRunRet), DB_WRONG_NETWORK);
+}
+
 TEST(WalletTests, SproutNoteDataSerialisation) {
     auto sk = libzcash::SproutSpendingKey::random();
     auto wtx = GetValidSproutReceive(sk, 10, true);
@@ -150,12 +192,12 @@ TEST(WalletTests, SproutNoteDataSerialisation) {
     EXPECT_EQ(noteData[jsoutpt].witnesses, noteData2[jsoutpt].witnesses);
 }
 
-
 TEST(WalletTests, FindUnspentSproutNotes) {
-    auto consensusParams = RegtestActivateSapling();
+    SelectParams(CBaseChainParams::TESTNET);
 
-    CWallet wallet;
+    CWallet wallet(Params());
     LOCK2(cs_main, wallet.cs_wallet);
+
     auto sk = libzcash::SproutSpendingKey::random();
     wallet.AddSproutSpendingKey(sk);
 
@@ -169,17 +211,19 @@ TEST(WalletTests, FindUnspentSproutNotes) {
     noteData[jsoutpt] = nd;
 
     wtx.SetSproutNoteData(noteData);
-    wallet.AddToWallet(wtx, true, NULL);
+    wallet.LoadWalletTx(wtx);
     EXPECT_FALSE(wallet.IsSproutSpent(nullifier));
 
     // We currently have an unspent and unconfirmed note in the wallet (depth of -1)
     std::vector<SproutNoteEntry> sproutEntries;
     std::vector<SaplingNoteEntry> saplingEntries;
-    wallet.GetFilteredNotes(sproutEntries, saplingEntries, "", 0);
+    std::vector<OrchardNoteMetadata> orchardEntries;
+    wallet.GetFilteredNotes(sproutEntries, saplingEntries, orchardEntries, std::nullopt, 0);
     EXPECT_EQ(0, sproutEntries.size());
     sproutEntries.clear();
     saplingEntries.clear();
-    wallet.GetFilteredNotes(sproutEntries, saplingEntries, "", -1);
+    orchardEntries.clear();
+    wallet.GetFilteredNotes(sproutEntries, saplingEntries, orchardEntries, std::nullopt, -1);
     EXPECT_EQ(1, sproutEntries.size());
     sproutEntries.clear();
     saplingEntries.clear();
@@ -197,28 +241,31 @@ TEST(WalletTests, FindUnspentSproutNotes) {
     EXPECT_EQ(0, chainActive.Height());
 
     wtx.SetMerkleBranch(block);
-    wallet.AddToWallet(wtx, true, NULL);
+    wallet.LoadWalletTx(wtx);
     EXPECT_FALSE(wallet.IsSproutSpent(nullifier));
 
 
     // We now have an unspent and confirmed note in the wallet (depth of 1)
-    wallet.GetFilteredNotes(sproutEntries, saplingEntries, "", 0);
+    wallet.GetFilteredNotes(sproutEntries, saplingEntries, orchardEntries, std::nullopt, 0);
     EXPECT_EQ(1, sproutEntries.size());
     sproutEntries.clear();
     saplingEntries.clear();
-    wallet.GetFilteredNotes(sproutEntries, saplingEntries, "", 1);
+    orchardEntries.clear();
+    wallet.GetFilteredNotes(sproutEntries, saplingEntries, orchardEntries, std::nullopt, 1);
     EXPECT_EQ(1, sproutEntries.size());
     sproutEntries.clear();
     saplingEntries.clear();
-    wallet.GetFilteredNotes(sproutEntries, saplingEntries, "", 2);
+    orchardEntries.clear();
+    wallet.GetFilteredNotes(sproutEntries, saplingEntries, orchardEntries, std::nullopt, 2);
     EXPECT_EQ(0, sproutEntries.size());
     sproutEntries.clear();
     saplingEntries.clear();
+    orchardEntries.clear();
 
 
     // Let's spend the note.
     auto wtx2 = GetValidSproutSpend(sk, note, 5);
-    wallet.AddToWallet(wtx2, true, NULL);
+    wallet.LoadWalletTx(wtx2);
     EXPECT_FALSE(wallet.IsSproutSpent(nullifier));
 
     // Fake-mine a spend transaction
@@ -236,29 +283,33 @@ TEST(WalletTests, FindUnspentSproutNotes) {
     EXPECT_EQ(1, chainActive.Height());
 
     wtx2.SetMerkleBranch(block2);
-    wallet.AddToWallet(wtx2, true, NULL);
+    wallet.LoadWalletTx(wtx2);
     EXPECT_TRUE(wallet.IsSproutSpent(nullifier));
 
     // The note has been spent.  By default, GetFilteredNotes() ignores spent notes.
-    wallet.GetFilteredNotes(sproutEntries, saplingEntries, "", 0);
+    wallet.GetFilteredNotes(sproutEntries, saplingEntries, orchardEntries, std::nullopt, 0);
     EXPECT_EQ(0, sproutEntries.size());
     sproutEntries.clear();
     saplingEntries.clear();
+    orchardEntries.clear();
     // Let's include spent notes to retrieve it.
-    wallet.GetFilteredNotes(sproutEntries, saplingEntries, "", 0, false);
+    wallet.GetFilteredNotes(sproutEntries, saplingEntries, orchardEntries, std::nullopt, 0, INT_MAX, false);
     EXPECT_EQ(1, sproutEntries.size());
     sproutEntries.clear();
     saplingEntries.clear();
+    orchardEntries.clear();
     // The spent note has two confirmations.
-    wallet.GetFilteredNotes(sproutEntries, saplingEntries, "", 2, false);
+    wallet.GetFilteredNotes(sproutEntries, saplingEntries, orchardEntries, std::nullopt, 2, INT_MAX, false);
     EXPECT_EQ(1, sproutEntries.size());
     sproutEntries.clear();
     saplingEntries.clear();
+    orchardEntries.clear();
     // It does not have 3 confirmations.
-    wallet.GetFilteredNotes(sproutEntries, saplingEntries, "", 3, false);
+    wallet.GetFilteredNotes(sproutEntries, saplingEntries, orchardEntries, std::nullopt, 3, INT_MAX, false);
     EXPECT_EQ(0, sproutEntries.size());
     sproutEntries.clear();
     saplingEntries.clear();
+    orchardEntries.clear();
 
 
     // Let's receive a new note
@@ -274,7 +325,7 @@ TEST(WalletTests, FindUnspentSproutNotes) {
         noteData[jsoutpt] = nd;
 
         wtx.SetSproutNoteData(noteData);
-        wallet.AddToWallet(wtx, true, NULL);
+        wallet.LoadWalletTx(wtx);
         EXPECT_FALSE(wallet.IsSproutSpent(nullifier));
 
         wtx3 = wtx;
@@ -295,37 +346,38 @@ TEST(WalletTests, FindUnspentSproutNotes) {
     EXPECT_EQ(2, chainActive.Height());
 
     wtx3.SetMerkleBranch(block3);
-    wallet.AddToWallet(wtx3, true, NULL);
+    wallet.LoadWalletTx(wtx3);
 
     // We now have an unspent note which has one confirmation, in addition to our spent note.
-    wallet.GetFilteredNotes(sproutEntries, saplingEntries, "", 1);
+    wallet.GetFilteredNotes(sproutEntries, saplingEntries, orchardEntries, std::nullopt, 1);
     EXPECT_EQ(1, sproutEntries.size());
     sproutEntries.clear();
     saplingEntries.clear();
+    orchardEntries.clear();
     // Let's return the spent note too.
-    wallet.GetFilteredNotes(sproutEntries, saplingEntries, "", 1, false);
+    wallet.GetFilteredNotes(sproutEntries, saplingEntries, orchardEntries, std::nullopt, 1, INT_MAX, false);
     EXPECT_EQ(2, sproutEntries.size());
     sproutEntries.clear();
     saplingEntries.clear();
+    orchardEntries.clear();
     // Increasing number of confirmations will exclude our new unspent note.
-    wallet.GetFilteredNotes(sproutEntries, saplingEntries, "", 2, false);
+    wallet.GetFilteredNotes(sproutEntries, saplingEntries, orchardEntries, std::nullopt, 2, INT_MAX, false);
     EXPECT_EQ(1, sproutEntries.size());
     sproutEntries.clear();
     saplingEntries.clear();
+    orchardEntries.clear();
     // If we also ignore spent notes at this depth, we won't find any notes.
-    wallet.GetFilteredNotes(sproutEntries, saplingEntries, "", 2, true);
+    wallet.GetFilteredNotes(sproutEntries, saplingEntries, orchardEntries, std::nullopt, 2, INT_MAX, true);
     EXPECT_EQ(0, sproutEntries.size());
     sproutEntries.clear();
     saplingEntries.clear();
+    orchardEntries.clear();
 
     // Tear down
     chainActive.SetTip(NULL);
     mapBlockIndex.erase(blockHash);
     mapBlockIndex.erase(blockHash2);
     mapBlockIndex.erase(blockHash3);
-
-    // Revert to default
-    RegtestDeactivateSapling();
 }
 
 
@@ -346,7 +398,7 @@ TEST(WalletTests, SetSproutNoteAddrsInCWalletTx) {
 }
 
 TEST(WalletTests, SetSaplingNoteAddrsInCWalletTx) {
-    SelectParams(CBaseChainParams::REGTEST);
+    LoadProofParameters();
 
     std::vector<libzcash::Zip212Enabled> zip_212_enabled = {libzcash::Zip212Enabled::BeforeZip212, libzcash::Zip212Enabled::AfterZip212};
     const Consensus::Params& (*activations [])() = {RegtestActivateSapling, RegtestActivateCanopy};
@@ -355,14 +407,14 @@ TEST(WalletTests, SetSaplingNoteAddrsInCWalletTx) {
     for (int ver = 0; ver < zip_212_enabled.size(); ver++) {
         auto consensusParams = (*activations[ver])();
 
-        TestWallet wallet;
+        TestWallet wallet(Params());
         LOCK(wallet.cs_wallet);
 
         auto sk = GetTestMasterSaplingSpendingKey();
         auto expsk = sk.expsk;
         auto fvk = expsk.full_viewing_key();
         auto ivk = fvk.in_viewing_key();
-        auto pk = sk.DefaultAddress();
+        auto pk = sk.ToXFVK().DefaultAddress();
 
         libzcash::SaplingNote note(pk, 50000, zip_212_enabled[ver]);
         auto cm = note.cmu().value();
@@ -375,7 +427,7 @@ TEST(WalletTests, SetSaplingNoteAddrsInCWalletTx) {
         ASSERT_TRUE(nf);
         uint256 nullifier = nf.value();
 
-        auto builder = TransactionBuilder(consensusParams, 1);
+        auto builder = TransactionBuilder(consensusParams, 1, std::nullopt);
         builder.AddSaplingSpend(expsk, note, anchor, witness);
         builder.AddSaplingOutput(fvk.ovk, pk, 50000, {});
         builder.SetFee(0);
@@ -437,7 +489,8 @@ TEST(WalletTests, SetInvalidSaplingNoteDataInCWalletTx) {
 }
 
 TEST(WalletTests, CheckSproutNoteCommitmentAgainstNotePlaintext) {
-    CWallet wallet;
+    SelectParams(CBaseChainParams::REGTEST);
+    CWallet wallet(Params());
     LOCK(wallet.cs_wallet);
 
     auto sk = libzcash::SproutSpendingKey::random();
@@ -461,7 +514,8 @@ TEST(WalletTests, CheckSproutNoteCommitmentAgainstNotePlaintext) {
 }
 
 TEST(WalletTests, GetSproutNoteNullifier) {
-    CWallet wallet;
+    SelectParams(CBaseChainParams::REGTEST);
+    CWallet wallet(Params());
     LOCK(wallet.cs_wallet);
 
     auto sk = libzcash::SproutSpendingKey::random();
@@ -495,21 +549,22 @@ TEST(WalletTests, GetSproutNoteNullifier) {
 }
 
 TEST(WalletTests, FindMySaplingNotes) {
-    auto consensusParams = RegtestActivateSapling();
+    LoadProofParameters();
 
-    TestWallet wallet;
+    auto consensusParams = RegtestActivateSapling();
+    TestWallet wallet(Params());
     LOCK(wallet.cs_wallet);
 
     // Generate dummy Sapling address
     auto sk = GetTestMasterSaplingSpendingKey();
     auto expsk = sk.expsk;
     auto extfvk = sk.ToXFVK();
-    auto pa = sk.DefaultAddress();
+    auto pa = extfvk.DefaultAddress();
 
     auto testNote = GetTestSaplingNote(pa, 50000);
 
     // Generate transaction
-    auto builder = TransactionBuilder(consensusParams, 1);
+    auto builder = TransactionBuilder(consensusParams, 1, std::nullopt);
     builder.AddSaplingSpend(expsk, testNote.note, testNote.tree.root(), testNote.tree.witness());
     builder.AddSaplingOutput(extfvk.fvk.ovk, pa, 25000, {});
     auto tx = builder.Build().GetTxOrThrow();
@@ -531,7 +586,8 @@ TEST(WalletTests, FindMySaplingNotes) {
 }
 
 TEST(WalletTests, FindMySproutNotes) {
-    CWallet wallet;
+    SelectParams(CBaseChainParams::REGTEST);
+    CWallet wallet(Params());
     LOCK(wallet.cs_wallet);
 
     auto sk = libzcash::SproutSpendingKey::random();
@@ -557,8 +613,10 @@ TEST(WalletTests, FindMySproutNotes) {
 }
 
 TEST(WalletTests, FindMySproutNotesInEncryptedWallet) {
-    TestWallet wallet;
+    SelectParams(CBaseChainParams::REGTEST);
+    TestWallet wallet(Params());
     LOCK(wallet.cs_wallet);
+
     uint256 r {GetRandHash()};
     CKeyingMaterial vMasterKey (r.begin(), r.end());
 
@@ -588,7 +646,8 @@ TEST(WalletTests, FindMySproutNotesInEncryptedWallet) {
 }
 
 TEST(WalletTests, GetConflictedSproutNotes) {
-    CWallet wallet;
+    SelectParams(CBaseChainParams::REGTEST);
+    CWallet wallet(Params());
     LOCK(wallet.cs_wallet);
 
     auto sk = libzcash::SproutSpendingKey::random();
@@ -605,15 +664,15 @@ TEST(WalletTests, GetConflictedSproutNotes) {
 
     // No conflicts for no spends
     EXPECT_EQ(0, wallet.GetConflicts(hash2).size());
-    wallet.AddToWallet(wtx, true, NULL);
+    wallet.LoadWalletTx(wtx);
     EXPECT_EQ(0, wallet.GetConflicts(hash2).size());
 
     // No conflicts for one spend
-    wallet.AddToWallet(wtx2, true, NULL);
+    wallet.LoadWalletTx(wtx2);
     EXPECT_EQ(0, wallet.GetConflicts(hash2).size());
 
     // Conflicts for two spends
-    wallet.AddToWallet(wtx3, true, NULL);
+    wallet.LoadWalletTx(wtx3);
     auto c3 = wallet.GetConflicts(hash2);
     EXPECT_EQ(2, c3.size());
     EXPECT_EQ(std::set<uint256>({hash2, hash3}), c3);
@@ -621,7 +680,7 @@ TEST(WalletTests, GetConflictedSproutNotes) {
 
 // Generate note A and spend to create note B, from which we spend to create two conflicting transactions
 TEST(WalletTests, GetConflictedSaplingNotes) {
-    SelectParams(CBaseChainParams::REGTEST);
+    LoadProofParameters();
 
     std::vector<libzcash::Zip212Enabled> zip_212_enabled = {libzcash::Zip212Enabled::BeforeZip212, libzcash::Zip212Enabled::AfterZip212};
     const Consensus::Params& (*activations [])() = {RegtestActivateSapling, RegtestActivateCanopy};
@@ -630,15 +689,15 @@ TEST(WalletTests, GetConflictedSaplingNotes) {
     for (int ver = 0; ver < zip_212_enabled.size(); ver++) {
         auto consensusParams = (*activations[ver])();
 
-        TestWallet wallet;
+        TestWallet wallet(Params());
         LOCK2(cs_main, wallet.cs_wallet);
 
         // Generate Sapling address
         auto sk = GetTestMasterSaplingSpendingKey();
         auto expsk = sk.expsk;
         auto extfvk = sk.ToXFVK();
-        auto ivk = extfvk.fvk.in_viewing_key();
-        auto pk = sk.DefaultAddress();
+        auto ivk = extfvk.ToIncomingViewingKey();
+        auto pk = extfvk.DefaultAddress();
 
         ASSERT_TRUE(wallet.AddSaplingZKey(sk));
         ASSERT_TRUE(wallet.HaveSaplingSpendingKey(extfvk));
@@ -652,7 +711,7 @@ TEST(WalletTests, GetConflictedSaplingNotes) {
         auto witness = saplingTree.witness();
 
         // Generate tx to create output note B
-        auto builder = TransactionBuilder(consensusParams, 1);
+        auto builder = TransactionBuilder(consensusParams, 1, std::nullopt);
         builder.AddSaplingSpend(expsk, note, anchor, witness);
         builder.AddSaplingOutput(extfvk.fvk.ovk, pk, 35000, {});
         auto tx = builder.Build().GetTxOrThrow();
@@ -676,10 +735,10 @@ TEST(WalletTests, GetConflictedSaplingNotes) {
         ASSERT_TRUE(saplingNoteData.size() > 0);
         wtx.SetSaplingNoteData(saplingNoteData);
         wtx.SetMerkleBranch(block);
-        wallet.AddToWallet(wtx, true, NULL);
+        wallet.LoadWalletTx(wtx);
 
         // Simulate receiving new block and ChainTip signal
-        wallet.IncrementNoteWitnesses(&fakeIndex, &block, sproutTree, saplingTree);
+        wallet.IncrementNoteWitnesses(Params().GetConsensus(),&fakeIndex, &block, sproutTree, saplingTree, true);
         wallet.UpdateSaplingNullifierNoteMapForBlock(&block);
 
         // Retrieve the updated wtx from wallet
@@ -708,13 +767,13 @@ TEST(WalletTests, GetConflictedSaplingNotes) {
         anchor = saplingTree.root();
 
         // Create transaction to spend note B
-        auto builder2 = TransactionBuilder(consensusParams, 2);
+        auto builder2 = TransactionBuilder(consensusParams, 2, std::nullopt);
         builder2.AddSaplingSpend(expsk, note2, anchor, spend_note_witness);
         builder2.AddSaplingOutput(extfvk.fvk.ovk, pk, 20000, {});
         auto tx2 = builder2.Build().GetTxOrThrow();
 
         // Create conflicting transaction which also spends note B
-        auto builder3 = TransactionBuilder(consensusParams, 2);
+        auto builder3 = TransactionBuilder(consensusParams, 2, std::nullopt);
         builder3.AddSaplingSpend(expsk, note2, anchor, spend_note_witness);
         builder3.AddSaplingOutput(extfvk.fvk.ovk, pk, 19999, {});
         auto tx3 = builder3.Build().GetTxOrThrow();
@@ -730,11 +789,11 @@ TEST(WalletTests, GetConflictedSaplingNotes) {
         EXPECT_EQ(0, wallet.GetConflicts(hash3).size());
 
         // No conflicts for one spend
-        wallet.AddToWallet(wtx2, true, NULL);
+        wallet.LoadWalletTx(wtx2);
         EXPECT_EQ(0, wallet.GetConflicts(hash2).size());
 
         // Conflicts for two spends
-        wallet.AddToWallet(wtx3, true, NULL);
+        wallet.LoadWalletTx(wtx3);
         auto c3 = wallet.GetConflicts(hash2);
         EXPECT_EQ(2, c3.size());
         EXPECT_EQ(std::set<uint256>({hash2, hash3}), c3);
@@ -748,7 +807,8 @@ TEST(WalletTests, GetConflictedSaplingNotes) {
 }
 
 TEST(WalletTests, SproutNullifierIsSpent) {
-    CWallet wallet;
+    SelectParams(CBaseChainParams::REGTEST);
+    CWallet wallet(Params());
     LOCK2(cs_main, wallet.cs_wallet);
 
     auto sk = libzcash::SproutSpendingKey::random();
@@ -760,11 +820,11 @@ TEST(WalletTests, SproutNullifierIsSpent) {
 
     EXPECT_FALSE(wallet.IsSproutSpent(nullifier));
 
-    wallet.AddToWallet(wtx, true, NULL);
+    wallet.LoadWalletTx(wtx);
     EXPECT_FALSE(wallet.IsSproutSpent(nullifier));
 
     auto wtx2 = GetValidSproutSpend(sk, note, 5);
-    wallet.AddToWallet(wtx2, true, NULL);
+    wallet.LoadWalletTx(wtx2);
     EXPECT_FALSE(wallet.IsSproutSpent(nullifier));
 
     // Fake-mine the transaction
@@ -780,7 +840,7 @@ TEST(WalletTests, SproutNullifierIsSpent) {
     EXPECT_EQ(0, chainActive.Height());
 
     wtx2.SetMerkleBranch(block);
-    wallet.AddToWallet(wtx2, true, NULL);
+    wallet.LoadWalletTx(wtx2);
     EXPECT_TRUE(wallet.IsSproutSpent(nullifier));
 
     // Tear down
@@ -789,21 +849,22 @@ TEST(WalletTests, SproutNullifierIsSpent) {
 }
 
 TEST(WalletTests, SaplingNullifierIsSpent) {
-    auto consensusParams = RegtestActivateSapling();
+    LoadProofParameters();
 
-    TestWallet wallet;
+    auto consensusParams = RegtestActivateSapling();
+    TestWallet wallet(Params());
     LOCK2(cs_main, wallet.cs_wallet);
 
     // Generate dummy Sapling address
     auto sk = GetTestMasterSaplingSpendingKey();
     auto expsk = sk.expsk;
     auto extfvk = sk.ToXFVK();
-    auto pa = sk.DefaultAddress();
+    auto pa = extfvk.DefaultAddress();
 
     auto testNote = GetTestSaplingNote(pa, 50000);
 
     // Generate transaction
-    auto builder = TransactionBuilder(consensusParams, 1);
+    auto builder = TransactionBuilder(consensusParams, 1, std::nullopt);
     builder.AddSaplingSpend(expsk,  testNote.note, testNote.tree.root(), testNote.tree.witness());
     builder.AddSaplingOutput(extfvk.fvk.ovk, pa, 25000, {});
     auto tx = builder.Build().GetTxOrThrow();
@@ -833,7 +894,7 @@ TEST(WalletTests, SaplingNullifierIsSpent) {
     EXPECT_EQ(0, chainActive.Height());
 
     wtx.SetMerkleBranch(block);
-    wallet.AddToWallet(wtx, true, NULL);
+    wallet.LoadWalletTx(wtx);
 
     // Verify note has been spent
     EXPECT_TRUE(wallet.IsSaplingSpent(nullifier));
@@ -847,7 +908,8 @@ TEST(WalletTests, SaplingNullifierIsSpent) {
 }
 
 TEST(WalletTests, NavigateFromSproutNullifierToNote) {
-    CWallet wallet;
+    SelectParams(CBaseChainParams::REGTEST);
+    CWallet wallet(Params());
     LOCK(wallet.cs_wallet);
 
     auto sk = libzcash::SproutSpendingKey::random();
@@ -866,7 +928,7 @@ TEST(WalletTests, NavigateFromSproutNullifierToNote) {
 
     EXPECT_EQ(0, wallet.mapSproutNullifiersToNotes.count(nullifier));
 
-    wallet.AddToWallet(wtx, true, NULL);
+    wallet.LoadWalletTx(wtx);
     EXPECT_EQ(1, wallet.mapSproutNullifiersToNotes.count(nullifier));
     EXPECT_EQ(wtx.GetHash(), wallet.mapSproutNullifiersToNotes[nullifier].hash);
     EXPECT_EQ(0, wallet.mapSproutNullifiersToNotes[nullifier].js);
@@ -874,21 +936,22 @@ TEST(WalletTests, NavigateFromSproutNullifierToNote) {
 }
 
 TEST(WalletTests, NavigateFromSaplingNullifierToNote) {
-    auto consensusParams = RegtestActivateSapling();
+    LoadProofParameters();
 
-    TestWallet wallet;
+    auto consensusParams = RegtestActivateSapling();
+    TestWallet wallet(Params());
     LOCK2(cs_main, wallet.cs_wallet);
 
     // Generate dummy Sapling address
     auto sk = GetTestMasterSaplingSpendingKey();
     auto expsk = sk.expsk;
     auto extfvk = sk.ToXFVK();
-    auto pa = sk.DefaultAddress();
+    auto pa = extfvk.DefaultAddress();
 
     auto testNote = GetTestSaplingNote(pa, 50000);
 
     // Generate transaction
-    auto builder = TransactionBuilder(consensusParams, 1);
+    auto builder = TransactionBuilder(consensusParams, 1, std::nullopt);
     builder.AddSaplingSpend(expsk, testNote.note, testNote.tree.root(), testNote.tree.witness());
     builder.AddSaplingOutput(extfvk.fvk.ovk, pa, 25000, {});
     auto tx = builder.Build().GetTxOrThrow();
@@ -923,7 +986,7 @@ TEST(WalletTests, NavigateFromSaplingNullifierToNote) {
     auto saplingNoteData = wallet.FindMySaplingNotes(wtx, chainActive.Height()).first;
     ASSERT_TRUE(saplingNoteData.size() > 0);
     wtx.SetSaplingNoteData(saplingNoteData);
-    wallet.AddToWallet(wtx, true, NULL);
+    wallet.LoadWalletTx(wtx);
 
     // Verify dummy note is now spent, as AddToWallet invokes AddToSpends()
     EXPECT_TRUE(wallet.IsSaplingSpent(nullifier));
@@ -937,7 +1000,7 @@ TEST(WalletTests, NavigateFromSaplingNullifierToNote) {
     }
 
     // Simulate receiving new block and ChainTip signal
-    wallet.IncrementNoteWitnesses(&fakeIndex, &block, sproutTree, testNote.tree);
+    wallet.IncrementNoteWitnesses(Params().GetConsensus(), &fakeIndex, &block, sproutTree, testNote.tree, true);
     wallet.UpdateSaplingNullifierNoteMapForBlock(&block);
 
     // Retrieve the updated wtx from wallet
@@ -967,7 +1030,8 @@ TEST(WalletTests, NavigateFromSaplingNullifierToNote) {
 }
 
 TEST(WalletTests, SpentSproutNoteIsFromMe) {
-    CWallet wallet;
+    SelectParams(CBaseChainParams::REGTEST);
+    CWallet wallet(Params());
     LOCK(wallet.cs_wallet);
 
     auto sk = libzcash::SproutSpendingKey::random();
@@ -990,14 +1054,14 @@ TEST(WalletTests, SpentSproutNoteIsFromMe) {
     EXPECT_FALSE(wallet.IsFromMe(wtx));
     EXPECT_FALSE(wallet.IsFromMe(wtx2));
 
-    wallet.AddToWallet(wtx, true, NULL);
+    wallet.LoadWalletTx(wtx);
     EXPECT_FALSE(wallet.IsFromMe(wtx));
     EXPECT_TRUE(wallet.IsFromMe(wtx2));
 }
 
 // Create note A, spend A to create note B, spend and verify note B is from me.
 TEST(WalletTests, SpentSaplingNoteIsFromMe) {
-    SelectParams(CBaseChainParams::REGTEST);
+    LoadProofParameters();
 
     std::vector<libzcash::Zip212Enabled> zip_212_enabled = {libzcash::Zip212Enabled::BeforeZip212, libzcash::Zip212Enabled::AfterZip212};
     const Consensus::Params& (*activations [])() = {RegtestActivateSapling, RegtestActivateCanopy};
@@ -1006,15 +1070,15 @@ TEST(WalletTests, SpentSaplingNoteIsFromMe) {
     for (int ver = 0; ver < zip_212_enabled.size(); ver++) {
         auto consensusParams = (*activations[ver])();
 
-        TestWallet wallet;
+        TestWallet wallet(Params());
         LOCK2(cs_main, wallet.cs_wallet);
 
         // Generate Sapling address
         auto sk = GetTestMasterSaplingSpendingKey();
         auto expsk = sk.expsk;
         auto extfvk = sk.ToXFVK();
-        auto ivk = extfvk.fvk.in_viewing_key();
-        auto pk = sk.DefaultAddress();
+        auto ivk = extfvk.ToIncomingViewingKey();
+        auto pk = extfvk.DefaultAddress();
 
         // Generate Sapling note A
         libzcash::SaplingNote note(pk, 50000, zip_212_enabled[ver]);
@@ -1025,7 +1089,7 @@ TEST(WalletTests, SpentSaplingNoteIsFromMe) {
         auto witness = saplingTree.witness();
 
         // Generate transaction, which sends funds to note B
-        auto builder = TransactionBuilder(consensusParams, 1);
+        auto builder = TransactionBuilder(consensusParams, 1, std::nullopt);
         builder.AddSaplingSpend(expsk, note, anchor, witness);
         builder.AddSaplingOutput(extfvk.fvk.ovk, pk, 25000, {});
         auto tx = builder.Build().GetTxOrThrow();
@@ -1051,12 +1115,12 @@ TEST(WalletTests, SpentSaplingNoteIsFromMe) {
         ASSERT_TRUE(saplingNoteData.size() > 0);
         wtx.SetSaplingNoteData(saplingNoteData);
         wtx.SetMerkleBranch(block);
-        wallet.AddToWallet(wtx, true, NULL);
+        wallet.LoadWalletTx(wtx);
 
         // Simulate receiving new block and ChainTip signal.
         // This triggers calculation of nullifiers for notes belonging to this wallet
         // in the output descriptions of wtx.
-        wallet.IncrementNoteWitnesses(&fakeIndex, &block, sproutTree, saplingTree);
+        wallet.IncrementNoteWitnesses(Params().GetConsensus(), &fakeIndex, &block, sproutTree, saplingTree, true);
         wallet.UpdateSaplingNullifierNoteMapForBlock(&block);
 
         // Retrieve the updated wtx from wallet
@@ -1097,7 +1161,7 @@ TEST(WalletTests, SpentSaplingNoteIsFromMe) {
         anchor = saplingTree.root();
 
         // Create transaction to spend note B
-        auto builder2 = TransactionBuilder(consensusParams, 2);
+        auto builder2 = TransactionBuilder(consensusParams, 2, std::nullopt);
         builder2.AddSaplingSpend(expsk, note2, anchor, spend_note_witness);
         builder2.AddSaplingOutput(extfvk.fvk.ovk, pk, 12500, {});
         auto tx2 = builder2.Build().GetTxOrThrow();
@@ -1128,9 +1192,9 @@ TEST(WalletTests, SpentSaplingNoteIsFromMe) {
         ASSERT_TRUE(saplingNoteData2.size() > 0);
         wtx2.SetSaplingNoteData(saplingNoteData2);
         wtx2.SetMerkleBranch(block2);
-        wallet.AddToWallet(wtx2, true, NULL);
+        wallet.LoadWalletTx(wtx2);
 
-        // Verify note B is spent. AddToWallet invokes AddToSpends which updates mapTxSaplingNullifiers
+        // Verify note B is spent. LoadWalletTx invokes AddToSpends which updates mapTxSaplingNullifiers
         EXPECT_TRUE(wallet.IsSaplingSpent(nullifier2));
 
         // Verify note B belongs to wallet.
@@ -1147,7 +1211,8 @@ TEST(WalletTests, SpentSaplingNoteIsFromMe) {
 }
 
 TEST(WalletTests, CachedWitnessesEmptyChain) {
-    TestWallet wallet;
+    SelectParams(CBaseChainParams::REGTEST);
+    TestWallet wallet(Params());
 
     auto sk = libzcash::SproutSpendingKey::random();
     wallet.AddSproutSpendingKey(sk);
@@ -1179,7 +1244,7 @@ TEST(WalletTests, CachedWitnessesEmptyChain) {
     EXPECT_FALSE((bool) sproutWitnesses[1]);
     EXPECT_FALSE((bool) saplingWitnesses[0]);
 
-    wallet.AddToWallet(wtx, true, NULL);
+    wallet.LoadWalletTx(wtx);
 
     ::GetWitnessesAndAnchors(wallet, sproutNotes, saplingNotes, sproutWitnesses, saplingWitnesses);
 
@@ -1192,7 +1257,7 @@ TEST(WalletTests, CachedWitnessesEmptyChain) {
     CBlockIndex index(block);
     SproutMerkleTree sproutTree;
     SaplingMerkleTree saplingTree;
-    wallet.IncrementNoteWitnesses(&index, &block, sproutTree, saplingTree);
+    wallet.IncrementNoteWitnesses(Params().GetConsensus(), &index, &block, sproutTree, saplingTree, true);
 
     ::GetWitnessesAndAnchors(wallet, sproutNotes, saplingNotes, sproutWitnesses, saplingWitnesses);
 
@@ -1200,14 +1265,16 @@ TEST(WalletTests, CachedWitnessesEmptyChain) {
     EXPECT_TRUE((bool) sproutWitnesses[1]);
     EXPECT_TRUE((bool) saplingWitnesses[0]);
 
-    // Until #1302 is implemented, this should triggger an assertion
-    EXPECT_DEATH(wallet.DecrementNoteWitnesses(&index),
+    // Until #1302 is implemented, this should trigger an assertion
+    EXPECT_DEATH(wallet.DecrementNoteWitnesses(Params().GetConsensus(), &index),
                  ".*nWitnessCacheSize > 0.*");
 }
 
 TEST(WalletTests, CachedWitnessesChainTip) {
-    TestWallet wallet;
+    SelectParams(CBaseChainParams::REGTEST);
+    TestWallet wallet(Params());
     LOCK(wallet.cs_wallet);
+
     std::pair<uint256, uint256> anchors1;
     CBlock block1;
     SproutMerkleTree sproutTree;
@@ -1244,7 +1311,7 @@ TEST(WalletTests, CachedWitnessesChainTip) {
         sproutNoteData[jsoutpt] = nd;
         wtx.SetSproutNoteData(sproutNoteData);
         std::vector<SaplingOutPoint> saplingNotes = SetSaplingNoteData(wtx);
-        wallet.AddToWallet(wtx, true, NULL);
+        wallet.LoadWalletTx(wtx);
 
         std::vector<JSOutPoint> sproutNotes {jsoutpt};
         std::vector<std::optional<SproutWitness>> sproutWitnesses;
@@ -1263,7 +1330,7 @@ TEST(WalletTests, CachedWitnessesChainTip) {
         index2.nHeight = 2;
         SproutMerkleTree sproutTree2 {sproutTree};
         SaplingMerkleTree saplingTree2 {saplingTree};
-        wallet.IncrementNoteWitnesses(&index2, &block2, sproutTree2, saplingTree2);
+        wallet.IncrementNoteWitnesses(Params().GetConsensus(), &index2, &block2, sproutTree2, saplingTree2, true);
 
         auto anchors2 = GetWitnessesAndAnchors(wallet, sproutNotes, saplingNotes, sproutWitnesses, saplingWitnesses);
         EXPECT_NE(anchors2.first, anchors2.second);
@@ -1274,7 +1341,7 @@ TEST(WalletTests, CachedWitnessesChainTip) {
         EXPECT_NE(anchors1.second, anchors2.second);
 
         // Decrementing should give us the previous anchor
-        wallet.DecrementNoteWitnesses(&index2);
+        wallet.DecrementNoteWitnesses(Params().GetConsensus(), &index2);
         auto anchors3 = GetWitnessesAndAnchors(wallet, sproutNotes, saplingNotes, sproutWitnesses, saplingWitnesses);
 
         EXPECT_FALSE((bool) sproutWitnesses[0]);
@@ -1284,7 +1351,7 @@ TEST(WalletTests, CachedWitnessesChainTip) {
         EXPECT_NE(anchors1.second, anchors3.second);
 
         // Re-incrementing with the same block should give the same result
-        wallet.IncrementNoteWitnesses(&index2, &block2, sproutTree, saplingTree);
+        wallet.IncrementNoteWitnesses(Params().GetConsensus(), &index2, &block2, sproutTree, saplingTree, true);
         auto anchors4 = GetWitnessesAndAnchors(wallet, sproutNotes, saplingNotes, sproutWitnesses, saplingWitnesses);
         EXPECT_NE(anchors4.first, anchors4.second);
 
@@ -1294,7 +1361,7 @@ TEST(WalletTests, CachedWitnessesChainTip) {
         EXPECT_EQ(anchors2.second, anchors4.second);
 
         // Incrementing with the same block again should not change the cache
-        wallet.IncrementNoteWitnesses(&index2, &block2, sproutTree, saplingTree);
+        wallet.IncrementNoteWitnesses(Params().GetConsensus(), &index2, &block2, sproutTree, saplingTree, true);
         std::vector<std::optional<SproutWitness>> sproutWitnesses5;
         std::vector<std::optional<SaplingWitness>> saplingWitnesses5;
 
@@ -1309,8 +1376,10 @@ TEST(WalletTests, CachedWitnessesChainTip) {
 }
 
 TEST(WalletTests, CachedWitnessesDecrementFirst) {
-    TestWallet wallet;
+    SelectParams(CBaseChainParams::REGTEST);
+    TestWallet wallet(Params());
     LOCK(wallet.cs_wallet);
+
     SproutMerkleTree sproutTree;
     SaplingMerkleTree saplingTree;
 
@@ -1354,7 +1423,7 @@ TEST(WalletTests, CachedWitnessesDecrementFirst) {
         noteData[jsoutpt] = nd;
         wtx.SetSproutNoteData(noteData);
         std::vector<SaplingOutPoint> saplingNotes = SetSaplingNoteData(wtx);
-        wallet.AddToWallet(wtx, true, NULL);
+        wallet.LoadWalletTx(wtx);
 
         std::vector<JSOutPoint> sproutNotes {jsoutpt};
         std::vector<std::optional<SproutWitness>> sproutWitnesses;
@@ -1367,7 +1436,7 @@ TEST(WalletTests, CachedWitnessesDecrementFirst) {
 
         // Decrementing (before the transaction has ever seen an increment)
         // should give us the previous anchor
-        wallet.DecrementNoteWitnesses(&index2);
+        wallet.DecrementNoteWitnesses(Params().GetConsensus(), &index2);
 
         auto anchors4 = GetWitnessesAndAnchors(wallet, sproutNotes, saplingNotes, sproutWitnesses, saplingWitnesses);
 
@@ -1378,7 +1447,7 @@ TEST(WalletTests, CachedWitnessesDecrementFirst) {
         EXPECT_NE(anchors2.second, anchors4.second);
 
         // Re-incrementing with the same block should give the same result
-        wallet.IncrementNoteWitnesses(&index2, &block2, sproutTree, saplingTree);
+        wallet.IncrementNoteWitnesses(Params().GetConsensus(), &index2, &block2, sproutTree, saplingTree, true);
 
         auto anchors5 = GetWitnessesAndAnchors(wallet, sproutNotes, saplingNotes, sproutWitnesses, saplingWitnesses);
 
@@ -1390,8 +1459,10 @@ TEST(WalletTests, CachedWitnessesDecrementFirst) {
 }
 
 TEST(WalletTests, CachedWitnessesCleanIndex) {
-    TestWallet wallet;
+    SelectParams(CBaseChainParams::REGTEST);
+    TestWallet wallet(Params());
     LOCK(wallet.cs_wallet);
+
     std::vector<CBlock> blocks;
     std::vector<CBlockIndex> indices;
     std::vector<JSOutPoint> sproutNotes;
@@ -1436,7 +1507,7 @@ TEST(WalletTests, CachedWitnessesCleanIndex) {
     for (size_t i = 0; i < numBlocks; i++) {
         SproutMerkleTree sproutRiPrevTree {sproutRiTree};
         SaplingMerkleTree saplingRiPrevTree {saplingRiTree};
-        wallet.IncrementNoteWitnesses(&(indices[i]), &(blocks[i]), sproutRiTree, saplingRiTree);
+        wallet.IncrementNoteWitnesses(Params().GetConsensus(), &(indices[i]), &(blocks[i]), sproutRiTree, saplingRiTree, true);
 
         auto anchors = GetWitnessesAndAnchors(wallet, sproutNotes, saplingNotes, sproutWitnesses, saplingWitnesses);
         for (size_t j = 0; j < numBlocks; j++) {
@@ -1450,7 +1521,7 @@ TEST(WalletTests, CachedWitnessesCleanIndex) {
         if ((i == 5) || (i == 50)) {
             // Pretend a reorg happened that was recorded in the block files
             {
-                wallet.DecrementNoteWitnesses(&(indices[i]));
+                wallet.DecrementNoteWitnesses(Params().GetConsensus(), &(indices[i]));
 
                 auto anchors = GetWitnessesAndAnchors(wallet, sproutNotes, saplingNotes, sproutWitnesses, saplingWitnesses);
                 for (size_t j = 0; j < numBlocks; j++) {
@@ -1463,7 +1534,7 @@ TEST(WalletTests, CachedWitnessesCleanIndex) {
             }
 
             {
-                wallet.IncrementNoteWitnesses(&(indices[i]), &(blocks[i]), sproutRiPrevTree, saplingRiPrevTree);
+                wallet.IncrementNoteWitnesses(Params().GetConsensus(), &(indices[i]), &(blocks[i]), sproutRiPrevTree, saplingRiPrevTree, true);
                 auto anchors = GetWitnessesAndAnchors(wallet, sproutNotes, saplingNotes, sproutWitnesses, saplingWitnesses);
                 for (size_t j = 0; j < numBlocks; j++) {
                     EXPECT_TRUE((bool) sproutWitnesses[j]);
@@ -1478,7 +1549,8 @@ TEST(WalletTests, CachedWitnessesCleanIndex) {
 }
 
 TEST(WalletTests, ClearNoteWitnessCache) {
-    TestWallet wallet;
+    SelectParams(CBaseChainParams::REGTEST);
+    TestWallet wallet(Params());
     LOCK(wallet.cs_wallet);
 
     auto sk = libzcash::SproutSpendingKey::random();
@@ -1508,7 +1580,7 @@ TEST(WalletTests, ClearNoteWitnessCache) {
     wtx.mapSaplingNoteData[saplingNotes[0]].witnessHeight = 1;
     wallet.nWitnessCacheSize = 2;
 
-    wallet.AddToWallet(wtx, true, NULL);
+    wallet.LoadWalletTx(wtx);
 
     // For Sprout, we have two outputs in the one JSDescription, only one of
     // which is in the wallet.
@@ -1545,8 +1617,10 @@ TEST(WalletTests, ClearNoteWitnessCache) {
 }
 
 TEST(WalletTests, WriteWitnessCache) {
-    TestWallet wallet;
+    SelectParams(CBaseChainParams::REGTEST);
+    TestWallet wallet(Params());
     LOCK(wallet.cs_wallet);
+
     MockWalletDB walletdb;
     CBlockLocator loc;
 
@@ -1562,7 +1636,7 @@ TEST(WalletTests, WriteWitnessCache) {
     SproutNoteData nd {sk.address(), nullifier};
     noteData[jsoutpt] = nd;
     wtx.SetSproutNoteData(noteData);
-    wallet.AddToWallet(wtx, true, NULL);
+    wallet.LoadWalletTx(wtx);
 
     // TxnBegin fails
     EXPECT_CALL(walletdb, TxnBegin())
@@ -1587,6 +1661,22 @@ TEST(WalletTests, WriteWitnessCache) {
     EXPECT_CALL(walletdb, WriteTx(wtx))
         .WillRepeatedly(Return(true));
 
+    // WriteOrchardWitnesses fails
+    EXPECT_CALL(walletdb, WriteOrchardWitnesses)
+        .WillOnce(Return(false));
+    EXPECT_CALL(walletdb, TxnAbort())
+        .Times(1);
+    wallet.SetBestChain(walletdb, loc);
+
+    // WriteOrchardWitnesses throws
+    EXPECT_CALL(walletdb, WriteOrchardWitnesses)
+        .WillOnce(ThrowLogicError());
+    EXPECT_CALL(walletdb, TxnAbort())
+        .Times(1);
+    wallet.SetBestChain(walletdb, loc);
+    EXPECT_CALL(walletdb, WriteOrchardWitnesses)
+        .WillRepeatedly(Return(true));
+
     // WriteWitnessCacheSize fails
     EXPECT_CALL(walletdb, WriteWitnessCacheSize(0))
         .WillOnce(Return(false));
@@ -1632,9 +1722,9 @@ TEST(WalletTests, WriteWitnessCache) {
 
 TEST(WalletTests, SetBestChainIgnoresTxsWithoutShieldedData) {
     SelectParams(CBaseChainParams::REGTEST);
-
-    TestWallet wallet;
+    TestWallet wallet(Params());
     LOCK(wallet.cs_wallet);
+
     MockWalletDB walletdb;
     CBlockLocator loc;
 
@@ -1652,13 +1742,13 @@ TEST(WalletTests, SetBestChainIgnoresTxsWithoutShieldedData) {
     t.vout[0].nValue = 90*CENT;
     t.vout[0].scriptPubKey = scriptPubKey;
     CWalletTx wtxTransparent {nullptr, t};
-    wallet.AddToWallet(wtxTransparent, true, nullptr);
+    wallet.LoadWalletTx(wtxTransparent);
 
     // Generate a Sprout transaction that is ours
     auto wtxSprout = GetValidSproutReceive(sk, 10, true);
     auto noteMap = wallet.FindMySproutNotes(wtxSprout);
     wtxSprout.SetSproutNoteData(noteMap);
-    wallet.AddToWallet(wtxSprout, true, nullptr);
+    wallet.LoadWalletTx(wtxSprout);
 
     // Generate a Sprout transaction that only involves our transparent address
     auto sk2 = libzcash::SproutSpendingKey::random();
@@ -1669,7 +1759,7 @@ TEST(WalletTests, SetBestChainIgnoresTxsWithoutShieldedData) {
     mtx.vout[0].scriptPubKey = scriptPubKey;
     mtx.vout[0].nValue = CENT;
     CWalletTx wtxSproutTransparent {nullptr, mtx};
-    wallet.AddToWallet(wtxSproutTransparent, true, nullptr);
+    wallet.LoadWalletTx(wtxSproutTransparent);
 
     // Generate a fake Sapling transaction
     CMutableTransaction mtxSapling;
@@ -1680,7 +1770,7 @@ TEST(WalletTests, SetBestChainIgnoresTxsWithoutShieldedData) {
     zcash_test_harness_random_jubjub_point(mtxSapling.vShieldedOutput[0].cv.begin());
     CWalletTx wtxSapling {nullptr, mtxSapling};
     SetSaplingNoteData(wtxSapling);
-    wallet.AddToWallet(wtxSapling, true, nullptr);
+    wallet.LoadWalletTx(wtxSapling);
 
     // Generate a fake Sapling transaction that would only involve our transparent addresses
     CMutableTransaction mtxSaplingTransparent;
@@ -1690,7 +1780,7 @@ TEST(WalletTests, SetBestChainIgnoresTxsWithoutShieldedData) {
     mtxSaplingTransparent.vShieldedOutput.resize(1);
     zcash_test_harness_random_jubjub_point(mtxSaplingTransparent.vShieldedOutput[0].cv.begin());
     CWalletTx wtxSaplingTransparent {nullptr, mtxSaplingTransparent};
-    wallet.AddToWallet(wtxSaplingTransparent, true, nullptr);
+    wallet.LoadWalletTx(wtxSaplingTransparent);
 
     EXPECT_CALL(walletdb, TxnBegin())
         .WillOnce(Return(true));
@@ -1704,6 +1794,8 @@ TEST(WalletTests, SetBestChainIgnoresTxsWithoutShieldedData) {
         .Times(1).WillOnce(Return(true));
     EXPECT_CALL(walletdb, WriteTx(wtxSaplingTransparent))
         .Times(0);
+    EXPECT_CALL(walletdb, WriteOrchardWitnesses)
+        .WillOnce(Return(true));
     EXPECT_CALL(walletdb, WriteWitnessCacheSize(0))
         .WillOnce(Return(true));
     EXPECT_CALL(walletdb, WriteBestBlock(loc))
@@ -1714,8 +1806,10 @@ TEST(WalletTests, SetBestChainIgnoresTxsWithoutShieldedData) {
 }
 
 TEST(WalletTests, UpdateSproutNullifierNoteMap) {
-    TestWallet wallet;
+    SelectParams(CBaseChainParams::REGTEST);
+    TestWallet wallet(Params());
     LOCK(wallet.cs_wallet);
+
     uint256 r {GetRandHash()};
     CKeyingMaterial vMasterKey (r.begin(), r.end());
 
@@ -1735,7 +1829,7 @@ TEST(WalletTests, UpdateSproutNullifierNoteMap) {
     noteData[jsoutpt] = nd;
     wtx.SetSproutNoteData(noteData);
 
-    wallet.AddToWallet(wtx, true, NULL);
+    wallet.LoadWalletTx(wtx);
     EXPECT_EQ(0, wallet.mapSproutNullifiersToNotes.count(nullifier));
 
     EXPECT_FALSE(wallet.UpdateNullifierNoteMap());
@@ -1750,7 +1844,8 @@ TEST(WalletTests, UpdateSproutNullifierNoteMap) {
 }
 
 TEST(WalletTests, UpdatedSproutNoteData) {
-    TestWallet wallet;
+    SelectParams(CBaseChainParams::REGTEST);
+    TestWallet wallet(Params());
     LOCK(wallet.cs_wallet);
 
     auto sk = libzcash::SproutSpendingKey::random();
@@ -1798,9 +1893,10 @@ TEST(WalletTests, UpdatedSproutNoteData) {
 }
 
 TEST(WalletTests, UpdatedSaplingNoteData) {
-    auto consensusParams = RegtestActivateSapling();
+    LoadProofParameters();
 
-    TestWallet wallet;
+    auto consensusParams = RegtestActivateSapling();
+    TestWallet wallet(Params());
     LOCK2(cs_main, wallet.cs_wallet);
 
     auto m = GetTestMasterSaplingSpendingKey();
@@ -1809,18 +1905,18 @@ TEST(WalletTests, UpdatedSaplingNoteData) {
     auto sk = m.Derive(0);
     auto expsk = sk.expsk;
     auto extfvk = sk.ToXFVK();
-    auto pa = sk.DefaultAddress();
+    auto pa = extfvk.DefaultAddress();
 
     // Generate dummy recipient Sapling address
     auto sk2 = m.Derive(1);
     auto expsk2 = sk2.expsk;
     auto extfvk2 = sk2.ToXFVK();
-    auto pa2 = sk2.DefaultAddress();
+    auto pa2 = extfvk2.DefaultAddress();
 
     auto testNote = GetTestSaplingNote(pa, 50000);
 
     // Generate transaction
-    auto builder = TransactionBuilder(consensusParams, 1);
+    auto builder = TransactionBuilder(consensusParams, 1, std::nullopt);
     builder.AddSaplingSpend(expsk, testNote.note, testNote.tree.root(), testNote.tree.witness());
     builder.AddSaplingOutput(extfvk.fvk.ovk, pa2, 25000, {});
     auto tx = builder.Build().GetTxOrThrow();
@@ -1849,10 +1945,10 @@ TEST(WalletTests, UpdatedSaplingNoteData) {
     ASSERT_TRUE(saplingNoteData.size() == 1); // wallet only has key for change output
     wtx.SetSaplingNoteData(saplingNoteData);
     wtx.SetMerkleBranch(block);
-    wallet.AddToWallet(wtx, true, NULL);
+    wallet.LoadWalletTx(wtx);
 
     // Simulate receiving new block and ChainTip signal
-    wallet.IncrementNoteWitnesses(&fakeIndex, &block, sproutTree, testNote.tree);
+    wallet.IncrementNoteWitnesses(Params().GetConsensus(), &fakeIndex, &block, sproutTree, testNote.tree, true);
     wallet.UpdateSaplingNullifierNoteMapForBlock(&block);
 
     // Retrieve the updated wtx from wallet
@@ -1909,7 +2005,8 @@ TEST(WalletTests, UpdatedSaplingNoteData) {
 }
 
 TEST(WalletTests, MarkAffectedSproutTransactionsDirty) {
-    TestWallet wallet;
+    SelectParams(CBaseChainParams::REGTEST);
+    TestWallet wallet(Params());
     LOCK(wallet.cs_wallet);
 
     auto sk = libzcash::SproutSpendingKey::random();
@@ -1927,7 +2024,7 @@ TEST(WalletTests, MarkAffectedSproutTransactionsDirty) {
     noteData[jsoutpt] = nd;
 
     wtx.SetSproutNoteData(noteData);
-    wallet.AddToWallet(wtx, true, NULL);
+    wallet.LoadWalletTx(wtx);
     wallet.MarkAffectedTransactionsDirty(wtx);
 
     // After getting a cached value, the first tx should be clean
@@ -1935,23 +2032,24 @@ TEST(WalletTests, MarkAffectedSproutTransactionsDirty) {
     EXPECT_TRUE(wallet.mapWallet[hash].fDebitCached);
 
     // After adding the note spend, the first tx should be dirty
-    wallet.AddToWallet(wtx2, true, NULL);
+    wallet.LoadWalletTx(wtx2);
     wallet.MarkAffectedTransactionsDirty(wtx2);
     EXPECT_FALSE(wallet.mapWallet[hash].fDebitCached);
 }
 
 TEST(WalletTests, MarkAffectedSaplingTransactionsDirty) {
-    auto consensusParams = RegtestActivateSapling();
+    LoadProofParameters();
 
-    TestWallet wallet;
+    auto consensusParams = RegtestActivateSapling();
+    TestWallet wallet(Params());
     LOCK2(cs_main, wallet.cs_wallet);
 
     // Generate Sapling address
     auto sk = GetTestMasterSaplingSpendingKey();
     auto expsk = sk.expsk;
     auto extfvk = sk.ToXFVK();
-    auto ivk = extfvk.fvk.in_viewing_key();
-    auto pk = sk.DefaultAddress();
+    auto ivk = extfvk.ToIncomingViewingKey();
+    auto pk = extfvk.DefaultAddress();
 
     ASSERT_TRUE(wallet.AddSaplingZKey(sk));
     ASSERT_TRUE(wallet.HaveSaplingSpendingKey(extfvk));
@@ -1963,7 +2061,7 @@ TEST(WalletTests, MarkAffectedSaplingTransactionsDirty) {
 
     // Generate shielding tx from transparent to Sapling
     // 0.0005 t-ZEC in, 0.0004 z-ZEC out, default fee
-    auto builder = TransactionBuilder(consensusParams, 1, &keystore);
+    auto builder = TransactionBuilder(consensusParams, 1, std::nullopt, &keystore);
     builder.AddTransparentInput(COutPoint(), scriptPubKey, 50000);
     builder.AddSaplingOutput(extfvk.fvk.ovk, pk, 40000, {});
     auto tx1 = builder.Build().GetTxOrThrow();
@@ -1996,10 +2094,10 @@ TEST(WalletTests, MarkAffectedSaplingTransactionsDirty) {
     ASSERT_TRUE(saplingNoteData.size() > 0);
     wtx.SetSaplingNoteData(saplingNoteData);
     wtx.SetMerkleBranch(block);
-    wallet.AddToWallet(wtx, true, NULL);
+    wallet.LoadWalletTx(wtx);
 
     // Simulate receiving new block and ChainTip signal
-    wallet.IncrementNoteWitnesses(&fakeIndex, &block, sproutTree, saplingTree);
+    wallet.IncrementNoteWitnesses(Params().GetConsensus(), &fakeIndex, &block, sproutTree, saplingTree, true);
     wallet.UpdateSaplingNullifierNoteMapForBlock(&block);
 
     // Retrieve the updated wtx from wallet
@@ -2017,7 +2115,7 @@ TEST(WalletTests, MarkAffectedSaplingTransactionsDirty) {
 
     // Create a Sapling-only transaction
     // 0.0004 z-ZEC in, 0.00025 z-ZEC out, default fee, 0.00005 z-ZEC change
-    auto builder2 = TransactionBuilder(consensusParams, 2);
+    auto builder2 = TransactionBuilder(consensusParams, 2, std::nullopt);
     builder2.AddSaplingSpend(expsk, note, anchor, witness);
     builder2.AddSaplingOutput(extfvk.fvk.ovk, pk, 25000, {});
     auto tx2 = builder2.Build().GetTxOrThrow();
@@ -2039,7 +2137,7 @@ TEST(WalletTests, MarkAffectedSaplingTransactionsDirty) {
     EXPECT_TRUE(wallet.mapWallet[hash].fDebitCached);
 
     // After adding the note spend, the first tx should be dirty
-    wallet.AddToWallet(wtx2, true, NULL);
+    wallet.LoadWalletTx(wtx2);
     wallet.MarkAffectedTransactionsDirty(wtx2);
     EXPECT_FALSE(wallet.mapWallet[hash].fDebitCached);
 
@@ -2052,7 +2150,8 @@ TEST(WalletTests, MarkAffectedSaplingTransactionsDirty) {
 }
 
 TEST(WalletTests, SproutNoteLocking) {
-    TestWallet wallet;
+    SelectParams(CBaseChainParams::REGTEST);
+    TestWallet wallet(Params());
     LOCK(wallet.cs_wallet);
 
     auto sk = libzcash::SproutSpendingKey::random();
@@ -2086,8 +2185,10 @@ TEST(WalletTests, SproutNoteLocking) {
 }
 
 TEST(WalletTests, SaplingNoteLocking) {
-    TestWallet wallet;
+    SelectParams(CBaseChainParams::REGTEST);
+    TestWallet wallet(Params());
     LOCK(wallet.cs_wallet);
+
     SaplingOutPoint sop1 {uint256(), 1};
     SaplingOutPoint sop2 {uint256(), 2};
 
@@ -2117,3 +2218,120 @@ TEST(WalletTests, SaplingNoteLocking) {
     EXPECT_FALSE(wallet.IsLockedNote(sop1));
     EXPECT_FALSE(wallet.IsLockedNote(sop2));
 }
+
+TEST(WalletTests, GenerateUnifiedAddress) {
+    (void) RegtestActivateSapling();
+    TestWallet wallet(Params());
+
+    auto uaResult = wallet.GenerateUnifiedAddress(0, {ReceiverType::P2PKH, ReceiverType::Sapling});
+
+    // If the wallet does not have a mnemonic seed available, it is
+    // treated as if the wallet is encrypted.
+    EXPECT_FALSE(wallet.IsCrypted());
+    EXPECT_FALSE(wallet.GetMnemonicSeed().has_value());
+    WalletUAGenerationResult expected = WalletUAGenerationError::WalletEncrypted;
+    EXPECT_EQ(uaResult, expected);
+
+    wallet.GenerateNewSeed();
+    EXPECT_FALSE(wallet.IsCrypted());
+    EXPECT_TRUE(wallet.GetMnemonicSeed().has_value());
+
+    // If the user has not generated a unified spending key,
+    // we cannot create an address for the account corresponding
+    // to that spending key.
+    uaResult = wallet.GenerateUnifiedAddress(0, {ReceiverType::P2PKH, ReceiverType::Sapling});
+    expected = WalletUAGenerationError::NoSuchAccount;
+    EXPECT_EQ(uaResult, expected);
+
+    // lock required by GenerateNewUnifiedSpendingKey
+    LOCK(wallet.cs_wallet);
+
+    // Create an account, then generate an address for that account.
+    auto ufvkpair = wallet.GenerateNewUnifiedSpendingKey();
+    auto ufvk = ufvkpair.first;
+    auto account = ufvkpair.second;
+    uaResult = wallet.GenerateUnifiedAddress(account, {ReceiverType::P2PKH, ReceiverType::Sapling});
+    auto ua = std::get_if<std::pair<libzcash::UnifiedAddress, libzcash::diversifier_index_t>>(&uaResult);
+    EXPECT_NE(ua, nullptr);
+
+    auto uaSaplingReceiver = ua->first.GetSaplingReceiver();
+    EXPECT_TRUE(uaSaplingReceiver.has_value());
+    EXPECT_EQ(uaSaplingReceiver.value(), ufvk.GetSaplingKey().value().Address(ua->second));
+
+    auto u4r = wallet.FindUnifiedAddressByReceiver(uaSaplingReceiver.value());
+    EXPECT_TRUE(u4r.has_value());
+    EXPECT_EQ(u4r.value(), ua->first);
+
+    // Explicitly trigger the invalid transparent child index failure
+    uaResult = wallet.GenerateUnifiedAddress(
+            0,
+            {ReceiverType::P2PKH, ReceiverType::Sapling},
+            MAX_TRANSPARENT_CHILD_IDX.succ().value());
+    expected = UnifiedAddressGenerationError::InvalidTransparentChildIndex;
+    EXPECT_EQ(uaResult, expected);
+
+    // Attempt to generate a UA at the maximum transparent child index. This might fail
+    // due to this index being invalid for Sapling; if so, it will return an error that
+    // the diversifier index is out of range. If it succeeds, we'll attempt to generate
+    // the next available diversifier, and this should always fail
+    uaResult = wallet.GenerateUnifiedAddress(
+            0,
+            {ReceiverType::P2PKH, ReceiverType::Sapling},
+            MAX_TRANSPARENT_CHILD_IDX);
+    ua = std::get_if<std::pair<libzcash::UnifiedAddress, libzcash::diversifier_index_t>>(&uaResult);
+    if (ua == nullptr) {
+        expected = UnifiedAddressGenerationError::NoAddressForDiversifier;
+        EXPECT_EQ(uaResult, expected);
+    } else {
+        // the previous generation attempt succeeded, so this one should definitely fail.
+        uaResult = wallet.GenerateUnifiedAddress(0, {ReceiverType::P2PKH, ReceiverType::Sapling});
+        expected = UnifiedAddressGenerationError::InvalidTransparentChildIndex;
+        EXPECT_EQ(uaResult, expected);
+    }
+
+    // Revert to default
+    RegtestDeactivateSapling();
+}
+
+TEST(WalletTests, GenerateUnifiedSpendingKeyAddsOrchardAddresses) {
+    (void) RegtestActivateSapling();
+    TestWallet wallet(Params());
+    wallet.GenerateNewSeed();
+
+    // lock required by GenerateNewUnifiedSpendingKey
+    LOCK(wallet.cs_wallet);
+
+    // Create an account.
+    auto ufvkpair = wallet.GenerateNewUnifiedSpendingKey();
+    auto ufvk = ufvkpair.first;
+    auto account = ufvkpair.second;
+    auto fvk = ufvk.GetOrchardKey();
+    EXPECT_TRUE(fvk.has_value());
+
+    // At this point the Orchard wallet should contain the change address, but
+    // no other addresses. We detect this by trying to look up their IVKs.
+    auto changeAddr = fvk->ToInternalIncomingViewingKey().Address(libzcash::diversifier_index_t{0});
+    auto internalIvk = wallet.GetOrchardWallet().GetIncomingViewingKeyForAddress(changeAddr);
+    EXPECT_TRUE(internalIvk.has_value());
+    EXPECT_EQ(internalIvk.value(), fvk->ToInternalIncomingViewingKey());
+    auto externalAddr = fvk->ToIncomingViewingKey().Address(libzcash::diversifier_index_t{0});
+    auto externalIvk = wallet.GetOrchardWallet().GetIncomingViewingKeyForAddress(externalAddr);
+    EXPECT_FALSE(externalIvk.has_value());
+
+    // Generate an address.
+    auto uaResult = wallet.GenerateUnifiedAddress(account, {ReceiverType::Orchard});
+    auto ua = std::get_if<std::pair<libzcash::UnifiedAddress, libzcash::diversifier_index_t>>(&uaResult);
+    EXPECT_NE(ua, nullptr);
+
+    auto uaOrchardReceiver = ua->first.GetOrchardReceiver();
+    EXPECT_TRUE(uaOrchardReceiver.has_value());
+    EXPECT_EQ(uaOrchardReceiver.value(), externalAddr);
+
+    // Now we can look up the external IVK.
+    externalIvk = wallet.GetOrchardWallet().GetIncomingViewingKeyForAddress(externalAddr);
+    EXPECT_TRUE(externalIvk.has_value());
+    EXPECT_EQ(externalIvk.value(), fvk->ToIncomingViewingKey());
+
+    // Revert to default
+    RegtestDeactivateSapling();
+}
diff --git a/src/wallet/gtest/test_wallet_zkeys.cpp b/src/wallet/gtest/test_wallet_zkeys.cpp
index 92b26574bf0..a51ec83f987 100644
--- a/src/wallet/gtest/test_wallet_zkeys.cpp
+++ b/src/wallet/gtest/test_wallet_zkeys.cpp
@@ -1,6 +1,7 @@
 #include <gtest/gtest.h>
 
 #include "fs.h"
+#include "db.h"
 #include "zcash/Address.hpp"
 #include "wallet/wallet.h"
 #include "wallet/walletdb.h"
@@ -8,9 +9,9 @@
 
 /**
  * This test covers Sapling methods on CWallet
- * GenerateNewSaplingZKey()
+ * GenerateNewLegacySaplingZKey()
  * AddSaplingZKey()
- * AddSaplingIncomingViewingKey()
+ * AddSaplingPaymentAddress()
  * LoadSaplingZKey()
  * LoadSaplingIncomingViewingKey()
  * LoadSaplingZKeyMetadata()
@@ -20,7 +21,7 @@ TEST(WalletZkeysTest, StoreAndLoadSaplingZkeys) {
 
     SelectParams(CBaseChainParams::MAIN);
 
-    CWallet wallet;
+    CWallet wallet(Params());
     LOCK(wallet.cs_wallet);
 
     // wallet should be empty
@@ -29,23 +30,22 @@ TEST(WalletZkeysTest, StoreAndLoadSaplingZkeys) {
     ASSERT_EQ(0, addrs.size());
 
     // No HD seed in the wallet
-    EXPECT_ANY_THROW(wallet.GenerateNewSaplingZKey());
+    EXPECT_ANY_THROW(wallet.GenerateNewLegacySaplingZKey());
 
-    // Load the all-zeroes seed
-    CKeyingMaterial rawSeed(32, 0);
-    HDSeed seed(rawSeed);
-    wallet.LoadHDSeed(seed);
+    // Add a random seed to the wallet.
+    wallet.GenerateNewSeed();
+    auto seed = wallet.GetMnemonicSeed().value();
 
     // Now this call succeeds
-    auto address = wallet.GenerateNewSaplingZKey();
+    auto address = wallet.GenerateNewLegacySaplingZKey();
 
     // wallet should have one key
     wallet.GetSaplingPaymentAddresses(addrs);
     ASSERT_EQ(1, addrs.size());
-    
+
     // verify wallet has incoming viewing key for the address
     ASSERT_TRUE(wallet.HaveSaplingIncomingViewingKey(address));
-    
+
     // manually add new spending key to wallet
     auto m = libzcash::SaplingExtendedSpendingKey::Master(seed);
     auto sk = m.Derive(0);
@@ -60,28 +60,31 @@ TEST(WalletZkeysTest, StoreAndLoadSaplingZkeys) {
     wallet.GetSaplingSpendingKey(extfvk, keyOut);
     ASSERT_EQ(sk, keyOut);
 
-    // verify there are two keys
+    // verify there is still only one address; adding the spending
+    // key no longer adds the default address
     wallet.GetSaplingPaymentAddresses(addrs);
-    EXPECT_EQ(2, addrs.size());
+    EXPECT_EQ(1, addrs.size());
     EXPECT_EQ(1, addrs.count(address));
-    EXPECT_EQ(1, addrs.count(sk.DefaultAddress()));
 
-    // Generate a diversified address different to the default
-    // If we can't get an early diversified address, we are very unlucky
-    blob88 diversifier;
-    diversifier.begin()[0] = 10;
-    auto dpa = sk.ToXFVK().Address(diversifier).value().second;
+    // Find a diversified address that does not use the same diversifier as the default address.
+    // By starting our search at `10` we ensure there's no more than a 2^-10 chance that we
+    // collide with the default diversifier.
+    libzcash::diversifier_index_t j(10);
+    auto dpa = sk.ToXFVK().FindAddress(j).first;
+
+    // add the default address
+    EXPECT_TRUE(wallet.AddSaplingPaymentAddress(sk.ToXFVK().ToIncomingViewingKey(), sk.ToXFVK().DefaultAddress()));
 
     // verify wallet only has the default address
-    EXPECT_TRUE(wallet.HaveSaplingIncomingViewingKey(sk.DefaultAddress()));
+    EXPECT_TRUE(wallet.HaveSaplingIncomingViewingKey(sk.ToXFVK().DefaultAddress()));
     EXPECT_FALSE(wallet.HaveSaplingIncomingViewingKey(dpa));
 
     // manually add a diversified address
-    auto ivk = extfvk.fvk.in_viewing_key();
-    EXPECT_TRUE(wallet.AddSaplingIncomingViewingKey(ivk, dpa));
+    auto ivk = extfvk.ToIncomingViewingKey();
+    EXPECT_TRUE(wallet.AddSaplingPaymentAddress(ivk, dpa));
 
     // verify wallet did add it
-    EXPECT_TRUE(wallet.HaveSaplingIncomingViewingKey(sk.DefaultAddress()));
+    EXPECT_TRUE(wallet.HaveSaplingIncomingViewingKey(sk.ToXFVK().DefaultAddress()));
     EXPECT_TRUE(wallet.HaveSaplingIncomingViewingKey(dpa));
 
     // Load a third key into the wallet
@@ -98,8 +101,8 @@ TEST(WalletZkeysTest, StoreAndLoadSaplingZkeys) {
     ASSERT_EQ(wallet.mapSaplingZKeyMetadata[ivk2].nCreateTime, now);
 
     // Load a diversified address for the third key into the wallet
-    auto dpa2 = sk2.ToXFVK().Address(diversifier).value().second;
-    EXPECT_TRUE(wallet.HaveSaplingIncomingViewingKey(sk2.DefaultAddress()));
+    auto dpa2 = sk2.ToXFVK().FindAddress(j).first;
+    EXPECT_FALSE(wallet.HaveSaplingIncomingViewingKey(sk2.ToXFVK().DefaultAddress()));
     EXPECT_FALSE(wallet.HaveSaplingIncomingViewingKey(dpa2));
     EXPECT_TRUE(wallet.LoadSaplingPaymentAddress(dpa2, ivk2));
     EXPECT_TRUE(wallet.HaveSaplingIncomingViewingKey(dpa2));
@@ -115,7 +118,7 @@ TEST(WalletZkeysTest, StoreAndLoadSaplingZkeys) {
 TEST(WalletZkeysTest, StoreAndLoadZkeys) {
     SelectParams(CBaseChainParams::MAIN);
 
-    CWallet wallet;
+    CWallet wallet(Params());
     LOCK(wallet.cs_wallet);
 
     // wallet should be empty
@@ -173,7 +176,7 @@ TEST(WalletZkeysTest, StoreAndLoadZkeys) {
 TEST(WalletZkeysTest, StoreAndLoadViewingKeys) {
     SelectParams(CBaseChainParams::MAIN);
 
-    CWallet wallet;
+    CWallet wallet(Params());
     LOCK(wallet.cs_wallet);
 
     // wallet should be empty
@@ -225,8 +228,11 @@ TEST(WalletZkeysTest, WriteZkeyDirectToDb) {
     fs::create_directories(pathTemp);
     mapArgs["-datadir"] = pathTemp.string();
 
-    bool fFirstRun;
-    CWallet wallet("wallet.dat");
+    bool fFirstRun, fFirstRunDummy;
+    CWallet dummyWallet(Params(), "wallet_direct_zkey_test.dat");
+    dummyWallet.LoadWallet(fFirstRunDummy);
+    bitdb.RemoveDb("wallet_direct_zkey_test.dat");
+    CWallet wallet(Params(), "wallet_direct_zkey_test.dat");
     LOCK(wallet.cs_wallet);
     ASSERT_EQ(DB_LOAD_OK, wallet.LoadWallet(fFirstRun));
 
@@ -250,7 +256,7 @@ TEST(WalletZkeysTest, WriteZkeyDirectToDb) {
     auto addr = sk.address();
     int64_t now = GetTime();
     CKeyMetadata meta(now);
-    CWalletDB db("wallet.dat");
+    CWalletDB db("wallet_direct_zkey_test.dat");
     db.WriteZKey(addr, sk, meta);
 
     // wallet should not be aware of key
@@ -298,8 +304,11 @@ TEST(WalletZkeysTest, WriteViewingKeyDirectToDB) {
     fs::create_directories(pathTemp);
     mapArgs["-datadir"] = pathTemp.string();
 
-    bool fFirstRun;
-    CWallet wallet("wallet-vkey.dat");
+    bool fFirstRun, fFirstRunDummy;
+    CWallet dummyWallet(Params(), "wallet-vkey.dat");
+    dummyWallet.LoadWallet(fFirstRunDummy);
+    bitdb.RemoveDb("wallet-vkey.dat");
+    CWallet wallet(Params(), "wallet-vkey.dat");
     LOCK(wallet.cs_wallet);
     ASSERT_EQ(DB_LOAD_OK, wallet.LoadWallet(fFirstRun));
 
@@ -345,8 +354,11 @@ TEST(WalletZkeysTest, WriteCryptedzkeyDirectToDb) {
     fs::create_directories(pathTemp);
     mapArgs["-datadir"] = pathTemp.string();
 
-    bool fFirstRun;
-    CWallet wallet("wallet_crypted.dat");
+    bool fFirstRun, fFirstRunDummy;
+    CWallet dummyWallet(Params(), "wallet_crypted.dat");
+    dummyWallet.LoadWallet(fFirstRunDummy);
+    bitdb.RemoveDb("wallet_crypted.dat");
+    CWallet wallet(Params(), "wallet_crypted.dat");
     LOCK(wallet.cs_wallet);
     ASSERT_EQ(DB_LOAD_OK, wallet.LoadWallet(fFirstRun));
 
@@ -370,25 +382,25 @@ TEST(WalletZkeysTest, WriteCryptedzkeyDirectToDb) {
     strWalletPass.reserve(100);
     strWalletPass = "hello";
     ASSERT_TRUE(wallet.EncryptWallet(strWalletPass));
-    
+
     // adding a new key will fail as the wallet is locked
     EXPECT_ANY_THROW(wallet.GenerateNewSproutZKey());
-    
+
     // unlock wallet and then add
     wallet.Unlock(strWalletPass);
     auto paymentAddress2 = wallet.GenerateNewSproutZKey();
 
     // Create a new wallet from the existing wallet path
-    CWallet wallet2("wallet_crypted.dat");
+    CWallet wallet2(Params(), "wallet_crypted.dat");
     ASSERT_EQ(DB_LOAD_OK, wallet2.LoadWallet(fFirstRun));
 
     // Confirm it's not the same as the other wallet
     ASSERT_TRUE(&wallet != &wallet2);
-    
+
     // wallet should have two keys
     wallet2.GetSproutPaymentAddresses(addrs);
     ASSERT_EQ(2, addrs.size());
-    
+
     // check we have entries for our payment addresses
     ASSERT_TRUE(addrs.count(paymentAddress));
     ASSERT_TRUE(addrs.count(paymentAddress2));
@@ -397,13 +409,13 @@ TEST(WalletZkeysTest, WriteCryptedzkeyDirectToDb) {
     libzcash::SproutSpendingKey keyOut;
     wallet2.GetSproutSpendingKey(paymentAddress, keyOut);
     ASSERT_FALSE(paymentAddress == keyOut.address());
-    
+
     // unlock wallet to get spending keys and verify payment addresses
     wallet2.Unlock(strWalletPass);
 
     wallet2.GetSproutSpendingKey(paymentAddress, keyOut);
     ASSERT_EQ(paymentAddress, keyOut.address());
-    
+
     wallet2.GetSproutSpendingKey(paymentAddress2, keyOut);
     ASSERT_EQ(paymentAddress2, keyOut.address());
 }
@@ -411,7 +423,7 @@ TEST(WalletZkeysTest, WriteCryptedzkeyDirectToDb) {
 /**
  * This test covers methods on CWalletDB to load/save crypted sapling z keys.
  */
-TEST(wallet_zkeys_tests, WriteCryptedSaplingZkeyDirectToDb) {
+TEST(WalletZkeysTest, WriteCryptedSaplingZkeyDirectToDb) {
     SelectParams(CBaseChainParams::TESTNET);
 
     // Get temporary and unique path for file.
@@ -420,16 +432,22 @@ TEST(wallet_zkeys_tests, WriteCryptedSaplingZkeyDirectToDb) {
     fs::create_directories(pathTemp);
     mapArgs["-datadir"] = pathTemp.string();
 
-    bool fFirstRun;
-    CWallet wallet("wallet_crypted_sapling.dat");
+    bool fFirstRun, fFirstRunDummy;
+    CWallet dummyWallet(Params(), "wallet_crypted_sapling.dat");
+    dummyWallet.LoadWallet(fFirstRunDummy);
+    bitdb.RemoveDb("wallet_crypted_sapling.dat");
+    CWallet wallet(Params(), "wallet_crypted_sapling.dat");
     LOCK(wallet.cs_wallet);
     ASSERT_EQ(DB_LOAD_OK, wallet.LoadWallet(fFirstRun));
 
      // No default CPubKey set
     ASSERT_TRUE(fFirstRun);
 
-    ASSERT_FALSE(wallet.HaveHDSeed());
+    ASSERT_FALSE(wallet.HaveMnemonicSeed());
+
+    // Add a mnemonic seed to the wallet.
     wallet.GenerateNewSeed();
+    ASSERT_TRUE(wallet.HaveMnemonicSeed());
 
     // wallet should be empty
     std::set<libzcash::SaplingPaymentAddress> addrs;
@@ -437,7 +455,7 @@ TEST(wallet_zkeys_tests, WriteCryptedSaplingZkeyDirectToDb) {
     ASSERT_EQ(0, addrs.size());
 
     // Add random key to the wallet
-    auto address = wallet.GenerateNewSaplingZKey();
+    auto address = wallet.GenerateNewLegacySaplingZKey();
 
     // wallet should have one key
     wallet.GetSaplingPaymentAddresses(addrs);
@@ -447,13 +465,12 @@ TEST(wallet_zkeys_tests, WriteCryptedSaplingZkeyDirectToDb) {
     // If we can't get an early diversified address, we are very unlucky
     libzcash::SaplingExtendedSpendingKey extsk;
     EXPECT_TRUE(wallet.GetSaplingExtendedSpendingKey(address, extsk));
-    blob88 diversifier;
-    diversifier.begin()[0] = 10;
-    auto dpa = extsk.ToXFVK().Address(diversifier).value().second;
+    libzcash::diversifier_index_t j(10);
+    auto dpa = extsk.ToXFVK().FindAddress(j).first;
 
     // Add diversified address to the wallet
     auto ivk = extsk.expsk.full_viewing_key().in_viewing_key();
-    EXPECT_TRUE(wallet.AddSaplingIncomingViewingKey(ivk, dpa));
+    EXPECT_TRUE(wallet.AddSaplingPaymentAddress(ivk, dpa));
 
     // encrypt wallet
     SecureString strWalletPass;
@@ -462,22 +479,27 @@ TEST(wallet_zkeys_tests, WriteCryptedSaplingZkeyDirectToDb) {
     ASSERT_TRUE(wallet.EncryptWallet(strWalletPass));
 
     // adding a new key will fail as the wallet is locked
-    EXPECT_ANY_THROW(wallet.GenerateNewSaplingZKey());
+    EXPECT_ANY_THROW(wallet.GenerateNewLegacySaplingZKey());
 
     // unlock wallet and then add
     wallet.Unlock(strWalletPass);
-    auto address2 = wallet.GenerateNewSaplingZKey();
+    auto address2 = wallet.GenerateNewLegacySaplingZKey();
+
+    // wallet should have three addresses: the default addresses for the two
+    // generated keys, and the added diversified address.
+    wallet.GetSaplingPaymentAddresses(addrs);
+    ASSERT_EQ(3, addrs.size());
 
     // flush the wallet to prevent race conditions
     wallet.Flush();
 
     // Create a new wallet from the existing wallet path
-    CWallet wallet2("wallet_crypted_sapling.dat");
+    CWallet wallet2(Params(), "wallet_crypted_sapling.dat");
     ASSERT_EQ(DB_LOAD_OK, wallet2.LoadWallet(fFirstRun));
 
     // Confirm it's not the same as the other wallet
     ASSERT_TRUE(&wallet != &wallet2);
-    ASSERT_TRUE(wallet2.HaveHDSeed());
+    ASSERT_TRUE(wallet2.HaveMnemonicSeed());
 
     // wallet should have three addresses
     wallet2.GetSaplingPaymentAddresses(addrs);
@@ -501,8 +523,8 @@ TEST(wallet_zkeys_tests, WriteCryptedSaplingZkeyDirectToDb) {
     wallet2.Unlock(strWalletPass);
 
     EXPECT_TRUE(wallet2.GetSaplingExtendedSpendingKey(address, keyOut));
-    ASSERT_EQ(address, keyOut.DefaultAddress());
+    ASSERT_EQ(address, keyOut.ToXFVK().DefaultAddress());
 
     EXPECT_TRUE(wallet2.GetSaplingExtendedSpendingKey(address2, keyOut));
-    ASSERT_EQ(address2, keyOut.DefaultAddress());
+    ASSERT_EQ(address2, keyOut.ToXFVK().DefaultAddress());
 }
diff --git a/src/wallet/orchard.cpp b/src/wallet/orchard.cpp
new file mode 100644
index 00000000000..38b6fe7d08b
--- /dev/null
+++ b/src/wallet/orchard.cpp
@@ -0,0 +1,41 @@
+// Copyright (c) 2022 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+#include "wallet/orchard.h"
+
+std::optional<libzcash::OrchardSpendingKey> OrchardWallet::GetSpendingKeyForAddress(
+    const libzcash::OrchardRawAddress& addr) const
+{
+    auto skPtr = orchard_wallet_get_spending_key_for_address(inner.get(), addr.inner.get());
+    if (skPtr == nullptr) return std::nullopt;
+    return libzcash::OrchardSpendingKey(skPtr);
+}
+
+std::vector<std::pair<libzcash::OrchardSpendingKey, orchard::SpendInfo>> OrchardWallet::GetSpendInfo(
+    const std::vector<OrchardNoteMetadata>& noteMetadata) const
+{
+    std::vector<std::pair<libzcash::OrchardSpendingKey, orchard::SpendInfo>> result;
+    for (const auto& note : noteMetadata) {
+        auto pSpendInfo = orchard_wallet_get_spend_info(
+            inner.get(),
+            note.GetOutPoint().hash.begin(),
+            note.GetOutPoint().n);
+        if (pSpendInfo == nullptr) {
+            throw std::logic_error("Called OrchardWallet::GetSpendInfo with unknown outpoint");
+        } else {
+            auto spendInfo = orchard::SpendInfo(
+                pSpendInfo,
+                note.GetAddress(),
+                note.GetNoteValue());
+
+            auto sk = GetSpendingKeyForAddress(note.GetAddress());
+            if (sk.has_value()) {
+                result.push_back(std::pair(std::move(sk.value()), std::move(spendInfo)));
+            } else {
+                throw std::logic_error("Unknown spending key for given outpoint");
+            }
+        }
+    }
+    return result;
+}
diff --git a/src/wallet/orchard.h b/src/wallet/orchard.h
new file mode 100644
index 00000000000..7812f7cc0cd
--- /dev/null
+++ b/src/wallet/orchard.h
@@ -0,0 +1,504 @@
+// Copyright (c) 2021 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+#ifndef ZCASH_WALLET_ORCHARD_H
+#define ZCASH_WALLET_ORCHARD_H
+
+#include <array>
+
+#include "primitives/transaction.h"
+#include "transaction_builder.h"
+
+#include "rust/orchard/keys.h"
+#include "rust/orchard/wallet.h"
+#include "zcash/address/orchard.hpp"
+
+class OrchardWallet;
+class OrchardWalletNoteCommitmentTreeWriter;
+class OrchardWalletNoteCommitmentTreeLoader;
+
+class OrchardNoteMetadata
+{
+private:
+    OrchardOutPoint op;
+    libzcash::OrchardRawAddress address;
+    CAmount noteValue;
+    std::array<uint8_t, ZC_MEMO_SIZE> memo;
+    int confirmations;
+public:
+    OrchardNoteMetadata(
+        OrchardOutPoint op,
+        const libzcash::OrchardRawAddress& address,
+        CAmount noteValue,
+        const std::array<unsigned char, ZC_MEMO_SIZE>& memo):
+        op(op), address(address), noteValue(noteValue), memo(memo), confirmations(0) {}
+
+    const OrchardOutPoint& GetOutPoint() const {
+        return op;
+    }
+
+    const libzcash::OrchardRawAddress& GetAddress() const {
+        return address;
+    }
+
+    void SetConfirmations(int c) {
+        confirmations = c;
+    }
+
+    int GetConfirmations() const {
+        return confirmations;
+    }
+
+    CAmount GetNoteValue() const {
+        return noteValue;
+    }
+
+    const std::array<uint8_t, ZC_MEMO_SIZE>& GetMemo() const {
+        return memo;
+    }
+};
+
+/**
+ * A container and serialization wrapper for storing information derived from
+ * a transaction that is relevant to restoring Orchard wallet caches.
+ */
+class OrchardWalletTxMeta
+{
+private:
+    // A map from action index to the IVK belonging to our wallet that decrypts
+    // that action
+    std::map<uint32_t, libzcash::OrchardIncomingViewingKey> mapOrchardActionData;
+    // A vector of the action indices that spend notes belonging to our wallet
+    std::vector<uint32_t> vActionsSpendingMyNotes;
+
+    friend class OrchardWallet;
+public:
+    OrchardWalletTxMeta() {}
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action) {
+        int nVersion = s.GetVersion();
+        if (!(s.GetType() & SER_GETHASH)) {
+            READWRITE(nVersion);
+        }
+        READWRITE(mapOrchardActionData);
+        READWRITE(vActionsSpendingMyNotes);
+    }
+
+    const std::map<uint32_t, libzcash::OrchardIncomingViewingKey>& GetMyActionIVKs() const {
+        return mapOrchardActionData;
+    }
+
+    const std::vector<uint32_t>& GetActionsSpendingMyNotes() const {
+        return vActionsSpendingMyNotes;
+    }
+
+    bool empty() const {
+        return (mapOrchardActionData.empty() && vActionsSpendingMyNotes.empty());
+    }
+
+    friend bool operator==(const OrchardWalletTxMeta& a, const OrchardWalletTxMeta& b) {
+        return (a.mapOrchardActionData == b.mapOrchardActionData &&
+                a.vActionsSpendingMyNotes == b.vActionsSpendingMyNotes);
+    }
+
+    friend bool operator!=(const OrchardWalletTxMeta& a, const OrchardWalletTxMeta& b) {
+        return !(a == b);
+    }
+};
+
+class OrchardActionSpend {
+private:
+    OrchardOutPoint outPoint;
+    libzcash::OrchardRawAddress receivedAt;
+    CAmount noteValue;
+public:
+    OrchardActionSpend(OrchardOutPoint outPoint, libzcash::OrchardRawAddress receivedAt, CAmount noteValue):
+        outPoint(outPoint), receivedAt(receivedAt), noteValue(noteValue) { }
+
+    OrchardOutPoint GetOutPoint() const {
+        return outPoint;
+    }
+
+    const libzcash::OrchardRawAddress& GetReceivedAt() const {
+        return receivedAt;
+    }
+
+    CAmount GetNoteValue() const {
+        return noteValue;
+    }
+};
+
+class OrchardActionOutput {
+private:
+    libzcash::OrchardRawAddress recipient;
+    CAmount noteValue;
+    std::array<unsigned char, 512> memo;
+    bool isOutgoing;
+public:
+    OrchardActionOutput(
+            libzcash::OrchardRawAddress recipient, CAmount noteValue, std::array<unsigned char, 512> memo, bool isOutgoing):
+            recipient(recipient), noteValue(noteValue), memo(memo), isOutgoing(isOutgoing) { }
+
+    const libzcash::OrchardRawAddress& GetRecipient() const {
+        return recipient;
+    }
+
+    CAmount GetNoteValue() const {
+        return noteValue;
+    }
+
+    const std::array<unsigned char, 512>& GetMemo() const {
+        return memo;
+    }
+
+    bool IsOutgoing() const {
+        return isOutgoing;
+    }
+};
+
+class OrchardActions {
+private:
+    std::map<uint32_t, OrchardActionSpend> spends;
+    std::map<uint32_t, OrchardActionOutput> outputs;
+public:
+    OrchardActions() {}
+
+    void AddSpend(uint32_t actionIdx, OrchardActionSpend spend) {
+        spends.insert({actionIdx, spend});
+    }
+
+    void AddOutput(uint32_t actionIdx, OrchardActionOutput output) {
+        outputs.insert({actionIdx, output});
+    }
+
+    const std::map<uint32_t, OrchardActionSpend>& GetSpends() {
+        return spends;
+    }
+
+    const std::map<uint32_t, OrchardActionOutput>& GetOutputs() {
+        return outputs;
+    }
+};
+
+class OrchardWallet
+{
+private:
+    std::unique_ptr<OrchardWalletPtr, decltype(&orchard_wallet_free)> inner;
+
+    friend class ::orchard::UnauthorizedBundle;
+    friend class OrchardWalletNoteCommitmentTreeWriter;
+    friend class OrchardWalletNoteCommitmentTreeLoader;
+public:
+    OrchardWallet() : inner(orchard_wallet_new(), orchard_wallet_free) {}
+    OrchardWallet(OrchardWallet&& wallet_data) : inner(std::move(wallet_data.inner)) {}
+    OrchardWallet& operator=(OrchardWallet&& wallet)
+    {
+        if (this != &wallet) {
+            inner = std::move(wallet.inner);
+        }
+        return *this;
+    }
+
+    // OrchardWallet should never be copied
+    OrchardWallet(const OrchardWallet&) = delete;
+    OrchardWallet& operator=(const OrchardWallet&) = delete;
+
+    /**
+     * Reset the state of the wallet to be suitable for rescan from the NU5 activation
+     * height.  This removes all witness and spentness information from the wallet. The
+     * keystore is unmodified and decrypted note, nullifier, and conflict data are left
+     * in place with the expectation that they will be overwritten and/or updated in the
+     * rescan process.
+     */
+    bool Reset() {
+        return orchard_wallet_reset(inner.get());
+    }
+
+    /**
+     * Checkpoint the note commitment tree. This returns `false` and leaves the note
+     * commitment tree unmodified if the block height specified is not the successor
+     * to the last block height checkpointed.
+     */
+    bool CheckpointNoteCommitmentTree(int nBlockHeight) {
+        assert(nBlockHeight >= 0);
+        return orchard_wallet_checkpoint(inner.get(), (uint32_t) nBlockHeight);
+    }
+
+    /**
+     * Return whether the orchard note commitment tree contains any checkpoints.
+     */
+    std::optional<int> GetLastCheckpointHeight() const {
+        uint32_t lastHeight{0};
+        if (orchard_wallet_get_last_checkpoint(inner.get(), &lastHeight)) {
+            return (int) lastHeight;
+        } else {
+            return std::nullopt;
+        }
+    }
+
+    /**
+     * Rewinds to the most recent checkpoint, and marks as unspent any notes
+     * previously identified as having been spent by transactions in the
+     * latest block.
+     */
+    bool Rewind(int nBlockHeight, uint32_t& blocksRewoundRet) {
+        assert(nBlockHeight >= 0);
+        return orchard_wallet_rewind(inner.get(), (uint32_t) nBlockHeight, &blocksRewoundRet);
+    }
+
+    static void PushOrchardActionIVK(void* rec, RawOrchardActionIVK actionIVK) {
+        reinterpret_cast<OrchardWalletTxMeta*>(rec)->mapOrchardActionData.insert_or_assign(
+                actionIVK.actionIdx, libzcash::OrchardIncomingViewingKey(actionIVK.ivk)
+                );
+    }
+
+    static void PushSpendActionIdx(void* rec, uint32_t actionIdx) {
+        reinterpret_cast<OrchardWalletTxMeta*>(rec)->vActionsSpendingMyNotes.push_back(actionIdx);
+    }
+
+    /**
+     * Add notes that are decryptable with IVKs for which the wallet
+     * contains the full viewing key to the wallet, and return the
+     * metadata describing the wallet's involvement with this action,
+     * or std::nullopt if the transaction does not involve the wallet.
+     */
+    std::optional<OrchardWalletTxMeta> AddNotesIfInvolvingMe(const CTransaction& tx) {
+        OrchardWalletTxMeta txMeta;
+        if (orchard_wallet_add_notes_from_bundle(
+                inner.get(),
+                tx.GetHash().begin(),
+                tx.GetOrchardBundle().inner.get(),
+                &txMeta,
+                PushOrchardActionIVK,
+                PushSpendActionIdx
+                )) {
+            return txMeta;
+        } else {
+            return std::nullopt;
+        }
+    }
+
+    /**
+     * Decrypts a selection of notes from the specified transaction's
+     * Orchard bundle with provided incoming viewing keys, and adds those
+     * notes to the wallet.
+     */
+    bool LoadWalletTx(
+            const std::optional<int> nBlockHeight,
+            const CTransaction& tx,
+            const OrchardWalletTxMeta& txMeta
+            ) {
+        std::vector<RawOrchardActionIVK> rawHints;
+        for (const auto& [action_idx, ivk] : txMeta.mapOrchardActionData) {
+            rawHints.push_back({ action_idx, ivk.inner.get() });
+        }
+        uint32_t blockHeight = nBlockHeight.has_value() ? (uint32_t) nBlockHeight.value() : 0;
+        return orchard_wallet_load_bundle(
+                inner.get(),
+                nBlockHeight.has_value() ? &blockHeight : nullptr,
+                tx.GetHash().begin(),
+                tx.GetOrchardBundle().inner.get(),
+                rawHints.data(),
+                rawHints.size(),
+                txMeta.vActionsSpendingMyNotes.data(),
+                txMeta.vActionsSpendingMyNotes.size());
+    }
+
+    /**
+     * Append each Orchard note commitment from the specified block to the
+     * wallet's note commitment tree.
+     *
+     * Returns `false` if the caller attempts to insert a block out-of-order.
+     */
+    bool AppendNoteCommitments(const int nBlockHeight, const CBlock& block) {
+        assert(nBlockHeight >= 0);
+        for (int txidx = 0; txidx < block.vtx.size(); txidx++) {
+            const CTransaction& tx = block.vtx[txidx];
+            if (!orchard_wallet_append_bundle_commitments(
+                    inner.get(),
+                    (uint32_t) nBlockHeight,
+                    txidx,
+                    tx.GetHash().begin(),
+                    tx.GetOrchardBundle().inner.get()
+                    )) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    uint256 GetLatestAnchor() const {
+        uint256 value;
+        orchard_wallet_commitment_tree_root(inner.get(), value.begin());
+        return value;
+    }
+
+    bool TxInvolvesMyNotes(const uint256& txid) {
+        return orchard_wallet_tx_involves_my_notes(
+                inner.get(),
+                txid.begin());
+    }
+
+    void AddSpendingKey(const libzcash::OrchardSpendingKey& sk) {
+        orchard_wallet_add_spending_key(inner.get(), sk.inner.get());
+    }
+
+    void AddFullViewingKey(const libzcash::OrchardFullViewingKey& fvk) {
+        orchard_wallet_add_full_viewing_key(inner.get(), fvk.inner.get());
+    }
+
+    std::optional<libzcash::OrchardSpendingKey> GetSpendingKeyForAddress(
+            const libzcash::OrchardRawAddress& addr) const;
+
+    std::optional<libzcash::OrchardIncomingViewingKey> GetIncomingViewingKeyForAddress(
+            const libzcash::OrchardRawAddress& addr) const {
+        auto ivkPtr = orchard_wallet_get_ivk_for_address(inner.get(), addr.inner.get());
+        if (ivkPtr == nullptr) return std::nullopt;
+        return libzcash::OrchardIncomingViewingKey(ivkPtr);
+    }
+
+    /**
+     * Adds an address/IVK pair to the wallet, and returns `true` if the
+     * IVK corresponds to a full viewing key known to the wallet, `false`
+     * otherwise.
+     */
+    bool AddRawAddress(
+            const libzcash::OrchardRawAddress& addr,
+            const libzcash::OrchardIncomingViewingKey& ivk) {
+        return orchard_wallet_add_raw_address(inner.get(), addr.inner.get(), ivk.inner.get());
+    }
+
+    static void PushOrchardNoteMeta(void* orchardNotesRet, RawOrchardNoteMetadata rawNoteMeta) {
+        uint256 txid;
+        std::move(std::begin(rawNoteMeta.txid), std::end(rawNoteMeta.txid), txid.begin());
+        OrchardOutPoint op(txid, rawNoteMeta.actionIdx);
+        std::array<uint8_t, ZC_MEMO_SIZE> memo;
+        std::move(std::begin(rawNoteMeta.memo), std::end(rawNoteMeta.memo), memo.begin());
+        OrchardNoteMetadata noteMeta(
+                op,
+                libzcash::OrchardRawAddress(rawNoteMeta.addr),
+                rawNoteMeta.noteValue,
+                memo);
+
+        reinterpret_cast<std::vector<OrchardNoteMetadata>*>(orchardNotesRet)->push_back(noteMeta);
+    }
+
+    void GetFilteredNotes(
+        std::vector<OrchardNoteMetadata>& orchardNotesRet,
+        const std::optional<libzcash::OrchardIncomingViewingKey>& ivk,
+        bool ignoreMined,
+        bool requireSpendingKey) const {
+
+        orchard_wallet_get_filtered_notes(
+            inner.get(),
+            ivk.has_value() ? ivk.value().inner.get() : nullptr,
+            ignoreMined,
+            requireSpendingKey,
+            &orchardNotesRet,
+            PushOrchardNoteMeta
+            );
+    }
+
+    static void PushTxId(void* txidsRet, unsigned char txid[32]) {
+        uint256 txid_out;
+        std::copy(txid, txid + 32, txid_out.begin());
+        reinterpret_cast<std::vector<uint256>*>(txidsRet)->push_back(txid_out);
+    }
+
+    std::vector<uint256> GetPotentialSpends(const OrchardOutPoint& outPoint) const {
+        std::vector<uint256> result;
+        orchard_wallet_get_potential_spends(
+            inner.get(),
+            outPoint.hash.begin(),
+            outPoint.n,
+            &result,
+            PushTxId
+            );
+        return result;
+    }
+
+    std::vector<std::pair<libzcash::OrchardSpendingKey, orchard::SpendInfo>> GetSpendInfo(
+        const std::vector<OrchardNoteMetadata>& noteMetadata) const;
+
+    void GarbageCollect() {
+        orchard_wallet_gc_note_commitment_tree(inner.get());
+    }
+
+    static void PushSpendAction(void* receiver, RawOrchardActionSpend rawSpend) {
+        uint256 txid;
+        std::move(std::begin(rawSpend.outpointTxId), std::end(rawSpend.outpointTxId), txid.begin());
+        auto spend = OrchardActionSpend(
+                OrchardOutPoint(txid, rawSpend.outpointActionIdx),
+                libzcash::OrchardRawAddress(rawSpend.receivedAt),
+                rawSpend.noteValue);
+        reinterpret_cast<OrchardActions*>(receiver)->AddSpend(rawSpend.spendActionIdx, spend);
+    }
+
+    static void PushOutputAction(void* receiver, RawOrchardActionOutput rawOutput) {
+        std::array<unsigned char, 512> memo;
+        std::move(std::begin(rawOutput.memo), std::end(rawOutput.memo), memo.begin());
+        auto output = OrchardActionOutput(
+                libzcash::OrchardRawAddress(rawOutput.addr),
+                rawOutput.noteValue,
+                memo,
+                rawOutput.isOutgoing);
+
+        reinterpret_cast<OrchardActions*>(receiver)->AddOutput(rawOutput.outputActionIdx, output);
+    }
+
+    OrchardActions GetTxActions(const CTransaction& tx, const std::vector<uint256>& ovks) const {
+        OrchardActions result;
+        orchard_wallet_get_txdata(
+                inner.get(),
+                tx.GetOrchardBundle().inner.get(),
+                reinterpret_cast<const unsigned char*>(ovks.data()),
+                ovks.size(),
+                &result,
+                PushSpendAction,
+                PushOutputAction);
+        return result;
+    }
+};
+
+class OrchardWalletNoteCommitmentTreeWriter
+{
+private:
+    const OrchardWallet& wallet;
+public:
+    OrchardWalletNoteCommitmentTreeWriter(const OrchardWallet& wallet): wallet(wallet) {}
+
+    template<typename Stream>
+    void Serialize(Stream& s) const {
+        RustStream rs(s);
+        if (!orchard_wallet_write_note_commitment_tree(
+                    wallet.inner.get(),
+                    &rs, RustStream<Stream>::write_callback)) {
+            throw std::ios_base::failure("Failed to serialize Orchard note commitment tree.");
+        }
+    }
+};
+
+class OrchardWalletNoteCommitmentTreeLoader
+{
+private:
+    OrchardWallet& wallet;
+public:
+    OrchardWalletNoteCommitmentTreeLoader(OrchardWallet& wallet): wallet(wallet) {}
+
+    template<typename Stream>
+    void Unserialize(Stream& s) {
+        RustStream rs(s);
+        if (!orchard_wallet_load_note_commitment_tree(
+                    wallet.inner.get(),
+                    &rs, RustStream<Stream>::read_callback)) {
+            throw std::ios_base::failure("Failed to load Orchard note commitment tree.");
+        }
+    }
+};
+
+#endif // ZCASH_ORCHARD_WALLET_H
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index d6c3130b010..727696eb9d4 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -3,6 +3,7 @@
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
 #include "chain.h"
+#include "core_io.h"
 #include "key_io.h"
 #include "rpc/server.h"
 #include "init.h"
@@ -11,6 +12,7 @@
 #include "script/standard.h"
 #include "sync.h"
 #include "util.h"
+#include "util/match.h"
 #include "utiltime.h"
 #include "wallet.h"
 
@@ -67,7 +69,7 @@ std::string DecodeDumpString(const std::string &str) {
     for (unsigned int pos = 0; pos < str.length(); pos++) {
         unsigned char c = str[pos];
         if (c == '%' && pos+2 < str.length()) {
-            c = (((str[pos+1]>>6)*9+((str[pos+1]-'0')&15)) << 4) | 
+            c = (((str[pos+1]>>6)*9+((str[pos+1]-'0')&15)) << 4) |
                 ((str[pos+2]>>6)*9+((str[pos+2]-'0')&15));
             pos += 2;
         }
@@ -80,7 +82,7 @@ UniValue importprivkey(const UniValue& params, bool fHelp)
 {
     if (!EnsureWalletIsAvailable(fHelp))
         return NullUniValue;
-    
+
     if (fHelp || params.size() < 1 || params.size() > 3)
         throw runtime_error(
             "importprivkey \"zcashprivkey\" ( \"label\" rescan )\n"
@@ -89,7 +91,7 @@ UniValue importprivkey(const UniValue& params, bool fHelp)
             "1. \"zcashprivkey\"   (string, required) The private key (see dumpprivkey)\n"
             "2. \"label\"            (string, optional, default=\"\") An optional label\n"
             "3. rescan               (boolean, optional, default=true) Rescan the wallet for transactions\n"
-            "\nNote: This call can take minutes to complete if rescan is true.\n"
+            "\nNote: This call can take a long time to complete if rescan is true.\n"
             "\nExamples:\n"
             "\nDump a private key\n"
             + HelpExampleCli("dumpprivkey", "\"myaddress\"") +
@@ -118,7 +120,8 @@ UniValue importprivkey(const UniValue& params, bool fHelp)
     if (params.size() > 2)
         fRescan = params[2].get_bool();
 
-    KeyIO keyIO(Params());
+    const auto& chainparams = Params();
+    KeyIO keyIO(chainparams);
 
     CKey key = keyIO.DecodeSecret(strSecret);
     if (!key.IsValid()) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid private key encoding");
@@ -144,7 +147,7 @@ UniValue importprivkey(const UniValue& params, bool fHelp)
         pwalletMain->nTimeFirstKey = 1; // 0 would be considered 'no value'
 
         if (fRescan) {
-            pwalletMain->ScanForWalletTransactions(chainActive.Genesis(), true);
+            pwalletMain->ScanForWalletTransactions(chainActive.Genesis(), true, false);
         }
     }
 
@@ -189,7 +192,7 @@ UniValue importaddress(const UniValue& params, bool fHelp)
 {
     if (!EnsureWalletIsAvailable(fHelp))
         return NullUniValue;
-    
+
     if (fHelp || params.size() < 1 || params.size() > 4)
         throw runtime_error(
             "importaddress \"address\" ( \"label\" rescan p2sh )\n"
@@ -199,7 +202,7 @@ UniValue importaddress(const UniValue& params, bool fHelp)
             "2. \"label\"            (string, optional, default=\"\") An optional label\n"
             "3. rescan               (boolean, optional, default=true) Rescan the wallet for transactions\n"
             "4. p2sh                 (boolean, optional, default=false) Add the P2SH version of the script as well\n"
-            "\nNote: This call can take minutes to complete if rescan is true.\n"
+            "\nNote: This call can take a long time to complete if rescan is true.\n"
             "If you have the full public key, you should call importpubkey instead of this.\n"
             "\nNote: If you import a non-standard raw script in hex form, outputs sending to it will be treated\n"
             "as change, and not show up in many RPCs.\n"
@@ -231,7 +234,8 @@ UniValue importaddress(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    KeyIO keyIO(Params());
+    const auto& chainparams = Params();
+    KeyIO keyIO(chainparams);
     CTxDestination dest = keyIO.DecodeDestination(params[0].get_str());
     if (IsValidDestination(dest)) {
         if (fP2SH) {
@@ -247,7 +251,7 @@ UniValue importaddress(const UniValue& params, bool fHelp)
 
     if (fRescan)
     {
-        pwalletMain->ScanForWalletTransactions(chainActive.Genesis(), true);
+        pwalletMain->ScanForWalletTransactions(chainActive.Genesis(), true, false);
         pwalletMain->ReacceptWalletTransactions();
     }
 
@@ -267,7 +271,7 @@ UniValue importpubkey(const UniValue& params, bool fHelp)
             "1. \"pubkey\"           (string, required) The hex-encoded public key\n"
             "2. \"label\"            (string, optional, default=\"\") An optional label\n"
             "3. rescan               (boolean, optional, default=true) Rescan the wallet for transactions\n"
-            "\nNote: This call can take minutes to complete if rescan is true.\n"
+            "\nNote: This call can take a long time to complete if rescan is true.\n"
             "\nExamples:\n"
             "\nImport a public key with rescan\n"
             + HelpExampleCli("importpubkey", "\"mypubkey\"") +
@@ -303,7 +307,7 @@ UniValue importpubkey(const UniValue& params, bool fHelp)
 
     if (fRescan)
     {
-        pwalletMain->ScanForWalletTransactions(chainActive.Genesis(), true);
+        pwalletMain->ScanForWalletTransactions(chainActive.Genesis(), true, false);
         pwalletMain->ReacceptWalletTransactions();
     }
 
@@ -338,7 +342,7 @@ UniValue importwallet(const UniValue& params, bool fHelp)
 {
     if (!EnsureWalletIsAvailable(fHelp))
         return NullUniValue;
-    
+
     if (fHelp || params.size() != 1)
         throw runtime_error(
             "importwallet \"filename\"\n"
@@ -378,7 +382,8 @@ UniValue importwallet_impl(const UniValue& params, bool fImportZKeys)
     int64_t nFilesize = std::max((int64_t)1, (int64_t)file.tellg());
     file.seekg(0, file.beg);
 
-    KeyIO keyIO(Params());
+    const auto& chainparams = Params();
+    KeyIO keyIO(chainparams);
 
     pwalletMain->ShowProgress(_("Importing..."), 0); // show progress dialog in GUI
     while (file.good()) {
@@ -400,9 +405,9 @@ UniValue importwallet_impl(const UniValue& params, bool fImportZKeys)
             // Only include hdKeypath and seedFpStr if we have both
             std::optional<std::string> hdKeypath = (vstr.size() > 3) ? std::optional<std::string>(vstr[2]) : std::nullopt;
             std::optional<std::string> seedFpStr = (vstr.size() > 3) ? std::optional<std::string>(vstr[3]) : std::nullopt;
-            if (IsValidSpendingKey(spendingkey)) {
+            if (spendingkey.has_value()) {
                 auto addResult = std::visit(
-                    AddSpendingKeyToWallet(pwalletMain, Params().GetConsensus(), nTime, hdKeypath, seedFpStr, true), spendingkey);
+                    AddSpendingKeyToWallet(pwalletMain, chainparams.GetConsensus(), nTime, hdKeypath, seedFpStr, true, true), spendingkey.value());
                 if (addResult == KeyAlreadyExists){
                     LogPrint("zrpc", "Skipping import of zaddr (key already present)\n");
                 } else if (addResult == KeyNotAdded) {
@@ -463,7 +468,7 @@ UniValue importwallet_impl(const UniValue& params, bool fImportZKeys)
         pwalletMain->nTimeFirstKey = nTimeBegin;
 
     LogPrintf("Rescanning last %i blocks\n", chainActive.Height() - pindex->nHeight + 1);
-    pwalletMain->ScanForWalletTransactions(pindex);
+    pwalletMain->ScanForWalletTransactions(pindex, false, false);
     pwalletMain->MarkDirty();
 
     if (!fGood)
@@ -476,7 +481,7 @@ UniValue dumpprivkey(const UniValue& params, bool fHelp)
 {
     if (!EnsureWalletIsAvailable(fHelp))
         return NullUniValue;
-    
+
     if (fHelp || params.size() != 1)
         throw runtime_error(
             "dumpprivkey \"t-addr\"\n"
@@ -520,7 +525,7 @@ UniValue z_exportwallet(const UniValue& params, bool fHelp)
 {
     if (!EnsureWalletIsAvailable(fHelp))
         return NullUniValue;
-    
+
     if (fHelp || params.size() != 1)
         throw runtime_error(
             "z_exportwallet \"filename\"\n"
@@ -545,6 +550,7 @@ UniValue dumpwallet(const UniValue& params, bool fHelp)
     if (fHelp || params.size() != 1)
         throw runtime_error(
             "dumpwallet \"filename\"\n"
+            "\nDEPRECATED. Please use the z_exportwallet RPC instead.\n"
             "\nDumps taddr wallet keys in a human-readable format.  Overwriting an existing file is not permitted.\n"
             "\nArguments:\n"
             "1. \"filename\"    (string, required) The filename, saved in folder set by zcashd -exportdir option\n"
@@ -609,13 +615,33 @@ UniValue dumpwallet_impl(const UniValue& params, bool fDumpZKeys)
     file << strprintf("# * Created on %s\n", EncodeDumpTime(GetTime()));
     file << strprintf("# * Best block at time of backup was %i (%s),\n", chainActive.Height(), chainActive.Tip()->GetBlockHash().ToString());
     file << strprintf("#   mined on %s\n", EncodeDumpTime(chainActive.Tip()->GetBlockTime()));
-    {
-        HDSeed hdSeed;
-        pwalletMain->GetHDSeed(hdSeed);
-        auto rawSeed = hdSeed.RawSeed();
-        file << strprintf("# HDSeed=%s fingerprint=%s", HexStr(rawSeed.begin(), rawSeed.end()), hdSeed.Fingerprint().GetHex());
-        file << "\n";
+
+    std::optional<MnemonicSeed> hdSeed = pwalletMain->GetMnemonicSeed();
+    if (hdSeed.has_value()) {
+        auto mSeed = hdSeed.value();
+        file << strprintf(
+                "# Emergency Recovery Information:\n"
+                "# - recovery_phrase=\"%s\"\n"
+                "# - language=%s\n"
+                "# - fingerprint=%s\n",
+                mSeed.GetMnemonic(),
+                MnemonicSeed::LanguageName(mSeed.GetLanguage()),
+                mSeed.Fingerprint().GetHex()
+                );
     }
+
+    std::optional<HDSeed> legacySeed = pwalletMain->GetLegacyHDSeed();
+    if (legacySeed.has_value()) {
+        auto rawSeed = legacySeed.value().RawSeed();
+        file << strprintf(
+                "# Legacy HD Seed:\n"
+                "# - seed=%s\n"
+                "# - fingerprint=%s\n",
+                HexStr(rawSeed.begin(), rawSeed.end()),
+                legacySeed.value().Fingerprint().GetHex()
+                );
+    }
+
     file << "\n";
     for (std::vector<std::pair<int64_t, CKeyID> >::const_iterator it = vKeyBirth.begin(); it != vKeyBirth.end(); it++) {
         const CKeyID &keyid = it->second;
@@ -623,13 +649,20 @@ UniValue dumpwallet_impl(const UniValue& params, bool fDumpZKeys)
         std::string strAddr = keyIO.EncodeDestination(keyid);
         CKey key;
         if (pwalletMain->GetKey(keyid, key)) {
+            CKeyMetadata keyMeta = pwalletMain->mapKeyMetadata[keyid];
+            file << strprintf("%s %s ", keyIO.EncodeSecret(key), strTime);
             if (pwalletMain->mapAddressBook.count(keyid)) {
-                file << strprintf("%s %s label=%s # addr=%s\n", keyIO.EncodeSecret(key), strTime, EncodeDumpString(pwalletMain->mapAddressBook[keyid].name), strAddr);
+                file << strprintf("label=%s", EncodeDumpString(pwalletMain->mapAddressBook[keyid].name));
             } else if (setKeyPool.count(keyid)) {
-                file << strprintf("%s %s reserve=1 # addr=%s\n", keyIO.EncodeSecret(key), strTime, strAddr);
+                file << "reserve=1";
             } else {
-                file << strprintf("%s %s change=1 # addr=%s\n", keyIO.EncodeSecret(key), strTime, strAddr);
+                file << "change=1";
             }
+            file << strprintf(" # addr=%s", strAddr);
+            if (!(keyMeta.hdKeypath.empty() || keyMeta.seedFp.IsNull())) {
+                file << strprintf(" hdkeypath=%s seedfp=%s", keyMeta.hdKeypath, keyMeta.seedFp.GetHex());
+            }
+            file << "\n";
         }
     }
     file << "\n";
@@ -658,12 +691,12 @@ UniValue dumpwallet_impl(const UniValue& params, bool fDumpZKeys)
                 auto ivk = extsk.expsk.full_viewing_key().in_viewing_key();
                 CKeyMetadata keyMeta = pwalletMain->mapSaplingZKeyMetadata[ivk];
                 std::string strTime = EncodeDumpTime(keyMeta.nCreateTime);
+                file << strprintf("%s %s", keyIO.EncodeSpendingKey(extsk), strTime);
                 // Keys imported with z_importkey do not have zip32 metadata
-                if (keyMeta.hdKeypath.empty() || keyMeta.seedFp.IsNull()) {
-                    file << strprintf("%s %s # zaddr=%s\n", keyIO.EncodeSpendingKey(extsk), strTime, keyIO.EncodePaymentAddress(addr));
-                } else {
-                    file << strprintf("%s %s %s %s # zaddr=%s\n", keyIO.EncodeSpendingKey(extsk), strTime, keyMeta.hdKeypath, keyMeta.seedFp.GetHex(), keyIO.EncodePaymentAddress(addr));
+                if (!(keyMeta.hdKeypath.empty() || keyMeta.seedFp.IsNull())) {
+                    file << strprintf(" %s %s", keyMeta.hdKeypath, keyMeta.seedFp.GetHex());
                 }
+                file << strprintf(" # zaddr=%s\n", keyIO.EncodePaymentAddress(addr));
             }
         }
         file << "\n";
@@ -684,12 +717,13 @@ UniValue z_importkey(const UniValue& params, bool fHelp)
     if (fHelp || params.size() < 1 || params.size() > 3)
         throw runtime_error(
             "z_importkey \"zkey\" ( rescan startHeight )\n"
-            "\nAdds a zkey (as returned by z_exportkey) to your wallet.\n"
+            "\nAdds a zkey (as returned by z_exportkey) to your wallet."
+            "\nImport of Orchard keys is not supported.\n"
             "\nArguments:\n"
             "1. \"zkey\"             (string, required) The zkey (see z_exportkey)\n"
             "2. rescan             (string, optional, default=\"whenkeyisnew\") Rescan the wallet for transactions - can be \"yes\", \"no\" or \"whenkeyisnew\"\n"
             "3. startHeight        (numeric, optional, default=0) Block height to start rescan from\n"
-            "\nNote: This call can take minutes to complete if rescan is true.\n"
+            "\nNote: This call can take a long time to complete if rescan is true.\n"
             "\nResult:\n"
             "{\n"
             "  \"type\" : \"xxxx\",                         (string) \"sprout\" or \"sapling\"\n"
@@ -748,20 +782,21 @@ UniValue z_importkey(const UniValue& params, bool fHelp)
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Block height out of range");
     }
 
-    KeyIO keyIO(Params());
+    const auto& chainparams = Params();
+    KeyIO keyIO(chainparams);
     string strSecret = params[0].get_str();
     auto spendingkey = keyIO.DecodeSpendingKey(strSecret);
-    if (!IsValidSpendingKey(spendingkey)) {
+    if (!spendingkey.has_value()) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid spending key");
     }
 
-    auto addrInfo = std::visit(libzcash::AddressInfoFromSpendingKey{}, spendingkey);
+    auto addrInfo = std::visit(libzcash::AddressInfoFromSpendingKey{}, spendingkey.value());
     UniValue result(UniValue::VOBJ);
     result.pushKV("type", addrInfo.first);
     result.pushKV("address", keyIO.EncodePaymentAddress(addrInfo.second));
 
     // Sapling support
-    auto addResult = std::visit(AddSpendingKeyToWallet(pwalletMain, Params().GetConsensus()), spendingkey);
+    auto addResult = std::visit(AddSpendingKeyToWallet(pwalletMain, chainparams.GetConsensus()), spendingkey.value());
     if (addResult == KeyAlreadyExists && fIgnoreExistingKey) {
         return result;
     }
@@ -769,13 +804,13 @@ UniValue z_importkey(const UniValue& params, bool fHelp)
     if (addResult == KeyNotAdded) {
         throw JSONRPCError(RPC_WALLET_ERROR, "Error adding spending key to wallet");
     }
-    
+
     // whenever a key is imported, we need to scan the whole chain
     pwalletMain->nTimeFirstKey = 1; // 0 would be considered 'no value'
-    
+
     // We want to scan for transactions and notes
     if (fRescan) {
-        pwalletMain->ScanForWalletTransactions(chainActive[nRescanHeight], true);
+        pwalletMain->ScanForWalletTransactions(chainActive[nRescanHeight], true, false);
     }
 
     return result;
@@ -794,7 +829,7 @@ UniValue z_importviewingkey(const UniValue& params, bool fHelp)
             "1. \"vkey\"             (string, required) The viewing key (see z_exportviewingkey)\n"
             "2. rescan             (string, optional, default=\"whenkeyisnew\") Rescan the wallet for transactions - can be \"yes\", \"no\" or \"whenkeyisnew\"\n"
             "3. startHeight        (numeric, optional, default=0) Block height to start rescan from\n"
-            "\nNote: This call can take minutes to complete if rescan is true.\n"
+            "\nNote: This call can take a long time to complete if rescan is true. Import of Unified viewing keys is not yet supported.\n"
             "\nResult:\n"
             "{\n"
             "  \"type\" : \"xxxx\",                         (string) \"sprout\" or \"sapling\"\n"
@@ -843,20 +878,21 @@ UniValue z_importviewingkey(const UniValue& params, bool fHelp)
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Block height out of range");
     }
 
-    KeyIO keyIO(Params());
+    const auto& chainparams = Params();
+    KeyIO keyIO(chainparams);
     string strVKey = params[0].get_str();
     auto viewingkey = keyIO.DecodeViewingKey(strVKey);
-    if (!IsValidViewingKey(viewingkey)) {
+    if (!viewingkey.has_value()) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid viewing key");
     }
 
-    auto addrInfo = std::visit(libzcash::AddressInfoFromViewingKey{}, viewingkey);
+    auto addrInfo = std::visit(libzcash::AddressInfoFromViewingKey(chainparams), viewingkey.value());
     UniValue result(UniValue::VOBJ);
     const string strAddress = keyIO.EncodePaymentAddress(addrInfo.second);
     result.pushKV("type", addrInfo.first);
     result.pushKV("address", strAddress);
 
-    auto addResult = std::visit(AddViewingKeyToWallet(pwalletMain), viewingkey);
+    auto addResult = std::visit(AddViewingKeyToWallet(pwalletMain, true), viewingkey.value());
     if (addResult == SpendingKeyExists) {
         throw JSONRPCError(
             RPC_WALLET_ERROR,
@@ -871,7 +907,7 @@ UniValue z_importviewingkey(const UniValue& params, bool fHelp)
 
     // We want to scan for transactions and notes
     if (fRescan) {
-        pwalletMain->ScanForWalletTransactions(chainActive[nRescanHeight], true);
+        pwalletMain->ScanForWalletTransactions(chainActive[nRescanHeight], true, false);
     }
 
     return result;
@@ -905,16 +941,52 @@ UniValue z_exportkey(const UniValue& params, bool fHelp)
 
     KeyIO keyIO(Params());
     auto address = keyIO.DecodePaymentAddress(strAddress);
-    if (!IsValidPaymentAddress(address)) {
+    if (!address.has_value()) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid zaddr");
     }
 
-    // Sapling support
-    auto sk = std::visit(GetSpendingKeyForPaymentAddress(pwalletMain), address);
-    if (!sk) {
-        throw JSONRPCError(RPC_WALLET_ERROR, "Wallet does not hold private zkey for this zaddr");
-    }
-    return keyIO.EncodeSpendingKey(sk.value());
+    std::string result = std::visit(match {
+        [&](const CKeyID& addr) {
+            CKey key;
+            if (pwalletMain->GetKey(addr, key)) {
+                return keyIO.EncodeSecret(key);
+            } else {
+                throw JSONRPCError(RPC_WALLET_ERROR, "Wallet does not hold the private key for this address.");
+            }
+        },
+        [&](const CScriptID& addr) {
+            CScript redeemScript;
+            if (pwalletMain->GetCScript(addr, redeemScript)) {
+                return FormatScript(redeemScript);
+            } else {
+                throw JSONRPCError(RPC_WALLET_ERROR, "Wallet does not hold the redeem script for this P2SH address.");
+            }
+        },
+        [&](const libzcash::SproutPaymentAddress& addr) {
+            libzcash::SproutSpendingKey key;
+            if (pwalletMain->GetSproutSpendingKey(addr, key)) {
+                return keyIO.EncodeSpendingKey(key);
+            } else {
+                throw JSONRPCError(RPC_WALLET_ERROR, "Wallet does not hold the private spending key for this Sprout address");
+            }
+        },
+        [&](const libzcash::SaplingPaymentAddress& addr) {
+            libzcash::SaplingExtendedSpendingKey extsk;
+            if (pwalletMain->GetSaplingExtendedSpendingKey(addr, extsk)) {
+                return keyIO.EncodeSpendingKey(extsk);
+            } else {
+                throw JSONRPCError(RPC_WALLET_ERROR, "Wallet does not hold the private spending key for this Sapling address");
+            }
+        },
+        [&](const libzcash::UnifiedAddress& ua) {
+            throw JSONRPCError(
+                    RPC_WALLET_ERROR,
+                    "No serialized form is defined for unified spending keys. "
+                    "Use the emergency recovery phrase for this wallet for backup purposes instead.");
+            return std::string(); //unreachable, here to make the compiler happy
+        }
+    }, address.value());
+    return result;
 }
 
 UniValue z_exportviewingkey(const UniValue& params, bool fHelp)
@@ -925,8 +997,10 @@ UniValue z_exportviewingkey(const UniValue& params, bool fHelp)
     if (fHelp || params.size() != 1)
         throw runtime_error(
             "z_exportviewingkey \"zaddr\"\n"
-            "\nReveals the viewing key corresponding to 'zaddr'.\n"
-            "Then the z_importviewingkey can be used with this output\n"
+            "\nReturns the full viewing key corresponding to 'zaddr' in the format specified by\n"
+            "https://zips.z.cash/protocol/protocol.pdf#addressandkeyencoding.\n"
+            "z_importviewingkey can be used to import Sprout and Sapling exported in this format;\n"
+            "import of unified viewing keys is not yet supported.\n"
             "\nArguments:\n"
             "1. \"zaddr\"   (string, required) The zaddr for the viewing key\n"
             "\nResult:\n"
@@ -944,11 +1018,11 @@ UniValue z_exportviewingkey(const UniValue& params, bool fHelp)
 
     KeyIO keyIO(Params());
     auto address = keyIO.DecodePaymentAddress(strAddress);
-    if (!IsValidPaymentAddress(address)) {
+    if (!address.has_value()) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid zaddr");
     }
 
-    auto vk = std::visit(GetViewingKeyForPaymentAddress(pwalletMain), address);
+    auto vk = std::visit(GetViewingKeyForPaymentAddress(pwalletMain), address.value());
     if (vk) {
         return keyIO.EncodeViewingKey(vk.value());
     } else {
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 23fae933e56..10718599ca8 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -16,15 +16,20 @@
 #include "proof_verifier.h"
 #include "rpc/server.h"
 #include "timedata.h"
+#include "tinyformat.h"
 #include "transaction_builder.h"
 #include "util.h"
+#include "util/match.h"
 #include "utilmoneystr.h"
+#include "utilstrencodings.h"
 #include "wallet.h"
 #include "walletdb.h"
 #include "primitives/transaction.h"
 #include "zcbenchmarks.h"
 #include "script/interpreter.h"
+#include "zcash/Zcash.h"
 #include "zcash/Address.hpp"
+#include "zcash/address/zip32.h"
 
 #include "utiltime.h"
 #include "asyncrpcoperation.h"
@@ -37,6 +42,7 @@
 #include <stdint.h>
 
 #include <boost/assign/list_of.hpp>
+#include <boost/algorithm/string/trim.hpp>
 #include <utf8.h>
 
 #include <univalue.h>
@@ -53,6 +59,7 @@ using namespace libzcash;
 
 const std::string ADDR_TYPE_SPROUT = "sprout";
 const std::string ADDR_TYPE_SAPLING = "sapling";
+const std::string ADDR_TYPE_ORCHARD = "orchard";
 
 extern UniValue TxJoinSplitToJSON(const CTransaction& tx);
 
@@ -81,6 +88,16 @@ bool EnsureWalletIsAvailable(bool avoidException)
     return true;
 }
 
+void EnsureWalletIsBackedUp(const CChainParams& params)
+{
+    if (GetBoolArg("-walletrequirebackup", params.RequireWalletBackup()) && !pwalletMain->MnemonicVerified())
+        throw JSONRPCError(
+                RPC_WALLET_BACKUP_REQUIRED,
+                "Error: Please acknowledge that you have backed up the wallet's emergency recovery phrase "
+                "by using zcashd-wallet-tool first."
+                );
+}
+
 void EnsureWalletIsUnlocked()
 {
     if (pwalletMain->IsLocked())
@@ -142,6 +159,7 @@ UniValue getnewaddress(const UniValue& params, bool fHelp)
     if (fHelp || params.size() > 1)
         throw runtime_error(
             "getnewaddress ( \"\" )\n"
+            "\nDEPRECATED\n"
             "\nReturns a new Zcash address for receiving payments.\n"
 
             "\nArguments:\n"
@@ -163,19 +181,19 @@ UniValue getnewaddress(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    if (!pwalletMain->IsLocked())
-        pwalletMain->TopUpKeyPool();
+    const CChainParams& chainparams = Params();
+    EnsureWalletIsBackedUp(chainparams);
+
+    EnsureWalletIsUnlocked();
 
     // Generate a new key that is added to wallet
-    CPubKey newKey;
-    if (!pwalletMain->GetKeyFromPool(newKey))
-        throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first");
+    CPubKey newKey = pwalletMain->GenerateNewKey(true);
     CKeyID keyID = newKey.GetID();
 
     std::string dummy_account;
     pwalletMain->SetAddressBook(keyID, dummy_account, "receive");
 
-    KeyIO keyIO(Params());
+    KeyIO keyIO(chainparams);
     return keyIO.EncodeDestination(keyID);
 }
 
@@ -198,6 +216,9 @@ UniValue getrawchangeaddress(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
+    const CChainParams& chainparams = Params();
+    EnsureWalletIsBackedUp(chainparams);
+
     if (!pwalletMain->IsLocked())
         pwalletMain->TopUpKeyPool();
 
@@ -210,7 +231,7 @@ UniValue getrawchangeaddress(const UniValue& params, bool fHelp)
 
     CKeyID keyID = vchPubKey.GetID();
 
-    KeyIO keyIO(Params());
+    KeyIO keyIO(chainparams);
     return keyIO.EncodeDestination(keyID);
 }
 
@@ -277,9 +298,10 @@ UniValue sendtoaddress(const UniValue& params, bool fHelp)
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
     KeyIO keyIO(Params());
-    CTxDestination dest = keyIO.DecodeDestination(params[0].get_str());
+    auto destStr = params[0].get_str();
+    CTxDestination dest = keyIO.DecodeDestination(destStr);
     if (!IsValidDestination(dest)) {
-        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Zcash address");
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string("Invalid " PACKAGE_NAME " transparent address: ") + destStr);
     }
 
     // Amount
@@ -305,6 +327,286 @@ UniValue sendtoaddress(const UniValue& params, bool fHelp)
     return wtx.GetHash().GetHex();
 }
 
+UniValue listaddresses(const UniValue& params, bool fHelp)
+{
+    if (!EnsureWalletIsAvailable(fHelp))
+        return NullUniValue;
+
+    if (fHelp)
+        throw runtime_error(
+            "listaddresses\n"
+            "\nLists the addresses managed by this wallet by source, including \n"
+            "those generated from randomness by this wallet, Sapling addresses \n"
+            "generated from the legacy HD seed, imported watchonly transparent \n"
+            "addresses, shielded addresses tracked using imported viewing keys, \n"
+            "and addresses derived from the wallet's mnemonic seed for releases \n"
+            "version 4.5.2 and above. \n"
+            "\nREMINDER: It is recommended that you back up your wallet.dat file \n"
+            "regularly!\n"
+            "\nResult:\n"
+            "[\n"
+            "  {\n"
+            "    \"source\": \"imported|imported_watchonly|keypool|legacy_seed|mnemonic_seed\"\n"
+            "    \"transparent\": {\n"
+            "      \"addresses\": [\"t14oHp2v54vfmdgQ3v3SNuQga8JKHTNi2a1\", ...],\n"
+            "      \"changeAddresses\": [\"t14oHp2v54vfmdgQ3v3SNuQga8JKHTNi2a1\", ...]\n"
+            "    },\n"
+            "    \"sprout\": {\n"
+            "      \"addresses\": [\"ztbx5DLDxa5ZLFTchHhoPNkKs57QzSyib6UqXpEdy76T1aUdFxJt1w9318Z8DJ73XzbnWHKEZP9Yjg712N5kMmP4QzS9iC9\", ...]\n"
+            "    },\n"
+            "    \"sapling\": [ -- each element in this list represents a set of diversified addresses derived from a single IVK. \n"
+            "      {\n"
+            "        \"zip32KeyPath\": \"m/32'/133'/0'\", -- optional field, not present for imported/watchonly sources,\n"
+            "        \"addresses\": [\n"
+            "          \"ztbx5DLDxa5ZLFTchHhoPNkKs57QzSyib6UqXpEdy76T1aUdFxJt1w9318Z8DJ73XzbnWHKEZP9Yjg712N5kMmP4QzS9iC9\",\n"
+            "          ...\n"
+            "        ]\n"
+            "      },\n"
+            "      ...\n"
+            "    ]\n"
+            "  },\n"
+            "  ...\n"
+            "]\n"
+            "In the case that a source does not have addresses for a pool, the key\n"
+            "associated with that pool will be absent.\n"
+            "\nExamples:\n"
+            + HelpExampleCli("listaddresses", "")
+            + HelpExampleRpc("listaddresses", "")
+        );
+
+    LOCK2(cs_main, pwalletMain->cs_wallet);
+
+    KeyIO keyIO(Params());
+
+    UniValue ret(UniValue::VARR);
+
+    // keypool-derived and imported/watchonly transparent addresses
+    std::set<CTxDestination> t_generated_dests;
+    std::set<CTxDestination> t_change_dests;
+    std::set<CTxDestination> t_watchonly_dests;
+    // Get the CTxDestination values for all the entries in the transparent address book.
+    // This will include any address that has been generated by this wallet.
+    for (const std::pair<CTxDestination, CAddressBookData>& item : pwalletMain->mapAddressBook) {
+        t_generated_dests.insert(item.first);
+    }
+
+    // Ensure we have every address that holds a balance. While this is likely to be redundant
+    // with respect to the entries in the address book for addresses generated by this wallet,
+    // there is not a guarantee that an externally generated address (such as one associated with
+    // a future unified incoming viewing key) will have been added to the address book.
+    for (const std::pair<CTxDestination, CAmount>& item : pwalletMain->GetAddressBalances()) {
+        auto script = GetScriptForDestination(item.first);
+        if (pwalletMain->HaveWatchOnly(script)) {
+            t_watchonly_dests.insert(item.first);
+        } else if (t_generated_dests.count(item.first) == 0) {
+            // assume that if we didn't add the address to the addrbook
+            // that it's a change address. Ideally we'd have a better way
+            // of checking this by exploring the transaction graph;
+            t_change_dests.insert(item.first);
+        } else {
+            // already accounted for in the address book
+        }
+    }
+
+    /// sprout addresses
+    std::set<libzcash::SproutPaymentAddress> sproutAddresses;
+    pwalletMain->GetSproutPaymentAddresses(sproutAddresses);
+
+    /// sapling addresses
+    std::set<libzcash::SaplingPaymentAddress> saplingAddresses;
+    pwalletMain->GetSaplingPaymentAddresses(saplingAddresses);
+
+    // legacy_random source
+    {
+        // Add legacy randomly generated address records to the result.
+        // This includes transparent addresses generated by the wallet via
+        // the keypool and Sprout addresses for which we have the
+        // spending key.
+        UniValue entry(UniValue::VOBJ);
+        entry.pushKV("source", "legacy_random");
+        bool hasData = false;
+
+        UniValue random_t(UniValue::VOBJ);
+
+        if (!t_generated_dests.empty()) {
+            UniValue random_t_addrs(UniValue::VARR);
+            for (const CTxDestination& dest : t_generated_dests) {
+                random_t_addrs.push_back(keyIO.EncodeDestination(dest));
+            }
+            random_t.pushKV("addresses", random_t_addrs);
+            hasData = true;
+        }
+
+        if (!t_change_dests.empty()) {
+            UniValue random_t_change_addrs(UniValue::VARR);
+            for (const CTxDestination& dest : t_change_dests) {
+                random_t_change_addrs.push_back(keyIO.EncodeDestination(dest));
+            }
+            random_t.pushKV("changeAddresses", random_t_change_addrs);
+            hasData = true;
+        }
+
+        if (!t_generated_dests.empty() || !t_change_dests.empty()) {
+            entry.pushKV("transparent", random_t);
+        }
+
+        if (!sproutAddresses.empty()) {
+            UniValue random_sprout_addrs(UniValue::VARR);
+            for (const SproutPaymentAddress& addr : sproutAddresses) {
+                if (pwalletMain->HaveSproutSpendingKey(addr)) {
+                    random_sprout_addrs.push_back(keyIO.EncodePaymentAddress(addr));
+                }
+            }
+
+            UniValue random_sprout(UniValue::VOBJ);
+            random_sprout.pushKV("addresses", random_sprout_addrs);
+
+            entry.pushKV("sprout", random_sprout);
+            hasData = true;
+        }
+
+        if (hasData) {
+            ret.push_back(entry);
+        }
+    }
+
+    // inner function that groups Sapling addresses by IVK for use in all sources
+    // that can contain Sapling addresses
+    auto add_sapling = [&](
+            const std::set<SaplingPaymentAddress>& addrs,
+            const PaymentAddressSource source,
+            UniValue& entry
+            ) {
+        bool hasData = false;
+
+        std::map<SaplingIncomingViewingKey, std::vector<SaplingPaymentAddress>> ivkAddrs;
+        for (const SaplingPaymentAddress& addr : addrs) {
+            if (GetSourceForPaymentAddress(pwalletMain)(addr) == source) {
+                SaplingIncomingViewingKey ivkRet;
+                if (pwalletMain->GetSaplingIncomingViewingKey(addr, ivkRet)) {
+                    ivkAddrs[ivkRet].push_back(addr);
+                }
+            }
+        }
+
+        {
+            UniValue ivk_groups(UniValue::VARR);
+            for (const auto& [ivk, addrs] : ivkAddrs) {
+                UniValue sapling_addrs(UniValue::VARR);
+                for (const SaplingPaymentAddress& addr : addrs) {
+                    sapling_addrs.push_back(keyIO.EncodePaymentAddress(addr));
+                }
+
+                UniValue sapling_obj(UniValue::VOBJ);
+
+                if (source == PaymentAddressSource::LegacyHDSeed || source == PaymentAddressSource::MnemonicHDSeed) {
+                    std::string hdKeyPath = pwalletMain->mapSaplingZKeyMetadata[ivk].hdKeypath;
+                    if (hdKeyPath != "") {
+                        sapling_obj.pushKV("zip32KeyPath", hdKeyPath);
+                    }
+                }
+
+                sapling_obj.pushKV("addresses", sapling_addrs);
+
+                ivk_groups.push_back(sapling_obj);
+            }
+
+            if (!ivk_groups.empty()) {
+                entry.pushKV("sapling", ivk_groups);
+                hasData = true;
+            }
+        }
+
+        return hasData;
+    };
+
+    /// imported source
+    {
+        UniValue entry(UniValue::VOBJ);
+        entry.pushKV("source", "imported");
+
+        bool hasData = false;
+
+        {
+            UniValue imported_sprout_addrs(UniValue::VARR);
+            for (const SproutPaymentAddress& addr : sproutAddresses) {
+                if (GetSourceForPaymentAddress(pwalletMain)(addr) == PaymentAddressSource::Imported) {
+                    imported_sprout_addrs.push_back(keyIO.EncodePaymentAddress(addr));
+                }
+            }
+
+            if (!imported_sprout_addrs.empty()) {
+                UniValue imported_sprout(UniValue::VOBJ);
+                imported_sprout.pushKV("addresses", imported_sprout_addrs);
+                entry.pushKV("sprout", imported_sprout);
+                hasData = true;
+            }
+        }
+
+        hasData |= add_sapling(saplingAddresses, PaymentAddressSource::Imported, entry);
+
+        if (hasData) {
+            ret.push_back(entry);
+        }
+    }
+
+    /// imported_watchonly source
+    {
+        UniValue entry(UniValue::VOBJ);
+        entry.pushKV("source", "imported_watchonly");
+        bool hasData = false;
+
+        if (!t_watchonly_dests.empty()) {
+            UniValue watchonly_t_addrs(UniValue::VARR);
+            for (const CTxDestination& dest: t_watchonly_dests) {
+                watchonly_t_addrs.push_back(keyIO.EncodeDestination(dest));
+            }
+
+            UniValue watchonly_t(UniValue::VOBJ);
+            watchonly_t.pushKV("addresses", watchonly_t_addrs);
+
+            entry.pushKV("transparent", watchonly_t);
+            hasData = true;
+        }
+
+        {
+            UniValue watchonly_sprout_addrs(UniValue::VARR);
+            for (const SproutPaymentAddress& addr : sproutAddresses) {
+                if (GetSourceForPaymentAddress(pwalletMain)(addr) == PaymentAddressSource::ImportedWatchOnly) {
+                    watchonly_sprout_addrs.push_back(keyIO.EncodePaymentAddress(addr));
+                }
+            }
+
+            if (!watchonly_sprout_addrs.empty()) {
+                UniValue watchonly_sprout(UniValue::VOBJ);
+                watchonly_sprout.pushKV("addresses", watchonly_sprout_addrs);
+                entry.pushKV("sprout", watchonly_sprout);
+                hasData = true;
+            }
+        }
+
+        hasData |= add_sapling(saplingAddresses, PaymentAddressSource::ImportedWatchOnly, entry);
+
+        if (hasData) {
+            ret.push_back(entry);
+        }
+    }
+
+    /// legacy_hdseed source
+    {
+        UniValue entry(UniValue::VOBJ);
+        entry.pushKV("source", "legacy_hdseed");
+
+        bool hasData = add_sapling(saplingAddresses, PaymentAddressSource::LegacyHDSeed, entry);
+
+        if (hasData) {
+            ret.push_back(entry);
+        };
+    }
+
+    return ret;
+}
+
 UniValue listaddressgroupings(const UniValue& params, bool fHelp)
 {
     if (!EnsureWalletIsAvailable(fHelp))
@@ -392,7 +694,7 @@ UniValue signmessage(const UniValue& params, bool fHelp)
     KeyIO keyIO(Params());
     CTxDestination dest = keyIO.DecodeDestination(strAddress);
     if (!IsValidDestination(dest)) {
-        throw JSONRPCError(RPC_TYPE_ERROR, "Invalid address");
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string("Invalid " PACKAGE_NAME " transparent address: ") + strAddress);
     }
 
     const CKeyID *keyID = std::get_if<CKeyID>(&dest);
@@ -438,7 +740,7 @@ UniValue getreceivedbyaddress(const UniValue& params, bool fHelp)
             + HelpExampleCli("getreceivedbyaddress", "\"t14oHp2v54vfmdgQ3v3SNuQga8JKHTNi2a1\" 0") +
             "\nThe amount with at least 6 confirmations, very safe\n"
             + HelpExampleCli("getreceivedbyaddress", "\"t14oHp2v54vfmdgQ3v3SNuQga8JKHTNi2a1\" 6") +
-            "\nAs a json rpc call\n"
+            "\nAs a JSON RPC call\n"
             + HelpExampleRpc("getreceivedbyaddress", "\"t14oHp2v54vfmdgQ3v3SNuQga8JKHTNi2a1\", 6")
        );
 
@@ -446,9 +748,10 @@ UniValue getreceivedbyaddress(const UniValue& params, bool fHelp)
 
     KeyIO keyIO(Params());
     // Bitcoin address
-    CTxDestination dest = keyIO.DecodeDestination(params[0].get_str());
+    auto destStr = params[0].get_str();
+    CTxDestination dest = keyIO.DecodeDestination(destStr);
     if (!IsValidDestination(dest)) {
-        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Zcash address");
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string("Invalid " PACKAGE_NAME " transparent address: ") + destStr);
     }
     CScript scriptPubKey = GetScriptForDestination(dest);
     if (!IsMine(*pwalletMain, scriptPubKey)) {
@@ -503,7 +806,7 @@ UniValue getbalance(const UniValue& params, bool fHelp)
             + HelpExampleCli("getbalance", "*") +
             "\nThe total amount in the wallet at least 5 blocks confirmed\n"
             + HelpExampleCli("getbalance", "\"*\" 6") +
-            "\nAs a json rpc call\n"
+            "\nAs a JSON RPC call\n"
             + HelpExampleRpc("getbalance", "\"*\", 6")
         );
 
@@ -585,7 +888,7 @@ UniValue sendmany(const UniValue& params, bool fHelp)
             + HelpExampleCli("sendmany", "\"\" \"{\\\"t14oHp2v54vfmdgQ3v3SNuQga8JKHTNi2a1\\\":0.01,\\\"t1353tsE8YMTA4EuV7dgUXGjNFf9KpVvKHz\\\":0.02}\" 6 \"testing\"") +
             "\nSend two amounts to two different addresses, subtract fee from amount:\n"
             + HelpExampleCli("sendmany", "\"\" \"{\\\"t14oHp2v54vfmdgQ3v3SNuQga8JKHTNi2a1\\\":0.01,\\\"t1353tsE8YMTA4EuV7dgUXGjNFf9KpVvKHz\\\":0.02}\" 1 \"\" \"[\\\"t14oHp2v54vfmdgQ3v3SNuQga8JKHTNi2a1\\\",\\\"t1353tsE8YMTA4EuV7dgUXGjNFf9KpVvKHz\\\"]\"") +
-            "\nAs a json rpc call\n"
+            "\nAs a JSON RPC call\n"
             + HelpExampleRpc("sendmany", "\"\", \"{\\\"t14oHp2v54vfmdgQ3v3SNuQga8JKHTNi2a1\\\":0.01,\\\"t1353tsE8YMTA4EuV7dgUXGjNFf9KpVvKHz\\\":0.02}\", 6, \"testing\"")
         );
 
@@ -616,7 +919,7 @@ UniValue sendmany(const UniValue& params, bool fHelp)
     for (const std::string& name_ : keys) {
         CTxDestination dest = keyIO.DecodeDestination(name_);
         if (!IsValidDestination(dest)) {
-            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string("Invalid Zcash address: ") + name_);
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string("Invalid " PACKAGE_NAME " transparent address: ") + name_);
         }
 
         if (destinations.count(dest)) {
@@ -993,7 +1296,7 @@ UniValue listtransactions(const UniValue& params, bool fHelp)
             + HelpExampleCli("listtransactions", "") +
             "\nList transactions 100 to 120\n"
             + HelpExampleCli("listtransactions", "\"*\" 20 100") +
-            "\nAs a json rpc call\n"
+            "\nAs a JSON RPC call\n"
             + HelpExampleRpc("listtransactions", "\"*\", 20, 100")
         );
 
@@ -1306,6 +1609,8 @@ UniValue keypoolrefill(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
+    EnsureWalletIsBackedUp(Params());
+
     // 0 is interpreted by TopUpKeyPool() as the default keypool size given by -keypool
     unsigned int kpSize = 0;
     if (params.size() > 0) {
@@ -1438,6 +1743,45 @@ UniValue walletpassphrasechange(const UniValue& params, bool fHelp)
     return NullUniValue;
 }
 
+UniValue walletconfirmbackup(const UniValue& params, bool fHelp)
+{
+    if (!EnsureWalletIsAvailable(fHelp))
+        return NullUniValue;
+
+    if (fHelp || params.size() != 1)
+        throw runtime_error(
+            "walletconfirmbackup \"emergency recovery phrase\"\n"
+            "\nCAUTION: This is an internal method that is not intended to be called directly by\n"
+            "users. Please use the zcashd-wallet-tool utility (built or installed in the same directory\n"
+            "as zcashd) instead. In particular, this method should not be used from zcash-cli, in order\n"
+            "to avoid exposing the recovery phrase on the command line.\n\n"
+            "Notify the wallet that the user has backed up the emergency recovery phrase,\n"
+            "which can be obtained by making a call to z_exportwallet. The zcashd embedded wallet\n"
+            "requires confirmation that the emergency recovery phrase has been backed up before it\n"
+            "will permit new spending keys or addresses to be generated.\n"
+            "\nArguments:\n"
+            "1. \"emergency recovery phrase\" (string, required) The full recovery phrase returned as part\n"
+            "   of the data returned by z_exportwallet. An error will be returned if the value provided\n"
+            "   does not match the wallet's existing emergency recovery phrase.\n"
+            "\nExamples:\n"
+            + HelpExampleRpc("walletconfirmbackup", "\"abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon art\"")
+        );
+
+    LOCK2(cs_main, pwalletMain->cs_wallet);
+
+    EnsureWalletIsUnlocked();
+
+    SecureString strMnemonicPhrase(params[0].get_str());
+    boost::trim(strMnemonicPhrase);
+    if (pwalletMain->VerifyMnemonicSeed(strMnemonicPhrase)) {
+        return NullUniValue;
+    } else {
+        throw JSONRPCError(
+                RPC_WALLET_PASSPHRASE_INCORRECT,
+                "Error: The emergency recovery phrase entered was incorrect.");
+    }
+}
+
 
 UniValue walletlock(const UniValue& params, bool fHelp)
 {
@@ -1509,7 +1853,7 @@ UniValue encryptwallet(const UniValue& params, bool fHelp)
             + HelpExampleCli("signmessage", "\"zcashaddress\" \"test message\"") +
             "\nNow lock the wallet again by removing the passphrase\n"
             + HelpExampleCli("walletlock", "") +
-            "\nAs a json rpc call\n"
+            "\nAs a JSON RPC call\n"
             + HelpExampleRpc("encryptwallet", "\"my pass phrase\"")
         );
 
@@ -1581,7 +1925,7 @@ UniValue lockunspent(const UniValue& params, bool fHelp)
             + HelpExampleCli("listlockunspent", "") +
             "\nUnlock the transaction again\n"
             + HelpExampleCli("lockunspent", "true \"[{\\\"txid\\\":\\\"a08e6907dbbd3d809776dbfc5d82e371b764ed838b5655e72f463568df1aadf0\\\",\\\"vout\\\":1}]\"") +
-            "\nAs a json rpc call\n"
+            "\nAs a JSON RPC call\n"
             + HelpExampleRpc("lockunspent", "false, \"[{\\\"txid\\\":\\\"a08e6907dbbd3d809776dbfc5d82e371b764ed838b5655e72f463568df1aadf0\\\",\\\"vout\\\":1}]\"")
         );
 
@@ -1655,7 +1999,7 @@ UniValue listlockunspent(const UniValue& params, bool fHelp)
             + HelpExampleCli("listlockunspent", "") +
             "\nUnlock the transaction again\n"
             + HelpExampleCli("lockunspent", "true \"[{\\\"txid\\\":\\\"a08e6907dbbd3d809776dbfc5d82e371b764ed838b5655e72f463568df1aadf0\\\",\\\"vout\\\":1}]\"") +
-            "\nAs a json rpc call\n"
+            "\nAs a JSON RPC call\n"
             + HelpExampleRpc("listlockunspent", "")
         );
 
@@ -1704,7 +2048,7 @@ UniValue settxfee(const UniValue& params, bool fHelp)
     return true;
 }
 
-CAmount getBalanceZaddr(std::optional<libzcash::RawAddress> address, int minDepth = 1, int maxDepth = INT_MAX, bool ignoreUnspendable=true);
+CAmount getBalanceZaddr(std::optional<libzcash::PaymentAddress> address, int minDepth = 1, int maxDepth = INT_MAX, bool ignoreUnspendable=true);
 
 UniValue getwalletinfo(const UniValue& params, bool fHelp)
 {
@@ -1728,7 +2072,10 @@ UniValue getwalletinfo(const UniValue& params, bool fHelp)
             "  \"keypoolsize\": xxxx,        (numeric) how many new keys are pre-generated\n"
             "  \"unlocked_until\": ttt,      (numeric) the timestamp in seconds since epoch (midnight Jan 1 1970 GMT) that the wallet is unlocked for transfers, or 0 if the wallet is locked\n"
             "  \"paytxfee\": x.xxxx,         (numeric) the transaction fee configuration, set in " + CURRENCY_UNIT + "/kB\n"
-            "  \"seedfp\": \"uint256\",        (string) the BLAKE2b-256 hash of the HD seed\n"
+            "  \"mnemonic_seedfp\": \"uint256\", (string) the BLAKE2b-256 hash of the HD seed derived from the wallet's emergency recovery phrase\n"
+            "  \"legacy_seedfp\": \"uint256\",   (string, optional) if this wallet was created prior to release 4.5.2, this will contain the BLAKE2b-256\n"
+            "                                    hash of the legacy HD seed that was used to derive Sapling addresses prior to the 4.5.2 upgrade to mnemonic\n"
+            "                                    emergency recovery phrases. This field was previously named \"seedfp\".\n"
             "}\n"
             "\nExamples:\n"
             + HelpExampleCli("getwalletinfo", "")
@@ -1750,9 +2097,15 @@ UniValue getwalletinfo(const UniValue& params, bool fHelp)
     if (pwalletMain->IsCrypted())
         obj.pushKV("unlocked_until", nWalletUnlockTime);
     obj.pushKV("paytxfee",      ValueFromAmount(payTxFee.GetFeePerK()));
-    uint256 seedFp = pwalletMain->GetHDChain().seedFp;
-    if (!seedFp.IsNull())
-         obj.pushKV("seedfp", seedFp.GetHex());
+    auto mnemonicChain = pwalletMain->GetMnemonicHDChain();
+    if (mnemonicChain.has_value())
+         obj.pushKV("mnemonic_seedfp", mnemonicChain.value().GetSeedFingerprint().GetHex());
+    // TODO: do we really need to return the legacy seed fingerprint if we're
+    // no longer using it to generate any new keys? What do people actually use
+    // the fingerprint for?
+    auto legacySeed = pwalletMain->GetLegacyHDSeed();
+    if (legacySeed.has_value())
+        obj.pushKV("legacy_seedfp", legacySeed.value().Fingerprint().GetHex());
     return obj;
 }
 
@@ -1840,13 +2193,13 @@ UniValue listunspent(const UniValue& params, bool fHelp)
     if (params.size() > 2) {
         UniValue inputs = params[2].get_array();
         for (size_t idx = 0; idx < inputs.size(); idx++) {
-            const UniValue& input = inputs[idx];
-            CTxDestination dest = keyIO.DecodeDestination(input.get_str());
+            auto destStr = inputs[idx].get_str();
+            CTxDestination dest = keyIO.DecodeDestination(destStr);
             if (!IsValidDestination(dest)) {
-                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string("Invalid Zcash address: ") + input.get_str());
+                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string("Invalid Zcash transparent address: ") + destStr);
             }
             if (!destinations.insert(dest).second) {
-                throw JSONRPCError(RPC_INVALID_PARAMETER, std::string("Invalid parameter, duplicated address: ") + input.get_str());
+                throw JSONRPCError(RPC_INVALID_PARAMETER, std::string("Invalid parameter, duplicated address: ") + destStr);
             }
         }
     }
@@ -1906,29 +2259,30 @@ UniValue z_listunspent(const UniValue& params, bool fHelp)
             "Optionally filter to only include notes sent to specified addresses.\n"
             "When minconf is 0, unspent notes with zero confirmations are returned, even though they are not immediately spendable.\n"
             "Results are an array of Objects, each of which has:\n"
-            "{txid, jsindex, jsoutindex, confirmations, address, amount, memo} (Sprout)\n"
-            "{txid, outindex, confirmations, address, amount, memo} (Sapling)\n"
+            "{txid, type, jsindex, jsoutindex, confirmations, address, amount, memo} (Sprout)\n"
+            "{txid, type, outindex, confirmations, address, amount, memo} (Sapling)\n"
             "\nArguments:\n"
             "1. minconf          (numeric, optional, default=1) The minimum confirmations to filter\n"
             "2. maxconf          (numeric, optional, default=9999999) The maximum confirmations to filter\n"
             "3. includeWatchonly (bool, optional, default=false) Also include watchonly addresses (see 'z_importviewingkey')\n"
-            "4. \"addresses\"      (string) A json array of zaddrs (both Sprout and Sapling) to filter on.  Duplicate addresses not allowed.\n"
+            "4. \"addresses\"      (string) A json array of shielded addresses to filter on.  Duplicate addresses not allowed.\n"
             "    [\n"
-            "      \"address\"     (string) zaddr\n"
+            "      \"address\"     (string) Sprout, Sapling, or Unified address\n"
             "      ,...\n"
             "    ]\n"
-            "\nResult\n"
+            "\nResult (output indices for only one pool will be present):\n"
             "[                             (array of json object)\n"
             "  {\n"
             "    \"txid\" : \"txid\",          (string) the transaction id \n"
+            "    \"type\" : \"sprout|sapling|orchard\", (string) The shielded pool\n"
             "    \"jsindex\" (sprout) : n,       (numeric) the joinsplit index\n"
             "    \"jsoutindex\" (sprout) : n,       (numeric) the output index of the joinsplit\n"
-            "    \"outindex\" (sapling) : n,       (numeric) the output index\n"
+            "    \"outindex\" (transparent, sapling, orchard) : n,       (numeric) the output index\n"
             "    \"confirmations\" : n,       (numeric) the number of confirmations\n"
             "    \"spendable\" : true|false,  (boolean) true if note can be spent by wallet, false if address is watchonly\n"
             "    \"address\" : \"address\",    (string) the shielded address\n"
             "    \"amount\": xxxxx,          (numeric) the amount of value in the note\n"
-            "    \"memo\": xxxxx,            (string) hexademical string representation of memo field\n"
+            "    \"memo\": xxxxx,            (string) hexadecimal string representation of memo field\n"
             "    \"change\": true|false,     (boolean) true if the address that received the note is also one of the sending addresses\n"
             "  }\n"
             "  ,...\n"
@@ -1958,8 +2312,6 @@ UniValue z_listunspent(const UniValue& params, bool fHelp)
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Maximum number of confirmations must be greater or equal to the minimum number of confirmations");
     }
 
-    std::set<libzcash::RawAddress> zaddrs = {};
-
     bool fIncludeWatchonly = false;
     if (params.size() > 2) {
         fIncludeWatchonly = params[2].get_bool();
@@ -1967,99 +2319,106 @@ UniValue z_listunspent(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
+    std::optional<NoteFilter> noteFilter = std::nullopt;
+    std::set<std::pair<libzcash::SproutPaymentAddress, uint256>> sproutNullifiers;
+    std::set<std::pair<libzcash::SaplingPaymentAddress, uint256>> saplingNullifiers;
+
     KeyIO keyIO(Params());
     // User has supplied zaddrs to filter on
     if (params.size() > 3) {
         UniValue addresses = params[3].get_array();
-        if (addresses.size()==0)
+        if (addresses.size() == 0) {
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, addresses array is empty.");
-
-        // Keep track of addresses to spot duplicates
-        set<std::string> setAddress;
+        }
 
         // Sources
+        std::vector<libzcash::PaymentAddress> sourceAddrs;
         for (const UniValue& o : addresses.getValues()) {
             if (!o.isStr()) {
                 throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, expected string");
             }
-            string address = o.get_str();
-            auto zaddr = keyIO.DecodePaymentAddress(address);
-            if (!IsValidPaymentAddress(zaddr)) {
-                throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, address is not a valid zaddr: ") + address);
-            }
-            auto hasSpendingKey = std::visit(HaveSpendingKeyForPaymentAddress(pwalletMain), zaddr);
-            if (!fIncludeWatchonly && !hasSpendingKey) {
-                throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, spending key for address does not belong to wallet: ") + address);
-            }
-            // We want to return unspent notes corresponding to any receiver within a
-            // Unified Address.
-            for (const auto ra : std::visit(GetRawAddresses(), zaddr)) {
-                zaddrs.insert(ra);
-            }
 
-            if (setAddress.count(address)) {
-                throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, duplicated address: ") + address);
+            auto zaddr = keyIO.DecodePaymentAddress(o.get_str());
+            if (!zaddr.has_value()) {
+                throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, not a valid Zcash address: ") + o.get_str());
             }
-            setAddress.insert(address);
+
+            sourceAddrs.push_back(zaddr.value());
         }
-    }
-    else {
+
+        noteFilter = NoteFilter::ForPaymentAddresses(sourceAddrs);
+        sproutNullifiers = pwalletMain->GetSproutNullifiers(noteFilter.value().GetSproutAddresses());
+        saplingNullifiers = pwalletMain->GetSaplingNullifiers(noteFilter.value().GetSaplingAddresses());
+
+        // If we don't include watchonly addresses, we must reject any address
+        // for which we do not have the spending key.
+        if (!fIncludeWatchonly && !pwalletMain->HasSpendingKeys(noteFilter.value())) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, spending key for an address does not belong to the wallet."));
+        }
+    } else {
         // User did not provide zaddrs, so use default i.e. all addresses
         std::set<libzcash::SproutPaymentAddress> sproutzaddrs = {};
         pwalletMain->GetSproutPaymentAddresses(sproutzaddrs);
+        sproutNullifiers = pwalletMain->GetSproutNullifiers(sproutzaddrs);
 
         // Sapling support
         std::set<libzcash::SaplingPaymentAddress> saplingzaddrs = {};
         pwalletMain->GetSaplingPaymentAddresses(saplingzaddrs);
-
-        zaddrs.insert(sproutzaddrs.begin(), sproutzaddrs.end());
-        zaddrs.insert(saplingzaddrs.begin(), saplingzaddrs.end());
+        saplingNullifiers = pwalletMain->GetSaplingNullifiers(saplingzaddrs);
     }
 
     UniValue results(UniValue::VARR);
 
-    if (zaddrs.size() > 0) {
-        std::vector<SproutNoteEntry> sproutEntries;
-        std::vector<SaplingNoteEntry> saplingEntries;
-        pwalletMain->GetFilteredNotes(sproutEntries, saplingEntries, zaddrs, nMinDepth, nMaxDepth, true, !fIncludeWatchonly, false);
-        auto nullifierSet = pwalletMain->GetNullifiersForAddresses(zaddrs);
+    std::vector<SproutNoteEntry> sproutEntries;
+    std::vector<SaplingNoteEntry> saplingEntries;
+    std::vector<OrchardNoteMetadata> orchardEntries;
+    pwalletMain->GetFilteredNotes(sproutEntries, saplingEntries, orchardEntries, noteFilter, nMinDepth, nMaxDepth, true, !fIncludeWatchonly, false);
 
-        for (auto & entry : sproutEntries) {
-            UniValue obj(UniValue::VOBJ);
-            obj.pushKV("txid", entry.jsop.hash.ToString());
-            obj.pushKV("jsindex", (int)entry.jsop.js );
-            obj.pushKV("jsoutindex", (int)entry.jsop.n);
-            obj.pushKV("confirmations", entry.confirmations);
-            bool hasSproutSpendingKey = HaveSpendingKeyForPaymentAddress(pwalletMain)(entry.address);
-            obj.pushKV("spendable", hasSproutSpendingKey);
-            obj.pushKV("address", keyIO.EncodePaymentAddress(entry.address));
-            obj.pushKV("amount", ValueFromAmount(CAmount(entry.note.value())));
-            std::string data(entry.memo.begin(), entry.memo.end());
-            obj.pushKV("memo", HexStr(data));
-            if (hasSproutSpendingKey) {
-                obj.pushKV("change", pwalletMain->IsNoteSproutChange(nullifierSet, entry.address, entry.jsop));
-            }
-            results.push_back(obj);
+    for (auto & entry : sproutEntries) {
+        UniValue obj(UniValue::VOBJ);
+        obj.pushKV("txid", entry.jsop.hash.ToString());
+        obj.pushKV("type", ADDR_TYPE_SPROUT);
+        obj.pushKV("jsindex", (int)entry.jsop.js );
+        obj.pushKV("jsoutindex", (int)entry.jsop.n);
+        obj.pushKV("confirmations", entry.confirmations);
+        bool hasSproutSpendingKey = pwalletMain->HaveSproutSpendingKey(entry.address);
+        obj.pushKV("spendable", hasSproutSpendingKey);
+        obj.pushKV("address", keyIO.EncodePaymentAddress(entry.address));
+        obj.pushKV("amount", ValueFromAmount(CAmount(entry.note.value())));
+        std::string data(entry.memo.begin(), entry.memo.end());
+        obj.pushKV("memo", HexStr(data));
+        if (hasSproutSpendingKey) {
+            obj.pushKV("change", pwalletMain->IsNoteSproutChange(sproutNullifiers, entry.address, entry.jsop));
         }
+        results.push_back(obj);
+    }
 
-        for (auto & entry : saplingEntries) {
-            UniValue obj(UniValue::VOBJ);
-            obj.pushKV("txid", entry.op.hash.ToString());
-            obj.pushKV("outindex", (int)entry.op.n);
-            obj.pushKV("confirmations", entry.confirmations);
-            bool hasSaplingSpendingKey = HaveSpendingKeyForPaymentAddress(pwalletMain)(entry.address);
-            obj.pushKV("spendable", hasSaplingSpendingKey);
-            // TODO: If we found this entry via a UA, show that instead.
-            obj.pushKV("address", keyIO.EncodePaymentAddress(entry.address));
-            obj.pushKV("amount", ValueFromAmount(CAmount(entry.note.value()))); // note.value() is equivalent to plaintext.value()
-            obj.pushKV("memo", HexStr(entry.memo));
-            if (hasSaplingSpendingKey) {
-                obj.pushKV("change", pwalletMain->IsNoteSaplingChange(nullifierSet, entry.address, entry.op));
+    for (auto & entry : saplingEntries) {
+        UniValue obj(UniValue::VOBJ);
+        obj.pushKV("txid", entry.op.hash.ToString());
+        obj.pushKV("type", ADDR_TYPE_SAPLING);
+        obj.pushKV("outindex", (int)entry.op.n);
+        obj.pushKV("confirmations", entry.confirmations);
+        bool hasSaplingSpendingKey = pwalletMain->HaveSaplingSpendingKeyForAddress(entry.address);
+        obj.pushKV("spendable", hasSaplingSpendingKey);
+        obj.pushKV("address", keyIO.EncodePaymentAddress([&]() {
+            auto ua = pwalletMain->FindUnifiedAddressByReceiver(entry.address);
+            if (ua.has_value()) {
+                return libzcash::PaymentAddress{ua.value()};
+            } else {
+                return libzcash::PaymentAddress{entry.address};
             }
-            results.push_back(obj);
+        }()));
+        obj.pushKV("amount", ValueFromAmount(CAmount(entry.note.value()))); // note.value() is equivalent to plaintext.value()
+        obj.pushKV("memo", HexStr(entry.memo));
+        if (hasSaplingSpendingKey) {
+            obj.pushKV("change", pwalletMain->IsNoteSaplingChange(saplingNullifiers, entry.address, entry.op));
         }
+        results.push_back(obj);
     }
 
+    // TODO ORCHARD #5683
+
     return results;
 }
 
@@ -2315,13 +2674,13 @@ UniValue zc_raw_receive(const UniValue& params, bool fHelp)
 
     KeyIO keyIO(Params());
     auto spendingkey = keyIO.DecodeSpendingKey(params[0].get_str());
-    if (!IsValidSpendingKey(spendingkey)) {
+    if (!spendingkey.has_value()) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid spending key");
     }
-    if (std::get_if<libzcash::SproutSpendingKey>(&spendingkey) == nullptr) {
+    if (std::get_if<libzcash::SproutSpendingKey>(&spendingkey.value()) == nullptr) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Only works with Sprout spending keys");
     }
-    SproutSpendingKey k = std::get<libzcash::SproutSpendingKey>(spendingkey);
+    SproutSpendingKey k = std::get<libzcash::SproutSpendingKey>(spendingkey.value());
 
     uint256 epk;
     unsigned char nonce;
@@ -2441,13 +2800,13 @@ UniValue zc_raw_joinsplit(const UniValue& params, bool fHelp)
     KeyIO keyIO(Params());
     for (const string& name_ : inputs.getKeys()) {
         auto spendingkey = keyIO.DecodeSpendingKey(inputs[name_].get_str());
-        if (!IsValidSpendingKey(spendingkey)) {
+        if (!spendingkey.has_value()) {
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid spending key");
         }
-        if (std::get_if<libzcash::SproutSpendingKey>(&spendingkey) == nullptr) {
+        if (std::get_if<libzcash::SproutSpendingKey>(&spendingkey.value()) == nullptr) {
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Only works with Sprout spending keys");
         }
-        SproutSpendingKey k = std::get<libzcash::SproutSpendingKey>(spendingkey);
+        SproutSpendingKey k = std::get<libzcash::SproutSpendingKey>(spendingkey.value());
 
         keys.push_back(k);
 
@@ -2488,11 +2847,13 @@ UniValue zc_raw_joinsplit(const UniValue& params, bool fHelp)
     }
 
     for (const string& name_ : outputs.getKeys()) {
-        auto addrTo = keyIO.DecodePaymentAddress(name_);
-        if (!IsValidPaymentAddress(addrTo)) {
+        auto addrToDecoded = keyIO.DecodePaymentAddress(name_);
+        if (!addrToDecoded.has_value()) {
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid recipient address.");
         }
-        if (std::get_if<libzcash::SproutPaymentAddress>(&addrTo) == nullptr) {
+
+        libzcash::PaymentAddress addrTo(addrToDecoded.value());
+        if (!std::holds_alternative<libzcash::SproutPaymentAddress>(addrTo)) {
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Only works with Sprout payment addresses");
         }
         CAmount nAmount = AmountFromValue(outputs[name_]);
@@ -2628,8 +2989,10 @@ UniValue z_getnewaddress(const UniValue& params, bool fHelp)
     if (fHelp || params.size() > 1)
         throw runtime_error(
             "z_getnewaddress ( type )\n"
+            "\nDEPRECATED. Use z_getnewaccount and z_getaddressforaccount instead.\n"
             "\nReturns a new shielded address for receiving payments.\n"
             "\nWith no arguments, returns a Sapling address.\n"
+            "Generating a Sprout address is not allowed after Canopy has activated.\n"
             "\nArguments:\n"
             "1. \"type\"         (string, optional, default=\"" + defaultType + "\") The type of address. One of [\""
             + ADDR_TYPE_SPROUT + "\", \"" + ADDR_TYPE_SAPLING + "\"].\n"
@@ -2643,93 +3006,372 @@ UniValue z_getnewaddress(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
+    const CChainParams& chainparams = Params();
+
     EnsureWalletIsUnlocked();
+    EnsureWalletIsBackedUp(chainparams);
 
     auto addrType = defaultType;
     if (params.size() > 0) {
         addrType = params[0].get_str();
     }
 
-    KeyIO keyIO(Params());
+    KeyIO keyIO(chainparams);
     if (addrType == ADDR_TYPE_SPROUT) {
+        if (chainparams.GetConsensus().NetworkUpgradeActive(chainActive.Height(), Consensus::UPGRADE_CANOPY)) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid address type, \""
+                               + ADDR_TYPE_SPROUT + "\" is not allowed after Canopy");
+        }
+        if (IsInitialBlockDownload(Params().GetConsensus())) {
+            throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Error: Creating a Sprout address during initial block download is not supported.");
+        }
         return keyIO.EncodePaymentAddress(pwalletMain->GenerateNewSproutZKey());
     } else if (addrType == ADDR_TYPE_SAPLING) {
-        return keyIO.EncodePaymentAddress(pwalletMain->GenerateNewSaplingZKey());
+        auto saplingAddress = pwalletMain->GenerateNewLegacySaplingZKey();
+        return keyIO.EncodePaymentAddress(saplingAddress);
     } else {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid address type");
     }
 }
 
-
-UniValue z_listaddresses(const UniValue& params, bool fHelp)
+UniValue z_getnewaccount(const UniValue& params, bool fHelp)
 {
     if (!EnsureWalletIsAvailable(fHelp))
         return NullUniValue;
-
-    if (fHelp || params.size() > 1)
+    if (fHelp || params.size() > 0)
         throw runtime_error(
-            "z_listaddresses ( includeWatchonly )\n"
-            "\nReturns the list of Sprout and Sapling shielded addresses belonging to the wallet.\n"
-            "\nArguments:\n"
-            "1. includeWatchonly (bool, optional, default=false) Also include watchonly addresses (see 'z_importviewingkey')\n"
+            "z_getnewaccount\n"
+            "\nPrepares and returns a new account.\n"
+            "\nAccounts are numbered starting from zero; this RPC method selects the next"
+            "\navailable sequential account number within the UA-compatible HD seed phrase.\n"
+            "\nEach new account is a separate group of funds within the wallet, and adds an"
+            "\nadditional performance cost to wallet scanning.\n"
+            "\nUse the z_getaddressforaccount RPC method to obtain addresses for an account.\n"
             "\nResult:\n"
-            "[                     (json array of string)\n"
-            "  \"zaddr\"           (string) a zaddr belonging to the wallet\n"
-            "  ,...\n"
-            "]\n"
+            "{\n"
+            "  \"account\": n,       (numeric) the new account number\n"
+            "}\n"
             "\nExamples:\n"
-            + HelpExampleCli("z_listaddresses", "")
-            + HelpExampleRpc("z_listaddresses", "")
+            + HelpExampleCli("z_getnewaccount", "")
+            + HelpExampleRpc("z_getnewaccount", "")
         );
 
-    LOCK2(cs_main, pwalletMain->cs_wallet);
+    if (!fExperimentalOrchardWallet) {
+        throw JSONRPCError(RPC_WALLET_ENCRYPTION_FAILED, "Error: the Orchard wallet experimental extensions are disabled.");
+    }
 
-    bool fIncludeWatchonly = false;
-    if (params.size() > 0) {
-        fIncludeWatchonly = params[0].get_bool();
+    LOCK(pwalletMain->cs_wallet);
+
+    EnsureWalletIsUnlocked();
+
+    // Generate the new account.
+    auto ufvkNew = pwalletMain->GenerateNewUnifiedSpendingKey();
+    const auto& account = ufvkNew.second;
+
+    UniValue result(UniValue::VOBJ);
+    result.pushKV("account", (uint64_t)account);
+    return result;
+}
+
+UniValue z_getaddressforaccount(const UniValue& params, bool fHelp)
+{
+    if (!EnsureWalletIsAvailable(fHelp))
+        return NullUniValue;
+    if (fHelp || params.size() < 1 || params.size() > 3)
+        throw runtime_error(
+            "z_getaddressforaccount account ( [\"pool\", ...] diversifier_index )\n"
+            "\nFor the given account number, derives a Unified Address in accordance"
+            "\nwith the remaining arguments:\n"
+            "\n- If no list of pools is given (or the empty list \"[]\"), the best and"
+            "\n  second-best shielded pools, along with the transparent pool, will be used."
+            "\n- If no diversifier index is given, the next unused index (that is valid"
+            "\n  for the list of pools) will be selected.\n"
+            "\nThe account number must have been previously generated by a call to the"
+            "\nz_getnewaccount RPC method.\n"
+            "\nOnce a Unified Address has been derived at a specific diversifier index,"
+            "\nre-deriving it (via a subsequent call to z_getaddressforaccount with the"
+            "\nsame account and index) will produce the same address with the same list"
+            "\nof pools. An error will be returned if a different list of pools is given.\n"
+            "\nResult:\n"
+            "{\n"
+            "  \"account\": n,                    (numeric) the specified account number\n"
+            "  \"diversifier_index\": n,          (numeric) the index specified or chosen\n"
+            "  \"pools\": [\"pool\",...]\",         (json array of string) the pools (e.g. \"transparent\", \"orchard\") for which the UA contains receivers\n"
+            "  \"unifiedaddress\"                 (string) The corresponding address\n"
+            "}\n"
+            "\nExamples:\n"
+            + HelpExampleCli("z_getaddressforaccount", "4")
+            + HelpExampleCli("z_getaddressforaccount", "4 '[]' 1")
+            + HelpExampleCli("z_getaddressforaccount", "4 '[\"transparent\",\"sapling\",\"orchard\"]' 1")
+            + HelpExampleRpc("z_getaddressforaccount", "4")
+        );
+
+    if (!fExperimentalOrchardWallet) {
+        throw JSONRPCError(RPC_WALLET_ENCRYPTION_FAILED, "Error: the Orchard wallet experimental extensions are disabled.");
     }
 
-    KeyIO keyIO(Params());
-    UniValue ret(UniValue::VARR);
-    {
-        std::set<libzcash::SproutPaymentAddress> addresses;
-        pwalletMain->GetSproutPaymentAddresses(addresses);
-        for (auto addr : addresses) {
-            if (fIncludeWatchonly || HaveSpendingKeyForPaymentAddress(pwalletMain)(addr)) {
-                ret.push_back(keyIO.EncodePaymentAddress(addr));
+    LOCK(pwalletMain->cs_wallet);
+
+    int64_t accountInt = params[0].get_int64();
+    if (accountInt < 0 || accountInt >= ZCASH_LEGACY_ACCOUNT) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid account number, must be 0 <= account <= (2^31)-2.");
+    }
+    libzcash::AccountId account = accountInt;
+
+    std::set<libzcash::ReceiverType> receivers;
+    if (params.size() >= 2) {
+        const auto& pools = params[1].get_array();
+        for (unsigned int i = 0; i < pools.size(); i++) {
+            const std::string& p = pools[i].get_str();
+            if (p == "transparent") {
+                receivers.insert(ReceiverType::P2PKH);
+            } else if (p == "sapling") {
+                receivers.insert(ReceiverType::Sapling);
+            } else if (p == "orchard") {
+                receivers.insert(ReceiverType::Orchard);
+            } else {
+                throw JSONRPCError(RPC_INVALID_PARAMETER, "pool arguments must be \"transparent\", \"sapling\", or \"orchard\"");
             }
         }
     }
-    {
-        std::set<libzcash::SaplingPaymentAddress> addresses;
-        pwalletMain->GetSaplingPaymentAddresses(addresses);
-        for (auto addr : addresses) {
-            if (fIncludeWatchonly || HaveSpendingKeyForPaymentAddress(pwalletMain)(addr)) {
-                ret.push_back(keyIO.EncodePaymentAddress(addr));
-            }
-        }
+    if (receivers.empty()) {
+        // Default is the best and second-best shielded pools, and the transparent pool.
+        receivers = CWallet::DefaultReceiverTypes();
     }
-    return ret;
-}
-
-CAmount getBalanceTaddr(std::string transparentAddress, int minDepth=1, bool ignoreUnspendable=true) {
-    std::set<CTxDestination> destinations;
-    vector<COutput> vecOutputs;
-    CAmount balance = 0;
 
-    KeyIO keyIO(Params());
-    if (transparentAddress.length() > 0) {
-        CTxDestination taddr = keyIO.DecodeDestination(transparentAddress);
-        if (!IsValidDestination(taddr)) {
-            throw std::runtime_error("invalid transparent address");
+    std::optional<libzcash::diversifier_index_t> j = std::nullopt;
+    if (params.size() >= 3) {
+        if (params[2].getType() != UniValue::VNUM) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid diversifier index, must be an unsigned integer.");
         }
-        destinations.insert(taddr);
+        auto parsed_diversifier_index_opt = ParseArbitraryInt(params[2].getValStr());
+        if (!parsed_diversifier_index_opt.has_value()) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "diversifier index must be a decimal integer.");
+        }
+        auto parsed_diversifier_index = parsed_diversifier_index_opt.value();
+        if (parsed_diversifier_index.size() > ZC_DIVERSIFIER_SIZE) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "diversifier index is too large.");
+        }
+        // Extend the byte array to the correct length for diversifier_index_t.
+        parsed_diversifier_index.resize(ZC_DIVERSIFIER_SIZE);
+        j = libzcash::diversifier_index_t(parsed_diversifier_index);
     }
 
+    EnsureWalletIsUnlocked();
+
+    // Generate the first UA for this account, using the best and next-best shielded pools
+    // and the transparent pool.
+    auto res = pwalletMain->GenerateUnifiedAddress(account, receivers, j);
+
+    UniValue result(UniValue::VOBJ);
+    result.pushKV("account", (uint64_t)account);
+
+    std::visit(match {
+        [&](std::pair<libzcash::UnifiedAddress, libzcash::diversifier_index_t> addr) {
+            result.pushKV("unifiedaddress", KeyIO(Params()).EncodePaymentAddress(addr.first));
+            UniValue j;
+            j.setNumStr(ArbitraryIntStr(std::vector(addr.second.begin(), addr.second.end())));
+            result.pushKV("diversifier_index", j);
+        },
+        [&](WalletUAGenerationError err) {
+            std::string strErr;
+            switch (err) {
+                case WalletUAGenerationError::NoSuchAccount:
+                    strErr = tfm::format("Error: account %d has not been generated by z_getnewaccount.", account);
+                    break;
+                case WalletUAGenerationError::ExistingAddressMismatch:
+                    strErr = tfm::format(
+                        "Error: address at diversifier index %s was already generated with different receiver types.",
+                        params[2].getValStr());
+                    break;
+                case WalletUAGenerationError::WalletEncrypted:
+                    // By construction, we should never see this error; this case is included
+                    // only for future-proofing.
+                    strErr = tfm::format("Error: wallet is encrypted.");
+            }
+            throw JSONRPCError(RPC_WALLET_ERROR, strErr);
+        },
+        [&](UnifiedAddressGenerationError err) {
+            std::string strErr;
+            switch (err) {
+                case UnifiedAddressGenerationError::NoAddressForDiversifier:
+                    strErr = tfm::format(
+                        "Error: no address at diversifier index %s.",
+                        ArbitraryIntStr(std::vector(j.value().begin(), j.value().end())));
+                    break;
+                case UnifiedAddressGenerationError::InvalidTransparentChildIndex:
+                    strErr = tfm::format(
+                        "Error: diversifier index %s cannot generate an address with a transparent receiver.",
+                        ArbitraryIntStr(std::vector(j.value().begin(), j.value().end())));
+                    break;
+                case UnifiedAddressGenerationError::ShieldedReceiverNotFound:
+                    strErr = tfm::format(
+                        "Error: cannot generate an address containing no shielded receivers.");
+                    break;
+                case UnifiedAddressGenerationError::ReceiverTypeNotAvailable:
+                    strErr = tfm::format(
+                        "Error: one or more of the requested receiver types does not have a corresponding spending key in this account.");
+                    break;
+                case UnifiedAddressGenerationError::DiversifierSpaceExhausted:
+                    strErr = tfm::format(
+                        "Error: ran out of diversifier indices. Generate a new account with z_getnewaccount");
+                    break;
+            }
+            throw JSONRPCError(RPC_WALLET_ERROR, strErr);
+        },
+    }, res);
+
+    UniValue pools(UniValue::VARR);
+    for (const auto& receiver : receivers) {
+        switch (receiver) {
+            case ReceiverType::P2PKH:
+                pools.push_back("transparent");
+                break;
+            case ReceiverType::Sapling:
+                pools.push_back("sapling");
+                break;
+            case ReceiverType::Orchard:
+                pools.push_back("orchard");
+                break;
+            default:
+                // Unreachable
+                assert(false);
+        }
+    }
+    result.pushKV("pools", pools);
+
+    return result;
+}
+
+
+UniValue z_listaddresses(const UniValue& params, bool fHelp)
+{
+    if (!EnsureWalletIsAvailable(fHelp))
+        return NullUniValue;
+
+    if (fHelp || params.size() > 1)
+        throw runtime_error(
+            "z_listaddresses ( includeWatchonly )\n"
+            "\nDEPRECATED\n"
+            "\nReturns the list of shielded addresses belonging to the wallet.\n"
+            "\nThis never returns Unified Addresses; see 'listaddresses' for them.\n"
+            "\nArguments:\n"
+            "1. includeWatchonly (bool, optional, default=false) Also include watchonly addresses (see 'z_importviewingkey')\n"
+            "\nResult:\n"
+            "[                     (json array of string)\n"
+            "  \"zaddr\"           (string) a zaddr belonging to the wallet\n"
+            "  ,...\n"
+            "]\n"
+            "\nExamples:\n"
+            + HelpExampleCli("z_listaddresses", "")
+            + HelpExampleRpc("z_listaddresses", "")
+        );
+
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    pwalletMain->AvailableCoins(vecOutputs, false, NULL, true);
+    bool fIncludeWatchonly = false;
+    if (params.size() > 0) {
+        fIncludeWatchonly = params[0].get_bool();
+    }
 
+    KeyIO keyIO(Params());
+    UniValue ret(UniValue::VARR);
+    {
+        std::set<libzcash::SproutPaymentAddress> addresses;
+        pwalletMain->GetSproutPaymentAddresses(addresses);
+        for (auto addr : addresses) {
+            if (fIncludeWatchonly || pwalletMain->HaveSproutSpendingKey(addr)) {
+                ret.push_back(keyIO.EncodePaymentAddress(addr));
+            }
+        }
+    }
+    {
+        std::set<libzcash::SaplingPaymentAddress> addresses;
+        pwalletMain->GetSaplingPaymentAddresses(addresses);
+        for (auto addr : addresses) {
+            // Don't show Sapling receivers that are part of an account in the wallet.
+            if (pwalletMain->FindUnifiedAddressByReceiver(addr).has_value()) {
+                continue;
+            }
+            if (fIncludeWatchonly || pwalletMain->HaveSaplingSpendingKeyForAddress(addr)) {
+                ret.push_back(keyIO.EncodePaymentAddress(addr));
+            }
+        }
+    }
+    return ret;
+}
+
+UniValue z_listunifiedreceivers(const UniValue& params, bool fHelp)
+{
+    if (!EnsureWalletIsAvailable(fHelp))
+        return NullUniValue;
+
+    if (fHelp || params.size() < 1 || params.size() > 1)
+        throw runtime_error(
+            "z_listunifiedreceivers unified_address\n"
+            "\nReturns the (per-pool) receivers contained within the provided UA;"
+            "\nthe UA may not have receivers for some pools.\n"
+            "\nTransactions that send funds to any of the receivers returned by this RPC"
+            "\nmethod will be detected by the wallet as having been sent to the unified"
+            "\naddress.\n"
+            "\nArguments:\n"
+            "1. unified_address (string) The unified address\n"
+            "\nResult:\n"
+            "{\n"
+            "  \"transparent\": \"address\",   (string) The legacy transparent address (P2PKH or P2SH)\n"
+            "  \"sapling\": \"address\",       (string) The legacy Sapling address\n"
+            "  \"orchard\": \"address\"        (string) The single-receiver Unified Address for the Orchard receiver\n"
+            "}\n"
+            "\nExamples:\n"
+            + HelpExampleCli("z_listunifiedreceivers", "")
+            + HelpExampleRpc("z_listunifiedreceivers", "")
+        );
+
+    if (!fExperimentalOrchardWallet) {
+        throw JSONRPCError(RPC_WALLET_ENCRYPTION_FAILED, "Error: the Orchard wallet experimental extensions are disabled.");
+    }
+
+    KeyIO keyIO(Params());
+    auto decoded = keyIO.DecodePaymentAddress(params[0].get_str());
+    if (!decoded.has_value()) {
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
+    }
+    if (!std::holds_alternative<libzcash::UnifiedAddress>(decoded.value())) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Address is not a unified address");
+    }
+    auto ua = std::get<libzcash::UnifiedAddress>(decoded.value());
+
+    UniValue result(UniValue::VOBJ);
+    for (const auto& receiver : ua) {
+        std::visit(match {
+            [&](const libzcash::OrchardRawAddress& addr) {
+                // Create a single-receiver UA that just contains this Orchard receiver.
+                UnifiedAddress singleReceiver;
+                singleReceiver.AddReceiver(addr);
+                result.pushKV("orchard", keyIO.EncodePaymentAddress(singleReceiver));
+            },
+            [&](const libzcash::SaplingPaymentAddress& addr) {
+                result.pushKV("sapling", keyIO.EncodePaymentAddress(addr));
+            },
+            [&](const CScriptID& addr) {
+                result.pushKV("transparent", keyIO.EncodePaymentAddress(addr));
+            },
+            [&](const CKeyID& addr) {
+                result.pushKV("transparent", keyIO.EncodePaymentAddress(addr));
+            },
+            [](auto rest) {},
+        }, receiver);
+    }
+    return result;
+}
+
+CAmount getBalanceTaddr(const std::optional<CTxDestination>& taddr, int minDepth=1, bool ignoreUnspendable=true) {
+    vector<COutput> vecOutputs;
+    CAmount balance = 0;
+
+    LOCK2(cs_main, pwalletMain->cs_wallet);
+
+    pwalletMain->AvailableCoins(vecOutputs, false, NULL, true);
     for (const COutput& out : vecOutputs) {
         if (out.nDepth < minDepth) {
             continue;
@@ -2739,13 +3381,13 @@ CAmount getBalanceTaddr(std::string transparentAddress, int minDepth=1, bool ign
             continue;
         }
 
-        if (destinations.size()) {
+        if (taddr.has_value()) {
             CTxDestination address;
             if (!ExtractDestination(out.tx->vout[out.i].scriptPubKey, address)) {
                 continue;
             }
 
-            if (!destinations.count(address)) {
+            if (address != taddr.value()) {
                 continue;
             }
         }
@@ -2756,24 +3398,28 @@ CAmount getBalanceTaddr(std::string transparentAddress, int minDepth=1, bool ign
     return balance;
 }
 
-CAmount getBalanceZaddr(std::optional<libzcash::RawAddress> address, int minDepth, int maxDepth, bool ignoreUnspendable) {
+CAmount getBalanceZaddr(std::optional<libzcash::PaymentAddress> address, int minDepth, int maxDepth, bool ignoreUnspendable) {
     CAmount balance = 0;
     std::vector<SproutNoteEntry> sproutEntries;
     std::vector<SaplingNoteEntry> saplingEntries;
+    std::vector<OrchardNoteMetadata> orchardEntries;
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    std::set<libzcash::RawAddress> filterAddresses;
-    if (address) {
-        filterAddresses.insert(address.value());
+    std::optional<NoteFilter> noteFilter = std::nullopt;
+    if (address.has_value()) {
+        noteFilter = NoteFilter::ForPaymentAddresses(std::vector({address.value()}));
     }
 
-    pwalletMain->GetFilteredNotes(sproutEntries, saplingEntries, filterAddresses, minDepth, maxDepth, true, ignoreUnspendable);
+    pwalletMain->GetFilteredNotes(sproutEntries, saplingEntries, orchardEntries, noteFilter, minDepth, maxDepth, true, ignoreUnspendable);
     for (auto & entry : sproutEntries) {
         balance += CAmount(entry.note.value());
     }
     for (auto & entry : saplingEntries) {
         balance += CAmount(entry.note.value());
     }
+    for (auto & entry : orchardEntries) {
+        balance += entry.GetNoteValue();
+    }
     return balance;
 }
 
@@ -2805,22 +3451,23 @@ UniValue z_listreceivedbyaddress(const UniValue& params, bool fHelp)
             "z_listreceivedbyaddress \"address\" ( minconf )\n"
             "\nReturn a list of amounts received by a zaddr belonging to the node's wallet.\n"
             "\nArguments:\n"
-            "1. \"address\"      (string) The private address.\n"
-            "2. minconf          (numeric, optional, default=1) Only include transactions confirmed at least this many times.\n"
-            "\nResult:\n"
+            "1. \"address\"      (string) The shielded address.\n"
+            "2. minconf        (numeric, optional, default=1) Only include transactions confirmed at least this many times.\n"
+            "\nResult (output indices for only one pool will be present):\n"
             "{\n"
-            "  \"txid\": \"txid\",           (string) the transaction id\n"
-            "  \"amount\": xxxxx,         (numeric) the amount of value in the note\n"
-            "  \"amountZat\" : xxxx       (numeric) The amount in " + MINOR_CURRENCY_UNIT + "\n"
-            "  \"memo\": xxxxx,           (string) hexadecimal string representation of memo field\n"
-            "  \"confirmations\" : n,     (numeric) the number of confirmations\n"
-            "  \"blockheight\": n,         (numeric) The block height containing the transaction\n"
-            "  \"blockindex\": n,         (numeric) The block index containing the transaction.\n"
-            "  \"blocktime\": xxx,              (numeric) The transaction time in seconds since epoch (midnight Jan 1 1970 GMT).\n"
-            "  \"jsindex\" (sprout) : n,     (numeric) the joinsplit index\n"
-            "  \"jsoutindex\" (sprout) : n,     (numeric) the output index of the joinsplit\n"
-            "  \"outindex\" (sapling) : n,     (numeric) the output index\n"
-            "  \"change\": true|false,    (boolean) true if the address that received the note is also one of the sending addresses\n"
+            "  \"pool\": \"pool\"                (string) one of (\"transparent\", \"sprout\", \"sapling\", \"orchard\")\n"
+            "  \"txid\": \"txid\",               (string) the transaction id\n"
+            "  \"amount\": xxxxx,              (numeric) the amount of value in the note\n"
+            "  \"amountZat\" : xxxx            (numeric) The amount in " + MINOR_CURRENCY_UNIT + "\n"
+            "  \"memo\": xxxxx,                (string) hexadecimal string representation of memo field\n"
+            "  \"confirmations\" : n,          (numeric) the number of confirmations\n"
+            "  \"blockheight\": n,             (numeric) The block height containing the transaction\n"
+            "  \"blockindex\": n,              (numeric) The block index containing the transaction.\n"
+            "  \"blocktime\": xxx,             (numeric) The transaction time in seconds since epoch (midnight Jan 1 1970 GMT).\n"
+            "  \"jsindex\" (sprout) : n,       (numeric) the joinsplit index\n"
+            "  \"jsoutindex\" (sprout) : n,    (numeric) the output index of the joinsplit\n"
+            "  \"outindex\" (transparent, sapling, orchard) : n, (numeric) the output index for transparent and Sapling outputs, or the action index for Orchard\n"
+            "  \"change\": true|false,         (boolean) true if the output was received to a change address\n"
             "}\n"
             "\nExamples:\n"
             + HelpExampleCli("z_listreceivedbyaddress", "\"ztfaW34Gj9FrnGUEf833ywDVL62NWXBM81u6EQnM6VR45eYnXhwztecW1SjxA7JrmAXKJhxhj3vDNEpVCQoSvVoSpmbhtjf\"")
@@ -2836,57 +3483,94 @@ UniValue z_listreceivedbyaddress(const UniValue& params, bool fHelp)
     if (nMinDepth < 0) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Minimum number of confirmations cannot be less than 0");
     }
+    UniValue result(UniValue::VARR);
 
     // Check that the from address is valid.
     auto fromaddress = params[0].get_str();
 
     KeyIO keyIO(Params());
-    auto zaddr = keyIO.DecodePaymentAddress(fromaddress);
-    if (!IsValidPaymentAddress(zaddr)) {
+    auto decoded = keyIO.DecodePaymentAddress(fromaddress);
+    if (!decoded.has_value()) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid zaddr.");
     }
 
+    // A non-unified address argument that is a receiver within a
+    // unified address known to this wallet is not allowed.
+    if (std::visit(match {
+        [&](const CKeyID& addr) {
+            return pwalletMain->FindUnifiedAddressByReceiver(addr).has_value();
+         },
+        [&](const CScriptID& addr) {
+            return pwalletMain->FindUnifiedAddressByReceiver(addr).has_value();
+        },
+        [&](const libzcash::SaplingPaymentAddress& addr) {
+            return pwalletMain->FindUnifiedAddressByReceiver(addr).has_value();
+        },
+        [&](const libzcash::SproutPaymentAddress& addr) {
+            // A unified address can't contain a Sprout receiver.
+            return false;
+        },
+        [&](const libzcash::UnifiedAddress& addr) {
+            // We allow unified addresses themselves, which cannot recurse.
+            return false;
+        }
+    }, decoded.value())) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "The provided address is a bare receiver from a Unified Address in this wallet. Provide the full UA instead.");
+    }
+
     // Visitor to support Sprout and Sapling addrs
-    if (!std::visit(PaymentAddressBelongsToWallet(pwalletMain), zaddr)) {
+    if (!std::visit(PaymentAddressBelongsToWallet(pwalletMain), decoded.value())) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "From address does not belong to this node, zaddr spending key or viewing key not found.");
     }
 
-    UniValue result(UniValue::VARR);
     std::vector<SproutNoteEntry> sproutEntries;
     std::vector<SaplingNoteEntry> saplingEntries;
-    pwalletMain->GetFilteredNotes(sproutEntries, saplingEntries, fromaddress, nMinDepth, false, false);
+    std::vector<OrchardNoteMetadata> orchardEntries;
 
-    std::set<std::pair<libzcash::RawAddress, uint256>> nullifierSet;
-    auto hasSpendingKey = std::visit(HaveSpendingKeyForPaymentAddress(pwalletMain), zaddr);
-    if (hasSpendingKey) {
-        nullifierSet = pwalletMain->GetNullifiersForAddresses(std::visit(GetRawAddresses(), zaddr));
-    }
-
-    if (std::get_if<libzcash::SproutPaymentAddress>(&zaddr) != nullptr) {
-        for (SproutNoteEntry & entry : sproutEntries) {
-            UniValue obj(UniValue::VOBJ);
-            obj.pushKV("txid", entry.jsop.hash.ToString());
-            obj.pushKV("amount", ValueFromAmount(CAmount(entry.note.value())));
-            obj.pushKV("amountZat", CAmount(entry.note.value()));
-            std::string data(entry.memo.begin(), entry.memo.end());
-            obj.pushKV("memo", HexStr(data));
-            obj.pushKV("jsindex", entry.jsop.js);
-            obj.pushKV("jsoutindex", entry.jsop.n);
-            obj.pushKV("confirmations", entry.confirmations);
+    auto noteFilter = NoteFilter::ForPaymentAddresses(std::vector({decoded.value()}));
+    pwalletMain->GetFilteredNotes(sproutEntries, saplingEntries, orchardEntries, noteFilter, nMinDepth, INT_MAX, false, false);
 
-            txblock BlockData(entry.jsop.hash);
-            obj.pushKV("blockheight", BlockData.height);
-            obj.pushKV("blockindex", BlockData.index);
-            obj.pushKV("blocktime", BlockData.time);
+    auto push_transparent_result = [&](const CTxDestination& dest) -> void {
+        const CScript scriptPubKey{GetScriptForDestination(dest)};
+        for (const auto& [_txid, wtx] : pwalletMain->mapWallet) {
+            if (!CheckFinalTx(wtx))
+                continue;
 
-            if (hasSpendingKey) {
-                obj.pushKV("change", pwalletMain->IsNoteSproutChange(nullifierSet, entry.address, entry.jsop));
+            int nDepth = wtx.GetDepthInMainChain();
+            if (nDepth < nMinDepth) continue;
+            for (size_t i = 0; i < wtx.vout.size(); ++i) {
+                const CTxOut& txout{wtx.vout[i]};
+                if (txout.scriptPubKey == scriptPubKey) {
+                    UniValue obj(UniValue::VOBJ);
+                    auto txid{wtx.GetHash()};
+                    obj.pushKV("pool", "transparent");
+                    obj.pushKV("txid", txid.ToString());
+                    obj.pushKV("amount", ValueFromAmount(txout.nValue));
+                    obj.pushKV("amountZat", txout.nValue);
+                    obj.pushKV("outindex", int(i));
+                    obj.pushKV("confirmations", nDepth);
+                    obj.pushKV("change", pwalletMain->IsChange(txout));
+
+                    txblock BlockData(txid);
+                    obj.pushKV("blockheight", BlockData.height);
+                    obj.pushKV("blockindex", BlockData.index);
+                    obj.pushKV("blocktime", BlockData.time);
+
+                    result.push_back(obj);
+                }
             }
-            result.push_back(obj);
         }
-    } else if (std::get_if<libzcash::SaplingPaymentAddress>(&zaddr) != nullptr) {
-        for (SaplingNoteEntry & entry : saplingEntries) {
+    };
+
+    auto push_sapling_result = [&](const libzcash::SaplingPaymentAddress& addr) -> void {
+        bool hasSpendingKey = pwalletMain->HaveSaplingSpendingKeyForAddress(addr);
+        std::set<std::pair<libzcash::SaplingPaymentAddress, uint256>> nullifierSet;
+        if (hasSpendingKey) {
+            nullifierSet = pwalletMain->GetSaplingNullifiers({addr});
+        }
+        for (const SaplingNoteEntry& entry : saplingEntries) {
             UniValue obj(UniValue::VOBJ);
+            obj.pushKV("pool", "sapling");
             obj.pushKV("txid", entry.op.hash.ToString());
             obj.pushKV("amount", ValueFromAmount(CAmount(entry.note.value())));
             obj.pushKV("amountZat", CAmount(entry.note.value()));
@@ -2900,11 +3584,67 @@ UniValue z_listreceivedbyaddress(const UniValue& params, bool fHelp)
             obj.pushKV("blocktime", BlockData.time);
 
             if (hasSpendingKey) {
-              obj.pushKV("change", pwalletMain->IsNoteSaplingChange(nullifierSet, entry.address, entry.op));
+                obj.pushKV("change", pwalletMain->IsNoteSaplingChange(nullifierSet, entry.address, entry.op));
             }
             result.push_back(obj);
         }
-    }
+    };
+
+    std::visit(match {
+        [&](const CKeyID& addr) { push_transparent_result(addr); },
+        [&](const CScriptID& addr) { push_transparent_result(addr); },
+        [&](const libzcash::SproutPaymentAddress& addr) {
+            bool hasSpendingKey = pwalletMain->HaveSproutSpendingKey(addr);
+            std::set<std::pair<libzcash::SproutPaymentAddress, uint256>> nullifierSet;
+            if (hasSpendingKey) {
+                nullifierSet = pwalletMain->GetSproutNullifiers({addr});
+            }
+            for (const SproutNoteEntry& entry : sproutEntries) {
+                UniValue obj(UniValue::VOBJ);
+                obj.pushKV("pool", "sprout");
+                obj.pushKV("txid", entry.jsop.hash.ToString());
+                obj.pushKV("amount", ValueFromAmount(CAmount(entry.note.value())));
+                obj.pushKV("amountZat", CAmount(entry.note.value()));
+                std::string data(entry.memo.begin(), entry.memo.end());
+                obj.pushKV("memo", HexStr(data));
+                obj.pushKV("jsindex", entry.jsop.js);
+                obj.pushKV("jsoutindex", entry.jsop.n);
+                obj.pushKV("confirmations", entry.confirmations);
+
+                txblock BlockData(entry.jsop.hash);
+                obj.pushKV("blockheight", BlockData.height);
+                obj.pushKV("blockindex", BlockData.index);
+                obj.pushKV("blocktime", BlockData.time);
+
+                if (hasSpendingKey) {
+                    obj.pushKV("change", pwalletMain->IsNoteSproutChange(nullifierSet, entry.address, entry.jsop));
+                }
+                result.push_back(obj);
+            }
+        },
+        [&](const libzcash::SaplingPaymentAddress& addr) {
+            push_sapling_result(addr);
+        },
+        [&](const libzcash::UnifiedAddress& addr) {
+            for (const auto& receiver : addr) {
+                std::visit(match {
+                    [&](const libzcash::SaplingPaymentAddress& addr) {
+                        push_sapling_result(addr);
+                    },
+                    [&](const CScriptID& addr) {
+                        CTxDestination dest = addr;
+                        push_transparent_result(dest);
+                    },
+                    [&](const CKeyID& addr) {
+                        CTxDestination dest = addr;
+                        push_transparent_result(dest);
+                    },
+                    [&](const auto& other) { } // TODO orchard
+
+                }, receiver);
+            }
+        }
+    }, decoded.value());
     return result;
 }
 
@@ -2916,11 +3656,12 @@ UniValue z_getbalance(const UniValue& params, bool fHelp)
     if (fHelp || params.size() == 0 || params.size() > 3)
         throw runtime_error(
             "z_getbalance \"address\" ( minconf inZat )\n"
+            "\nDEPRECATED; please use z_getbalanceforviewingkey instead.`\n"
             "\nReturns the balance of a taddr or zaddr belonging to the node's wallet.\n"
             "\nCAUTION: If the wallet has only an incoming viewing key for this address, then spends cannot be"
-            "\ndetected, and so the returned balance may be larger than the actual balance.\n"
+            "\ndetected, and so the returned balance may be larger than the actual balance."
             "\nArguments:\n"
-            "1. \"address\"      (string) The selected address. It may be a transparent or private address.\n"
+            "1. \"address\"        (string) The selected address. It may be a transparent or shielded address.\n"
             "2. minconf          (numeric, optional, default=1) Only include transactions confirmed at least this many times.\n"
             "3. inZat            (bool, optional, default=false) Get the result amount in " + MINOR_CURRENCY_UNIT + " (as an integer).\n"
             "\nResult:\n"
@@ -2930,7 +3671,7 @@ UniValue z_getbalance(const UniValue& params, bool fHelp)
             + HelpExampleCli("z_getbalance", "\"myaddress\"") +
             "\nThe total amount received by address \"myaddress\" at least 5 blocks confirmed\n"
             + HelpExampleCli("z_getbalance", "\"myaddress\" 5") +
-            "\nAs a json rpc call\n"
+            "\nAs a JSON RPC call\n"
             + HelpExampleRpc("z_getbalance", "\"myaddress\", 5")
         );
 
@@ -2947,27 +3688,49 @@ UniValue z_getbalance(const UniValue& params, bool fHelp)
     KeyIO keyIO(Params());
     // Check that the from address is valid.
     auto fromaddress = params[0].get_str();
-    bool fromTaddr = false;
-    CTxDestination taddr = keyIO.DecodeDestination(fromaddress);
     auto pa = keyIO.DecodePaymentAddress(fromaddress);
-    fromTaddr = IsValidDestination(taddr);
-    if (!fromTaddr) {
-        if (!IsValidPaymentAddress(pa)) {
-            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid from address, should be a taddr or zaddr.");
-        }
-        if (!std::visit(PaymentAddressBelongsToWallet(pwalletMain), pa)) {
-             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "From address does not belong to this node, spending key or viewing key not found.");
-        }
+
+    if (!pa.has_value()) {
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid from address, should be a taddr or zaddr.");
+    }
+    if (!std::visit(PaymentAddressBelongsToWallet(pwalletMain), pa.value())) {
+         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "From address does not belong to this node.");
     }
 
     CAmount nBalance = 0;
-    if (fromTaddr) {
-        nBalance = getBalanceTaddr(fromaddress, nMinDepth, false);
-    } else {
-        // TODO: Return an error if a UA is provided (once we support UAs).
-        auto zaddr = std::visit(RecipientForPaymentAddress(), pa).value();
-        nBalance = getBalanceZaddr(zaddr, nMinDepth, INT_MAX, false);
-    }
+    std::visit(match {
+        [&](const CKeyID& addr) {
+            nBalance = getBalanceTaddr(addr, nMinDepth, false);
+        },
+        [&](const CScriptID& addr) {
+            nBalance = getBalanceTaddr(addr, nMinDepth, false);
+        },
+        [&](const libzcash::SproutPaymentAddress& addr) {
+            nBalance = getBalanceZaddr(addr, nMinDepth, INT_MAX, false);
+        },
+        [&](const libzcash::SaplingPaymentAddress& addr) {
+            nBalance = getBalanceZaddr(addr, nMinDepth, INT_MAX, false);
+        },
+        [&](const libzcash::UnifiedAddress& addr) {
+            auto selector = pwalletMain->ZTXOSelectorForAddress(addr, true, false);
+            if (!selector.has_value()) {
+                throw JSONRPCError(
+                    RPC_INVALID_ADDRESS_OR_KEY,
+                    "Unified address does not correspond to an account in the wallet");
+            }
+            auto spendableInputs = pwalletMain->FindSpendableInputs(selector.value(), true, nMinDepth);
+
+            for (const auto& t : spendableInputs.utxos) {
+                nBalance += t.Value();
+            }
+            for (const auto& t : spendableInputs.saplingNoteEntries) {
+                nBalance += t.note.value();
+            }
+            for (const auto& t : spendableInputs.orchardNoteMetadata) {
+                nBalance += t.GetNoteValue();
+            }
+        },
+    }, pa.value());
 
     // inZat
     if (params.size() > 2 && params[2].get_bool()) {
@@ -2977,6 +3740,222 @@ UniValue z_getbalance(const UniValue& params, bool fHelp)
     return ValueFromAmount(nBalance);
 }
 
+UniValue z_getbalanceforviewingkey(const UniValue& params, bool fHelp)
+{
+    if (!EnsureWalletIsAvailable(fHelp))
+        return NullUniValue;
+
+    if (fHelp || params.size() < 1 || params.size() > 2)
+        throw runtime_error(
+            "z_getbalanceforviewingkey \"fvk\" ( minconf )\n"
+            "\nReturns the per-pool balances viewable by a full viewing key known to the node's wallet."
+            "\nSprout viewing keys may be used only if the wallet controls the corresponding spending key."
+            "\nArguments:\n"
+            "1. \"fvk\"        (string) The selected full viewing key.\n"
+            "2. minconf      (numeric, optional, default=1) Only include transactions confirmed at least this many times.\n"
+            "\nResult:\n"
+            "{\n"
+            "  \"pools\": {\n"
+            "    \"transparent\": {\n"
+            "        \"valueZat\": amount   (numeric) The amount held in the transparent pool viewable by this fvk\n"
+            "    \"},\n"
+            "    \"sprout\": {\n"
+            "        \"valueZat\": amount   (numeric) The amount held in the sprout pool viewable by this fvk\n"
+            "    \"},\n"
+            "    \"sapling\": {\n"
+            "        \"valueZat\": amount   (numeric) The amount held in the sapling pool viewable by this fvk\n"
+            "    \"},\n"
+            "    \"orchard\": {\n"
+            "        \"valueZat\": amount   (numeric) The amount held in the orchard pool viewable by this fvk\n"
+            "    \"}\n"
+            "  \"},\n"
+            "  \"minimum_confirmations\": n (numeric) The given minconf argument\n"
+            "}\n"
+            "Result amounts are in units of " + MINOR_CURRENCY_UNIT + ".\n"
+            "Pools for which the balance is zero are not shown.\n"
+            "\nExamples:\n"
+            "\nThe per-pool amount viewable by key \"myfvk\" with at least 1 block confirmed\n"
+            + HelpExampleCli("z_getbalanceforviewingkey", "\"myfvk\"") +
+            "\nThe per-pool amount viewable by key \"myfvk\" with at least 5 blocks confirmed\n"
+            + HelpExampleCli("z_getbalanceforviewingkey", "\"myfvk\" 5") +
+            "\nAs a JSON RPC call\n"
+            + HelpExampleRpc("z_getbalanceforviewingkey", "\"myfvk\", 5")
+        );
+
+    if (!fExperimentalOrchardWallet) {
+        throw JSONRPCError(RPC_WALLET_ENCRYPTION_FAILED, "Error: the Orchard wallet experimental extensions are disabled.");
+    }
+
+    KeyIO keyIO(Params());
+    auto decoded = keyIO.DecodeViewingKey(params[0].get_str());
+    if (!decoded.has_value()) {
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid full viewing key");
+    }
+    auto fvk = decoded.value();
+
+    int minconf = 1;
+    if (params.size() > 1) {
+        minconf = params[1].get_int();
+        if (minconf < 0) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Minimum number of confirmations cannot be less than 0");
+        }
+    }
+
+    LOCK2(cs_main, pwalletMain->cs_wallet);
+
+    // Sprout viewing keys cannot provide accurate balance information because they
+    // cannot detect spends, so we require that the wallet control the spending key
+    // in the case that a Sprout viewing key is provided. Sapling and unified
+    // FVKs make it possible to correctly determine balance without having the
+    // spending key, so we permit that here.
+    bool requireSpendingKey = std::holds_alternative<libzcash::SproutViewingKey>(fvk);
+    auto selector = pwalletMain->ZTXOSelectorForViewingKey(fvk, requireSpendingKey);
+    if (!selector.has_value()) {
+        throw JSONRPCError(
+            RPC_INVALID_PARAMETER,
+            "Error: the wallet does not recognize the specified viewing key.");
+    }
+
+    auto spendableInputs = pwalletMain->FindSpendableInputs(selector.value(), true, minconf);
+
+    CAmount transparentBalance = 0;
+    CAmount sproutBalance = 0;
+    CAmount saplingBalance = 0;
+    CAmount orchardBalance = 0;
+    for (const auto& t : spendableInputs.utxos) {
+        transparentBalance += t.Value();
+    }
+    for (const auto& t : spendableInputs.sproutNoteEntries) {
+        sproutBalance += t.note.value();
+    }
+    for (const auto& t : spendableInputs.saplingNoteEntries) {
+        saplingBalance += t.note.value();
+    }
+    for (const auto& t : spendableInputs.orchardNoteMetadata) {
+        orchardBalance += t.GetNoteValue();
+    }
+
+    UniValue pools(UniValue::VOBJ);
+    auto renderBalance = [&](std::string poolName, CAmount balance) {
+        if (balance > 0) {
+            UniValue pool(UniValue::VOBJ);
+            pool.pushKV("valueZat", balance);
+            pools.pushKV(poolName, pool);
+        }
+    };
+    renderBalance("transparent", transparentBalance);
+    renderBalance("sprout", sproutBalance);
+    renderBalance("sapling", saplingBalance);
+    renderBalance("orchard", orchardBalance);
+
+    UniValue result(UniValue::VOBJ);
+    result.pushKV("pools", pools);
+    result.pushKV("minimum_confirmations", minconf);
+
+    return result;
+}
+
+UniValue z_getbalanceforaccount(const UniValue& params, bool fHelp)
+{
+    if (!EnsureWalletIsAvailable(fHelp))
+        return NullUniValue;
+
+    if (fHelp || params.size() < 1 || params.size() > 2)
+        throw runtime_error(
+            "z_getbalanceforaccount account ( minconf )\n"
+            "\nReturns the spendable pool balances of the given account."
+            "\nArguments:\n"
+            "1. account      (numeric) The account number.\n"
+            "2. minconf      (numeric, optional, default=1) Only include transactions confirmed at least this many times.\n"
+            "\nResult:\n"
+            "{\n"
+            "  \"pools\": {\n"
+            "    \"transparent\": {\n"
+            "        \"valueZat\": amount   (numeric) The amount held in the transparent pool by this account\n"
+            "    \"},\n"
+            "    \"sapling\": {\n"
+            "        \"valueZat\": amount   (numeric) The amount held in the sapling pool by this account\n"
+            "    \"},\n"
+            "    \"orchard\": {\n"
+            "        \"valueZat\": amount   (numeric) The amount held in the orchard pool by this account\n"
+            "    \"}\n"
+            "  \"},\n"
+            "  \"minimum_confirmations\": n (numeric) The given minconf argument\n"
+            "}\n"
+            "Result amounts are in units of " + MINOR_CURRENCY_UNIT + ".\n"
+            "Pools for which the balance is zero are not shown.\n"
+            "\nExamples:\n"
+            "\nThe per-pool amount received by account 4 with at least 1 block confirmed\n"
+            + HelpExampleCli("z_getbalanceforaccount", "4") +
+            "\nThe per-pool amount received by account 4 with at least 5 block confirmations\n"
+            + HelpExampleCli("z_getbalanceforaccount", "4 5") +
+            "\nAs a JSON RPC call\n"
+            + HelpExampleRpc("z_getbalanceforaccount", "4 5")
+        );
+
+    if (!fExperimentalOrchardWallet) {
+        throw JSONRPCError(RPC_WALLET_ENCRYPTION_FAILED, "Error: the Orchard wallet experimental extensions are disabled.");
+    }
+
+    int64_t accountInt = params[0].get_int64();
+    if (accountInt < 0 || accountInt >= ZCASH_LEGACY_ACCOUNT) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid account number, must be 0 <= account <= (2^31)-2.");
+    }
+    libzcash::AccountId account = accountInt;
+
+    int minconf = 1;
+    if (params.size() > 1) {
+        minconf = params[1].get_int();
+        if (minconf < 0) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Minimum number of confirmations cannot be less than 0");
+        }
+    }
+
+    LOCK2(cs_main, pwalletMain->cs_wallet);
+
+    // Get the receivers for this account.
+    auto selector = pwalletMain->ZTXOSelectorForAccount(account, false);
+    if (!selector.has_value()) {
+        throw JSONRPCError(
+            RPC_INVALID_PARAMETER,
+            tfm::format("Error: account %d has not been generated by z_getnewaccount.", account));
+    }
+
+    auto spendableInputs = pwalletMain->FindSpendableInputs(selector.value(), true, minconf);
+    // Accounts never contain Sprout notes.
+    assert(spendableInputs.sproutNoteEntries.empty());
+
+    CAmount transparentBalance = 0;
+    CAmount saplingBalance = 0;
+    CAmount orchardBalance = 0;
+    for (const auto& t : spendableInputs.utxos) {
+        transparentBalance += t.Value();
+    }
+    for (const auto& t : spendableInputs.saplingNoteEntries) {
+        saplingBalance += t.note.value();
+    }
+    for (const auto& t : spendableInputs.orchardNoteMetadata) {
+        orchardBalance += t.GetNoteValue();
+    }
+
+    UniValue pools(UniValue::VOBJ);
+    auto renderBalance = [&](std::string poolName, CAmount balance) {
+        if (balance > 0) {
+            UniValue pool(UniValue::VOBJ);
+            pool.pushKV("valueZat", balance);
+            pools.pushKV(poolName, pool);
+        }
+    };
+    renderBalance("transparent", transparentBalance);
+    renderBalance("sapling", saplingBalance);
+    renderBalance("orchard", orchardBalance);
+
+    UniValue result(UniValue::VOBJ);
+    result.pushKV("pools", pools);
+    result.pushKV("minimum_confirmations", minconf);
+
+    return result;
+}
 
 UniValue z_gettotalbalance(const UniValue& params, bool fHelp)
 {
@@ -2986,6 +3965,7 @@ UniValue z_gettotalbalance(const UniValue& params, bool fHelp)
     if (fHelp || params.size() > 2)
         throw runtime_error(
             "z_gettotalbalance ( minconf includeWatchonly )\n"
+            "\nDEPRECATED. Please use the z_getbalanceforaccount RPC instead.\n"
             "\nReturn the total value of funds stored in the node's wallet.\n"
             "\nCAUTION: If the wallet contains any addresses for which it only has incoming viewing keys,"
             "\nthe returned private balance may be larger than the actual balance, because spends cannot"
@@ -2996,7 +3976,7 @@ UniValue z_gettotalbalance(const UniValue& params, bool fHelp)
             "\nResult:\n"
             "{\n"
             "  \"transparent\": xxxxx,     (numeric) the total balance of transparent funds\n"
-            "  \"private\": xxxxx,         (numeric) the total balance of shielded funds (in both Sprout and Sapling addresses)\n"
+            "  \"private\": xxxxx,         (numeric) the total balance of shielded funds (in all shielded addresses)\n"
             "  \"total\": xxxxx,           (numeric) the total balance of both transparent and shielded funds\n"
             "}\n"
             "\nExamples:\n"
@@ -3004,7 +3984,7 @@ UniValue z_gettotalbalance(const UniValue& params, bool fHelp)
             + HelpExampleCli("z_gettotalbalance", "") +
             "\nThe total amount in the wallet at least 5 blocks confirmed\n"
             + HelpExampleCli("z_gettotalbalance", "5") +
-            "\nAs a json rpc call\n"
+            "\nAs a JSON RPC call\n"
             + HelpExampleRpc("z_gettotalbalance", "5")
         );
 
@@ -3027,7 +4007,7 @@ UniValue z_gettotalbalance(const UniValue& params, bool fHelp)
     // but they don't because wtx.GetAmounts() does not handle tx where there are no outputs
     // pwalletMain->GetBalance() does not accept min depth parameter
     // so we use our own method to get balance of utxos.
-    CAmount nBalance = getBalanceTaddr("", nMinDepth, !fIncludeWatchonly);
+    CAmount nBalance = getBalanceTaddr(std::nullopt, nMinDepth, !fIncludeWatchonly);
     CAmount nPrivateBalance = getBalanceZaddr(std::nullopt, nMinDepth, INT_MAX, !fIncludeWatchonly);
     CAmount nTotalBalance = nBalance + nPrivateBalance;
     UniValue result(UniValue::VOBJ);
@@ -3053,14 +4033,16 @@ UniValue z_viewtransaction(const UniValue& params, bool fHelp)
             "  \"txid\" : \"transactionid\",   (string) The transaction id\n"
             "  \"spends\" : [\n"
             "    {\n"
-            "      \"type\" : \"sprout|sapling\",      (string) The type of address\n"
+            "      \"type\" : \"sprout|sapling|orchard\",      (string) The shielded pool\n"
             "      \"js\" : n,                       (numeric, sprout) the index of the JSDescription within vJoinSplit\n"
             "      \"jsSpend\" : n,                  (numeric, sprout) the index of the spend within the JSDescription\n"
             "      \"spend\" : n,                    (numeric, sapling) the index of the spend within vShieldedSpend\n"
+            "      \"action\" : n,                   (numeric, orchard) the index of the action within orchard bundle\n"
             "      \"txidPrev\" : \"transactionid\",   (string) The id for the transaction this note was created in\n"
             "      \"jsPrev\" : n,                   (numeric, sprout) the index of the JSDescription within vJoinSplit\n"
             "      \"jsOutputPrev\" : n,             (numeric, sprout) the index of the output within the JSDescription\n"
             "      \"outputPrev\" : n,               (numeric, sapling) the index of the output within the vShieldedOutput\n"
+            "      \"actionPrev\" : n,               (numeric, orchard) the index of the action within the orchard bundle\n"
             "      \"address\" : \"zcashaddress\",     (string) The Zcash address involved in the transaction\n"
             "      \"value\" : x.xxx                 (numeric) The amount in " + CURRENCY_UNIT + "\n"
             "      \"valueZat\" : xxxx               (numeric) The amount in zatoshis\n"
@@ -3069,15 +4051,17 @@ UniValue z_viewtransaction(const UniValue& params, bool fHelp)
             "  ],\n"
             "  \"outputs\" : [\n"
             "    {\n"
-            "      \"type\" : \"sprout|sapling\",      (string) The type of address\n"
+            "      \"type\" : \"sprout|sapling|orchard\",      (string) The shielded pool\n"
             "      \"js\" : n,                       (numeric, sprout) the index of the JSDescription within vJoinSplit\n"
             "      \"jsOutput\" : n,                 (numeric, sprout) the index of the output within the JSDescription\n"
             "      \"output\" : n,                   (numeric, sapling) the index of the output within the vShieldedOutput\n"
-            "      \"address\" : \"zcashaddress\",     (string) The Zcash address involved in the transaction\n"
-            "      \"outgoing\" : true|false         (boolean, sapling) True if the output is not for an address in the wallet\n"
+            "      \"action\" : n,                   (numeric, orchard) the index of the action within the orchard bundle\n"
+            "      \"address\" : \"zcashaddress\",     (string) The Zcash address involved in the transaction. Not included for change outputs.\n"
+            "      \"outgoing\" : true|false         (boolean) True if the output is not for an address in the wallet\n"
+            "      \"walletInternal\" : true|false   (boolean) True if this is a change output.\n"
             "      \"value\" : x.xxx                 (numeric) The amount in " + CURRENCY_UNIT + "\n"
             "      \"valueZat\" : xxxx               (numeric) The amount in zatoshis\n"
-            "      \"memo\" : \"hexmemo\",             (string) Hexademical string representation of the memo field\n"
+            "      \"memo\" : \"hexmemo\",             (string) hexadecimal string representation of the memo field\n"
             "      \"memoStr\" : \"memo\",             (string) Only returned if memo contains valid UTF-8 text.\n"
             "    }\n"
             "    ,...\n"
@@ -3091,15 +4075,15 @@ UniValue z_viewtransaction(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    uint256 hash;
-    hash.SetHex(params[0].get_str());
+    uint256 txid;
+    txid.SetHex(params[0].get_str());
 
     UniValue entry(UniValue::VOBJ);
-    if (!pwalletMain->mapWallet.count(hash))
+    if (!pwalletMain->mapWallet.count(txid))
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid or non-wallet transaction id");
-    const CWalletTx& wtx = pwalletMain->mapWallet[hash];
+    const CWalletTx& wtx = pwalletMain->mapWallet[txid];
 
-    entry.pushKV("txid", hash.GetHex());
+    entry.pushKV("txid", txid.GetHex());
 
     UniValue spends(UniValue::VARR);
     UniValue outputs(UniValue::VARR);
@@ -3177,9 +4161,39 @@ UniValue z_viewtransaction(const UniValue& params, bool fHelp)
     // Collect OutgoingViewingKeys for recovering output information
     std::set<uint256> ovks;
     {
-        // Generate the common ovk for recovering t->z outputs.
+        // Generate the old, pre-UA accounts OVK for recovering t->z outputs.
         HDSeed seed = pwalletMain->GetHDSeedForRPC();
         ovks.insert(ovkForShieldingFromTaddr(seed));
+
+        // Generate the OVKs for shielding from the legacy UA account
+        auto legacyKey = pwalletMain->GetLegacyAccountKey().ToAccountPubKey();
+        auto legacyAcctOVKs = legacyKey.GetOVKsForShielding();
+        ovks.insert(legacyAcctOVKs.first);
+        ovks.insert(legacyAcctOVKs.second);
+
+        // Generate the OVKs for shielding for all unified key components
+        for (const auto& [_, ufvkid] : pwalletMain->mapUnifiedAccountKeys) {
+            auto ufvk = pwalletMain->GetUnifiedFullViewingKey(ufvkid);
+            if (ufvk.has_value()) {
+                auto tkey = ufvk.value().GetTransparentKey();
+                if (tkey.has_value()) {
+                    auto tovks = tkey.value().GetOVKsForShielding();
+                    ovks.insert(tovks.first);
+                    ovks.insert(tovks.second);
+                }
+                auto skey = ufvk.value().GetSaplingKey();
+                if (skey.has_value()) {
+                    auto sovks = skey.value().GetOVKs();
+                    ovks.insert(sovks.first);
+                    ovks.insert(sovks.second);
+                }
+                auto okey = ufvk.value().GetOrchardKey();
+                if (okey.has_value()) {
+                    ovks.insert(okey.value().ToExternalOutgoingViewingKey());
+                    ovks.insert(okey.value().ToInternalOutgoingViewingKey());
+                }
+            }
+        }
     }
 
     // Sapling spends
@@ -3208,12 +4222,22 @@ UniValue z_viewtransaction(const UniValue& params, bool fHelp)
         assert(pwalletMain->GetSaplingFullViewingKey(wtxPrev.mapSaplingNoteData.at(op).ivk, extfvk));
         ovks.insert(extfvk.fvk.ovk);
 
+        // Show the address that was cached at transaction construction as the
+        // recipient.
+        std::optional<std::string> addrStr;
+        if (!pwalletMain->IsInternalRecipient(pa)) {
+            auto addr = pwalletMain->GetPaymentAddressForRecipient(txid, pa);
+            addrStr = keyIO.EncodePaymentAddress(addr);
+        }
+
         UniValue entry(UniValue::VOBJ);
         entry.pushKV("type", ADDR_TYPE_SAPLING);
         entry.pushKV("spend", (int)i);
         entry.pushKV("txidPrev", op.hash.GetHex());
         entry.pushKV("outputPrev", (int)op.n);
-        entry.pushKV("address", keyIO.EncodePaymentAddress(pa));
+        if (addrStr.has_value()) {
+            entry.pushKV("address", addrStr.value());
+        }
         entry.pushKV("value", ValueFromAmount(notePt.value()));
         entry.pushKV("valueZat", notePt.value());
         spends.push_back(entry);
@@ -3221,7 +4245,7 @@ UniValue z_viewtransaction(const UniValue& params, bool fHelp)
 
     // Sapling outputs
     for (uint32_t i = 0; i < wtx.vShieldedOutput.size(); ++i) {
-        auto op = SaplingOutPoint(hash, i);
+        auto op = SaplingOutPoint(txid, i);
 
         SaplingNotePlaintext notePt;
         SaplingPaymentAddress pa;
@@ -3251,17 +4275,89 @@ UniValue z_viewtransaction(const UniValue& params, bool fHelp)
         }
         auto memo = notePt.memo();
 
+        // Show the address that was cached at transaction construction as the
+        // recipient.
+        std::optional<std::string> addrStr;
+        bool isInternal = pwalletMain->IsInternalRecipient(pa);
+        if (!isInternal) {
+            auto addr = pwalletMain->GetPaymentAddressForRecipient(txid, pa);
+            addrStr = keyIO.EncodePaymentAddress(addr);
+        }
+
         UniValue entry(UniValue::VOBJ);
         entry.pushKV("type", ADDR_TYPE_SAPLING);
         entry.pushKV("output", (int)op.n);
         entry.pushKV("outgoing", isOutgoing);
-        entry.pushKV("address", keyIO.EncodePaymentAddress(pa));
+        entry.pushKV("walletInternal", isInternal);
+        if (addrStr.has_value()) {
+            entry.pushKV("address", addrStr.value());
+        }
         entry.pushKV("value", ValueFromAmount(notePt.value()));
         entry.pushKV("valueZat", notePt.value());
         addMemo(entry, memo);
         outputs.push_back(entry);
     }
 
+    std::vector<uint256> ovksVector(ovks.begin(), ovks.end());
+    OrchardActions orchardActions = wtx.RecoverOrchardActions(ovksVector);
+
+    // Orchard spends
+    for (auto & pair  : orchardActions.GetSpends()) {
+        auto actionIdx = pair.first;
+        OrchardActionSpend orchardActionSpend = pair.second;
+        auto outpoint = orchardActionSpend.GetOutPoint();
+        auto receivedAt = orchardActionSpend.GetReceivedAt();
+        auto noteValue = orchardActionSpend.GetNoteValue();
+
+        std::optional<std::string> addrStr;
+        if (!pwalletMain->IsInternalRecipient(receivedAt)) {
+            auto ua = pwalletMain->FindUnifiedAddressByReceiver(receivedAt);
+            assert(ua.has_value());
+            addrStr = keyIO.EncodePaymentAddress(ua.value());
+        }
+
+        UniValue entry(UniValue::VOBJ);
+        entry.pushKV("type", ADDR_TYPE_ORCHARD);
+        entry.pushKV("action", (int) actionIdx);
+        entry.pushKV("txidPrev", outpoint.hash.GetHex());
+        entry.pushKV("actionPrev", (int) outpoint.n);
+        if (addrStr.has_value()) {
+            entry.pushKV("address", addrStr.value());
+        }
+        entry.pushKV("value", ValueFromAmount(noteValue));
+        entry.pushKV("valueZat", noteValue);
+        spends.push_back(entry);
+    }
+
+    // Orchard outputs
+    for (const auto& [actionIdx, orchardActionOutput]  : orchardActions.GetOutputs()) {
+        auto noteValue = orchardActionOutput.GetNoteValue();
+        auto recipient = orchardActionOutput.GetRecipient();
+        auto memo = orchardActionOutput.GetMemo();
+
+        // Show the address that was cached at transaction construction as the
+        // recipient.
+        std::optional<std::string> addrStr;
+        bool isInternal = pwalletMain->IsInternalRecipient(recipient);
+        if (!isInternal) {
+            auto addr = pwalletMain->GetPaymentAddressForRecipient(txid, recipient);
+            addrStr = keyIO.EncodePaymentAddress(addr);
+        }
+
+        UniValue entry(UniValue::VOBJ);
+        entry.pushKV("type", ADDR_TYPE_ORCHARD);
+        entry.pushKV("action", (int) actionIdx);
+        entry.pushKV("outgoing", orchardActionOutput.IsOutgoing());
+        entry.pushKV("walletInternal", isInternal);
+        if (addrStr.has_value()) {
+            entry.pushKV("address", addrStr.value());
+        }
+        entry.pushKV("value", ValueFromAmount(noteValue));
+        entry.pushKV("valueZat", noteValue);
+        addMemo(entry, memo);
+        outputs.push_back(entry);
+    }
+
     entry.pushKV("spends", spends);
     entry.pushKV("outputs", outputs);
 
@@ -3371,7 +4467,6 @@ UniValue z_getoperationstatus_IMPL(const UniValue& params, bool fRemoveFinishedO
     return ret;
 }
 
-
 // JSDescription size depends on the transaction version
 #define V3_JS_DESCRIPTION_SIZE    (GetSerializeSize(JSDescription(), SER_NETWORK, (OVERWINTER_TX_VERSION | (1 << 31))))
 // Here we define the maximum number of zaddr outputs that can be included in a transaction.
@@ -3384,14 +4479,84 @@ UniValue z_getoperationstatus_IMPL(const UniValue& params, bool fRemoveFinishedO
 #define CTXIN_SPEND_DUST_SIZE   148
 #define CTXOUT_REGULAR_SIZE     34
 
+size_t EstimateTxSize(
+        const ZTXOSelector& ztxoSelector,
+        const std::vector<SendManyRecipient>& recipients,
+        int nextBlockHeight) {
+    CMutableTransaction mtx;
+    mtx.fOverwintered = true;
+    mtx.nConsensusBranchId = CurrentEpochBranchId(nextBlockHeight, Params().GetConsensus());
+
+    bool fromSprout = ztxoSelector.SelectsSprout();
+    bool fromTaddr = ztxoSelector.SelectsTransparent();
+
+    // As a sanity check, estimate and verify that the size of the transaction will be valid.
+    // Depending on the input notes, the actual tx size may turn out to be larger and perhaps invalid.
+    size_t txsize = 0;
+    size_t taddrRecipientCount = 0;
+    size_t orchardRecipientCount = 0;
+    for (const SendManyRecipient& recipient : recipients) {
+        std::visit(match {
+            [&](const CKeyID&) {
+                taddrRecipientCount += 1;
+            },
+            [&](const CScriptID&) {
+                taddrRecipientCount += 1;
+            },
+            [&](const libzcash::SaplingPaymentAddress& addr) {
+                mtx.vShieldedOutput.push_back(OutputDescription());
+            },
+            [&](const libzcash::SproutPaymentAddress& addr) {
+                JSDescription jsdesc;
+                jsdesc.proof = GrothProof();
+                mtx.vJoinSplit.push_back(jsdesc);
+            },
+            [&](const libzcash::OrchardRawAddress& addr) {
+                if (fromSprout) {
+                    throw JSONRPCError(
+                        RPC_INVALID_PARAMETER,
+                        "Sending funds from a Sprout address to a Unified Address is not supported by z_sendmany");
+                }
+                orchardRecipientCount += 1;
+            }
+        }, recipient.address);
+    }
+
+    bool nu5Active = Params().GetConsensus().NetworkUpgradeActive(nextBlockHeight, Consensus::UPGRADE_NU5);
+
+    if (fromSprout || !nu5Active) {
+        mtx.nVersionGroupId = SAPLING_VERSION_GROUP_ID;
+        mtx.nVersion = SAPLING_TX_VERSION;
+    } else {
+        mtx.nVersionGroupId = ZIP225_VERSION_GROUP_ID;
+        mtx.nVersion = ZIP225_TX_VERSION;
+    }
+
+    CTransaction tx(mtx);
+    txsize += GetSerializeSize(tx, SER_NETWORK, tx.nVersion);
+    if (fromTaddr) {
+        txsize += CTXIN_SPEND_DUST_SIZE;
+        txsize += CTXOUT_REGULAR_SIZE; // There will probably be taddr change
+    }
+    txsize += CTXOUT_REGULAR_SIZE * taddrRecipientCount;
+
+    if (orchardRecipientCount > 0) {
+        // - The Orchard transaction builder pads to a minimum of 2 actions.
+        // - We subtract 1 because `GetSerializeSize(tx, ...)` already counts
+        //   `ZC_ZIP225_ORCHARD_NUM_ACTIONS_BASE_SIZE`.
+        txsize += ZC_ZIP225_ORCHARD_BASE_SIZE - 1 + ZC_ZIP225_ORCHARD_MARGINAL_SIZE * std::max(2, (int) orchardRecipientCount);
+    }
+    return txsize;
+}
+
 UniValue z_sendmany(const UniValue& params, bool fHelp)
 {
     if (!EnsureWalletIsAvailable(fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() < 2 || params.size() > 4)
+    if (fHelp || params.size() < 2 || params.size() > 5)
         throw runtime_error(
-            "z_sendmany \"fromaddress\" [{\"address\":... ,\"amount\":...},...] ( minconf ) ( fee )\n"
+            "z_sendmany \"fromaddress\" [{\"address\":... ,\"amount\":...},...] ( minconf ) ( fee ) ( privacyPolicy )\n"
             "\nSend multiple times. Amounts are decimal numbers with at most 8 digits of precision."
             "\nChange generated from one or more transparent addresses flows to a new transparent"
             "\naddress, while change generated from a shielded address returns to itself."
@@ -3404,15 +4569,35 @@ UniValue z_sendmany(const UniValue& params, bool fHelp)
             "                           The following special strings are also accepted:\n"
             "                               - \"ANY_TADDR\": Select non-coinbase UTXOs from any transparent addresses belonging to the wallet.\n"
             "                                              Use z_shieldcoinbase to shield coinbase UTXOs from multiple transparent addresses.\n"
+            "                           If the address is a UA, transfer from the most recent pool with sufficient funds\n"
             "2. \"amounts\"             (array, required) An array of json objects representing the amounts to send.\n"
             "    [{\n"
-            "      \"address\":address  (string, required) The address is a taddr or zaddr\n"
+            "      \"address\":address  (string, required) The address is a taddr, zaddr, or Unified Address\n"
             "      \"amount\":amount    (numeric, required) The numeric amount in " + CURRENCY_UNIT + " is the value\n"
             "      \"memo\":memo        (string, optional) If the address is a zaddr, raw data represented in hexadecimal string format\n"
             "    }, ... ]\n"
             "3. minconf               (numeric, optional, default=1) Only use funds confirmed at least this many times.\n"
-            "4. fee                   (numeric, optional, default="
-            + strprintf("%s", FormatMoney(DEFAULT_FEE)) + ") The fee amount to attach to this transaction.\n"
+            "4. fee                   (numeric, optional, default=" + strprintf("%s", FormatMoney(DEFAULT_FEE)) + ") The fee amount to attach to this transaction.\n"
+            "5. privacyPolicy         (string, optional, default=\"LegacyCompat\") Policy for what information leakage is acceptable.\n"
+            "                         One of the following strings:\n"
+            "                               - \"FullPrivacy\": Only allow fully-shielded transactions (involving a single shielded pool).\n"
+            "                               - \"LegacyCompat\": If the transaction involves any Unified Addressess, this is equivalent to\n"
+            "                                 \"FullPrivacy\". Otherwise, this is equivalent to \"AllowFullyTransparent\".\n"
+            "                               - \"AllowRevealedAmounts\": Allow funds to cross between shielded pools, revealing the amount\n"
+            "                                 that crosses pools.\n"
+            "                               - \"AllowRevealedRecipients\": Allow transparent recipients. This also implies revealing\n"
+            "                                 information described under \"AllowRevealedAmounts\".\n"
+            "                               - \"AllowRevealedSenders\": Allow transparent funds to be spent, revealing the sending\n"
+            "                                 addresses and amounts. This implies revealing information described under \"AllowRevealedAmounts\".\n"
+            "                               - \"AllowFullyTransparent\": Allow transaction to both spend transparent funds and have\n"
+            "                                 transparent recipients. This implies revealing information described under \"AllowRevealedSenders\"\n"
+            "                                 and \"AllowRevealedRecipients\".\n"
+            "                               - \"AllowLinkingAccountAddresses\": Allow selecting transparent coins from the full account,\n"
+            "                                 rather than just the funds sent to the transparent receiver in the provided Unified Address.\n"
+            "                                 This implies revealing information described under \"AllowRevealedSenders\".\n"
+            "                               - \"NoPrivacy\": Allow the transaction to reveal any information necessary to create it.\n"
+            "                                 This implies revealing information described under \"AllowFullyTransparent\" and\n"
+            "                                 \"AllowLinkingAccountAddresses\".\n"
             "\nResult:\n"
             "\"operationid\"          (string) An operationid to pass to z_getoperationstatus to get the result of the operation.\n"
             "\nExamples:\n"
@@ -3423,194 +4608,183 @@ UniValue z_sendmany(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
+    const auto& chainparams = Params();
+    int nextBlockHeight = chainActive.Height() + 1;
+
     ThrowIfInitialBlockDownload();
+    if (!chainparams.GetConsensus().NetworkUpgradeActive(nextBlockHeight, Consensus::UPGRADE_SAPLING)) {
+        throw JSONRPCError(
+            RPC_INVALID_PARAMETER, "Cannot create shielded transactions before Sapling has activated");
+    }
+
+    KeyIO keyIO(chainparams);
+
+    // We need to know the privacy policy before we construct the ZTXOSelector,
+    // but we can't determine the default privacy policy without knowing whether
+    // any UAs are involved. We break this cycle by parsing the privacy policy
+    // argument first, and then resolving it to the default after parsing the
+    // rest of the arguments. This works because all possible defaults for the
+    // privacy policy have the same effect on ZTXOSelector construction (in that
+    // they don't include AllowLinkingAccountAddresses).
+    std::optional<TransactionStrategy> maybeStrategy;
+    if (params.size() > 4) {
+        auto strategyName = params[4].get_str();
+        if (strategyName != "LegacyCompat") {
+            maybeStrategy = TransactionStrategy::FromString(strategyName);
+            if (!maybeStrategy.has_value()) {
+                throw JSONRPCError(
+                    RPC_INVALID_PARAMETER,
+                    strprintf("Unknown privacy policy name '%s'", strategyName));
+            }
+        }
+    }
+
+    bool involvesUnifiedAddress = false;
 
     // Check that the from address is valid.
+    // Unified address (UA) allowed here (#5185)
     auto fromaddress = params[0].get_str();
-    bool fromTaddr = false;
-    bool fromSapling = false;
-    KeyIO keyIO(Params());
-    if (fromaddress == "ANY_TADDR") {
-        fromTaddr = true;
-    } else {
-        CTxDestination taddr = keyIO.DecodeDestination(fromaddress);
-        fromTaddr = IsValidDestination(taddr);
-        if (!fromTaddr) {
-            auto res = keyIO.DecodePaymentAddress(fromaddress);
-            if (!IsValidPaymentAddress(res)) {
-                // invalid
-                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid from address, should be a taddr or zaddr.");
+    ZTXOSelector ztxoSelector = [&]() {
+        if (fromaddress == "ANY_TADDR") {
+            return CWallet::LegacyTransparentZTXOSelector(true);
+        } else {
+            auto decoded = keyIO.DecodePaymentAddress(fromaddress);
+            if (!decoded.has_value()) {
+                throw JSONRPCError(
+                        RPC_INVALID_ADDRESS_OR_KEY,
+                        "Invalid from address: should be a taddr, zaddr, UA, or the string 'ANY_TADDR'.");
             }
 
-            // Check that we have the spending key
-            if (!std::visit(HaveSpendingKeyForPaymentAddress(pwalletMain), res)) {
-                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "From address does not belong to this node, zaddr spending key not found.");
+            auto ztxoSelectorOpt = pwalletMain->ZTXOSelectorForAddress(
+                decoded.value(),
+                true,
+                // LegacyCompat does not include AllowLinkingAccountAddresses.
+                maybeStrategy.has_value() ? maybeStrategy.value().AllowLinkingAccountAddresses() : false);
+            if (!ztxoSelectorOpt.has_value()) {
+                throw JSONRPCError(
+                        RPC_INVALID_ADDRESS_OR_KEY,
+                        "Invalid from address, no payment source found for address.");
             }
 
-            // Remember whether this is a Sprout or Sapling address
-            fromSapling = std::get_if<libzcash::SaplingPaymentAddress>(&res) != nullptr;
+            auto selectorAccount = pwalletMain->FindAccountForSelector(ztxoSelectorOpt.value());
+            std::visit(match {
+                [&](const libzcash::UnifiedAddress& ua) {
+                    if (!selectorAccount.has_value() || selectorAccount.value() == ZCASH_LEGACY_ACCOUNT) {
+                        throw JSONRPCError(
+                                RPC_INVALID_ADDRESS_OR_KEY,
+                                "Invalid from address, UA does not correspond to a known account.");
+                    }
+                    involvesUnifiedAddress = true;
+                },
+                [&](const auto& other) {
+                    if (selectorAccount.has_value() && selectorAccount.value() != ZCASH_LEGACY_ACCOUNT) {
+                        throw JSONRPCError(
+                                RPC_INVALID_ADDRESS_OR_KEY,
+                                "Invalid from address: is a bare receiver from a Unified Address in this wallet. Provide the UA as returned by z_getaddressforaccount instead.");
+                    }
+                }
+            }, decoded.value());
+
+            return ztxoSelectorOpt.value();
         }
-    }
-    // This logic will need to be updated if we add a new shielded pool
-    bool fromSprout = !(fromTaddr || fromSapling);
+    }();
 
     UniValue outputs = params[1].get_array();
-
-    if (outputs.size()==0)
+    if (outputs.size() == 0) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, amounts array is empty.");
+    }
 
-    // Keep track of addresses to spot duplicates
-    set<std::string> setAddress;
-
-    // Track whether we see any Sprout addresses
-    bool noSproutAddrs = !fromSprout;
-
-    // Recipients
-    std::vector<SendManyRecipient> taddrRecipients;
-    std::vector<SendManyRecipient> zaddrRecipients;
+    std::set<RecipientAddress> recipientAddrs;
+    std::vector<SendManyRecipient> recipients;
     CAmount nTotalOut = 0;
-
-    bool containsSproutOutput = false;
-    bool containsSaplingOutput = false;
-
     for (const UniValue& o : outputs.getValues()) {
         if (!o.isObject())
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, expected object");
 
         // sanity check, report error if unknown key-value pairs
-        for (const string& name_ : o.getKeys()) {
-            std::string s = name_;
-            if (s != "address" && s != "amount" && s!="memo")
-                throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, unknown key: ")+s);
+        for (const std::string& s : o.getKeys()) {
+            if (s != "address" && s != "amount" && s != "memo")
+                throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, unknown key: ") + s);
         }
 
-        string address = find_value(o, "address").get_str();
-        bool isZaddr = false;
-        CTxDestination taddr = keyIO.DecodeDestination(address);
-        if (!IsValidDestination(taddr)) {
-            auto res = keyIO.DecodePaymentAddress(address);
-            if (IsValidPaymentAddress(res)) {
-                isZaddr = true;
-
-                bool toSapling = std::get_if<libzcash::SaplingPaymentAddress>(&res) != nullptr;
-                bool toSprout = !toSapling;
-                noSproutAddrs = noSproutAddrs && toSapling;
-
-                containsSproutOutput |= toSprout;
-                containsSaplingOutput |= toSapling;
-
-                // Sending to both Sprout and Sapling is currently unsupported using z_sendmany
-                if (containsSproutOutput && containsSaplingOutput) {
-                    throw JSONRPCError(
-                        RPC_INVALID_PARAMETER,
-                        "Cannot send to both Sprout and Sapling addresses using z_sendmany");
-                }
-
-                // If sending between shielded addresses, they must be the same type
-                if ((fromSprout && toSapling) || (fromSapling && toSprout)) {
-                    throw JSONRPCError(
-                        RPC_INVALID_PARAMETER,
-                        "Cannot send between Sprout and Sapling addresses using z_sendmany");
-                }
-
-                int nextBlockHeight = chainActive.Height() + 1;
+        std::string addrStr = find_value(o, "address").get_str();
+        auto decoded = keyIO.DecodePaymentAddress(addrStr);
+        if (!decoded.has_value()) {
+            throw JSONRPCError(
+                    RPC_INVALID_PARAMETER,
+                    std::string("Invalid parameter, unknown address format: ") + addrStr);
+        }
 
-                if (fromTaddr && toSprout) {
-                    const bool canopyActive = Params().GetConsensus().NetworkUpgradeActive(nextBlockHeight, Consensus::UPGRADE_CANOPY);
-                    if (canopyActive) {
-                        throw JSONRPCError(RPC_VERIFY_REJECTED, "Sprout shielding is not supported after Canopy");
-                    }
-                }
+        std::optional<RecipientAddress> addr = std::visit(
+            SelectRecipientAddress(chainparams.GetConsensus(), nextBlockHeight),
+            decoded.value());
+        if (!addr.has_value()) {
+            bool toSprout = std::holds_alternative<libzcash::SproutPaymentAddress>(decoded.value());
+            if (toSprout) {
+                throw JSONRPCError(
+                    RPC_INVALID_PARAMETER,
+                    "Sending funds into the Sprout pool is not supported by z_sendmany");
             } else {
-                throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, unknown address format: ")+address );
+                throw JSONRPCError(
+                    RPC_INVALID_PARAMETER,
+                    "Unified address contained no recognized receiver types.");
             }
         }
 
-        if (setAddress.count(address))
-            throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, duplicated address: ")+address);
-        setAddress.insert(address);
+        if (!recipientAddrs.insert(addr.value()).second) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, duplicated recipient address: ") + addrStr);
+        }
 
         UniValue memoValue = find_value(o, "memo");
-        string memo;
+        std::optional<std::string> memo;
         if (!memoValue.isNull()) {
             memo = memoValue.get_str();
-            if (!isZaddr) {
-                throw JSONRPCError(RPC_INVALID_PARAMETER, "Memo cannot be used with a taddr.  It can only be used with a zaddr.");
-            } else if (!IsHex(memo)) {
+            if (!std::visit(libzcash::IsShieldedRecipient(), addr.value())) {
+                throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, memos cannot be sent to transparent addresses.");
+            } else if (!IsHex(memo.value())) {
                 throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, expected memo data in hexadecimal format.");
             }
-            if (memo.length() > ZC_MEMO_SIZE*2) {
+
+            if (memo.value().length() > ZC_MEMO_SIZE*2) {
                 throw JSONRPCError(RPC_INVALID_PARAMETER,  strprintf("Invalid parameter, size of memo is larger than maximum allowed %d", ZC_MEMO_SIZE ));
             }
         }
 
         UniValue av = find_value(o, "amount");
         CAmount nAmount = AmountFromValue( av );
-        if (nAmount < 0)
+        if (nAmount < 0) {
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, amount must be positive");
+        }
 
-        if (isZaddr) {
-            zaddrRecipients.push_back( SendManyRecipient(address, nAmount, memo) );
-        } else {
-            taddrRecipients.push_back( SendManyRecipient(address, nAmount, memo) );
+        std::optional<libzcash::UnifiedAddress> ua = std::nullopt;
+        if (std::holds_alternative<libzcash::UnifiedAddress>(decoded.value())) {
+            ua = std::get<libzcash::UnifiedAddress>(decoded.value());
+            involvesUnifiedAddress = true;
         }
 
+        recipients.push_back(SendManyRecipient(ua, addr.value(), nAmount, memo));
         nTotalOut += nAmount;
     }
-
-    int nextBlockHeight = chainActive.Height() + 1;
-    CMutableTransaction mtx;
-    mtx.fOverwintered = true;
-    mtx.nVersionGroupId = SAPLING_VERSION_GROUP_ID;
-    mtx.nVersion = SAPLING_TX_VERSION;
-    unsigned int max_tx_size = MAX_TX_SIZE_AFTER_SAPLING;
-    if (!Params().GetConsensus().NetworkUpgradeActive(nextBlockHeight, Consensus::UPGRADE_SAPLING)) {
-        if (Params().GetConsensus().NetworkUpgradeActive(nextBlockHeight, Consensus::UPGRADE_OVERWINTER)) {
-            mtx.nVersionGroupId = OVERWINTER_VERSION_GROUP_ID;
-            mtx.nVersion = OVERWINTER_TX_VERSION;
-        } else {
-            mtx.fOverwintered = false;
-            mtx.nVersion = 2;
-        }
-
-        max_tx_size = MAX_TX_SIZE_BEFORE_SAPLING;
-
-        // Check the number of zaddr outputs does not exceed the limit.
-        if (zaddrRecipients.size() > Z_SENDMANY_MAX_ZADDR_OUTPUTS_BEFORE_SAPLING)  {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, too many zaddr outputs");
-        }
-        // If Sapling is not active, do not allow sending from or sending to Sapling addresses.
-        if (fromSapling || containsSaplingOutput) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, Sapling has not activated");
-        }
+    if (recipients.empty()) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "No recipients");
     }
 
-    // As a sanity check, estimate and verify that the size of the transaction will be valid.
-    // Depending on the input notes, the actual tx size may turn out to be larger and perhaps invalid.
-    size_t txsize = 0;
-    for (int i = 0; i < zaddrRecipients.size(); i++) {
-        auto address = zaddrRecipients[i].address;
-        auto res = keyIO.DecodePaymentAddress(address);
-        bool toSapling = std::get_if<libzcash::SaplingPaymentAddress>(&res) != nullptr;
-        if (toSapling) {
-            mtx.vShieldedOutput.push_back(OutputDescription());
-        } else {
-            JSDescription jsdesc;
-            if (mtx.fOverwintered && (mtx.nVersion >= SAPLING_TX_VERSION)) {
-                jsdesc.proof = GrothProof();
-            }
-            mtx.vJoinSplit.push_back(jsdesc);
-        }
-    }
-    CTransaction tx(mtx);
-    txsize += GetSerializeSize(tx, SER_NETWORK, tx.nVersion);
-    if (fromTaddr) {
-        txsize += CTXIN_SPEND_DUST_SIZE;
-        txsize += CTXOUT_REGULAR_SIZE;      // There will probably be taddr change
-    }
-    txsize += CTXOUT_REGULAR_SIZE * taddrRecipients.size();
-    if (txsize > max_tx_size) {
-        throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Too many outputs, size of raw transaction would be larger than limit of %d bytes", max_tx_size ));
+    // Now that we've set involvesUnifiedAddress correctly, we can finish
+    // evaluating the strategy.
+    TransactionStrategy strategy = maybeStrategy.value_or(
+        // Default privacy policy is "LegacyCompat".
+        involvesUnifiedAddress ?
+            TransactionStrategy(PrivacyPolicy::FullPrivacy) :
+            TransactionStrategy(PrivacyPolicy::AllowFullyTransparent)
+    );
+
+    // Sanity check for transaction size
+    // TODO: move this to the builder?
+    auto txsize = EstimateTxSize(ztxoSelector, recipients, nextBlockHeight);
+    if (txsize > MAX_TX_SIZE_AFTER_SAPLING) {
+        throw JSONRPCError(
+                RPC_INVALID_PARAMETER,
+                strprintf("Too many outputs, size of raw transaction would be larger than limit of %d bytes", MAX_TX_SIZE_AFTER_SAPLING));
     }
 
     // Minimum confirmations
@@ -3623,9 +4797,7 @@ UniValue z_sendmany(const UniValue& params, bool fHelp)
     }
 
     // Fee in Zatoshis, not currency format)
-    CAmount nFee        = DEFAULT_FEE;
-    CAmount nDefaultFee = nFee;
-
+    CAmount nFee = DEFAULT_FEE;
     if (params.size() > 3) {
         if (params[3].get_real() == 0.0) {
             nFee = 0;
@@ -3634,16 +4806,20 @@ UniValue z_sendmany(const UniValue& params, bool fHelp)
         }
 
         // Check that the user specified fee is not absurd.
-        // This allows amount=0 (and all amount < nDefaultFee) transactions to use the default network fee
-        // or anything less than nDefaultFee instead of being forced to use a custom fee and leak metadata
-        if (nTotalOut < nDefaultFee) {
-            if (nFee > nDefaultFee) {
-                throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Small transaction amount %s has fee %s that is greater than the default fee %s", FormatMoney(nTotalOut), FormatMoney(nFee), FormatMoney(nDefaultFee)));
+        // This allows amount=0 (and all amount < DEFAULT_FEE) transactions to use the default network fee
+        // or anything less than DEFAULT_FEE instead of being forced to use a custom fee and leak metadata
+        if (nTotalOut < DEFAULT_FEE) {
+            if (nFee > DEFAULT_FEE) {
+                throw JSONRPCError(
+                        RPC_INVALID_PARAMETER,
+                        strprintf("Small transaction amount %s has fee %s that is greater than the default fee %s", FormatMoney(nTotalOut), FormatMoney(nFee), FormatMoney(DEFAULT_FEE)));
             }
         } else {
             // Check that the user specified fee is not absurd.
             if (nFee > nTotalOut) {
-                throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Fee %s is greater than the sum of outputs %s and also greater than the default fee", FormatMoney(nFee), FormatMoney(nTotalOut)));
+                throw JSONRPCError(
+                        RPC_INVALID_PARAMETER,
+                        strprintf("Fee %s is greater than the sum of outputs %s and also greater than the default fee", FormatMoney(nFee), FormatMoney(nTotalOut)));
             }
         }
     }
@@ -3656,33 +4832,22 @@ UniValue z_sendmany(const UniValue& params, bool fHelp)
     o.pushKV("fee", std::stod(FormatMoney(nFee)));
     UniValue contextInfo = o;
 
-    if (!fromTaddr || !zaddrRecipients.empty()) {
-        // We have shielded inputs or outputs, and therefore cannot create
-        // transactions before Sapling activates.
-        if (!Params().GetConsensus().NetworkUpgradeActive(nextBlockHeight, Consensus::UPGRADE_SAPLING)) {
-            throw JSONRPCError(
-                RPC_INVALID_PARAMETER, "Cannot create shielded transactions before Sapling has activated");
-        }
-    }
-
-    // Builder (used if Sapling addresses are involved)
-    std::optional<TransactionBuilder> builder;
-    if (noSproutAddrs) {
-        builder = TransactionBuilder(Params().GetConsensus(), nextBlockHeight, pwalletMain);
-    }
-
-    // Contextual transaction we will build on
-    // (used if no Sapling addresses are involved)
-    CMutableTransaction contextualTx = CreateNewContextualCMutableTransaction(
-        Params().GetConsensus(), nextBlockHeight, !noSproutAddrs);
-    bool isShielded = !fromTaddr || zaddrRecipients.size() > 0;
-    if (contextualTx.nVersion == 1 && isShielded) {
-        contextualTx.nVersion = 2; // Tx format should support vJoinSplits
+    std::optional<uint256> orchardAnchor;
+    if (!ztxoSelector.SelectsSprout()) {
+        // Allow Orchard recipients by setting an Orchard anchor.
+        // TODO: Add an orchardAnchorHeight field to ZTXOSelector so we can ensure the
+        // same anchor is used for witnesses of any selected Orchard note.
+        auto orchardAnchorHeight = nextBlockHeight - nOrchardAnchorConfirmations;
+        orchardAnchor = chainActive[orchardAnchorHeight]->hashFinalOrchardRoot;
     }
+    TransactionBuilder builder(chainparams.GetConsensus(), nextBlockHeight, orchardAnchor, pwalletMain);
 
     // Create operation and add to global queue
     std::shared_ptr<AsyncRPCQueue> q = getAsyncRPCQueue();
-    std::shared_ptr<AsyncRPCOperation> operation( new AsyncRPCOperation_sendmany(builder, contextualTx, fromaddress, taddrRecipients, zaddrRecipients, nMinDepth, nFee, contextInfo) );
+    std::shared_ptr<AsyncRPCOperation> operation(
+            new AsyncRPCOperation_sendmany(
+                std::move(builder), ztxoSelector, recipients, nMinDepth, strategy, nFee, contextInfo)
+            );
     q->addOperation(operation);
     AsyncRPCOperationId operationId = operation->getId();
     return operationId;
@@ -3748,10 +4913,10 @@ UniValue z_getmigrationstatus(const UniValue& params, bool fHelp) {
     {
         std::vector<SproutNoteEntry> sproutEntries;
         std::vector<SaplingNoteEntry> saplingEntries;
-        std::set<libzcash::RawAddress> noFilter;
+        std::vector<OrchardNoteMetadata> orchardEntries;
         // Here we are looking for any and all Sprout notes for which we have the spending key, including those
         // which are locked and/or only exist in the mempool, as they should be included in the unmigrated amount.
-        pwalletMain->GetFilteredNotes(sproutEntries, saplingEntries, noFilter, 0, INT_MAX, true, true, false);
+        pwalletMain->GetFilteredNotes(sproutEntries, saplingEntries, orchardEntries, std::nullopt, 0, INT_MAX, true, true, false);
         CAmount unmigratedAmount = 0;
         for (const auto& sproutEntry : sproutEntries) {
             unmigratedAmount += sproutEntry.note.value();
@@ -3873,30 +5038,46 @@ UniValue z_shieldcoinbase(const UniValue& params, bool fHelp)
     auto fromaddress = params[0].get_str();
     bool isFromWildcard = fromaddress == "*";
     KeyIO keyIO(Params());
-    CTxDestination taddr;
+
+    // Set of source addresses to filter utxos by
+    std::set<CTxDestination> sources = {};
     if (!isFromWildcard) {
-        taddr = keyIO.DecodeDestination(fromaddress);
-        if (!IsValidDestination(taddr)) {
+        CTxDestination taddr = keyIO.DecodeDestination(fromaddress);
+        if (IsValidDestination(taddr)) {
+            sources.insert(taddr);
+        } else {
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid from address, should be a taddr or \"*\".");
         }
     }
 
-    // Validate the destination address
-    auto destaddress = params[1].get_str();
-    if (!keyIO.IsValidPaymentAddressString(destaddress)) {
-        throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, unknown address format: ") + destaddress );
-    }
-
     int nextBlockHeight = chainActive.Height() + 1;
     const bool canopyActive = Params().GetConsensus().NetworkUpgradeActive(nextBlockHeight, Consensus::UPGRADE_CANOPY);
 
-    if (canopyActive) {
-        auto decodeAddr = keyIO.DecodePaymentAddress(destaddress);
-        bool isToSproutZaddr = (std::get_if<libzcash::SproutPaymentAddress>(&decodeAddr) != nullptr);
-
-        if (isToSproutZaddr) {
-            throw JSONRPCError(RPC_VERIFY_REJECTED, "Sprout shielding is not supported after Canopy activation");
-        }
+    // Validate the destination address
+    auto destStr = params[1].get_str();
+    auto destaddress = keyIO.DecodePaymentAddress(destStr);
+    if (destaddress.has_value()) {
+        std::visit(match {
+            [&](const CKeyID& addr) {
+                throw JSONRPCError(RPC_VERIFY_REJECTED, "Cannot shield coinbase output to a p2pkh address.");
+            },
+            [&](const CScriptID&) {
+                throw JSONRPCError(RPC_VERIFY_REJECTED, "Cannot shield coinbase output to a p2sh address.");
+            },
+            [&](const libzcash::SaplingPaymentAddress& addr) {
+                // OK
+            },
+            [&](const libzcash::SproutPaymentAddress& addr) {
+                if (canopyActive) {
+                    throw JSONRPCError(RPC_VERIFY_REJECTED, "Sprout shielding is not supported after Canopy activation");
+                }
+            },
+            [&](const libzcash::UnifiedAddress& ua) {
+                // OK
+            }
+        }, destaddress.value());
+    } else {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, unknown address format: ") + destStr);
     }
 
     // Convert fee from currency format to zatoshis
@@ -3938,12 +5119,6 @@ UniValue z_shieldcoinbase(const UniValue& params, bool fHelp)
     bool maxedOutFlag = false;
     const size_t mempoolLimit = nLimit;
 
-    // Set of addresses to filter utxos by
-    std::set<CTxDestination> destinations = {};
-    if (!isFromWildcard) {
-        destinations.insert(taddr);
-    }
-
     // Get available utxos
     vector<COutput> vecOutputs;
     pwalletMain->AvailableCoins(vecOutputs, true, NULL, false, true);
@@ -3958,8 +5133,9 @@ UniValue z_shieldcoinbase(const UniValue& params, bool fHelp)
         if (!ExtractDestination(out.tx->vout[out.i].scriptPubKey, address)) {
             continue;
         }
-        // If taddr is not wildcard "*", filter utxos
-        if (destinations.size() > 0 && !destinations.count(address)) {
+
+        // If from address was not the wildcard "*", filter utxos
+        if (sources.size() > 0 && !sources.count(address)) {
             continue;
         }
 
@@ -4015,8 +5191,14 @@ UniValue z_shieldcoinbase(const UniValue& params, bool fHelp)
     contextInfo.pushKV("fee", ValueFromAmount(nFee));
 
     // Builder (used if Sapling addresses are involved)
+    std::optional<uint256> orchardAnchor;
+    if (canopyActive) {
+        // Allow Orchard recipients by setting an Orchard anchor.
+        auto orchardAnchorHeight = nextBlockHeight - nOrchardAnchorConfirmations;
+        orchardAnchor = chainActive[orchardAnchorHeight]->hashFinalOrchardRoot;
+    }
     TransactionBuilder builder = TransactionBuilder(
-        Params().GetConsensus(), nextBlockHeight, pwalletMain);
+        Params().GetConsensus(), nextBlockHeight, orchardAnchor, pwalletMain);
 
     // Contextual transaction we will build on
     // (used if no Sapling addresses are involved)
@@ -4028,7 +5210,8 @@ UniValue z_shieldcoinbase(const UniValue& params, bool fHelp)
 
     // Create operation and add to global queue
     std::shared_ptr<AsyncRPCQueue> q = getAsyncRPCQueue();
-    std::shared_ptr<AsyncRPCOperation> operation( new AsyncRPCOperation_shieldcoinbase(builder, contextualTx, inputs, destaddress, nFee, contextInfo) );
+    std::shared_ptr<AsyncRPCOperation> operation( new AsyncRPCOperation_shieldcoinbase(
+        std::move(builder), contextualTx, inputs, destaddress.value(), nFee, contextInfo) );
     q->addOperation(operation);
     AsyncRPCOperationId operationId = operation->getId();
 
@@ -4110,8 +5293,8 @@ UniValue z_mergetoaddress(const UniValue& params, bool fHelp)
     bool useAnyUTXO = false;
     bool useAnySprout = false;
     bool useAnySapling = false;
-    std::set<CTxDestination> taddrs = {};
-    std::set<libzcash::RawAddress> zaddrs = {};
+    std::set<CTxDestination> taddrs;
+    std::vector<libzcash::PaymentAddress> zaddrs;
 
     UniValue addresses = params[0].get_array();
     if (addresses.size()==0)
@@ -4139,24 +5322,32 @@ UniValue z_mergetoaddress(const UniValue& params, bool fHelp)
             useAnySapling = true;
             isFromNonSprout = true;
         } else {
-            CTxDestination taddr = keyIO.DecodeDestination(address);
-            if (IsValidDestination(taddr)) {
-                taddrs.insert(taddr);
-                isFromNonSprout = true;
-            } else {
-                auto zaddr = keyIO.DecodePaymentAddress(address);
-                if (IsValidPaymentAddress(zaddr)) {
-                    // We want to merge notes corresponding to any receiver within a
-                    // Unified Address.
-                    for (const auto ra : std::visit(GetRawAddresses(), zaddr)) {
-                        zaddrs.insert(ra);
-                        if (std::get_if<libzcash::SaplingPaymentAddress>(&ra) != nullptr) {
-                            isFromNonSprout = true;
-                        }
+            auto addr = keyIO.DecodePaymentAddress(address);
+            if (addr.has_value()) {
+                std::visit(match {
+                    [&](const CKeyID& taddr) {
+                        taddrs.insert(taddr);
+                        isFromNonSprout = true;
+                    },
+                    [&](const CScriptID& taddr) {
+                        taddrs.insert(taddr);
+                        isFromNonSprout = true;
+                    },
+                    [&](const libzcash::SaplingPaymentAddress& zaddr) {
+                        zaddrs.push_back(zaddr);
+                        isFromNonSprout = true;
+                    },
+                    [&](const libzcash::SproutPaymentAddress& zaddr) {
+                        zaddrs.push_back(zaddr);
+                    },
+                    [&](libzcash::UnifiedAddress) {
+                        throw JSONRPCError(
+                                RPC_INVALID_PARAMETER,
+                                "Unified addresses are not supported in z_mergetoaddress");
                     }
-                } else {
-                    throw JSONRPCError(RPC_INVALID_PARAMETER, string("Unknown address format: ") + address);
-                }
+                }, addr.value());
+            } else {
+                throw JSONRPCError(RPC_INVALID_PARAMETER, string("Unknown address format: ") + address);
             }
         }
 
@@ -4178,25 +5369,39 @@ UniValue z_mergetoaddress(const UniValue& params, bool fHelp)
     const bool canopyActive = Params().GetConsensus().NetworkUpgradeActive(nextBlockHeight, Consensus::UPGRADE_CANOPY);
 
     // Validate the destination address
-    auto destaddress = params[1].get_str();
+    auto destStr = params[1].get_str();
+    auto destaddress = keyIO.DecodePaymentAddress(destStr);
+    bool isToTaddr = false;
     bool isToSproutZaddr = false;
     bool isToSaplingZaddr = false;
-    CTxDestination taddr = keyIO.DecodeDestination(destaddress);
-    if (!IsValidDestination(taddr)) {
-        auto decodeAddr = keyIO.DecodePaymentAddress(destaddress);
-        if (IsValidPaymentAddress(decodeAddr)) {
-            if (std::get_if<libzcash::SaplingPaymentAddress>(&decodeAddr) != nullptr) {
+    if (destaddress.has_value()) {
+        std::visit(match {
+            [&](CKeyID addr) {
+                isToTaddr = true;
+            },
+            [&](CScriptID addr) {
+                isToTaddr = true;
+            },
+            [&](libzcash::SaplingPaymentAddress addr) {
                 isToSaplingZaddr = true;
                 // If Sapling is not active, do not allow sending to a sapling addresses.
                 if (!saplingActive) {
                     throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, Sapling has not activated");
                 }
-            } else {
+            },
+            [&](libzcash::SproutPaymentAddress addr) {
                 isToSproutZaddr = true;
+            },
+            [&](libzcash::UnifiedAddress) {
+                throw JSONRPCError(
+                        RPC_INVALID_PARAMETER,
+                        "Invalid parameter, unified addresses are not yet supported.");
             }
-        } else {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, unknown address format: ") + destaddress );
-        }
+        }, destaddress.value());
+    } else {
+        throw JSONRPCError(
+                RPC_INVALID_PARAMETER,
+                string("Invalid parameter, unknown address format: ") + destStr);
     }
 
     if (canopyActive && isFromNonSprout && isToSproutZaddr) {
@@ -4246,7 +5451,7 @@ UniValue z_mergetoaddress(const UniValue& params, bool fHelp)
         }
     }
 
-    MergeToAddressRecipient recipient(destaddress, memo);
+    MergeToAddressRecipient recipient(destaddress.value(), memo);
 
     // Prepare to get UTXOs and notes
     std::vector<MergeToAddressInputUTXO> utxoInputs;
@@ -4319,7 +5524,12 @@ UniValue z_mergetoaddress(const UniValue& params, bool fHelp)
         // Get available notes
         std::vector<SproutNoteEntry> sproutEntries;
         std::vector<SaplingNoteEntry> saplingEntries;
-        pwalletMain->GetFilteredNotes(sproutEntries, saplingEntries, zaddrs);
+        std::vector<OrchardNoteMetadata> orchardEntries;
+        std::optional<NoteFilter> noteFilter =
+            useAnySprout || useAnySapling ?
+                std::nullopt :
+                std::optional(NoteFilter::ForPaymentAddresses(zaddrs));
+        pwalletMain->GetFilteredNotes(sproutEntries, saplingEntries, orchardEntries, noteFilter);
 
         // If Sapling is not active, do not allow sending from a sapling addresses.
         if (!saplingActive && saplingEntries.size() > 0) {
@@ -4411,7 +5621,7 @@ UniValue z_mergetoaddress(const UniValue& params, bool fHelp)
     // - We only have one from address
     // - It's equal to toaddress
     // - The address only contains a single UTXO or note
-    if (setAddress.size() == 1 && setAddress.count(destaddress) && (numUtxos + numNotes) == 1) {
+    if (setAddress.size() == 1 && setAddress.count(destStr) && (numUtxos + numNotes) == 1) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Destination address is also the only source address, and all its funds are already merged.");
     }
 
@@ -4434,7 +5644,7 @@ UniValue z_mergetoaddress(const UniValue& params, bool fHelp)
     contextInfo.pushKV("toaddress", params[1]);
     contextInfo.pushKV("fee", ValueFromAmount(nFee));
 
-    if (!sproutNoteInputs.empty() || !saplingNoteInputs.empty() || !IsValidDestination(taddr)) {
+    if (!sproutNoteInputs.empty() || !saplingNoteInputs.empty() || !isToTaddr) {
         // We have shielded inputs or the recipient is a shielded address, and
         // therefore we cannot create transactions before Sapling activates.
         if (!saplingActive) {
@@ -4456,12 +5666,21 @@ UniValue z_mergetoaddress(const UniValue& params, bool fHelp)
     // Builder (used if Sapling addresses are involved)
     std::optional<TransactionBuilder> builder;
     if (isToSaplingZaddr || saplingNoteInputs.size() > 0) {
-        builder = TransactionBuilder(Params().GetConsensus(), nextBlockHeight, pwalletMain);
+        std::optional<uint256> orchardAnchor;
+        if (!isSproutShielded) {
+            // Allow Orchard recipients by setting an Orchard anchor.
+            // TODO: Add an orchardAnchorHeight field to ZTXOSelector so we can ensure the
+            // same anchor is used for witnesses of any selected Orchard note.
+            auto orchardAnchorHeight = nextBlockHeight - nOrchardAnchorConfirmations;
+            orchardAnchor = chainActive[orchardAnchorHeight]->hashFinalOrchardRoot;
+        }
+        builder = TransactionBuilder(Params().GetConsensus(), nextBlockHeight, orchardAnchor, pwalletMain);
     }
     // Create operation and add to global queue
     std::shared_ptr<AsyncRPCQueue> q = getAsyncRPCQueue();
     std::shared_ptr<AsyncRPCOperation> operation(
-        new AsyncRPCOperation_mergetoaddress(builder, contextualTx, utxoInputs, sproutNoteInputs, saplingNoteInputs, recipient, nFee, contextInfo) );
+        new AsyncRPCOperation_mergetoaddress(
+            std::move(builder), contextualTx, utxoInputs, sproutNoteInputs, saplingNoteInputs, recipient, nFee, contextInfo) );
     q->addOperation(operation);
     AsyncRPCOperationId operationId = operation->getId();
 
@@ -4538,11 +5757,12 @@ UniValue z_getnotescount(const UniValue& params, bool fHelp)
             "z_getnotescount\n"
             "\nArguments:\n"
             "1. minconf      (numeric, optional, default=1) Only include notes in transactions confirmed at least this many times.\n"
-            "\nReturns the number of sprout and sapling notes available in the wallet.\n"
+            "\nReturns the number of shielded notes of each pool available in the wallet.\n"
             "\nResult:\n"
             "{\n"
-            "  \"sprout\"      (numeric) the number of sprout notes in the wallet\n"
-            "  \"sapling\"     (numeric) the number of sapling notes in the wallet\n"
+            "  \"sprout\"      (numeric) the number of Sprout notes in the wallet\n"
+            "  \"sapling\"     (numeric) the number of Sapling notes in the wallet\n"
+            "  \"orchard\"     (numeric) the number of Orchard notes in the wallet\n"
             "}\n"
             "\nExamples:\n"
             + HelpExampleCli("z_getnotescount", "0")
@@ -4557,15 +5777,18 @@ UniValue z_getnotescount(const UniValue& params, bool fHelp)
 
     int sprout = 0;
     int sapling = 0;
+    int orchard = 0;
     for (auto& wtx : pwalletMain->mapWallet) {
         if (wtx.second.GetDepthInMainChain() >= nMinDepth) {
             sprout += wtx.second.mapSproutNoteData.size();
             sapling += wtx.second.mapSaplingNoteData.size();
+            orchard += wtx.second.orchardTxMeta.GetMyActionIVKs().size();
         }
     }
     UniValue ret(UniValue::VOBJ);
     ret.pushKV("sprout", sprout);
     ret.pushKV("sapling", sapling);
+    ret.pushKV("orchard", orchard);
 
     return ret;
 }
@@ -4608,6 +5831,7 @@ static const CRPCCommand commands[] =
     { "wallet",             "importaddress",            &importaddress,            true  },
     { "wallet",             "importpubkey",             &importpubkey,             true  },
     { "wallet",             "keypoolrefill",            &keypoolrefill,            true  },
+    { "wallet",             "listaddresses",            &listaddresses,            true  },
     { "wallet",             "listaddressgroupings",     &listaddressgroupings,     false },
     { "wallet",             "listlockunspent",          &listlockunspent,          false },
     { "wallet",             "listreceivedbyaddress",    &listreceivedbyaddress,    false },
@@ -4622,6 +5846,7 @@ static const CRPCCommand commands[] =
     { "wallet",             "walletlock",               &walletlock,               true  },
     { "wallet",             "walletpassphrasechange",   &walletpassphrasechange,   true  },
     { "wallet",             "walletpassphrase",         &walletpassphrase,         true  },
+    { "wallet",             "walletconfirmbackup",      &walletconfirmbackup,      true  },
     { "wallet",             "zcbenchmark",              &zc_benchmark,             true  },
     { "wallet",             "zcrawkeygen",              &zc_raw_keygen,            true  },
     { "wallet",             "zcrawjoinsplit",           &zc_raw_joinsplit,         true  },
@@ -4631,6 +5856,8 @@ static const CRPCCommand commands[] =
     { "wallet",             "z_listunspent",            &z_listunspent,            false },
     { "wallet",             "z_getbalance",             &z_getbalance,             false },
     { "wallet",             "z_gettotalbalance",        &z_gettotalbalance,        false },
+    { "wallet",             "z_getbalanceforviewingkey",&z_getbalanceforviewingkey,false },
+    { "wallet",             "z_getbalanceforaccount",   &z_getbalanceforaccount,   false },
     { "wallet",             "z_mergetoaddress",         &z_mergetoaddress,         false },
     { "wallet",             "z_sendmany",               &z_sendmany,               false },
     { "wallet",             "z_setmigration",           &z_setmigration,           false },
@@ -4640,7 +5867,10 @@ static const CRPCCommand commands[] =
     { "wallet",             "z_getoperationresult",     &z_getoperationresult,     true  },
     { "wallet",             "z_listoperationids",       &z_listoperationids,       true  },
     { "wallet",             "z_getnewaddress",          &z_getnewaddress,          true  },
+    { "wallet",             "z_getnewaccount",          &z_getnewaccount,          true  },
     { "wallet",             "z_listaddresses",          &z_listaddresses,          true  },
+    { "wallet",             "z_listunifiedreceivers",   &z_listunifiedreceivers,   true  },
+    { "wallet",             "z_getaddressforaccount",   &z_getaddressforaccount,   true  },
     { "wallet",             "z_exportkey",              &z_exportkey,              true  },
     { "wallet",             "z_importkey",              &z_importkey,              true  },
     { "wallet",             "z_exportviewingkey",       &z_exportviewingkey,       true  },
diff --git a/src/wallet/test/rpc_wallet_tests.cpp b/src/wallet/test/rpc_wallet_tests.cpp
index 1181e39605f..b2bb27b9e91 100644
--- a/src/wallet/test/rpc_wallet_tests.cpp
+++ b/src/wallet/test/rpc_wallet_tests.cpp
@@ -75,6 +75,15 @@ static UniValue ValueFromString(const std::string &str)
     return value;
 }
 
+static SaplingPaymentAddress DefaultSaplingAddress(CWallet* pwallet) {
+    auto usk = pwallet->GenerateUnifiedSpendingKeyForAccount(0);
+
+    return usk.value()
+        .ToFullViewingKey()
+        .GetSaplingKey().value()
+        .FindAddress(libzcash::diversifier_index_t(0)).first;
+}
+
 BOOST_FIXTURE_TEST_SUITE(rpc_wallet_tests, WalletTestingSetup)
 
 BOOST_AUTO_TEST_CASE(rpc_addmultisig)
@@ -125,7 +134,7 @@ BOOST_AUTO_TEST_CASE(rpc_wallet)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    CPubKey demoPubkey = pwalletMain->GenerateNewKey();
+    CPubKey demoPubkey = pwalletMain->GenerateNewKey(true);
     CTxDestination demoAddress(CTxDestination(demoPubkey.GetID()));
     UniValue retValue;
     string strPurpose = "receive";
@@ -134,7 +143,7 @@ BOOST_AUTO_TEST_CASE(rpc_wallet)
         pwalletMain->SetAddressBook(demoPubkey.GetID(), "", strPurpose);
     });
 
-    CPubKey setaccountDemoPubkey = pwalletMain->GenerateNewKey();
+    CPubKey setaccountDemoPubkey = pwalletMain->GenerateNewKey(true);
     CTxDestination setaccountDemoAddress(CTxDestination(setaccountDemoPubkey.GetID()));
 
     /*********************************
@@ -188,6 +197,11 @@ BOOST_AUTO_TEST_CASE(rpc_wallet)
      *********************************/
     BOOST_CHECK_NO_THROW(CallRPC("listaddressgroupings"));
 
+    /*********************************
+     * 		walletconfirmbackup
+     *********************************/
+    BOOST_CHECK_THROW(CallRPC(string("walletconfirmbackup \"badmnemonic\"")), runtime_error);
+
     /*********************************
      * 		getrawchangeaddress
      *********************************/
@@ -218,6 +232,28 @@ BOOST_AUTO_TEST_CASE(rpc_wallet)
     /* Correct address, message and signature*/
     BOOST_CHECK(CallRPC("verifymessage " + keyIO.EncodeDestination(demoAddress) + " " + retValue.get_str() + " mymessage").get_bool() == true);
 
+    /*********************************
+     * 		listaddresses
+     *********************************/
+    BOOST_CHECK_NO_THROW(retValue = CallRPC("listaddresses"));
+    UniValue arr = retValue.get_array();
+    {
+        BOOST_CHECK_EQUAL(1, arr.size());
+        bool notFound = true;
+        for (auto a : arr.getValues()) {
+            auto source = find_value(a.get_obj(), "source");
+            if (source.get_str() == "legacy_random") {
+                auto t_obj = find_value(a.get_obj(), "transparent");
+                auto addrs = find_value(t_obj, "addresses").get_array();
+                BOOST_CHECK_EQUAL(2, addrs.size());
+                for (auto addr : addrs.getValues()) {
+                    notFound &= keyIO.DecodeDestination(addr.get_str()) != demoAddress;
+                }
+            }
+        }
+        BOOST_CHECK(!notFound);
+    }
+
     /*********************************
      * 	     fundrawtransaction
      *********************************/
@@ -340,25 +376,28 @@ BOOST_AUTO_TEST_CASE(rpc_wallet_getbalance)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
+    UniValue retValue;
+    BOOST_CHECK_NO_THROW(retValue = CallRPC("getnewaddress"));
+    std::string taddr1 = retValue.get_str();
 
     BOOST_CHECK_THROW(CallRPC("z_getbalance too many args"), runtime_error);
     BOOST_CHECK_THROW(CallRPC("z_getbalance invalidaddress"), runtime_error);
-    BOOST_CHECK_NO_THROW(CallRPC("z_getbalance tmC6YZnCUhm19dEXxh3Jb7srdBJxDawaCab"));
-    BOOST_CHECK_THROW(CallRPC("z_getbalance tmC6YZnCUhm19dEXxh3Jb7srdBJxDawaCab -1"), runtime_error);
-    BOOST_CHECK_NO_THROW(CallRPC("z_getbalance tmC6YZnCUhm19dEXxh3Jb7srdBJxDawaCab 0"));
+    // address does not belong to wallet
+    BOOST_CHECK_THROW(CallRPC("z_getbalance tmC6YZnCUhm19dEXxh3Jb7srdBJxDawaCab"), runtime_error);
+    BOOST_CHECK_NO_THROW(CallRPC(std::string("z_getbalance ") + taddr1));
+    // negative minconf not allowed
+    BOOST_CHECK_THROW(CallRPC(std::string("z_getbalance ") + taddr1 + " -1"), runtime_error);
+    BOOST_CHECK_NO_THROW(CallRPC(std::string("z_getbalance ") + taddr1 + std::string(" 0")));
+    // don't have the spending key
     BOOST_CHECK_THROW(CallRPC("z_getbalance tnRZ8bPq2pff3xBWhTJhNkVUkm2uhzksDeW5PvEa7aFKGT9Qi3YgTALZfjaY4jU3HLVKBtHdSXxoPoLA3naMPcHBcY88FcF 1"), runtime_error);
 
-
     BOOST_CHECK_THROW(CallRPC("z_gettotalbalance too manyargs"), runtime_error);
     BOOST_CHECK_THROW(CallRPC("z_gettotalbalance -1"), runtime_error);
     BOOST_CHECK_NO_THROW(CallRPC("z_gettotalbalance 0"));
 
-
     BOOST_CHECK_THROW(CallRPC("z_listreceivedbyaddress too many args"), runtime_error);
     // negative minconf not allowed
     BOOST_CHECK_THROW(CallRPC("z_listreceivedbyaddress tmC6YZnCUhm19dEXxh3Jb7srdBJxDawaCab -1"), runtime_error);
-    // invalid zaddr, taddr not allowed
-    BOOST_CHECK_THROW(CallRPC("z_listreceivedbyaddress tmC6YZnCUhm19dEXxh3Jb7srdBJxDawaCab 0"), runtime_error);
     // don't have the spending key
     BOOST_CHECK_THROW(CallRPC("z_listreceivedbyaddress tnRZ8bPq2pff3xBWhTJhNkVUkm2uhzksDeW5PvEa7aFKGT9Qi3YgTALZfjaY4jU3HLVKBtHdSXxoPoLA3naMPcHBcY88FcF 1"), runtime_error);
 }
@@ -580,21 +619,22 @@ BOOST_AUTO_TEST_CASE(rpc_wallet_z_importwallet)
     BOOST_CHECK(addrs.size()==1);
 
     // check that we have the spending key for the address
-    auto address = keyIO.DecodePaymentAddress(testAddr);
-    BOOST_CHECK(IsValidPaymentAddress(address));
-    BOOST_ASSERT(std::get_if<libzcash::SproutPaymentAddress>(&address) != nullptr);
-    auto addr = std::get<libzcash::SproutPaymentAddress>(address);
-    BOOST_CHECK(pwalletMain->HaveSproutSpendingKey(addr));
+    auto decoded = keyIO.DecodePaymentAddress(testAddr);
+    BOOST_CHECK(decoded.has_value());
+    libzcash::PaymentAddress address(decoded.value());
+    BOOST_ASSERT(std::holds_alternative<libzcash::SproutPaymentAddress>(address));
+    auto sprout_addr = std::get<libzcash::SproutPaymentAddress>(address);
+    BOOST_CHECK(pwalletMain->HaveSproutSpendingKey(sprout_addr));
 
     // Verify the spending key is the same as the test data
     libzcash::SproutSpendingKey k;
-    BOOST_CHECK(pwalletMain->GetSproutSpendingKey(addr, k));
+    BOOST_CHECK(pwalletMain->GetSproutSpendingKey(sprout_addr, k));
     BOOST_CHECK_EQUAL(testKey, keyIO.EncodeSpendingKey(k));
 }
 
-
 /*
- * This test covers RPC commands z_listaddresses, z_importkey, z_exportkey
+ * This test covers RPC commands z_listaddresses, z_importkey, z_exportkey,
+ * listaddresses, z_importviewingkey, z_exportviewingkey
  */
 BOOST_AUTO_TEST_CASE(rpc_wallet_z_importexport)
 {
@@ -621,9 +661,9 @@ BOOST_AUTO_TEST_CASE(rpc_wallet_z_importexport)
     BOOST_CHECK_THROW(CallRPC(prefix + "100badchars"), runtime_error);
 
     // wallet should currently be empty
-    std::set<libzcash::SproutPaymentAddress> addrs;
-    pwalletMain->GetSproutPaymentAddresses(addrs);
-    BOOST_CHECK(addrs.size()==0);
+    std::set<libzcash::SproutPaymentAddress> sproutAddrs;
+    pwalletMain->GetSproutPaymentAddresses(sproutAddrs);
+    BOOST_CHECK(sproutAddrs.size()==0);
     std::set<libzcash::SaplingPaymentAddress> saplingAddrs;
     pwalletMain->GetSaplingPaymentAddresses(saplingAddrs);
     BOOST_CHECK(saplingAddrs.empty());
@@ -641,20 +681,64 @@ BOOST_AUTO_TEST_CASE(rpc_wallet_z_importexport)
         BOOST_CHECK_NO_THROW(retValue = CallRPC(string("z_exportkey ") + testAddr));
         BOOST_CHECK_EQUAL(retValue.get_str(), testKey);
 
-        // create a random Sapling key locally
+        // create a random Sapling key locally; split between IVKs and spending keys.
         auto testSaplingSpendingKey = m.Derive(i);
-        auto testSaplingPaymentAddress = testSaplingSpendingKey.DefaultAddress();
-        std::string testSaplingAddr = keyIO.EncodePaymentAddress(testSaplingPaymentAddress);
-        std::string testSaplingKey = keyIO.EncodeSpendingKey(testSaplingSpendingKey);
-        BOOST_CHECK_NO_THROW(CallRPC(string("z_importkey ") + testSaplingKey));
-        BOOST_CHECK_NO_THROW(retValue = CallRPC(string("z_exportkey ") + testSaplingAddr));
-        BOOST_CHECK_EQUAL(retValue.get_str(), testSaplingKey);
+        auto testSaplingPaymentAddress = testSaplingSpendingKey.ToXFVK().DefaultAddress();
+        if (i % 2 == 0) {
+            std::string testSaplingAddr = keyIO.EncodePaymentAddress(testSaplingPaymentAddress);
+            std::string testSaplingKey = keyIO.EncodeSpendingKey(testSaplingSpendingKey);
+            BOOST_CHECK_NO_THROW(CallRPC(string("z_importkey ") + testSaplingKey));
+            BOOST_CHECK_NO_THROW(retValue = CallRPC(string("z_exportkey ") + testSaplingAddr));
+            BOOST_CHECK_EQUAL(retValue.get_str(), testSaplingKey);
+        } else {
+            std::string testSaplingAddr = keyIO.EncodePaymentAddress(testSaplingPaymentAddress);
+            std::string testSaplingKey = keyIO.EncodeViewingKey(testSaplingSpendingKey.ToXFVK());
+            BOOST_CHECK_NO_THROW(CallRPC(string("z_importviewingkey ") + testSaplingKey));
+            BOOST_CHECK_NO_THROW(retValue = CallRPC(string("z_exportviewingkey ") + testSaplingAddr));
+            BOOST_CHECK_EQUAL(retValue.get_str(), testSaplingKey);
+        }
     }
 
     // Verify we can list the keys imported
     BOOST_CHECK_NO_THROW(retValue = CallRPC("z_listaddresses"));
     UniValue arr = retValue.get_array();
-    BOOST_CHECK(arr.size() == (2 * n1));
+    BOOST_CHECK(arr.size() == n1 + (n1 / 2));
+
+    // Verify that the keys imported are also available from listaddresses
+    {
+        BOOST_CHECK_NO_THROW(retValue = CallRPC("listaddresses"));
+        auto listarr = retValue.get_array();
+        bool sproutCountMatch = false;
+        bool saplingSpendingKeyMatch = false;
+        bool saplingIVKMatch = false;
+        for (auto a : listarr.getValues()) {
+            auto source = find_value(a.get_obj(), "source");
+            if (source.get_str() == "legacy_random") {
+                auto sprout_obj = find_value(a.get_obj(), "sprout").get_obj();
+                auto sprout_addrs = find_value(sprout_obj, "addresses").get_array();
+                sproutCountMatch = (sprout_addrs.size() == n1);
+            }
+            if (source.get_str() == "imported") {
+                int addr_count = 0;
+                for (auto sapling_obj : find_value(a.get_obj(), "sapling").get_array().getValues()) {
+                    auto sapling_addrs = find_value(sapling_obj, "addresses").get_array();
+                    addr_count += sapling_addrs.size();
+                }
+                saplingSpendingKeyMatch = (addr_count == n1 / 2);
+            }
+            if (source.get_str() == "imported_watchonly") {
+                int addr_count = 0;
+                for (auto sapling_obj : find_value(a.get_obj(), "sapling").get_array().getValues()) {
+                    auto sapling_addrs = find_value(sapling_obj, "addresses").get_array();
+                    addr_count += sapling_addrs.size();
+                }
+                saplingIVKMatch = (addr_count == n1 / 2);
+            }
+        }
+        BOOST_CHECK(sproutCountMatch);
+        BOOST_CHECK(saplingSpendingKeyMatch);
+        BOOST_CHECK(saplingIVKMatch);
+    }
 
     // Put addresses into a set
     std::unordered_set<std::string> myaddrs;
@@ -667,12 +751,14 @@ BOOST_AUTO_TEST_CASE(rpc_wallet_z_importexport)
         myaddrs.insert(keyIO.EncodePaymentAddress(pwalletMain->GenerateNewSproutZKey()));
     }
 
-    // Verify number of addresses stored in wallet is n1+n2
+    // Verify number of addresses stored in wallet is correct
     int numAddrs = myaddrs.size();
-    BOOST_CHECK(numAddrs == (2 * n1) + n2);
-    pwalletMain->GetSproutPaymentAddresses(addrs);
+    // sprout_addrs + sapling addrs with spend authority + new sprout addrs
+    BOOST_CHECK(numAddrs == (n1 + (n1 / 2) + n2));
+    pwalletMain->GetSproutPaymentAddresses(sproutAddrs);
     pwalletMain->GetSaplingPaymentAddresses(saplingAddrs);
-    BOOST_CHECK(addrs.size() + saplingAddrs.size() == numAddrs);
+    // here we also include the watchonly sapling addresses
+    BOOST_CHECK(sproutAddrs.size() + saplingAddrs.size() == numAddrs + (n1 / 2));
 
     // Ask wallet to list addresses
     BOOST_CHECK_NO_THROW(retValue = CallRPC("z_listaddresses"));
@@ -685,31 +771,41 @@ BOOST_AUTO_TEST_CASE(rpc_wallet_z_importexport)
         listaddrs.insert(element.get_str());
     }
 
+    // Verify that the newly added sprout keys imported are also available from listaddresses
+    {
+        BOOST_CHECK_NO_THROW(retValue = CallRPC("listaddresses"));
+        auto listarr = retValue.get_array();
+        bool sproutCountMatch = false;
+        for (auto a : listarr.getValues()) {
+            auto source = find_value(a.get_obj(), "source");
+            if (source.get_str() == "legacy_random") {
+                auto sprout_obj = find_value(a.get_obj(), "sprout").get_obj();
+                auto sprout_addrs = find_value(sprout_obj, "addresses").get_array();
+                sproutCountMatch = (sprout_addrs.size() == n1 + n2);
+            }
+        }
+        BOOST_CHECK(sproutCountMatch);
+    }
+
     // Verify the two sets of addresses are the same
     BOOST_CHECK(listaddrs.size() == numAddrs);
     BOOST_CHECK(myaddrs == listaddrs);
-
 }
 
 // Check if address is of given type and spendable from our wallet.
 template <typename ADDR_TYPE>
-void CheckHaveAddr(const libzcash::PaymentAddress& addr) {
-
-    BOOST_CHECK(IsValidPaymentAddress(addr));
-    auto addr_of_type = std::get_if<ADDR_TYPE>(&addr);
+void CheckHaveAddr(const std::optional<libzcash::PaymentAddress>& addr) {
+    BOOST_CHECK(addr.has_value());
+    auto addr_of_type = std::get_if<ADDR_TYPE>(&(addr.value()));
     BOOST_ASSERT(addr_of_type != nullptr);
 
-    HaveSpendingKeyForPaymentAddress test(pwalletMain);
-    BOOST_CHECK(test(*addr_of_type));
+    BOOST_CHECK(pwalletMain->ZTXOSelectorForAddress(*addr_of_type, true, false).has_value());
 }
 
 BOOST_AUTO_TEST_CASE(rpc_wallet_z_getnewaddress) {
     using namespace libzcash;
-    UniValue addr;
 
-    if (!pwalletMain->HaveHDSeed()) {
-        pwalletMain->GenerateNewSeed();
-    }
+    UniValue addr;
 
     KeyIO keyIO(Params());
     // No parameter defaults to sapling address
@@ -724,11 +820,52 @@ BOOST_AUTO_TEST_CASE(rpc_wallet_z_getnewaddress) {
     addr = CallRPC("z_getnewaddress sprout");
     CheckHaveAddr<SproutPaymentAddress>(keyIO.DecodePaymentAddress(addr.get_str()));
 
+    // Requesting a sprout address during IBD should fail
+    bool ibd = TestSetIBD(true);
+    CheckRPCThrows("z_getnewaddress sprout", "Error: Creating a Sprout address during initial block download is not supported.");
+    TestSetIBD(ibd);
+
     // Should throw on invalid argument
     CheckRPCThrows("z_getnewaddress garbage", "Invalid address type");
 
     // Too many arguments will throw with the help
     BOOST_CHECK_THROW(CallRPC("z_getnewaddress many args"), runtime_error);
+
+    {
+        UniValue list;
+        BOOST_CHECK_NO_THROW(list = CallRPC("listaddresses"));
+        auto listarr = list.get_array();
+        bool sproutCountMatch = false;
+        bool saplingExtfvksMatch = false;
+        bool saplingSpendAuth0 = false;
+        bool saplingSpendAuth1 = false;
+        bool saplingCountMismatch = true;
+        for (auto a : listarr.getValues()) {
+            auto source = find_value(a.get_obj(), "source");
+            if (source.get_str() == "legacy_random") {
+                auto sproutObj = find_value(a.get_obj(), "sprout").get_obj();
+                auto sproutAddrs = find_value(sproutObj, "addresses").get_array();
+                sproutCountMatch = (sproutAddrs.size() == 1);
+            }
+            if (source.get_str() == "legacy_hdseed") {
+                auto sapling_addr_sets = find_value(a.get_obj(), "sapling").get_array();
+                saplingExtfvksMatch = (sapling_addr_sets.size() == 2);
+
+                for (auto saplingObj : sapling_addr_sets.getValues()) {
+                    auto keypath = find_value(saplingObj, "zip32KeyPath").get_str();
+                    saplingSpendAuth0 |= (keypath == "m/32'/133'/2147483647'/0'");
+                    saplingSpendAuth1 |= (keypath == "m/32'/133'/2147483647'/1'");
+                    auto saplingAddrs = find_value(saplingObj, "addresses").get_array();
+                    saplingCountMismatch &= (saplingAddrs.size() != 1);
+                }
+            }
+        }
+        BOOST_CHECK(sproutCountMatch);
+        BOOST_CHECK(saplingExtfvksMatch);
+        BOOST_CHECK(!saplingCountMismatch);
+        BOOST_CHECK(saplingSpendAuth0);
+        BOOST_CHECK(saplingSpendAuth1);
+    }
 }
 
 /**
@@ -756,7 +893,7 @@ class MockSleepOperation : public AsyncRPCOperation {
 
 
 /*
- * Test Aysnc RPC queue and operations.
+ * Test Async RPC queue and operations.
  */
 BOOST_AUTO_TEST_CASE(rpc_wallet_async_operations)
 {
@@ -998,7 +1135,8 @@ BOOST_AUTO_TEST_CASE(rpc_z_sendmany_parameters)
 
     BOOST_CHECK_THROW(CallRPC("z_sendmany"), runtime_error);
     BOOST_CHECK_THROW(CallRPC("z_sendmany toofewargs"), runtime_error);
-    BOOST_CHECK_THROW(CallRPC("z_sendmany just too many args here"), runtime_error);
+    // too many arguments:
+    BOOST_CHECK_THROW(CallRPC("z_sendmany addr [] 1 0.001 true true"), runtime_error);
 
     // bad from address
     BOOST_CHECK_THROW(CallRPC("z_sendmany "
@@ -1015,28 +1153,28 @@ BOOST_AUTO_TEST_CASE(rpc_z_sendmany_parameters)
     // duplicate address
     BOOST_CHECK_THROW(CallRPC("z_sendmany "
             "tmRr6yJonqGK23UVhrKuyvTpF8qxQQjKigJ "
-            "[{\"address\":\"tmQP9L3s31cLsghVYf2Jb5MhKj1jRBPoeQn\", \"amount\":50.0},"
-            " {\"address\":\"tmQP9L3s31cLsghVYf2Jb5MhKj1jRBPoeQn\", \"amount\":12.0} ]"
+            "[{\"address\":\"tmQP9L3s31cLsghVYf2Jb5MhKj1jRBPoeQn\",\"amount\":50.0},"
+            "{\"address\":\"tmQP9L3s31cLsghVYf2Jb5MhKj1jRBPoeQn\",\"amount\":12.0}]"
             ), runtime_error);
 
     // invalid fee amount, cannot be negative
     BOOST_CHECK_THROW(CallRPC("z_sendmany "
             "tmRr6yJonqGK23UVhrKuyvTpF8qxQQjKigJ "
-            "[{\"address\":\"tmQP9L3s31cLsghVYf2Jb5MhKj1jRBPoeQn\", \"amount\":50.0}] "
+            "[{\"address\":\"tmQP9L3s31cLsghVYf2Jb5MhKj1jRBPoeQn\",\"amount\":50.0}] "
             "1 -0.00001"
             ), runtime_error);
 
     // invalid fee amount, bigger than MAX_MONEY
     BOOST_CHECK_THROW(CallRPC("z_sendmany "
             "tmRr6yJonqGK23UVhrKuyvTpF8qxQQjKigJ "
-            "[{\"address\":\"tmQP9L3s31cLsghVYf2Jb5MhKj1jRBPoeQn\", \"amount\":50.0}] "
+            "[{\"address\":\"tmQP9L3s31cLsghVYf2Jb5MhKj1jRBPoeQn\",\"amount\":50.0}] "
             "1 21000001"
             ), runtime_error);
 
     // fee amount is bigger than sum of outputs
     BOOST_CHECK_THROW(CallRPC("z_sendmany "
             "tmRr6yJonqGK23UVhrKuyvTpF8qxQQjKigJ "
-            "[{\"address\":\"tmQP9L3s31cLsghVYf2Jb5MhKj1jRBPoeQn\", \"amount\":50.0}] "
+            "[{\"address\":\"tmQP9L3s31cLsghVYf2Jb5MhKj1jRBPoeQn\",\"amount\":50.0}] "
             "1 50.00000001"
             ), runtime_error);
 
@@ -1048,58 +1186,12 @@ BOOST_AUTO_TEST_CASE(rpc_z_sendmany_parameters)
     KeyIO keyIO(Params());
     std::string zaddr1 = keyIO.EncodePaymentAddress(pa);
     BOOST_CHECK_THROW(CallRPC(string("z_sendmany tmRr6yJonqGK23UVhrKuyvTpF8qxQQjKigJ ")
-            + "[{\"address\":\"" + zaddr1 + "\", \"amount\":123.456}]"), runtime_error);
+            + "[{\"address\":\"" + zaddr1 + "\",\"amount\":123.456}]"), runtime_error);
 
     // Mutable tx containing contextual information we need to build tx
     UniValue retValue = CallRPC("getblockcount");
     int nHeight = retValue.get_int();
-    CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), nHeight + 1);
-    if (mtx.nVersion == 1) {
-        mtx.nVersion = 2;
-    }
-
-    // Test constructor of AsyncRPCOperation_sendmany
-    try {
-        std::shared_ptr<AsyncRPCOperation> operation(new AsyncRPCOperation_sendmany(std::nullopt, mtx, "",{}, {}, -1));
-    } catch (const UniValue& objError) {
-        BOOST_CHECK( find_error(objError, "Minconf cannot be negative"));
-    }
-
-    try {
-        std::shared_ptr<AsyncRPCOperation> operation(new AsyncRPCOperation_sendmany(std::nullopt, mtx, "",{}, {}, 1));
-    } catch (const UniValue& objError) {
-        BOOST_CHECK( find_error(objError, "From address parameter missing"));
-    }
-
-    try {
-        std::shared_ptr<AsyncRPCOperation> operation( new AsyncRPCOperation_sendmany(std::nullopt, mtx, "tmRr6yJonqGK23UVhrKuyvTpF8qxQQjKigJ", {}, {}, 1) );
-    } catch (const UniValue& objError) {
-        BOOST_CHECK( find_error(objError, "No recipients"));
-    }
-
-    try {
-        std::vector<SendManyRecipient> recipients = { SendManyRecipient("dummy", 1*COIN, "") };
-        std::shared_ptr<AsyncRPCOperation> operation( new AsyncRPCOperation_sendmany(std::nullopt, mtx, "INVALID", recipients, {}, 1) );
-    } catch (const UniValue& objError) {
-        BOOST_CHECK( find_error(objError, "Invalid from address"));
-    }
-
-    // Testnet payment addresses begin with 'zt'.  This test detects an incorrect prefix.
-    try {
-        std::vector<SendManyRecipient> recipients = { SendManyRecipient("dummy", 1*COIN, "") };
-        std::shared_ptr<AsyncRPCOperation> operation( new AsyncRPCOperation_sendmany(std::nullopt, mtx, "zcMuhvq8sEkHALuSU2i4NbNQxshSAYrpCExec45ZjtivYPbuiFPwk6WHy4SvsbeZ4siy1WheuRGjtaJmoD1J8bFqNXhsG6U", recipients, {}, 1) );
-    } catch (const UniValue& objError) {
-        BOOST_CHECK( find_error(objError, "Invalid from address"));
-    }
-
-    // Note: The following will crash as a google test because AsyncRPCOperation_sendmany
-    // invokes a method on pwalletMain, which is undefined in the google test environment.
-    try {
-        std::vector<SendManyRecipient> recipients = { SendManyRecipient("dummy", 1*COIN, "") };
-        std::shared_ptr<AsyncRPCOperation> operation( new AsyncRPCOperation_sendmany(std::nullopt, mtx, "ztjiDe569DPNbyTE6TSdJTaSDhoXEHLGvYoUnBU1wfVNU52TEyT6berYtySkd21njAeEoh8fFJUT42kua9r8EnhBaEKqCpP", recipients, {}, 1) );
-    } catch (const UniValue& objError) {
-        BOOST_CHECK( find_error(objError, "no spending key found for zaddr"));
-    }
+    TransactionBuilder builder(Params().GetConsensus(), nHeight + 1, std::nullopt, pwalletMain);
 }
 
 BOOST_AUTO_TEST_CASE(asyncrpcoperation_sign_send_raw_transaction) {
@@ -1119,6 +1211,7 @@ BOOST_AUTO_TEST_CASE(rpc_z_sendmany_internals)
 {
     SelectParams(CBaseChainParams::TESTNET);
     const Consensus::Params& consensusParams = Params().GetConsensus();
+    KeyIO keyIO(Params());
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
@@ -1128,54 +1221,49 @@ BOOST_AUTO_TEST_CASE(rpc_z_sendmany_internals)
     // We removed the ability to create pre-Sapling Sprout proofs, so we can
     // only create Sapling-onwards transactions.
     int nHeight = consensusParams.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight;
-    CMutableTransaction mtx = CreateNewContextualCMutableTransaction(consensusParams, nHeight + 1);
-    if (mtx.nVersion == 1) {
-        mtx.nVersion = 2;
-    }
 
     // add keys manually
     BOOST_CHECK_NO_THROW(retValue = CallRPC("getnewaddress"));
-    std::string taddr1 = retValue.get_str();
-    auto pa = pwalletMain->GenerateNewSproutZKey();
-    KeyIO keyIO(Params());
-    std::string zaddr1 = keyIO.EncodePaymentAddress(pa);
+    auto taddr1 = std::get<CKeyID>(keyIO.DecodePaymentAddress(retValue.get_str()).value());
+
+    if (!pwalletMain->HaveMnemonicSeed()) {
+        pwalletMain->GenerateNewSeed();
+    }
+    auto zaddr1 = pwalletMain->GenerateNewLegacySaplingZKey();
 
     // there are no utxos to spend
     {
-        std::vector<SendManyRecipient> recipients = { SendManyRecipient(zaddr1, 100*COIN, "DEADBEEF") };
-        std::shared_ptr<AsyncRPCOperation> operation( new AsyncRPCOperation_sendmany(std::nullopt, mtx, taddr1, {}, recipients, 1) );
+        auto selector = pwalletMain->ZTXOSelectorForAddress(taddr1, true, false).value();
+        TransactionBuilder builder(consensusParams, nHeight + 1, std::nullopt, pwalletMain);
+        std::vector<SendManyRecipient> recipients = { SendManyRecipient(std::nullopt, zaddr1, 100*COIN, "DEADBEEF") };
+        TransactionStrategy strategy;
+        std::shared_ptr<AsyncRPCOperation> operation(new AsyncRPCOperation_sendmany(std::move(builder), selector, recipients, 1, strategy));
         operation->main();
         BOOST_CHECK(operation->isFailed());
         std::string msg = operation->getErrorMessage();
-        BOOST_CHECK( msg.find("Insufficient transparent funds") != string::npos);
+        BOOST_CHECK( msg.find("Insufficient funds") != string::npos);
     }
 
-    // minconf cannot be zero when sending from zaddr
-    {
-        try {
-            std::vector<SendManyRecipient> recipients = {SendManyRecipient(taddr1, 100*COIN, "DEADBEEF")};
-            std::shared_ptr<AsyncRPCOperation> operation(new AsyncRPCOperation_sendmany(std::nullopt, mtx, zaddr1, recipients, {}, 0));
-            BOOST_CHECK(false); // Fail test if an exception is not thrown
-        } catch (const UniValue& objError) {
-            BOOST_CHECK(find_error(objError, "Minconf cannot be zero when sending from zaddr"));
-        }
-    }
-
-
     // there are no unspent notes to spend
     {
-        std::vector<SendManyRecipient> recipients = { SendManyRecipient(taddr1, 100*COIN, "DEADBEEF") };
-        std::shared_ptr<AsyncRPCOperation> operation( new AsyncRPCOperation_sendmany(std::nullopt, mtx, zaddr1, recipients, {}, 1) );
+        auto selector = pwalletMain->ZTXOSelectorForAddress(zaddr1, true, false).value();
+        TransactionBuilder builder(consensusParams, nHeight + 1, std::nullopt, pwalletMain);
+        std::vector<SendManyRecipient> recipients = { SendManyRecipient(std::nullopt, taddr1, 100*COIN, "DEADBEEF") };
+        TransactionStrategy strategy(PrivacyPolicy::AllowRevealedRecipients);
+        std::shared_ptr<AsyncRPCOperation> operation(new AsyncRPCOperation_sendmany(std::move(builder), selector, recipients, 1, strategy));
         operation->main();
         BOOST_CHECK(operation->isFailed());
         std::string msg = operation->getErrorMessage();
-        BOOST_CHECK( msg.find("Insufficient funds, no unspent notes") != string::npos);
+        BOOST_CHECK(msg.find("Insufficient funds: have 0.00") != string::npos);
     }
 
     // get_memo_from_hex_string())
     {
-        std::vector<SendManyRecipient> recipients = { SendManyRecipient(zaddr1, 100*COIN, "DEADBEEF") };
-        std::shared_ptr<AsyncRPCOperation> operation( new AsyncRPCOperation_sendmany(std::nullopt, mtx, zaddr1, recipients, {}, 1) );
+        auto selector = pwalletMain->ZTXOSelectorForAddress(zaddr1, true, false).value();
+        TransactionBuilder builder(consensusParams, nHeight + 1, std::nullopt, pwalletMain);
+        std::vector<SendManyRecipient> recipients = { SendManyRecipient(std::nullopt, zaddr1, 100*COIN, "DEADBEEF") };
+        TransactionStrategy strategy;
+        std::shared_ptr<AsyncRPCOperation> operation(new AsyncRPCOperation_sendmany(std::move(builder), selector, recipients, 1, strategy));
         std::shared_ptr<AsyncRPCOperation_sendmany> ptr = std::dynamic_pointer_cast<AsyncRPCOperation_sendmany> (operation);
         TEST_FRIEND_AsyncRPCOperation_sendmany proxy(ptr);
 
@@ -1221,106 +1309,6 @@ BOOST_AUTO_TEST_CASE(rpc_z_sendmany_internals)
             BOOST_CHECK( find_error(objError, "hexadecimal format"));
         }
     }
-
-
-    // add_taddr_change_output_to_tx() will append a vout to a raw transaction
-    {
-        std::vector<SendManyRecipient> recipients = { SendManyRecipient(zaddr1, 100*COIN, "DEADBEEF") };
-        std::shared_ptr<AsyncRPCOperation> operation( new AsyncRPCOperation_sendmany(std::nullopt, mtx, zaddr1, recipients, {}, 1) );
-        std::shared_ptr<AsyncRPCOperation_sendmany> ptr = std::dynamic_pointer_cast<AsyncRPCOperation_sendmany> (operation);
-        TEST_FRIEND_AsyncRPCOperation_sendmany proxy(ptr);
-
-        CTransaction tx = proxy.getTx();
-        BOOST_CHECK(tx.vout.size() == 0);
-
-        CReserveKey keyChange(pwalletMain);
-        CAmount amount = 12345600000;
-        proxy.add_taddr_change_output_to_tx(keyChange, amount);
-        tx = proxy.getTx();
-        BOOST_CHECK(tx.vout.size() == 1);
-        CTxOut out = tx.vout[0];
-        BOOST_CHECK_EQUAL(out.nValue, amount);
-
-        amount = 111100000;
-        proxy.add_taddr_change_output_to_tx(keyChange, amount);
-        tx = proxy.getTx();
-        BOOST_CHECK(tx.vout.size() == 2);
-        out = tx.vout[1];
-        BOOST_CHECK_EQUAL(out.nValue, amount);
-    }
-
-    // add_taddr_outputs_to_tx() will append many vouts to a raw transaction
-    {
-        std::vector<SendManyRecipient> recipients = {
-            SendManyRecipient("tmTGScYwiLMzHe4uGZtBYmuqoW4iEoYNMXt", 123000000, ""),
-            SendManyRecipient("tmUSbHz3vxnwLvRyNDXbwkZxjVyDodMJEhh", 456000000, ""),
-            SendManyRecipient("tmYZAXYPCP56Xa5JQWWPZuK7o7bfUQW6kkd", 789000000, ""),
-        };
-        std::shared_ptr<AsyncRPCOperation> operation( new AsyncRPCOperation_sendmany(std::nullopt, mtx, zaddr1, recipients, {}, 1) );
-        std::shared_ptr<AsyncRPCOperation_sendmany> ptr = std::dynamic_pointer_cast<AsyncRPCOperation_sendmany> (operation);
-        TEST_FRIEND_AsyncRPCOperation_sendmany proxy(ptr);
-
-        proxy.add_taddr_outputs_to_tx();
-
-        CTransaction tx = proxy.getTx();
-        BOOST_CHECK(tx.vout.size() == 3);
-        BOOST_CHECK_EQUAL(tx.vout[0].nValue, 123000000);
-        BOOST_CHECK_EQUAL(tx.vout[1].nValue, 456000000);
-        BOOST_CHECK_EQUAL(tx.vout[2].nValue, 789000000);
-    }
-
-    // Test the perform_joinsplit methods.
-    {
-        // Dummy input so the operation object can be instantiated.
-        std::vector<SendManyRecipient> recipients = { SendManyRecipient(zaddr1, 50000, "ABCD") };
-
-        std::shared_ptr<AsyncRPCOperation> operation( new AsyncRPCOperation_sendmany(std::nullopt, mtx, zaddr1, {}, recipients, 1) );
-        std::shared_ptr<AsyncRPCOperation_sendmany> ptr = std::dynamic_pointer_cast<AsyncRPCOperation_sendmany> (operation);
-        TEST_FRIEND_AsyncRPCOperation_sendmany proxy(ptr);
-
-        // Enable test mode so tx is not sent and proofs are not generated
-        static_cast<AsyncRPCOperation_sendmany *>(operation.get())->testmode = true;
-
-        AsyncJoinSplitInfo info;
-        std::vector<std::optional < SproutWitness>> witnesses;
-        uint256 anchor;
-        try {
-            proxy.perform_joinsplit(info, witnesses, anchor);
-        } catch (const std::runtime_error & e) {
-            BOOST_CHECK( string(e.what()).find("anchor is null")!= string::npos);
-        }
-
-        try {
-            std::vector<JSOutPoint> v;
-            proxy.perform_joinsplit(info, v);
-        } catch (const std::runtime_error & e) {
-            BOOST_CHECK( string(e.what()).find("anchor is null")!= string::npos);
-        }
-
-        info.notes.push_back(SproutNote());
-        try {
-            proxy.perform_joinsplit(info);
-        } catch (const std::runtime_error & e) {
-            BOOST_CHECK( string(e.what()).find("number of notes")!= string::npos);
-        }
-
-        info.notes.clear();
-        info.vjsin.push_back(JSInput());
-        info.vjsin.push_back(JSInput());
-        info.vjsin.push_back(JSInput());
-        try {
-            proxy.perform_joinsplit(info);
-        } catch (const std::runtime_error & e) {
-            BOOST_CHECK( string(e.what()).find("unsupported joinsplit input")!= string::npos);
-        }
-
-        info.vjsin.clear();
-        try {
-            proxy.perform_joinsplit(info);
-        } catch (const std::runtime_error & e) {
-            BOOST_CHECK( string(e.what()).find("error verifying joinsplit")!= string::npos);
-        }
-    }
 }
 
 
@@ -1330,7 +1318,7 @@ BOOST_AUTO_TEST_CASE(rpc_z_sendmany_taddr_to_sapling)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    if (!pwalletMain->HaveHDSeed()) {
+    if (!pwalletMain->HaveMnemonicSeed()) {
         pwalletMain->GenerateNewSeed();
     }
 
@@ -1338,10 +1326,9 @@ BOOST_AUTO_TEST_CASE(rpc_z_sendmany_taddr_to_sapling)
 
     KeyIO keyIO(Params());
     // add keys manually
-    auto taddr = pwalletMain->GenerateNewKey().GetID();
+    auto taddr = pwalletMain->GenerateNewKey(true).GetID();
     std::string taddr1 = keyIO.EncodeDestination(taddr);
-    auto pa = pwalletMain->GenerateNewSaplingZKey();
-    std::string zaddr1 = keyIO.EncodePaymentAddress(pa);
+    auto pa = pwalletMain->GenerateNewLegacySaplingZKey();
 
     const Consensus::Params& consensusParams = Params().GetConsensus();
     retValue = CallRPC("getblockcount");
@@ -1352,7 +1339,7 @@ BOOST_AUTO_TEST_CASE(rpc_z_sendmany_taddr_to_sapling)
     CScript scriptPubKey = CScript() << OP_DUP << OP_HASH160 << ToByteVector(taddr) << OP_EQUALVERIFY << OP_CHECKSIG;
     mtx.vout.push_back(CTxOut(5 * COIN, scriptPubKey));
     CWalletTx wtx(pwalletMain, mtx);
-    pwalletMain->AddToWallet(wtx, true, NULL);
+    pwalletMain->LoadWalletTx(wtx);
 
     // Fake-mine the transaction
     BOOST_CHECK_EQUAL(0, chainActive.Height());
@@ -1368,14 +1355,16 @@ BOOST_AUTO_TEST_CASE(rpc_z_sendmany_taddr_to_sapling)
     BOOST_CHECK(chainActive.Contains(&fakeIndex));
     BOOST_CHECK_EQUAL(1, chainActive.Height());
     wtx.SetMerkleBranch(block);
-    pwalletMain->AddToWallet(wtx, true, NULL);
+    pwalletMain->LoadWalletTx(wtx);
 
     // Context that z_sendmany requires
-    auto builder = TransactionBuilder(consensusParams, nextBlockHeight, pwalletMain);
+    auto builder = TransactionBuilder(consensusParams, nextBlockHeight, std::nullopt, pwalletMain);
     mtx = CreateNewContextualCMutableTransaction(consensusParams, nextBlockHeight);
 
-    std::vector<SendManyRecipient> recipients = { SendManyRecipient(zaddr1, 1*COIN, "ABCD") };
-    std::shared_ptr<AsyncRPCOperation> operation( new AsyncRPCOperation_sendmany(builder, mtx, taddr1, {}, recipients, 0) );
+    auto selector = pwalletMain->ZTXOSelectorForAddress(taddr, true, false).value();
+    std::vector<SendManyRecipient> recipients = { SendManyRecipient(std::nullopt, pa, 1*COIN, "ABCD") };
+    TransactionStrategy strategy(PrivacyPolicy::AllowRevealedSenders);
+    std::shared_ptr<AsyncRPCOperation> operation(new AsyncRPCOperation_sendmany(std::move(builder), selector, recipients, 0, strategy));
     std::shared_ptr<AsyncRPCOperation_sendmany> ptr = std::dynamic_pointer_cast<AsyncRPCOperation_sendmany> (operation);
 
     // Enable test mode so tx is not sent
@@ -1383,7 +1372,9 @@ BOOST_AUTO_TEST_CASE(rpc_z_sendmany_taddr_to_sapling)
 
     // Generate the Sapling shielding transaction
     operation->main();
-    BOOST_CHECK(operation->isSuccess());
+    if (!operation->isSuccess()) {
+        BOOST_FAIL(operation->getErrorMessage());
+    }
 
     // Get the transaction
     auto result = operation->getResult();
@@ -1402,13 +1393,19 @@ BOOST_AUTO_TEST_CASE(rpc_z_sendmany_taddr_to_sapling)
         tx.vShieldedOutput[0].cmu,
         tx.vShieldedOutput[0].ephemeralKey));
 
-    // We should be able to decrypt the outCiphertext with the ovk
-    // generated for transparent addresses
-    HDSeed seed;
-    BOOST_ASSERT(pwalletMain->GetHDSeed(seed));
+    auto accountKey = pwalletMain->GetLegacyAccountKey().ToAccountPubKey();
+    auto ovks = accountKey.GetOVKsForShielding();
+    // We should not be able to decrypt with the internal change OVK for shielding
+    BOOST_CHECK(!AttemptSaplingOutDecryption(
+        tx.vShieldedOutput[0].outCiphertext,
+        ovks.first,
+        tx.vShieldedOutput[0].cv,
+        tx.vShieldedOutput[0].cmu,
+        tx.vShieldedOutput[0].ephemeralKey));
+    // We should be able to decrypt with the external OVK for shielding
     BOOST_CHECK(AttemptSaplingOutDecryption(
         tx.vShieldedOutput[0].outCiphertext,
-        ovkForShieldingFromTaddr(seed),
+        ovks.second,
         tx.vShieldedOutput[0].cv,
         tx.vShieldedOutput[0].cmu,
         tx.vShieldedOutput[0].ephemeralKey));
@@ -1430,6 +1427,7 @@ BOOST_AUTO_TEST_CASE(rpc_z_sendmany_taddr_to_sapling)
 BOOST_AUTO_TEST_CASE(rpc_wallet_encrypted_wallet_zkeys)
 {
     LOCK2(cs_main, pwalletMain->cs_wallet);
+
     UniValue retValue;
     int n = 100;
 
@@ -1486,10 +1484,11 @@ BOOST_AUTO_TEST_CASE(rpc_wallet_encrypted_wallet_zkeys)
 BOOST_AUTO_TEST_CASE(rpc_wallet_encrypted_wallet_sapzkeys)
 {
     LOCK2(cs_main, pwalletMain->cs_wallet);
+
     UniValue retValue;
     int n = 100;
 
-    if(!pwalletMain->HaveHDSeed())
+    if(!pwalletMain->HaveMnemonicSeed())
     {
         pwalletMain->GenerateNewSeed();
     }
@@ -1538,7 +1537,7 @@ BOOST_AUTO_TEST_CASE(rpc_wallet_encrypted_wallet_sapzkeys)
     // Verify the key has been added
     BOOST_CHECK_NO_THROW(retValue = CallRPC("z_listaddresses"));
     arr = retValue.get_array();
-    BOOST_CHECK(arr.size() == n+1);
+    BOOST_CHECK_EQUAL(arr.size(), n+1);
 
     // We can't simulate over RPC the wallet closing and being reloaded
     // but there are tests for this in gtest.
@@ -1646,8 +1645,8 @@ BOOST_AUTO_TEST_CASE(rpc_z_shieldcoinbase_parameters)
     }
 
     // Test constructor of AsyncRPCOperation_shieldcoinbase
-    std::string testnetzaddr = "ztjiDe569DPNbyTE6TSdJTaSDhoXEHLGvYoUnBU1wfVNU52TEyT6berYtySkd21njAeEoh8fFJUT42kua9r8EnhBaEKqCpP";
-    std::string mainnetzaddr = "zcMuhvq8sEkHALuSU2i4NbNQxshSAYrpCExec45ZjtivYPbuiFPwk6WHy4SvsbeZ4siy1WheuRGjtaJmoD1J8bFqNXhsG6U";
+    KeyIO keyIO(Params());
+    auto testnetzaddr = std::get<libzcash::SproutPaymentAddress>(keyIO.DecodePaymentAddress("ztjiDe569DPNbyTE6TSdJTaSDhoXEHLGvYoUnBU1wfVNU52TEyT6berYtySkd21njAeEoh8fFJUT42kua9r8EnhBaEKqCpP").value());
 
     try {
         std::shared_ptr<AsyncRPCOperation> operation(new AsyncRPCOperation_shieldcoinbase(TransactionBuilder(), mtx, {}, testnetzaddr, -1 ));
@@ -1660,15 +1659,6 @@ BOOST_AUTO_TEST_CASE(rpc_z_shieldcoinbase_parameters)
     } catch (const UniValue& objError) {
         BOOST_CHECK( find_error(objError, "Empty inputs"));
     }
-
-    // Testnet payment addresses begin with 'zt'.  This test detects an incorrect prefix.
-    try {
-        std::vector<ShieldCoinbaseUTXO> inputs = { ShieldCoinbaseUTXO{uint256(),0,0} };
-        std::shared_ptr<AsyncRPCOperation> operation( new AsyncRPCOperation_shieldcoinbase(TransactionBuilder(), mtx, inputs, mainnetzaddr, 1) );
-    } catch (const UniValue& objError) {
-        BOOST_CHECK( find_error(objError, "Invalid to address"));
-    }
-
 }
 
 
@@ -1686,14 +1676,12 @@ BOOST_AUTO_TEST_CASE(rpc_z_shieldcoinbase_internals)
     CMutableTransaction mtx = CreateNewContextualCMutableTransaction(consensusParams, nHeight + 1);
 
     // Add keys manually
-    KeyIO keyIO(Params());
     auto pa = pwalletMain->GenerateNewSproutZKey();
-    std::string zaddr = keyIO.EncodePaymentAddress(pa);
 
     // Insufficient funds
     {
         std::vector<ShieldCoinbaseUTXO> inputs = { ShieldCoinbaseUTXO{uint256(),0,0} };
-        std::shared_ptr<AsyncRPCOperation> operation( new AsyncRPCOperation_shieldcoinbase(TransactionBuilder(), mtx, inputs, zaddr) );
+        std::shared_ptr<AsyncRPCOperation> operation( new AsyncRPCOperation_shieldcoinbase(TransactionBuilder(), mtx, inputs, pa) );
         operation->main();
         BOOST_CHECK(operation->isFailed());
         std::string msg = operation->getErrorMessage();
@@ -1704,7 +1692,7 @@ BOOST_AUTO_TEST_CASE(rpc_z_shieldcoinbase_internals)
     {
         // Dummy input so the operation object can be instantiated.
         std::vector<ShieldCoinbaseUTXO> inputs = { ShieldCoinbaseUTXO{uint256(),0,100000} };
-        std::shared_ptr<AsyncRPCOperation> operation( new AsyncRPCOperation_shieldcoinbase(TransactionBuilder(), mtx, inputs, zaddr) );
+        std::shared_ptr<AsyncRPCOperation> operation( new AsyncRPCOperation_shieldcoinbase(TransactionBuilder(), mtx, inputs, pa) );
         std::shared_ptr<AsyncRPCOperation_shieldcoinbase> ptr = std::dynamic_pointer_cast<AsyncRPCOperation_shieldcoinbase> (operation);
         TEST_FRIEND_AsyncRPCOperation_shieldcoinbase proxy(ptr);
         static_cast<AsyncRPCOperation_shieldcoinbase *>(operation.get())->testmode = true;
@@ -1813,12 +1801,10 @@ BOOST_AUTO_TEST_CASE(rpc_z_mergetoaddress_parameters)
     CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), nHeight + 1);
 
     // Test constructor of AsyncRPCOperation_mergetoaddress
+    KeyIO keyIO(Params());
     MergeToAddressRecipient testnetzaddr(
-        "ztjiDe569DPNbyTE6TSdJTaSDhoXEHLGvYoUnBU1wfVNU52TEyT6berYtySkd21njAeEoh8fFJUT42kua9r8EnhBaEKqCpP",
+        keyIO.DecodePaymentAddress("ztjiDe569DPNbyTE6TSdJTaSDhoXEHLGvYoUnBU1wfVNU52TEyT6berYtySkd21njAeEoh8fFJUT42kua9r8EnhBaEKqCpP").value(),
         "testnet memo");
-    MergeToAddressRecipient mainnetzaddr(
-        "zcMuhvq8sEkHALuSU2i4NbNQxshSAYrpCExec45ZjtivYPbuiFPwk6WHy4SvsbeZ4siy1WheuRGjtaJmoD1J8bFqNXhsG6U",
-        "mainnet memo");
 
     try {
         std::shared_ptr<AsyncRPCOperation> operation(new AsyncRPCOperation_mergetoaddress(std::nullopt,  mtx, {}, {}, {}, testnetzaddr, -1 ));
@@ -1836,14 +1822,6 @@ BOOST_AUTO_TEST_CASE(rpc_z_mergetoaddress_parameters)
 
     std::vector<MergeToAddressInputUTXO> inputs = { MergeToAddressInputUTXO{ COutPoint{uint256(), 0}, 0, CScript()} };
 
-    try {
-        MergeToAddressRecipient badaddr("", "memo");
-        std::shared_ptr<AsyncRPCOperation> operation(new AsyncRPCOperation_mergetoaddress(std::nullopt, mtx, inputs, {}, {}, badaddr, 1));
-        BOOST_FAIL("Should have caused an error");
-    } catch (const UniValue& objError) {
-        BOOST_CHECK( find_error(objError, "Recipient parameter missing"));
-    }
-
     std::vector<MergeToAddressInputSproutNote> sproutNoteInputs =
         {MergeToAddressInputSproutNote{JSOutPoint(), SproutNote(), 0, SproutSpendingKey()}};
     std::vector<MergeToAddressInputSaplingNote> saplingNoteInputs =
@@ -1863,15 +1841,6 @@ BOOST_AUTO_TEST_CASE(rpc_z_mergetoaddress_parameters)
     } catch (const UniValue& objError) {
         BOOST_CHECK(find_error(objError, "Sprout notes are not supported by the TransactionBuilder"));
     }
-
-    // Testnet payment addresses begin with 'zt'.  This test detects an incorrect prefix.
-    try {
-        std::vector<MergeToAddressInputUTXO> inputs = { MergeToAddressInputUTXO{ COutPoint{uint256(), 0}, 0, CScript()} };
-        std::shared_ptr<AsyncRPCOperation> operation( new AsyncRPCOperation_mergetoaddress(std::nullopt, mtx, inputs, {}, {}, mainnetzaddr, 1) );
-        BOOST_FAIL("Should have caused an error");
-    } catch (const UniValue& objError) {
-        BOOST_CHECK( find_error(objError, "Invalid recipient address"));
-    }
 }
 
 
@@ -1880,6 +1849,7 @@ BOOST_AUTO_TEST_CASE(rpc_z_mergetoaddress_internals)
 {
     SelectParams(CBaseChainParams::TESTNET);
     const Consensus::Params& consensusParams = Params().GetConsensus();
+    KeyIO keyIO(Params());
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
@@ -1893,10 +1863,9 @@ BOOST_AUTO_TEST_CASE(rpc_z_mergetoaddress_internals)
 
     // Add keys manually
     BOOST_CHECK_NO_THROW(retValue = CallRPC("getnewaddress"));
-    MergeToAddressRecipient taddr1(retValue.get_str(), "");
+    MergeToAddressRecipient taddr1(keyIO.DecodePaymentAddress(retValue.get_str()).value(), "");
     auto pa = pwalletMain->GenerateNewSproutZKey();
-    KeyIO keyIO(Params());
-    MergeToAddressRecipient zaddr1(keyIO.EncodePaymentAddress(pa), "DEADBEEF");
+    MergeToAddressRecipient zaddr1(pa, "DEADBEEF");
 
     // Insufficient funds
     {
@@ -2022,12 +1991,12 @@ BOOST_AUTO_TEST_CASE(rpc_z_mergetoaddress_internals)
 void TestWTxStatus(const Consensus::Params consensusParams, const int delta) {
 
     auto AddTrx = [&consensusParams]() {
-        auto taddr = pwalletMain->GenerateNewKey().GetID();
+        auto taddr = pwalletMain->GenerateNewKey(true).GetID();
         CMutableTransaction mtx = CreateNewContextualCMutableTransaction(consensusParams, 1);
         CScript scriptPubKey = CScript() << OP_DUP << OP_HASH160 << ToByteVector(taddr) << OP_EQUALVERIFY << OP_CHECKSIG;
         mtx.vout.push_back(CTxOut(5 * COIN, scriptPubKey));
         CWalletTx wtx(pwalletMain, mtx);
-        pwalletMain->AddToWallet(wtx, true, NULL);
+        pwalletMain->LoadWalletTx(wtx);
         return wtx;
     };
 
@@ -2048,7 +2017,7 @@ void TestWTxStatus(const Consensus::Params consensusParams, const int delta) {
 
         if (has_trx) {
             wtx.SetMerkleBranch(block);
-            pwalletMain->AddToWallet(wtx, true, NULL);
+            pwalletMain->LoadWalletTx(wtx);
         }
 
         hashes.push_back(blockHash);
diff --git a/src/wallet/test/wallet_test_fixture.cpp b/src/wallet/test/wallet_test_fixture.cpp
index 31e790988cd..0b5694f47e0 100644
--- a/src/wallet/test/wallet_test_fixture.cpp
+++ b/src/wallet/test/wallet_test_fixture.cpp
@@ -9,10 +9,14 @@ WalletTestingSetup::WalletTestingSetup(): TestingSetup()
     bitdb.MakeMock();
 
     bool fFirstRun;
-    pwalletMain = new CWallet("wallet_test.dat");
+    pwalletMain = new CWallet(Params(), "wallet_test.dat");
     pwalletMain->LoadWallet(fFirstRun);
-    RegisterValidationInterface(pwalletMain);
+    if (!pwalletMain->HaveMnemonicSeed()) {
+        pwalletMain->GenerateNewSeed();
+        pwalletMain->VerifyMnemonicSeed(pwalletMain->GetMnemonicSeed().value().GetMnemonic());
+    }
 
+    RegisterValidationInterface(pwalletMain);
     RegisterWalletRPCCommands(tableRPC);
 }
 
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index 7693aab01a1..09a7aadb76b 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -26,7 +26,6 @@ typedef set<pair<const CWalletTx*,unsigned int> > CoinSet;
 
 BOOST_FIXTURE_TEST_SUITE(wallet_tests, WalletTestingSetup)
 
-static CWallet wallet;
 static vector<COutput> vCoins;
 
 static void add_coin(const CAmount& nValue, int nAge = 6*24, bool fIsFromMe = false, int nInput=0)
@@ -41,7 +40,7 @@ static void add_coin(const CAmount& nValue, int nAge = 6*24, bool fIsFromMe = fa
         // so stop vin being empty, and cache a non-zero Debit to fake out IsFromMe()
         tx.vin.resize(1);
     }
-    CWalletTx* wtx = new CWalletTx(&wallet, tx);
+    CWalletTx* wtx = new CWalletTx(pwalletMain, tx);
     if (fIsFromMe)
     {
         wtx->fDebitCached = true;
@@ -69,32 +68,30 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
     CoinSet setCoinsRet, setCoinsRet2;
     CAmount nValueRet;
 
-    LOCK(wallet.cs_wallet);
-
     // test multiple times to allow for differences in the shuffle order
     for (int i = 0; i < RUN_TESTS; i++)
     {
         empty_wallet();
 
         // with an empty wallet we can't even pay one cent
-        BOOST_CHECK(!wallet.SelectCoinsMinConf( 1 * CENT, 1, 6, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK(!CWallet::SelectCoinsMinConf( 1 * CENT, 1, 6, vCoins, setCoinsRet, nValueRet));
 
         add_coin(1*CENT, 4);        // add a new 1 cent coin
 
         // with a new 1 cent coin, we still can't find a mature 1 cent
-        BOOST_CHECK(!wallet.SelectCoinsMinConf( 1 * CENT, 1, 6, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK(!CWallet::SelectCoinsMinConf( 1 * CENT, 1, 6, vCoins, setCoinsRet, nValueRet));
 
         // but we can find a new 1 cent
-        BOOST_CHECK( wallet.SelectCoinsMinConf( 1 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( CWallet::SelectCoinsMinConf( 1 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 1 * CENT);
 
         add_coin(2*CENT);           // add a mature 2 cent coin
 
         // we can't make 3 cents of mature coins
-        BOOST_CHECK(!wallet.SelectCoinsMinConf( 3 * CENT, 1, 6, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK(!CWallet::SelectCoinsMinConf( 3 * CENT, 1, 6, vCoins, setCoinsRet, nValueRet));
 
         // we can make 3 cents of new  coins
-        BOOST_CHECK( wallet.SelectCoinsMinConf( 3 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( CWallet::SelectCoinsMinConf( 3 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 3 * CENT);
 
         add_coin(5*CENT);           // add a mature 5 cent coin,
@@ -104,33 +101,33 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
         // now we have new: 1+10=11 (of which 10 was self-sent), and mature: 2+5+20=27.  total = 38
 
         // we can't make 38 cents only if we disallow new coins:
-        BOOST_CHECK(!wallet.SelectCoinsMinConf(38 * CENT, 1, 6, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK(!CWallet::SelectCoinsMinConf(38 * CENT, 1, 6, vCoins, setCoinsRet, nValueRet));
         // we can't even make 37 cents if we don't allow new coins even if they're from us
-        BOOST_CHECK(!wallet.SelectCoinsMinConf(38 * CENT, 6, 6, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK(!CWallet::SelectCoinsMinConf(38 * CENT, 6, 6, vCoins, setCoinsRet, nValueRet));
         // but we can make 37 cents if we accept new coins from ourself
-        BOOST_CHECK( wallet.SelectCoinsMinConf(37 * CENT, 1, 6, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( CWallet::SelectCoinsMinConf(37 * CENT, 1, 6, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 37 * CENT);
         // and we can make 38 cents if we accept all new coins
-        BOOST_CHECK( wallet.SelectCoinsMinConf(38 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( CWallet::SelectCoinsMinConf(38 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 38 * CENT);
 
         // try making 34 cents from 1,2,5,10,20 - we can't do it exactly
-        BOOST_CHECK( wallet.SelectCoinsMinConf(34 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( CWallet::SelectCoinsMinConf(34 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 35 * CENT);       // but 35 cents is closest
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 3U);     // the best should be 20+10+5.  it's incredibly unlikely the 1 or 2 got included (but possible)
 
         // when we try making 7 cents, the smaller coins (1,2,5) are enough.  We should see just 2+5
-        BOOST_CHECK( wallet.SelectCoinsMinConf( 7 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( CWallet::SelectCoinsMinConf( 7 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 7 * CENT);
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 2U);
 
         // when we try making 8 cents, the smaller coins (1,2,5) are exactly enough.
-        BOOST_CHECK( wallet.SelectCoinsMinConf( 8 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( CWallet::SelectCoinsMinConf( 8 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK(nValueRet == 8 * CENT);
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 3U);
 
         // when we try making 9 cents, no subset of smaller coins is enough, and we get the next bigger coin (10)
-        BOOST_CHECK( wallet.SelectCoinsMinConf( 9 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( CWallet::SelectCoinsMinConf( 9 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 10 * CENT);
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U);
 
@@ -144,30 +141,30 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
         add_coin(30*CENT); // now we have 6+7+8+20+30 = 71 cents total
 
         // check that we have 71 and not 72
-        BOOST_CHECK( wallet.SelectCoinsMinConf(71 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
-        BOOST_CHECK(!wallet.SelectCoinsMinConf(72 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( CWallet::SelectCoinsMinConf(71 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK(!CWallet::SelectCoinsMinConf(72 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
 
         // now try making 16 cents.  the best smaller coins can do is 6+7+8 = 21; not as good at the next biggest coin, 20
-        BOOST_CHECK( wallet.SelectCoinsMinConf(16 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( CWallet::SelectCoinsMinConf(16 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 20 * CENT); // we should get 20 in one coin
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U);
 
         add_coin( 5*CENT); // now we have 5+6+7+8+20+30 = 75 cents total
 
         // now if we try making 16 cents again, the smaller coins can make 5+6+7 = 18 cents, better than the next biggest coin, 20
-        BOOST_CHECK( wallet.SelectCoinsMinConf(16 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( CWallet::SelectCoinsMinConf(16 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 18 * CENT); // we should get 18 in 3 coins
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 3U);
 
         add_coin( 18*CENT); // now we have 5+6+7+8+18+20+30
 
         // and now if we try making 16 cents again, the smaller coins can make 5+6+7 = 18 cents, the same as the next biggest coin, 18
-        BOOST_CHECK( wallet.SelectCoinsMinConf(16 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( CWallet::SelectCoinsMinConf(16 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 18 * CENT);  // we should get 18 in 1 coin
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U); // because in the event of a tie, the biggest coin wins
 
         // now try making 11 cents.  we should get 5+6
-        BOOST_CHECK( wallet.SelectCoinsMinConf(11 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( CWallet::SelectCoinsMinConf(11 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 11 * CENT);
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 2U);
 
@@ -176,11 +173,11 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
         add_coin( 2*COIN);
         add_coin( 3*COIN);
         add_coin( 4*COIN); // now we have 5+6+7+8+18+20+30+100+200+300+400 = 1094 cents
-        BOOST_CHECK( wallet.SelectCoinsMinConf(95 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( CWallet::SelectCoinsMinConf(95 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 1 * COIN);  // we should get 1 BTC in 1 coin
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U);
 
-        BOOST_CHECK( wallet.SelectCoinsMinConf(195 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( CWallet::SelectCoinsMinConf(195 * CENT, 1, 1, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 2 * COIN);  // we should get 2 BTC in 1 coin
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U);
 
@@ -195,14 +192,14 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
 
         // try making 1 * MIN_CHANGE from the 1.5 * MIN_CHANGE
         // we'll get change smaller than MIN_CHANGE whatever happens, so can expect MIN_CHANGE exactly
-        BOOST_CHECK( wallet.SelectCoinsMinConf(MIN_CHANGE, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( CWallet::SelectCoinsMinConf(MIN_CHANGE, 1, 1, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, MIN_CHANGE);
 
         // but if we add a bigger coin, small change is avoided
         add_coin(1111*MIN_CHANGE);
 
         // try making 1 from 0.1 + 0.2 + 0.3 + 0.4 + 0.5 + 1111 = 1112.5
-        BOOST_CHECK( wallet.SelectCoinsMinConf(1 * MIN_CHANGE, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( CWallet::SelectCoinsMinConf(1 * MIN_CHANGE, 1, 1, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 1 * MIN_CHANGE); // we should get the exact amount
 
         // if we add more small coins:
@@ -210,7 +207,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
         add_coin(0.7*MIN_CHANGE);
 
         // and try again to make 1.0 * MIN_CHANGE
-        BOOST_CHECK( wallet.SelectCoinsMinConf(1 * MIN_CHANGE, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( CWallet::SelectCoinsMinConf(1 * MIN_CHANGE, 1, 1, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 1 * MIN_CHANGE); // we should get the exact amount
 
         // run the 'mtgox' test (see https://blockchair.com/bitcoin/transaction/29a3efd3ef04f9153d47a990bd7b048a4b2d213daaa5fb8ed670fb85f13bdbcf)
@@ -219,7 +216,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
         for (int i = 0; i < 20; i++)
             add_coin(50000 * COIN);
 
-        BOOST_CHECK( wallet.SelectCoinsMinConf(500000 * COIN, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( CWallet::SelectCoinsMinConf(500000 * COIN, 1, 1, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 500000 * COIN); // we should get the exact amount
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 10U); // in ten coins
 
@@ -232,7 +229,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
         add_coin(0.6 * MIN_CHANGE);
         add_coin(0.7 * MIN_CHANGE);
         add_coin(1111 * MIN_CHANGE);
-        BOOST_CHECK( wallet.SelectCoinsMinConf(1 * MIN_CHANGE, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( CWallet::SelectCoinsMinConf(1 * MIN_CHANGE, 1, 1, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 1111 * MIN_CHANGE); // we get the bigger coin
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U);
 
@@ -242,7 +239,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
         add_coin(0.6 * MIN_CHANGE);
         add_coin(0.8 * MIN_CHANGE);
         add_coin(1111 * MIN_CHANGE);
-        BOOST_CHECK( wallet.SelectCoinsMinConf(MIN_CHANGE, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( CWallet::SelectCoinsMinConf(MIN_CHANGE, 1, 1, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, MIN_CHANGE);   // we should get the exact amount
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 2U); // in two coins 0.4+0.6
 
@@ -253,12 +250,12 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
         add_coin(100  * MIN_CHANGE);
 
         // trying to make 100.01 from these three coins
-        BOOST_CHECK( wallet.SelectCoinsMinConf(100.01 * MIN_CHANGE, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( CWallet::SelectCoinsMinConf(100.01 * MIN_CHANGE, 1, 1, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 101.05 * MIN_CHANGE);   // we should get all coins
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 3U);
 
         // but if we try to make 99.9, we should take the bigger of the two small coins to avoid small change
-        BOOST_CHECK( wallet.SelectCoinsMinConf(99.9 * MIN_CHANGE, 1, 1, vCoins, setCoinsRet, nValueRet));
+        BOOST_CHECK( CWallet::SelectCoinsMinConf(99.9 * MIN_CHANGE, 1, 1, vCoins, setCoinsRet, nValueRet));
         BOOST_CHECK_EQUAL(nValueRet, 101 * MIN_CHANGE);
         BOOST_CHECK_EQUAL(setCoinsRet.size(), 2U);
 
@@ -268,7 +265,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
              // Create 676 inputs (= MAX_STANDARD_TX_SIZE / 148 bytes per input)
              for (uint16_t j = 0; j < 676; j++)
                  add_coin(amt);
-             BOOST_CHECK(wallet.SelectCoinsMinConf(2000, 1, 1, vCoins, setCoinsRet, nValueRet));
+             BOOST_CHECK(CWallet::SelectCoinsMinConf(2000, 1, 1, vCoins, setCoinsRet, nValueRet));
              if (amt - 2000 < MIN_CHANGE) {
                  // needs more than one input:
                  uint16_t returnSize = std::ceil((2000.0 + MIN_CHANGE)/amt);
@@ -290,8 +287,8 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
 
             // picking 50 from 100 coins doesn't depend on the shuffle,
             // but does depend on randomness in the stochastic approximation code
-            BOOST_CHECK(wallet.SelectCoinsMinConf(50 * COIN, 1, 6, vCoins, setCoinsRet , nValueRet));
-            BOOST_CHECK(wallet.SelectCoinsMinConf(50 * COIN, 1, 6, vCoins, setCoinsRet2, nValueRet));
+            BOOST_CHECK(CWallet::SelectCoinsMinConf(50 * COIN, 1, 6, vCoins, setCoinsRet , nValueRet));
+            BOOST_CHECK(CWallet::SelectCoinsMinConf(50 * COIN, 1, 6, vCoins, setCoinsRet2, nValueRet));
             BOOST_CHECK(!equal_sets(setCoinsRet, setCoinsRet2));
 
             int fails = 0;
@@ -299,8 +296,8 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
             {
                 // selecting 1 from 100 identical coins depends on the shuffle; this test will fail 1% of the time
                 // run the test RANDOM_REPEATS times and only complain if all of them fail
-                BOOST_CHECK(wallet.SelectCoinsMinConf(COIN, 1, 6, vCoins, setCoinsRet , nValueRet));
-                BOOST_CHECK(wallet.SelectCoinsMinConf(COIN, 1, 6, vCoins, setCoinsRet2, nValueRet));
+                BOOST_CHECK(CWallet::SelectCoinsMinConf(COIN, 1, 6, vCoins, setCoinsRet , nValueRet));
+                BOOST_CHECK(CWallet::SelectCoinsMinConf(COIN, 1, 6, vCoins, setCoinsRet2, nValueRet));
                 if (equal_sets(setCoinsRet, setCoinsRet2))
                     fails++;
             }
@@ -316,8 +313,8 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
             {
                 // selecting 1 from 100 identical coins depends on the shuffle; this test will fail 1% of the time
                 // run the test RANDOM_REPEATS times and only complain if all of them fail
-                BOOST_CHECK(wallet.SelectCoinsMinConf(90*CENT, 1, 6, vCoins, setCoinsRet , nValueRet));
-                BOOST_CHECK(wallet.SelectCoinsMinConf(90*CENT, 1, 6, vCoins, setCoinsRet2, nValueRet));
+                BOOST_CHECK(CWallet::SelectCoinsMinConf(90*CENT, 1, 6, vCoins, setCoinsRet , nValueRet));
+                BOOST_CHECK(CWallet::SelectCoinsMinConf(90*CENT, 1, 6, vCoins, setCoinsRet2, nValueRet));
                 if (equal_sets(setCoinsRet, setCoinsRet2))
                     fails++;
             }
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index cc33143919d..99b773feecb 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1,5 +1,6 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2014 The Bitcoin Core developers
+// Copyright (c) 2016-2022 The Zcash developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
@@ -25,6 +26,8 @@
 #include "script/sign.h"
 #include "timedata.h"
 #include "utilmoneystr.h"
+#include "util/match.h"
+#include "zcash/Address.hpp"
 #include "zcash/JoinSplit.hpp"
 #include "zcash/Note.hpp"
 #include "crypter.h"
@@ -32,6 +35,7 @@
 
 #include <algorithm>
 #include <assert.h>
+#include <numeric>
 #include <variant>
 
 #include <boost/algorithm/string/replace.hpp>
@@ -47,6 +51,7 @@ unsigned int nTxConfirmTarget = DEFAULT_TX_CONFIRM_TARGET;
 bool bSpendZeroConfChange = DEFAULT_SPEND_ZEROCONF_CHANGE;
 bool fSendFreeTransactions = DEFAULT_SEND_FREE_TRANSACTIONS;
 bool fPayAtLeastCustomFee = true;
+unsigned int nOrchardAnchorConfirmations = DEFAULT_ORCHARD_ANCHOR_CONFIRMATIONS;
 
 const char * DEFAULT_WALLET_DAT = "wallet.dat";
 
@@ -56,6 +61,10 @@ const char * DEFAULT_WALLET_DAT = "wallet.dat";
  */
 CFeeRate CWallet::minTxFee = CFeeRate(DEFAULT_TRANSACTION_MINFEE);
 
+std::set<ReceiverType> CWallet::DefaultReceiverTypes() {
+    return {ReceiverType::P2PKH, ReceiverType::Sapling, ReceiverType::Orchard};
+}
+
 /** @defgroup mapWallet
  *
  * @{
@@ -110,52 +119,74 @@ libzcash::SproutPaymentAddress CWallet::GenerateNewSproutZKey()
     return addr;
 }
 
-// Generate a new Sapling spending key and return its public payment address
-SaplingPaymentAddress CWallet::GenerateNewSaplingZKey()
-{
-    AssertLockHeld(cs_wallet); // mapSaplingZKeyMetadata
+// Generates a new Sapling spending key as a child of the legacy Sapling account,
+// and returns its public payment address.
+//
+// The z_getnewaddress API must use the mnemonic HD seed, and fail if that seed
+// is not present. The account index is determined by trial of values of
+// mnemonicHDChain.GetLegacySaplingKeyCounter() until one is found that produces
+// a valid Sapling key.
+SaplingPaymentAddress CWallet::GenerateNewLegacySaplingZKey() {
+    AssertLockHeld(cs_wallet);
 
-    // Create new metadata
-    int64_t nCreationTime = GetTime();
-    CKeyMetadata metadata(nCreationTime);
+    if (!mnemonicHDChain.has_value()) {
+        throw std::runtime_error(
+                "CWallet::GenerateNewLegacySaplingZKey(): Wallet is missing mnemonic seed metadata.");
+    }
+    CHDChain& hdChain = mnemonicHDChain.value();
 
-    // Try to get the seed
-    HDSeed seed;
-    if (!GetHDSeed(seed))
-        throw std::runtime_error("CWallet::GenerateNewSaplingZKey(): HD seed not found");
+    // loop until we find an unused address index
+    while (true) {
+        auto generated = GenerateLegacySaplingZKey(hdChain.GetLegacySaplingKeyCounter());
 
-    auto m = libzcash::SaplingExtendedSpendingKey::Master(seed);
-    uint32_t bip44CoinType = Params().BIP44CoinType();
+        // advance the address index counter so that the next time we need to generate
+        // a key we're pointing at a free index.
+        hdChain.IncrementLegacySaplingKeyCounter();
+        if (!generated.second) {
+            // the key already existed, so try the next one
+            continue;
+        } else {
+            // Update the persisted chain information
+            if (fFileBacked && !CWalletDB(strWalletFile).WriteMnemonicHDChain(hdChain)) {
+                throw std::runtime_error(
+                        "CWallet::GenerateNewLegacySaplingZKey(): Writing HD chain model failed");
+            }
 
-    // We use a fixed keypath scheme of m/32'/coin_type'/account'
-    // Derive m/32'
-    auto m_32h = m.Derive(32 | ZIP32_HARDENED_KEY_LIMIT);
-    // Derive m/32'/coin_type'
-    auto m_32h_cth = m_32h.Derive(bip44CoinType | ZIP32_HARDENED_KEY_LIMIT);
+            return generated.first;
+        }
+    }
+}
 
-    // Derive account key at next index, skip keys already known to the wallet
-    libzcash::SaplingExtendedSpendingKey xsk;
-    do
-    {
-        xsk = m_32h_cth.Derive(hdChain.saplingAccountCounter | ZIP32_HARDENED_KEY_LIMIT);
-        metadata.hdKeypath = "m/32'/" + std::to_string(bip44CoinType) + "'/" + std::to_string(hdChain.saplingAccountCounter) + "'";
-        metadata.seedFp = hdChain.seedFp;
-        // Increment childkey index
-        hdChain.saplingAccountCounter++;
-    } while (HaveSaplingSpendingKey(xsk.ToXFVK()));
+std::pair<SaplingPaymentAddress, bool> CWallet::GenerateLegacySaplingZKey(uint32_t addrIndex) {
+    auto seedOpt = GetMnemonicSeed();
+    if (!seedOpt.has_value()) {
+        throw std::runtime_error(
+                "CWallet::GenerateLegacySaplingZKey(): Wallet does not have a mnemonic seed.");
+    }
+    auto seed = seedOpt.value();
+
+    auto xsk = libzcash::SaplingExtendedSpendingKey::Legacy(seed, BIP44CoinType(), addrIndex);
+    auto extfvk = xsk.first.ToXFVK();
+    if (!HaveSaplingSpendingKey(extfvk)) {
+        auto ivk = extfvk.ToIncomingViewingKey();
+        CKeyMetadata keyMeta(GetTime());
+        keyMeta.hdKeypath = xsk.second;
+        keyMeta.seedFp = seed.Fingerprint();
+        mapSaplingZKeyMetadata[ivk] = keyMeta;
 
-    // Update the chain model in the database
-    if (fFileBacked && !CWalletDB(strWalletFile).WriteHDChain(hdChain))
-        throw std::runtime_error("CWallet::GenerateNewSaplingZKey(): Writing HD chain model failed");
+        if (!AddSaplingZKey(xsk.first)) {
+            throw std::runtime_error("CWallet::GenerateLegacySaplingZKey(): AddSaplingZKey failed.");
+        }
 
-    auto ivk = xsk.expsk.full_viewing_key().in_viewing_key();
-    mapSaplingZKeyMetadata[ivk] = metadata;
+        auto addr = extfvk.DefaultAddress();
+        if (!AddSaplingPaymentAddress(ivk, addr)) {
+            throw std::runtime_error("CWallet::GenerateLegacySaplingZKey(): AddSaplingPaymentAddress failed.");
+        };
 
-    if (!AddSaplingZKey(xsk)) {
-        throw std::runtime_error("CWallet::GenerateNewSaplingZKey(): AddSaplingZKey failed");
+        return std::make_pair(addr, true) ;
+    } else {
+        return std::make_pair(extfvk.DefaultAddress(), false);
     }
-    // return default sapling payment address.
-    return xsk.DefaultAddress();
 }
 
 // Add spending key to keystore
@@ -195,13 +226,13 @@ bool CWallet::AddSaplingFullViewingKey(const libzcash::SaplingExtendedFullViewin
 }
 
 // Add payment address -> incoming viewing key map entry
-bool CWallet::AddSaplingIncomingViewingKey(
+bool CWallet::AddSaplingPaymentAddress(
     const libzcash::SaplingIncomingViewingKey &ivk,
     const libzcash::SaplingPaymentAddress &addr)
 {
     AssertLockHeld(cs_wallet); // mapSaplingZKeyMetadata
 
-    if (!CCryptoKeyStore::AddSaplingIncomingViewingKey(ivk, addr)) {
+    if (!CCryptoKeyStore::AddSaplingPaymentAddress(ivk, addr)) {
         return false;
     }
 
@@ -209,13 +240,74 @@ bool CWallet::AddSaplingIncomingViewingKey(
         return true;
     }
 
-    if (!IsCrypted()) {
-        return CWalletDB(strWalletFile).WriteSaplingPaymentAddress(addr, ivk);
+    return CWalletDB(strWalletFile).WriteSaplingPaymentAddress(addr, ivk);
+}
+
+// Add spending key to keystore
+bool CWallet::AddOrchardZKey(const libzcash::OrchardSpendingKey &sk)
+{
+    AssertLockHeld(cs_wallet); // orchardWallet
+
+    if (IsCrypted()) {
+        // encrypted storage of Orchard spending keys is not supported
+        return false;
     }
 
-    return true;
+    orchardWallet.AddSpendingKey(sk);
+
+    if (!fFileBacked) {
+        return true;
+    }
+
+    return true; // TODO ORCHARD: persist spending key
+}
+
+bool CWallet::AddOrchardFullViewingKey(const libzcash::OrchardFullViewingKey &fvk)
+{
+    AssertLockHeld(cs_wallet); // orchardWallet
+    orchardWallet.AddFullViewingKey(fvk);
+
+    if (!fFileBacked) {
+        return true;
+    }
+
+    return true; // TODO ORCHARD: persist fvk
+}
+
+// Add Orchard payment address -> incoming viewing key map entry
+bool CWallet::AddOrchardRawAddress(
+    const libzcash::OrchardIncomingViewingKey &ivk,
+    const libzcash::OrchardRawAddress &addr)
+{
+    AssertLockHeld(cs_wallet); // orchardWallet
+    if (!orchardWallet.AddRawAddress(addr, ivk)) {
+        // We should never add an Orchard raw address for which we don't know
+        // the corresponding FVK.
+        return false;
+    };
+
+    if (!fFileBacked) {
+        return true;
+    }
+
+    return true; // TODO ORCHARD: ensure mapping will be recreated on wallet load
+}
+
+// Loads a payment address -> incoming viewing key map entry
+// to the in-memory wallet's keystore.
+bool CWallet::LoadOrchardRawAddress(
+    const libzcash::OrchardRawAddress &addr,
+    const libzcash::OrchardIncomingViewingKey &ivk)
+{
+    AssertLockHeld(cs_wallet); // orchardWallet
+    return orchardWallet.AddRawAddress(addr, ivk);
 }
 
+// Returns a loader that can be used to read an Orchard note commitment
+// tree from a stream into the Orchard wallet.
+OrchardWalletNoteCommitmentTreeLoader CWallet::GetOrchardNoteCommitmentTreeLoader() {
+    return OrchardWalletNoteCommitmentTreeLoader(orchardWallet);
+}
 
 // Add spending key to keystore and persist to disk
 bool CWallet::AddSproutZKey(const libzcash::SproutSpendingKey &key)
@@ -234,40 +326,73 @@ bool CWallet::AddSproutZKey(const libzcash::SproutSpendingKey &key)
         return true;
 
     if (!IsCrypted()) {
-        return CWalletDB(strWalletFile).WriteZKey(addr,
-                                                  key,
-                                                  mapSproutZKeyMetadata[addr]);
+        return CWalletDB(strWalletFile).WriteZKey(addr, key, mapSproutZKeyMetadata[addr]);
     }
     return true;
 }
 
-CPubKey CWallet::GenerateNewKey()
+CPubKey CWallet::GenerateNewKey(bool external)
 {
     AssertLockHeld(cs_wallet); // mapKeyMetadata
-    bool fCompressed = CanSupportFeature(FEATURE_COMPRPUBKEY); // default to compressed public keys if we want 0.6.0 wallets
 
-    CKey secret;
-    secret.MakeNewKey(fCompressed);
+    if (!mnemonicHDChain.has_value()) {
+        throw std::runtime_error(
+                "CWallet::GenerateNewKey(): Wallet is missing mnemonic seed metadata.");
+    }
+    CHDChain& hdChain = mnemonicHDChain.value();
+
+    transparent::AccountKey accountKey = this->GetLegacyAccountKey();
+    std::optional<CPubKey> pubkey = std::nullopt;
+    do {
+        auto index = hdChain.GetLegacyTKeyCounter(external);
+        auto key = external ?
+            accountKey.DeriveExternalSpendingKey(index) :
+            accountKey.DeriveInternalSpendingKey(index);
 
-    // Compressed public keys were introduced in version 0.6.0
-    if (fCompressed)
-        SetMinVersion(FEATURE_COMPRPUBKEY);
+        hdChain.IncrementLegacyTKeyCounter(external);
+        if (key.has_value()) {
+            pubkey = AddTransparentSecretKey(
+                hdChain.GetSeedFingerprint(),
+                key.value(),
+                transparent::AccountKey::KeyPath(BIP44CoinType(), ZCASH_LEGACY_ACCOUNT, external, index)
+            );
+        }
+        // if we did not successfully generate a key, try again.
+    } while (!pubkey.has_value());
+
+    // Update the persisted chain information
+    if (fFileBacked && !CWalletDB(strWalletFile).WriteMnemonicHDChain(hdChain)) {
+        throw std::runtime_error("CWallet::GenerateNewKey(): Writing HD chain model failed");
+    }
+
+    return pubkey.value();
+}
 
+CPubKey CWallet::AddTransparentSecretKey(
+        const uint256& seedFingerprint,
+        const CKey& secret,
+        const HDKeyPath& keyPath)
+{
     CPubKey pubkey = secret.GetPubKey();
     assert(secret.VerifyPubKey(pubkey));
 
     // Create new metadata
-    int64_t nCreationTime = GetTime();
-    mapKeyMetadata[pubkey.GetID()] = CKeyMetadata(nCreationTime);
-    if (!nTimeFirstKey || nCreationTime < nTimeFirstKey)
-        nTimeFirstKey = nCreationTime;
+    CKeyMetadata keyMeta(GetTime());
+    keyMeta.hdKeypath = keyPath;
+    keyMeta.seedFp = seedFingerprint;
+    mapKeyMetadata[pubkey.GetID()] = keyMeta;
+    if (nTimeFirstKey == 0 || keyMeta.nCreateTime < nTimeFirstKey)
+        nTimeFirstKey = keyMeta.nCreateTime;
 
     if (!AddKeyPubKey(secret, pubkey))
-        throw std::runtime_error("CWallet::GenerateNewKey(): AddKey failed");
+        throw std::runtime_error("CWallet::GenerateNewKey(): AddKeyPubKey failed");
+
     return pubkey;
 }
 
-bool CWallet::AddKeyPubKey(const CKey& secret, const CPubKey &pubkey)
+bool CWallet::AddKeyPubKey(
+        const CKey& secret,
+        const CPubKey &pubkey)
 {
     AssertLockHeld(cs_wallet); // mapKeyMetadata
     if (!CCryptoKeyStore::AddKeyPubKey(secret, pubkey))
@@ -284,11 +409,13 @@ bool CWallet::AddKeyPubKey(const CKey& secret, const CPubKey &pubkey)
 
     if (!fFileBacked)
         return true;
+
     if (!IsCrypted()) {
         return CWalletDB(strWalletFile).WriteKey(pubkey,
                                                  secret.GetPrivKey(),
                                                  mapKeyMetadata[pubkey.GetID()]);
     }
+
     return true;
 }
 
@@ -353,181 +480,783 @@ bool CWallet::AddCryptedSaplingSpendingKey(const libzcash::SaplingExtendedFullVi
         if (pwalletdbEncryption) {
             return pwalletdbEncryption->WriteCryptedSaplingZKey(extfvk,
                                                          vchCryptedSecret,
-                                                         mapSaplingZKeyMetadata[extfvk.fvk.in_viewing_key()]);
+                                                         mapSaplingZKeyMetadata[extfvk.ToIncomingViewingKey()]);
         } else {
             return CWalletDB(strWalletFile).WriteCryptedSaplingZKey(extfvk,
                                                          vchCryptedSecret,
-                                                         mapSaplingZKeyMetadata[extfvk.fvk.in_viewing_key()]);
+                                                         mapSaplingZKeyMetadata[extfvk.ToIncomingViewingKey()]);
         }
     }
     return false;
 }
 
-void CWallet::LoadKeyMetadata(const CPubKey &pubkey, const CKeyMetadata &meta)
-{
-    AssertLockHeld(cs_wallet); // mapKeyMetadata
-    if (meta.nCreateTime && (!nTimeFirstKey || meta.nCreateTime < nTimeFirstKey))
-        nTimeFirstKey = meta.nCreateTime;
+libzcash::transparent::AccountKey CWallet::GetLegacyAccountKey() const {
+    auto seedOpt = GetMnemonicSeed();
+    if (!seedOpt.has_value()) {
+        throw std::runtime_error(
+                "CWallet::GenerateNewKey(): Wallet does not have a mnemonic seed.");
+    }
+    auto seed = seedOpt.value();
 
-    mapKeyMetadata[pubkey.GetID()] = meta;
+    // All mnemonic seeds are checked at construction to ensure that we can obtain
+    // a valid spending key for the account ZCASH_LEGACY_ACCOUNT;
+    // therefore, the `value()` call here is safe.
+    return transparent::AccountKey::ForAccount(
+            seed,
+            BIP44CoinType(),
+            ZCASH_LEGACY_ACCOUNT).value();
 }
 
-void CWallet::LoadZKeyMetadata(const SproutPaymentAddress &addr, const CKeyMetadata &meta)
-{
-    AssertLockHeld(cs_wallet); // mapSproutZKeyMetadata
-    mapSproutZKeyMetadata[addr] = meta;
-}
 
-bool CWallet::LoadCryptedKey(const CPubKey &vchPubKey, const std::vector<unsigned char> &vchCryptedSecret)
-{
-    return CCryptoKeyStore::AddCryptedKey(vchPubKey, vchCryptedSecret);
-}
+std::pair<UnifiedFullViewingKey, libzcash::AccountId> CWallet::GenerateNewUnifiedSpendingKey() {
+    AssertLockHeld(cs_wallet);
 
-bool CWallet::LoadCryptedZKey(const libzcash::SproutPaymentAddress &addr, const libzcash::ReceivingKey &rk, const std::vector<unsigned char> &vchCryptedSecret)
-{
-    return CCryptoKeyStore::AddCryptedSproutSpendingKey(addr, rk, vchCryptedSecret);
-}
+    if (!mnemonicHDChain.has_value()) {
+        throw std::runtime_error(
+                "CWallet::GenerateNewUnifiedSpendingKey(): Wallet is missing mnemonic seed metadata.");
+    }
 
-bool CWallet::LoadCryptedSaplingZKey(
-    const libzcash::SaplingExtendedFullViewingKey &extfvk,
-    const std::vector<unsigned char> &vchCryptedSecret)
-{
-     return CCryptoKeyStore::AddCryptedSaplingSpendingKey(extfvk, vchCryptedSecret);
-}
+    CHDChain& hdChain = mnemonicHDChain.value();
+    while (true) {
+        auto accountId = hdChain.GetAccountCounter();
+        auto generated = GenerateUnifiedSpendingKeyForAccount(accountId);
+        hdChain.IncrementAccountCounter();
 
-void CWallet::LoadSaplingZKeyMetadata(const libzcash::SaplingIncomingViewingKey &ivk, const CKeyMetadata &meta)
-{
-    AssertLockHeld(cs_wallet); // mapSaplingZKeyMetadata
-    mapSaplingZKeyMetadata[ivk] = meta;
-}
+        if (generated.has_value()) {
+            // Update the persisted chain information
+            if (fFileBacked && !CWalletDB(strWalletFile).WriteMnemonicHDChain(hdChain)) {
+                throw std::runtime_error(
+                        "CWallet::GenerateNewUnifiedSpendingKey(): Writing HD chain model failed");
+            }
 
-bool CWallet::LoadSaplingZKey(const libzcash::SaplingExtendedSpendingKey &key)
-{
-    return CCryptoKeyStore::AddSaplingSpendingKey(key);
+            return std::make_pair(generated.value().ToFullViewingKey(), accountId);
+        }
+    }
 }
 
-bool CWallet::LoadSaplingFullViewingKey(const libzcash::SaplingExtendedFullViewingKey &extfvk)
-{
-    return CCryptoKeyStore::AddSaplingFullViewingKey(extfvk);
-}
+std::optional<libzcash::ZcashdUnifiedSpendingKey>
+        CWallet::GenerateUnifiedSpendingKeyForAccount(libzcash::AccountId accountId) {
+    AssertLockHeld(cs_wallet); // mapUnifiedAccountKeys
 
-bool CWallet::LoadSaplingPaymentAddress(
-    const libzcash::SaplingPaymentAddress &addr,
-    const libzcash::SaplingIncomingViewingKey &ivk)
-{
-    return CCryptoKeyStore::AddSaplingIncomingViewingKey(ivk, addr);
-}
+    auto seed = GetMnemonicSeed();
+    if (!seed.has_value()) {
+        throw std::runtime_error(std::string(__func__) + ": Wallet has no mnemonic HD seed.");
+    }
 
-bool CWallet::LoadZKey(const libzcash::SproutSpendingKey &key)
-{
-    return CCryptoKeyStore::AddSproutSpendingKey(key);
+    auto usk = ZcashdUnifiedSpendingKey::ForAccount(seed.value(), BIP44CoinType(), accountId);
+    if (usk.has_value()) {
+        auto ufvk = usk.value().ToFullViewingKey();
+        auto ufvkid = ufvk.GetKeyID(Params());
+
+        ZcashdUnifiedAccountMetadata skmeta(seed.value().Fingerprint(), BIP44CoinType(), accountId, ufvkid);
+
+        // We don't store the spending key directly; instead, we store each of
+        // the spending key's components, in order to not violate invariants
+        // with respect to the encryption of the wallet. We store each
+        // component in the appropriate wallet subsystem, and store the
+        // metadata that can be used to re-derive the spending key along with
+        // the fingerprint of the associated full viewing key.
+
+        // Set up the bidirectional maps between the account ID and the UFVK ID.
+        auto metaKey = std::make_pair(skmeta.GetSeedFingerprint(), skmeta.GetAccountId());
+        const auto [it, is_new_key] = mapUnifiedAccountKeys.insert({metaKey, skmeta.GetKeyID()});
+        if (!is_new_key) {
+            // key was already present, so just return the USK.
+            return usk.value();
+        }
+
+        // We set up the UFVKAddressMetadata with the correct account ID (so we identify
+        // the UFVK as corresponding to this account) and empty receivers data (as we
+        // haven't generated any addresses yet). We don't need to persist this directly,
+        // because we persist skmeta below, and mapUfvkAddressMetadata is populated in
+        // LoadUnifiedAccountMetadata().
+        mapUfvkAddressMetadata.insert({ufvkid, UFVKAddressMetadata(accountId)});
+
+        // We do not explicitly add any transparent component to the keystore;
+        // the secret keys that we need to store are the child spending keys
+        // that are produced whenever we create a transparent address.
+
+        // Create the function that we'll use to add Sapling keys
+        // to the wallet.
+        auto addSaplingKey = AddSpendingKeyToWallet(
+            this, Params().GetConsensus(), GetTime(),
+            libzcash::Zip32AccountKeyPath(BIP44CoinType(), accountId),
+            skmeta.GetSeedFingerprint().GetHex(), true, false
+        );
+
+        // Add the Sapling spending key to the wallet
+        auto saplingEsk = usk.value().GetSaplingKey();
+        if (addSaplingKey(saplingEsk) == KeyNotAdded) {
+            // If adding the Sapling key to the wallet failed, abort the process.
+            throw std::runtime_error("CWalletDB::GenerateUnifiedSpendingKeyForAccount(): Unable to add Sapling spending key to the wallet.");
+        }
+
+        // Add the Sapling change spending key to the wallet
+        auto saplingChangeEsk = saplingEsk.DeriveInternalKey();
+        if (addSaplingKey(saplingChangeEsk) == KeyNotAdded) {
+            // If adding the Sapling change key to the wallet failed, abort the process.
+            throw std::runtime_error("CWalletDB::GenerateUnifiedSpendingKeyForAccount(): Unable to add Sapling change key to the wallet.");
+        }
+
+        // Associate the Sapling default change address with its IVK. We do this
+        // here because there is only ever a single Sapling change receiver, and
+        // it is never exposed to the user. External Sapling receivers are added
+        // when the user calls z_getaddressforaccount.
+        auto saplingXFVK = saplingEsk.ToXFVK();
+        if (!AddSaplingPaymentAddress(saplingXFVK.GetChangeIVK(), saplingXFVK.GetChangeAddress())) {
+            throw std::runtime_error("CWallet::GenerateUnifiedSpendingKeyForAccount(): Failed to add Sapling change address to the wallet.");
+        };
+
+        // Add Orchard spending key to the wallet
+        auto orchardSk = usk.value().GetOrchardKey();
+        orchardWallet.AddSpendingKey(orchardSk);
+
+        // Associate the Orchard default change address with its IVK. We do this
+        // here because there is only ever a single Orchard change receiver, and
+        // it is never exposed to the user. External Orchard receivers are added
+        // when the user calls z_getaddressforaccount.
+        auto orchardInternalFvk = orchardSk.ToFullViewingKey().ToInternalIncomingViewingKey();
+        if (!AddOrchardRawAddress(orchardInternalFvk, orchardInternalFvk.Address(0))) {
+            throw std::runtime_error("CWallet::GenerateUnifiedSpendingKeyForAccount(): Failed to add Orchard change address to the wallet.");
+        };
+
+        auto zufvk = ZcashdUnifiedFullViewingKey::FromUnifiedFullViewingKey(Params(), ufvk);
+        if (!CCryptoKeyStore::AddUnifiedFullViewingKey(zufvk)) {
+            throw std::runtime_error("CWalletDB::GenerateUnifiedSpendingKeyForAccount(): Failed to add UFVK to the keystore.");
+        }
+
+        if (fFileBacked) {
+            auto walletdb = CWalletDB(strWalletFile);
+            if (!( walletdb.WriteUnifiedFullViewingKey(ufvk) &&
+                   walletdb.WriteUnifiedAccountMetadata(skmeta)
+                 )) {
+                throw std::runtime_error("CWalletDB::GenerateUnifiedSpendingKeyForAccount(): walletdb write failed.");
+            }
+        }
+
+        return usk;
+    } else {
+        return std::nullopt;
+    }
 }
 
-bool CWallet::AddSproutViewingKey(const libzcash::SproutViewingKey &vk)
+bool CWallet::AddUnifiedFullViewingKey(const libzcash::UnifiedFullViewingKey &ufvk)
 {
-    if (!CCryptoKeyStore::AddSproutViewingKey(vk)) {
+    AssertLockHeld(cs_wallet);
+
+    auto zufvk = ZcashdUnifiedFullViewingKey::FromUnifiedFullViewingKey(Params(), ufvk);
+    auto keyId = ufvk.GetKeyID(Params());
+    if (!CCryptoKeyStore::AddUnifiedFullViewingKey(zufvk)) {
         return false;
     }
-    nTimeFirstKey = 1; // No birthday information for viewing keys.
+
     if (!fFileBacked) {
         return true;
     }
-    return CWalletDB(strWalletFile).WriteSproutViewingKey(vk);
+
+    return CWalletDB(strWalletFile).WriteUnifiedFullViewingKey(ufvk);
 }
 
-bool CWallet::RemoveSproutViewingKey(const libzcash::SproutViewingKey &vk)
-{
-    AssertLockHeld(cs_wallet);
-    if (!CCryptoKeyStore::RemoveSproutViewingKey(vk)) {
-        return false;
-    }
-    if (fFileBacked) {
-        if (!CWalletDB(strWalletFile).EraseSproutViewingKey(vk)) {
-            return false;
-        }
+std::optional<ZcashdUnifiedFullViewingKey> CWallet::GetUnifiedFullViewingKeyByAccount(libzcash::AccountId accountId) const {
+    if (!mnemonicHDChain.has_value()) {
+        throw std::runtime_error(
+                "CWallet::GetUnifiedFullViewingKeyByAccount(): Wallet is missing mnemonic seed metadata.");
     }
 
-    return true;
+    auto seedfp = mnemonicHDChain.value().GetSeedFingerprint();
+    auto entry = mapUnifiedAccountKeys.find(std::make_pair(seedfp, accountId));
+    if (entry != mapUnifiedAccountKeys.end()) {
+        return CCryptoKeyStore::GetUnifiedFullViewingKey(entry->second);
+    } else {
+        return std::nullopt;
+    }
 }
 
-bool CWallet::LoadSproutViewingKey(const libzcash::SproutViewingKey &vk)
-{
-    return CCryptoKeyStore::AddSproutViewingKey(vk);
+WalletUAGenerationResult ToWalletUAGenerationResult(UnifiedAddressGenerationResult result) {
+    return std::visit(match {
+        [](const UnifiedAddressGenerationError& err) {
+            return WalletUAGenerationResult(err);
+        },
+        [](const std::pair<UnifiedAddress, diversifier_index_t>& addrPair) {
+            return WalletUAGenerationResult(addrPair);
+        }
+    }, result);
 }
 
-bool CWallet::AddCScript(const CScript& redeemScript)
+WalletUAGenerationResult CWallet::GenerateUnifiedAddress(
+    const libzcash::AccountId& accountId,
+    const std::set<libzcash::ReceiverType>& receiverTypes,
+    std::optional<libzcash::diversifier_index_t> j)
 {
-    if (!CCryptoKeyStore::AddCScript(redeemScript))
-        return false;
-    if (!fFileBacked)
-        return true;
-    return CWalletDB(strWalletFile).WriteCScript(Hash160(redeemScript), redeemScript);
-}
+    bool searchDiversifiers = !j.has_value();
+    if (!libzcash::HasShielded(receiverTypes)) {
+        return UnifiedAddressGenerationError::ShieldedReceiverNotFound;
+    }
 
-bool CWallet::LoadCScript(const CScript& redeemScript)
-{
-    /* A sanity check was added in pull #3843 to avoid adding redeemScripts
-     * that never can be redeemed. However, old wallets may still contain
-     * these. Do not add them to the wallet and warn. */
-    KeyIO keyIO(Params());
-    if (redeemScript.size() > MAX_SCRIPT_ELEMENT_SIZE)
-    {
-        std::string strAddr = keyIO.EncodeDestination(CScriptID(redeemScript));
-        LogPrintf("%s: Warning: This wallet contains a redeemScript of size %i which exceeds maximum size %i thus can never be redeemed. Do not use address %s.\n",
-            __func__, redeemScript.size(), MAX_SCRIPT_ELEMENT_SIZE, strAddr);
-        return true;
+    // The wallet must be unlocked in order to generate new transparent UA
+    // receivers, because we need to be able to add the secret key for the
+    // external child address at the diversifier index to the wallet's
+    // transparent backend in order to be able to detect transactions as
+    // ours rather than considering them as watch-only.
+    bool hasTransparent = receiverTypes.find(ReceiverType::P2PKH) != receiverTypes.end();
+    if (hasTransparent) {
+        // A preemptive check to ensure that the user has not specified an
+        // invalid transparent child index. If we search from a valid transparent
+        // child index into invalid child index space.
+        if (j.has_value() && !j.value().ToTransparentChildIndex().has_value()) {
+            return UnifiedAddressGenerationError::InvalidTransparentChildIndex;
+        }
+
+        if (IsCrypted() || !GetMnemonicSeed().has_value()) {
+            return WalletUAGenerationError::WalletEncrypted;
+        }
     }
 
-    return CCryptoKeyStore::AddCScript(redeemScript);
-}
+    auto ufvk = GetUnifiedFullViewingKeyByAccount(accountId);
+    if (ufvk.has_value()) {
+        auto ufvkid = ufvk.value().GetKeyID();
 
-bool CWallet::AddWatchOnly(const CScript &dest)
-{
-    if (!CCryptoKeyStore::AddWatchOnly(dest))
-        return false;
-    nTimeFirstKey = 1; // No birthday information for watch-only keys.
-    NotifyWatchonlyChanged(true);
-    if (!fFileBacked)
-        return true;
-    return CWalletDB(strWalletFile).WriteWatchOnly(dest);
+        // Check whether an address has already been generated for any provided
+        // diversifier index. Return that address, or set the diversifier index
+        // at which we'll begin searching for the next available diversified
+        // address.
+        auto metadata = mapUfvkAddressMetadata.find(ufvkid);
+        if (metadata != mapUfvkAddressMetadata.end()) {
+            if (j.has_value()) {
+
+                auto receivers = metadata->second.GetReceivers(j.value());
+                if (receivers.has_value()) {
+                    // Ensure that the set of receiver types being requested is
+                    // the same as the set of receiver types that was previously
+                    // generated. If they match, simply return that address.
+                    if (receivers.value() == receiverTypes) {
+                        return ToWalletUAGenerationResult(ufvk.value().Address(j.value(), receiverTypes));
+                    } else {
+                        return WalletUAGenerationError::ExistingAddressMismatch;
+                    }
+                }
+            } else {
+                // Set the diversifier index to one greater than the last used
+                // diversifier
+                j = metadata->second.GetNextDiversifierIndex();
+                if (!j.has_value()) {
+                    return UnifiedAddressGenerationError::DiversifierSpaceExhausted;
+                }
+            }
+        } else {
+            // Begin searching from the zero diversifier index if we haven't
+            // yet generated an address from the specified UFVK and no
+            // diversifier index has been specified.
+            if (!j.has_value()) {
+                j = libzcash::diversifier_index_t(0);
+            }
+        }
+
+        // Find a working diversifier and construct the associated address.
+        // At this point, we know that `j` will contain a value.
+        auto addressGenerationResult = searchDiversifiers ?
+            ufvk.value().FindAddress(j.value(), receiverTypes) :
+            ufvk.value().Address(j.value(), receiverTypes);
+
+        if (std::holds_alternative<UnifiedAddressGenerationError>(addressGenerationResult)) {
+            return std::get<UnifiedAddressGenerationError>(addressGenerationResult);
+        }
+
+        auto address = std::get<std::pair<UnifiedAddress, diversifier_index_t>>(addressGenerationResult);
+
+        assert(mapUfvkAddressMetadata[ufvkid].SetReceivers(address.second, receiverTypes));
+        if (hasTransparent) {
+            // We must construct and add the transparent spending key associated
+            // with the external and internal transparent child addresses to the
+            // transparent keystore. This call to `value` will succeed because
+            // this key must have been previously generated.
+            auto usk = GenerateUnifiedSpendingKeyForAccount(accountId).value();
+            auto accountKey = usk.GetTransparentKey();
+            // this .value is known to be safe from the earlier check
+            auto childIndex = address.second.ToTransparentChildIndex().value();
+            auto externalKey = accountKey.DeriveExternalSpendingKey(childIndex);
+
+            if (!externalKey.has_value()) {
+                return UnifiedAddressGenerationError::NoAddressForDiversifier;
+            }
+
+            AddTransparentSecretKey(
+                mnemonicHDChain.value().GetSeedFingerprint(),
+                externalKey.value(),
+                transparent::AccountKey::KeyPath(BIP44CoinType(), accountId, true, childIndex)
+            );
+
+            // We do not add the change address for the transparent key, because
+            // we do not send transparent change when using unified accounts.
+
+            // Writing this data is handled by `CWalletDB::WriteUnifiedAddressMetadata` below.
+            assert(
+                CCryptoKeyStore::AddTransparentReceiverForUnifiedAddress(
+                    ufvkid, address.second, address.first
+                )
+            );
+        }
+
+        // If the address has a Sapling component, add an association between
+        // that address and the Sapling IVK corresponding to the ufvk
+        auto hasSapling = receiverTypes.find(ReceiverType::Sapling) != receiverTypes.end();
+        if (hasSapling) {
+            auto dfvk = ufvk.value().GetSaplingKey();
+            auto saplingAddress = address.first.GetSaplingReceiver();
+            assert (dfvk.has_value() && saplingAddress.has_value());
+
+            AddSaplingPaymentAddress(dfvk.value().ToIncomingViewingKey(), saplingAddress.value());
+        }
+
+        // If the address has an Orchard component, add an association between
+        // that address and the Orchard IVK corresponding to the ufvk
+        auto hasOrchard = receiverTypes.find(ReceiverType::Orchard) != receiverTypes.end();
+        if (hasOrchard) {
+            auto fvk = ufvk.value().GetOrchardKey();
+            auto orchardReceiver = address.first.GetOrchardReceiver();
+            assert (fvk.has_value() && orchardReceiver.has_value());
+
+            AddOrchardRawAddress(fvk.value().ToIncomingViewingKey(), orchardReceiver.value());
+        }
+
+        // Save the metadata for the generated address so that we can re-derive
+        // it in the future.
+        ZcashdUnifiedAddressMetadata addrmeta(ufvkid, address.second, receiverTypes);
+        if (fFileBacked && !CWalletDB(strWalletFile).WriteUnifiedAddressMetadata(addrmeta)) {
+            throw std::runtime_error(
+                    "CWallet::AddUnifiedAddress(): Writing unified address metadata failed");
+        }
+
+        return address;
+    } else {
+        return WalletUAGenerationError::NoSuchAccount;
+    }
 }
 
-bool CWallet::RemoveWatchOnly(const CScript &dest)
+bool CWallet::LoadUnifiedFullViewingKey(const libzcash::UnifiedFullViewingKey &key)
 {
-    AssertLockHeld(cs_wallet);
-    if (!CCryptoKeyStore::RemoveWatchOnly(dest))
-        return false;
-    if (!HaveWatchOnly())
-        NotifyWatchonlyChanged(false);
-    if (fFileBacked)
-        if (!CWalletDB(strWalletFile).EraseWatchOnly(dest))
-            return false;
-
-    return true;
+    return CCryptoKeyStore::AddUnifiedFullViewingKey(
+        ZcashdUnifiedFullViewingKey::FromUnifiedFullViewingKey(Params(), key)
+    );
 }
 
-bool CWallet::LoadWatchOnly(const CScript &dest)
+bool CWallet::LoadUnifiedAccountMetadata(const ZcashdUnifiedAccountMetadata &skmeta)
 {
-    return CCryptoKeyStore::AddWatchOnly(dest);
+    AssertLockHeld(cs_wallet); // mapUnifiedAccountKeys
+    auto metaKey = std::make_pair(skmeta.GetSeedFingerprint(), skmeta.GetAccountId());
+    mapUnifiedAccountKeys.insert({metaKey, skmeta.GetKeyID()});
+    return mapUfvkAddressMetadata[skmeta.GetKeyID()].SetAccountId(skmeta.GetAccountId());
 }
 
-bool CWallet::Unlock(const SecureString& strWalletPassphrase)
+bool CWallet::LoadUnifiedAddressMetadata(const ZcashdUnifiedAddressMetadata &addrmeta)
 {
-    CCrypter crypter;
-    CKeyingMaterial vMasterKey;
+    AssertLockHeld(cs_wallet);
 
-    {
-        LOCK(cs_wallet);
-        for (const MasterKeyMap::value_type& pMasterKey : mapMasterKeys)
-        {
-            if(!crypter.SetKeyFromPassphrase(strWalletPassphrase, pMasterKey.second.vchSalt, pMasterKey.second.nDeriveIterations, pMasterKey.second.nDerivationMethod))
-                return false;
+    return mapUfvkAddressMetadata[addrmeta.GetKeyID()].SetReceivers(
+                addrmeta.GetDiversifierIndex(),
+                addrmeta.GetReceiverTypes());
+}
+
+PaymentAddress CWallet::GetPaymentAddressForRecipient(
+        const uint256& txid,
+        const libzcash::RecipientAddress& recipient) const
+{
+    auto self = this;
+    auto defaultAddress = [&]() -> PaymentAddress {
+        auto ufvk = self->GetUFVKForReceiver(RecipientAddressToReceiver(recipient));
+        return std::visit(match {
+            [&](const CKeyID& addr) {
+                auto ua = self->FindUnifiedAddressByReceiver(addr);
+                if (ua.has_value()) {
+                    return libzcash::PaymentAddress{ua.value()};
+                } else {
+                    return libzcash::PaymentAddress{addr};
+                }
+            },
+            [&](const CScriptID& addr) {
+                auto ua = self->FindUnifiedAddressByReceiver(addr);
+                if (ua.has_value()) {
+                    return libzcash::PaymentAddress{ua.value()};
+                } else {
+                    return libzcash::PaymentAddress{addr};
+                }
+            },
+            [&](const SaplingPaymentAddress& addr) {
+                auto ua = self->FindUnifiedAddressByReceiver(addr);
+                if (ua.has_value()) {
+                    return libzcash::PaymentAddress{ua.value()};
+                } else if (ufvk.has_value() && ufvk->GetSaplingKey().has_value()) {
+                    auto saplingKey = ufvk->GetSaplingKey().value();
+                    auto j = saplingKey.DecryptDiversifier(addr.d);
+                    // std::get is safe here because we know we have a valid Sapling diversifier index
+                    auto defaultUA = std::get<std::pair<UnifiedAddress, diversifier_index_t>>(
+                            ufvk->Address(j, CWallet::DefaultReceiverTypes()));
+                    return libzcash::PaymentAddress{defaultUA.first};
+                } else {
+                    return libzcash::PaymentAddress{addr};
+                }
+            },
+            [&](const OrchardRawAddress& addr) {
+                auto ua = self->FindUnifiedAddressByReceiver(addr);
+                if (ua.has_value()) {
+                    return libzcash::PaymentAddress{ua.value()};
+                } else if (ufvk.has_value() && ufvk->GetOrchardKey().has_value()) {
+                    auto orchardKey = ufvk->GetOrchardKey().value();
+                    auto j = orchardKey.ToIncomingViewingKey().DecryptDiversifier(addr);
+                    if (j.has_value()) {
+                        auto genResult = ufvk->Address(j.value(), CWallet::DefaultReceiverTypes());
+                        auto defaultUA = std::get_if<std::pair<UnifiedAddress, diversifier_index_t>>(&genResult);
+                        if (defaultUA != nullptr) {
+                            return libzcash::PaymentAddress{defaultUA->first};
+                        }
+                    }
+                }
+
+                return libzcash::PaymentAddress{UnifiedAddress::ForSingleReceiver(addr)};
+            }
+        }, recipient);
+    };
+
+    auto recipientsPtr = sendRecipients.find(txid);
+    if (recipientsPtr == sendRecipients.end()) {
+        // we don't know the recipient, so we just return the simplest type
+        return defaultAddress();
+    } else {
+        // search the list of recipient mappings for one corresponding to
+        // our recipient, and return the known UA if it exists; otherwise
+        // just use the default.
+        for (const auto& mapping : recipientsPtr->second) {
+            if (mapping.address == recipient && mapping.ua.has_value()) {
+                return PaymentAddress{mapping.ua.value()};
+            }
+        }
+        return defaultAddress();
+    }
+}
+
+bool CWallet::IsInternalRecipient(const libzcash::RecipientAddress& recipient) const
+{
+    auto self = this;
+    return std::visit(match {
+        [&](const CKeyID& addr) {
+            // we never send transparent change when sending to or from a
+            // unified address
+            return false;
+        },
+        [&](const CScriptID& addr) {
+            // we never use P2SH for change or shielding
+            return false;
+        },
+        [&](const SaplingPaymentAddress& addr) {
+            auto ufvk = self->GetUFVKForReceiver(addr);
+            if (ufvk.has_value()) {
+                auto changeAddr = ufvk->GetChangeAddress(SaplingChangeRequest());
+                if (changeAddr.has_value()) {
+                    return changeAddr.value() == recipient;
+                }
+            }
+            return false;
+        },
+        [&](const OrchardRawAddress& addr) {
+            auto ufvk = self->GetUFVKForReceiver(addr);
+            if (ufvk.has_value()) {
+                auto changeAddr = ufvk->GetChangeAddress(OrchardChangeRequest());
+                if (changeAddr.has_value()) {
+                    return changeAddr.value() == recipient;
+                }
+            }
+            return false;
+        }
+    }, recipient);
+}
+
+void CWallet::LoadRecipientMapping(const uint256& txid, const RecipientMapping& mapping) {
+    sendRecipients[txid].push_back(mapping);
+}
+
+bool CWallet::LoadCaches()
+{
+    AssertLockHeld(cs_wallet);
+    AssertLockHeld(cs_main);
+
+    auto seed = GetMnemonicSeed();
+
+    // Restore unified key metadata
+    for (auto account = mapUnifiedAccountKeys.begin(); account != mapUnifiedAccountKeys.end(); ++account) {
+        auto ufvkId = account->second;
+        auto ufvk = GetUnifiedFullViewingKey(ufvkId);
+
+        if (!seed.has_value()) {
+            LogPrintf("%s: Error: Mnemonic seed was not loaded despite an account existing in the wallet.\n",
+                __func__);
+            return false;
+        }
+
+        if (ufvk.has_value()) {
+            auto metadata = mapUfvkAddressMetadata.find(ufvkId);
+            if (metadata != mapUfvkAddressMetadata.end()) {
+                auto accountId = metadata->second.GetAccountId();
+                if (!accountId.has_value()) {
+                    LogPrintf("%s: Error: Address records exist for an account that was not loaded in the wallet.\n",
+                        __func__);
+                    return false;
+                }
+                auto usk = ZcashdUnifiedSpendingKey::ForAccount(seed.value(), BIP44CoinType(), accountId.value());
+                if (!usk.has_value()) {
+                    LogPrintf("%s: Error: Unable to generate a unified spending key for an account.\n",
+                        __func__);
+                    return false;
+                }
+
+                // add Orchard spending key to the orchard wallet
+                {
+                    auto orchardSk = usk.value().GetOrchardKey();
+                    orchardWallet.AddSpendingKey(orchardSk);
+
+                    // Associate the Orchard default change address with its IVK
+                    auto orchardInternalIvk = orchardSk.ToFullViewingKey().ToInternalIncomingViewingKey();
+                    if (!AddOrchardRawAddress(orchardInternalIvk, orchardInternalIvk.Address(0))) {
+                        LogPrintf("%s: Error: Unable to generate a default internal address.\n",
+                            __func__);
+                        return false;
+                    }
+                }
+
+                // restore unified addresses that have been previously generated to the
+                // keystore
+                for (const auto &[j, receiverTypes] : metadata->second.GetKnownReceiverSetsByDiversifierIndex()) {
+                    bool restored = std::visit(match {
+                        [&](const UnifiedAddressGenerationError& err) {
+                            LogPrintf("%s: Error: Unable to generate a unified address.\n",
+                                __func__);
+                            return false;
+                        },
+                        [&](const std::pair<UnifiedAddress, diversifier_index_t>& addr) {
+                            // Associate the orchard address with our IVK, if there's
+                            // an orchard receiver present in this address.
+                            auto orchardFvk = ufvk.value().GetOrchardKey();
+                            auto orchardReceiver = addr.first.GetOrchardReceiver();
+
+                            if (orchardFvk.has_value() != orchardReceiver.has_value()) {
+                                LogPrintf("%s: Error: Orchard receiver in unified address is inconsistent with the unified viewing key.\n",
+                                    __func__);
+                                return false;
+                            }
+
+                            if (orchardFvk.has_value()) {
+                                if (!AddOrchardRawAddress(orchardFvk.value().ToIncomingViewingKey(), orchardReceiver.value())) {
+                                    LogPrintf("%s: Error: Unable to add Orchard address -> IVK mapping.\n",
+                                        __func__);
+                                    return false;
+                                }
+                            }
+
+                            return CCryptoKeyStore::AddTransparentReceiverForUnifiedAddress(
+                                    ufvkId, addr.second, addr.first);
+                        }
+                    }, ufvk.value().Address(j, receiverTypes));
+
+                    // failure to restore the generated address is an error
+                    if (!restored) return false;
+                }
+            } else {
+                // Loaded an account, but didn't initialize
+                // `mapUfvkAddressMetadata` for the corresponding viewing key.
+                LogPrintf("%s: Error: UFVK address map not initialized despite an account existing.\n",
+                    __func__);
+                return false;
+            }
+        } else {
+            LogPrintf("%s: Error: Unified viewing key missing for an account.\n",
+                __func__);
+            return false;
+        }
+    }
+
+    // Restore decrypted Orchard notes.
+    for (const auto& [_, walletTx] : mapWallet) {
+        if (!walletTx.orchardTxMeta.empty()) {
+            const CBlockIndex* pTxIndex;
+            std::optional<int> blockHeight;
+            if (walletTx.GetDepthInMainChain(pTxIndex) > 0) {
+                blockHeight = pTxIndex->nHeight;
+            }
+            if (!orchardWallet.LoadWalletTx(blockHeight, walletTx, walletTx.orchardTxMeta)) {
+                LogPrintf("%s: Error: Failed to decrypt previously decrypted notes for txid %s.\n",
+                    __func__, walletTx.GetHash().GetHex());
+                return false;
+            }
+        }
+    }
+
+    return true;
+}
+
+void CWallet::LoadKeyMetadata(const CPubKey &pubkey, const CKeyMetadata &meta)
+{
+    AssertLockHeld(cs_wallet); // mapKeyMetadata
+    if (meta.nCreateTime && (!nTimeFirstKey || meta.nCreateTime < nTimeFirstKey))
+        nTimeFirstKey = meta.nCreateTime;
+
+    mapKeyMetadata[pubkey.GetID()] = meta;
+}
+
+void CWallet::LoadZKeyMetadata(const SproutPaymentAddress &addr, const CKeyMetadata &meta)
+{
+    AssertLockHeld(cs_wallet); // mapSproutZKeyMetadata
+    mapSproutZKeyMetadata[addr] = meta;
+}
+
+bool CWallet::LoadCryptedKey(const CPubKey &vchPubKey, const std::vector<unsigned char> &vchCryptedSecret)
+{
+    return CCryptoKeyStore::AddCryptedKey(vchPubKey, vchCryptedSecret);
+}
+
+bool CWallet::LoadCryptedZKey(const libzcash::SproutPaymentAddress &addr, const libzcash::ReceivingKey &rk, const std::vector<unsigned char> &vchCryptedSecret)
+{
+    return CCryptoKeyStore::AddCryptedSproutSpendingKey(addr, rk, vchCryptedSecret);
+}
+
+bool CWallet::LoadCryptedSaplingZKey(
+    const libzcash::SaplingExtendedFullViewingKey &extfvk,
+    const std::vector<unsigned char> &vchCryptedSecret)
+{
+     return CCryptoKeyStore::AddCryptedSaplingSpendingKey(extfvk, vchCryptedSecret);
+}
+
+void CWallet::LoadSaplingZKeyMetadata(const libzcash::SaplingIncomingViewingKey &ivk, const CKeyMetadata &meta)
+{
+    AssertLockHeld(cs_wallet); // mapSaplingZKeyMetadata
+    mapSaplingZKeyMetadata[ivk] = meta;
+}
+
+bool CWallet::LoadSaplingZKey(const libzcash::SaplingExtendedSpendingKey &key)
+{
+    return CCryptoKeyStore::AddSaplingSpendingKey(key);
+}
+
+bool CWallet::LoadSaplingFullViewingKey(const libzcash::SaplingExtendedFullViewingKey &extfvk)
+{
+    return CCryptoKeyStore::AddSaplingFullViewingKey(extfvk);
+}
+
+bool CWallet::LoadSaplingPaymentAddress(
+    const libzcash::SaplingPaymentAddress &addr,
+    const libzcash::SaplingIncomingViewingKey &ivk)
+{
+    return CCryptoKeyStore::AddSaplingPaymentAddress(ivk, addr);
+}
+
+bool CWallet::LoadZKey(const libzcash::SproutSpendingKey &key)
+{
+    return CCryptoKeyStore::AddSproutSpendingKey(key);
+}
+
+bool CWallet::AddSproutViewingKey(const libzcash::SproutViewingKey &vk)
+{
+    if (!CCryptoKeyStore::AddSproutViewingKey(vk)) {
+        return false;
+    }
+    nTimeFirstKey = 1; // No birthday information for viewing keys.
+    if (!fFileBacked) {
+        return true;
+    }
+    return CWalletDB(strWalletFile).WriteSproutViewingKey(vk);
+}
+
+bool CWallet::RemoveSproutViewingKey(const libzcash::SproutViewingKey &vk)
+{
+    AssertLockHeld(cs_wallet);
+    if (!CCryptoKeyStore::RemoveSproutViewingKey(vk)) {
+        return false;
+    }
+    if (fFileBacked) {
+        if (!CWalletDB(strWalletFile).EraseSproutViewingKey(vk)) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+bool CWallet::LoadSproutViewingKey(const libzcash::SproutViewingKey &vk)
+{
+    return CCryptoKeyStore::AddSproutViewingKey(vk);
+}
+
+bool CWallet::AddCScript(const CScript& redeemScript)
+{
+    if (!CCryptoKeyStore::AddCScript(redeemScript))
+        return false;
+    if (!fFileBacked)
+        return true;
+    return CWalletDB(strWalletFile).WriteCScript(Hash160(redeemScript), redeemScript);
+}
+
+bool CWallet::LoadCScript(const CScript& redeemScript)
+{
+    /* A sanity check was added in pull #3843 to avoid adding redeemScripts
+     * that never can be redeemed. However, old wallets may still contain
+     * these. Do not add them to the wallet and warn. */
+    KeyIO keyIO(Params());
+    if (redeemScript.size() > MAX_SCRIPT_ELEMENT_SIZE)
+    {
+        std::string strAddr = keyIO.EncodeDestination(CScriptID(redeemScript));
+        LogPrintf("%s: Warning: This wallet contains a redeemScript of size %i which exceeds maximum size %i thus can never be redeemed. Do not use address %s.\n",
+            __func__, redeemScript.size(), MAX_SCRIPT_ELEMENT_SIZE, strAddr);
+        return true;
+    }
+
+    return CCryptoKeyStore::AddCScript(redeemScript);
+}
+
+bool CWallet::AddWatchOnly(const CScript &dest)
+{
+    if (!CCryptoKeyStore::AddWatchOnly(dest))
+        return false;
+    nTimeFirstKey = 1; // No birthday information for watch-only keys.
+    NotifyWatchonlyChanged(true);
+    if (!fFileBacked)
+        return true;
+    return CWalletDB(strWalletFile).WriteWatchOnly(dest);
+}
+
+bool CWallet::RemoveWatchOnly(const CScript &dest)
+{
+    AssertLockHeld(cs_wallet);
+    if (!CCryptoKeyStore::RemoveWatchOnly(dest))
+        return false;
+    if (!HaveWatchOnly())
+        NotifyWatchonlyChanged(false);
+    if (fFileBacked)
+        if (!CWalletDB(strWalletFile).EraseWatchOnly(dest))
+            return false;
+
+    return true;
+}
+
+bool CWallet::LoadWatchOnly(const CScript &dest)
+{
+    return CCryptoKeyStore::AddWatchOnly(dest);
+}
+
+bool CWallet::Unlock(const SecureString& strWalletPassphrase)
+{
+    CCrypter crypter;
+    CKeyingMaterial vMasterKey;
+
+    {
+        LOCK(cs_wallet);
+        for (const MasterKeyMap::value_type& pMasterKey : mapMasterKeys)
+        {
+            if(!crypter.SetKeyFromPassphrase(strWalletPassphrase, pMasterKey.second.vchSalt, pMasterKey.second.nDeriveIterations, pMasterKey.second.nDerivationMethod))
+                return false;
             if (!crypter.Decrypt(pMasterKey.second.vchCryptedKey, vMasterKey))
                 continue; // try another master key
             if (CCryptoKeyStore::Unlock(vMasterKey)) {
                 // Now that the wallet is decrypted, ensure we have an HD seed.
                 // https://github.com/zcash/zcash/issues/3607
-                if (!this->HaveHDSeed()) {
+                if (!this->HaveMnemonicSeed()) {
                     this->GenerateNewSeed();
                 }
                 return true;
@@ -586,9 +1315,13 @@ bool CWallet::ChangeWalletPassphrase(const SecureString& strOldWalletPassphrase,
 void CWallet::ChainTipAdded(const CBlockIndex *pindex,
                             const CBlock *pblock,
                             SproutMerkleTree sproutTree,
-                            SaplingMerkleTree saplingTree)
+                            SaplingMerkleTree saplingTree,
+                            bool performOrchardWalletUpdates)
 {
-    IncrementNoteWitnesses(pindex, pblock, sproutTree, saplingTree);
+    IncrementNoteWitnesses(
+            Params().GetConsensus(),
+            pindex, pblock,
+            sproutTree, saplingTree, performOrchardWalletUpdates);
     UpdateSaplingNullifierNoteMapForBlock(pblock);
 
     // SetBestChain() can be expensive for large wallets, so do only
@@ -616,19 +1349,22 @@ void CWallet::ChainTipAdded(const CBlockIndex *pindex,
 
 void CWallet::ChainTip(const CBlockIndex *pindex,
                        const CBlock *pblock,
+                       // If this is None, it indicates a rollback and we will decrement the
+                       // witnesses / rewind the tree
                        std::optional<std::pair<SproutMerkleTree, SaplingMerkleTree>> added)
 {
-    if (added) {
-        ChainTipAdded(pindex, pblock, added->first, added->second);
+    const auto& consensus = Params().GetConsensus();
+    if (added.has_value()) {
+        ChainTipAdded(pindex, pblock, added->first, added->second, true);
         // Prevent migration transactions from being created when node is syncing after launch,
         // and also when node wakes up from suspension/hibernation and incoming blocks are old.
-        if (!IsInitialBlockDownload(Params().GetConsensus()) &&
+        if (!IsInitialBlockDownload(consensus) &&
             pblock->GetBlockTime() > GetTime() - 3 * 60 * 60)
         {
             RunSaplingMigration(pindex->nHeight);
         }
     } else {
-        DecrementNoteWitnesses(pindex);
+        DecrementNoteWitnesses(consensus, pindex);
         UpdateSaplingNullifierNoteMapForBlock(pblock);
     }
 }
@@ -684,49 +1420,58 @@ void CWallet::SetBestChain(const CBlockLocator& loc)
     SetBestChainINTERNAL(walletdb, loc);
 }
 
-std::set<std::pair<libzcash::RawAddress, uint256>> CWallet::GetNullifiersForAddresses(
-        const std::set<libzcash::RawAddress> & addresses)
-{
-    std::set<std::pair<libzcash::RawAddress, uint256>> nullifierSet;
-    // Sapling ivk -> list of addrs map
-    // (There may be more than one diversified address for a given ivk.)
-    std::map<libzcash::SaplingIncomingViewingKey, std::vector<libzcash::SaplingPaymentAddress>> ivkMap;
-    for (const auto & addr : addresses) {
-        auto saplingAddr = std::get_if<libzcash::SaplingPaymentAddress>(&addr);
-        if (saplingAddr != nullptr) {
-            libzcash::SaplingIncomingViewingKey ivk;
-            this->GetSaplingIncomingViewingKey(*saplingAddr, ivk);
-            ivkMap[ivk].push_back(*saplingAddr);
-        }
-    }
-    for (const auto & txPair : mapWallet) {
-        // Sprout
-        for (const auto & noteDataPair : txPair.second.mapSproutNoteData) {
-            auto & noteData = noteDataPair.second;
-            auto & nullifier = noteData.nullifier;
-            auto & address = noteData.address;
-            if (nullifier && addresses.count(address)) {
-                nullifierSet.insert(std::make_pair(address, nullifier.value()));
+std::set<std::pair<libzcash::SproutPaymentAddress, uint256>> CWallet::GetSproutNullifiers(
+        const std::set<libzcash::SproutPaymentAddress>& addresses) {
+    std::set<std::pair<libzcash::SproutPaymentAddress, uint256>> nullifierSet;
+    if (!addresses.empty()) {
+        for (const auto& txPair : mapWallet) {
+            for (const auto & noteDataPair : txPair.second.mapSproutNoteData) {
+                auto & noteData = noteDataPair.second;
+                auto & nullifier = noteData.nullifier;
+                auto & address = noteData.address;
+                if (nullifier && addresses.count(address) > 0) {
+                    nullifierSet.insert(std::make_pair(address, nullifier.value()));
+                }
             }
         }
-        // Sapling
-        for (const auto & noteDataPair : txPair.second.mapSaplingNoteData) {
-            auto & noteData = noteDataPair.second;
-            auto & nullifier = noteData.nullifier;
-            auto & ivk = noteData.ivk;
-            if (nullifier && ivkMap.count(ivk)) {
-                for (const auto & addr : ivkMap[ivk]) {
-                    nullifierSet.insert(std::make_pair(addr, nullifier.value()));
+    }
+
+    return nullifierSet;
+}
+
+std::set<std::pair<libzcash::SaplingPaymentAddress, uint256>> CWallet::GetSaplingNullifiers(
+        const std::set<libzcash::SaplingPaymentAddress>& addresses) {
+    std::set<std::pair<libzcash::SaplingPaymentAddress, uint256>> nullifierSet;
+    if (!addresses.empty()) {
+        // Sapling ivk -> list of addrs map
+        // (There may be more than one diversified address for a given ivk.)
+        std::map<libzcash::SaplingIncomingViewingKey, std::vector<libzcash::SaplingPaymentAddress>> ivkMap;
+        for (const auto & addr : addresses) {
+            libzcash::SaplingIncomingViewingKey ivk;
+            this->GetSaplingIncomingViewingKey(addr, ivk);
+            ivkMap[ivk].push_back(addr);
+        }
+
+        for (const auto& txPair : mapWallet) {
+            for (const auto& noteDataPair : txPair.second.mapSaplingNoteData) {
+                auto & noteData = noteDataPair.second;
+                auto & nullifier = noteData.nullifier;
+                auto & ivk = noteData.ivk;
+                if (nullifier && ivkMap.count(ivk) > 0) {
+                    for (const auto & addr : ivkMap[ivk]) {
+                        nullifierSet.insert(std::make_pair(addr, nullifier.value()));
+                    }
                 }
             }
         }
     }
+
     return nullifierSet;
 }
 
 bool CWallet::IsNoteSproutChange(
-        const std::set<std::pair<libzcash::RawAddress, uint256>> & nullifierSet,
-        const libzcash::RawAddress & address,
+        const std::set<std::pair<libzcash::SproutPaymentAddress, uint256>> & nullifierSet,
+        const libzcash::SproutPaymentAddress& address,
         const JSOutPoint & jsop)
 {
     // A Note is marked as "change" if the address that received it
@@ -748,8 +1493,9 @@ bool CWallet::IsNoteSproutChange(
     return false;
 }
 
-bool CWallet::IsNoteSaplingChange(const std::set<std::pair<libzcash::RawAddress, uint256>> & nullifierSet,
-        const libzcash::RawAddress & address,
+bool CWallet::IsNoteSaplingChange(
+        const std::set<std::pair<libzcash::SaplingPaymentAddress, uint256>> & nullifierSet,
+        const libzcash::SaplingPaymentAddress& address,
         const SaplingOutPoint & op)
 {
     // A Note is marked as "change" if the address that received it
@@ -760,6 +1506,8 @@ bool CWallet::IsNoteSaplingChange(const std::set<std::pair<libzcash::RawAddress,
     // - Notes created by consolidation transactions (e.g. using
     //   z_mergetoaddress).
     // - Notes sent from one address to itself.
+    // FIXME: This also needs to check against the wallet's change address
+    // for the associated unified account when we add UA support
     for (const SpendDescription &spend : mapWallet[op.hash].vShieldedSpend) {
         if (nullifierSet.count(std::make_pair(address, spend.nullifier))) {
             return true;
@@ -837,6 +1585,7 @@ set<uint256> CWallet::GetConflicts(const uint256& txid) const
             }
             range_n = mapTxSproutNullifiers.equal_range(nullifier);
             for (TxNullifiers::const_iterator it = range_n.first; it != range_n.second; ++it) {
+                // TODO: Take into account transaction expiry for v4 transactions; see #5585
                 result.insert(it->second);
             }
         }
@@ -851,9 +1600,24 @@ set<uint256> CWallet::GetConflicts(const uint256& txid) const
         }
         range_o = mapTxSaplingNullifiers.equal_range(nullifier);
         for (TxNullifiers::const_iterator it = range_o.first; it != range_o.second; ++it) {
+            // TODO: Take into account transaction expiry; see #5585
             result.insert(it->second);
         }
     }
+
+    for (uint32_t i = 0; i < wtx.GetOrchardBundle().GetNumActions(); i++) {
+        OrchardOutPoint op(wtx.GetHash(), i);
+        auto potential_spends = orchardWallet.GetPotentialSpends(op);
+
+        if (potential_spends.size() <= 1) {
+            continue;  // No conflict if zero or one spends
+        }
+        for (const uint256 txid : potential_spends) {
+            // TODO: Take into account transaction expiry; see #5585
+            result.insert(txid);
+        }
+    }
+
     return result;
 }
 
@@ -981,8 +1745,559 @@ void CWallet::SyncMetaData(pair<typename TxSpendMap<T>::iterator, typename TxSpe
     }
 }
 
-/**
- * Outpoint is spent if any non-conflicted transaction
+//
+// Zcash transaction output selectors
+//
+
+std::optional<ZTXOSelector> CWallet::ZTXOSelectorForAccount(
+    libzcash::AccountId account,
+    bool requireSpendingKey,
+    std::set<libzcash::ReceiverType> receiverTypes) const
+{
+    if (mnemonicHDChain.has_value() &&
+        mapUnifiedAccountKeys.count(
+            std::make_pair(mnemonicHDChain.value().GetSeedFingerprint(), account)
+        ) > 0)
+    {
+        return ZTXOSelector(AccountZTXOPattern(account, receiverTypes), requireSpendingKey);
+    } else {
+        return std::nullopt;
+    }
+}
+
+std::optional<ZTXOSelector> CWallet::ZTXOSelectorForAddress(
+        const libzcash::PaymentAddress& addr,
+        bool requireSpendingKey,
+        bool allowAddressLinkability) const
+{
+    auto self = this;
+    std::optional<ZTXOPattern> pattern = std::nullopt;
+    std::visit(match {
+        [&](const CKeyID& addr) {
+            if (!requireSpendingKey || self->HaveKey(addr)) {
+                pattern = addr;
+            }
+        },
+        [&](const CScriptID& addr) {
+            if (!requireSpendingKey || self->HaveCScript(addr)) {
+                pattern = addr;
+            }
+        },
+        [&](const libzcash::SaplingPaymentAddress& addr) {
+            if (!requireSpendingKey || self->HaveSaplingSpendingKeyForAddress(addr)) {
+                pattern = addr;
+            }
+        },
+        [&](const libzcash::SproutPaymentAddress& addr) {
+            if (!requireSpendingKey || self->HaveSproutSpendingKey(addr)) {
+                pattern = addr;
+            }
+        },
+        [&](const libzcash::UnifiedAddress& ua) {
+            auto ufvkMeta = GetUFVKMetadataForAddress(ua);
+            if (ufvkMeta.has_value()) {
+                // TODO: at present, the `false` value for the `requireSpendingKey` argument
+                // is not respected for unified addresses, because we have no notion of
+                // an account for which we do not control the spending key. An alternate
+                // approach would be to use the UFVK directly in the case that we cannot
+                // determine a local account.
+                auto accountId = this->GetUnifiedAccountId(ufvkMeta.value().GetUFVKId());
+                if (accountId.has_value()) {
+                    if (allowAddressLinkability) {
+                        pattern = AccountZTXOPattern(accountId.value(), ua.GetKnownReceiverTypes());
+                    } else {
+                        pattern = ua;
+                    }
+                }
+            } else {
+                pattern = ua;
+            }
+        }
+    }, addr);
+
+    if (pattern.has_value()) {
+        return ZTXOSelector(pattern.value(), requireSpendingKey);
+    } else {
+        return std::nullopt;
+    }
+}
+
+std::optional<ZTXOSelector> CWallet::ZTXOSelectorForViewingKey(
+        const libzcash::ViewingKey& vk,
+        bool requireSpendingKey) const
+{
+    auto self = this;
+    std::optional<ZTXOPattern> pattern = std::nullopt;
+    std::visit(match {
+        [&](const libzcash::SaplingExtendedFullViewingKey& vk) {
+            if (!requireSpendingKey || self->HaveSaplingSpendingKey(vk)) {
+                pattern = vk;
+            }
+        },
+        [&](const libzcash::SproutViewingKey& vk) {
+            if (!requireSpendingKey || self->HaveSproutSpendingKey(vk.address())) {
+                pattern = vk;
+            }
+        },
+        [&](const libzcash::UnifiedFullViewingKey& ufvk) {
+            auto ufvkId = ufvk.GetKeyID(Params());
+            auto accountId = this->GetUnifiedAccountId(ufvkId);
+            if (accountId.has_value()) {
+                pattern = AccountZTXOPattern(accountId.value(), ufvk.GetKnownReceiverTypes());
+            } else {
+                pattern = ufvk;
+            }
+        }
+    }, vk);
+
+    if (pattern.has_value()) {
+        return ZTXOSelector(pattern.value(), requireSpendingKey);
+    } else {
+        return std::nullopt;
+    }
+}
+
+ZTXOSelector CWallet::LegacyTransparentZTXOSelector(bool requireSpendingKey) {
+    return ZTXOSelector(
+            AccountZTXOPattern(ZCASH_LEGACY_ACCOUNT, {ReceiverType::P2PKH, ReceiverType::P2SH}),
+            requireSpendingKey);
+}
+
+std::optional<libzcash::AccountId> CWallet::FindAccountForSelector(const ZTXOSelector& selector) const {
+    auto self = this;
+    std::optional<libzcash::AccountId> result{};
+    std::visit(match {
+        [&](const CKeyID& addr) {
+            auto meta = self->GetUFVKMetadataForReceiver(addr);
+            if (meta.has_value()) {
+                result = self->GetUnifiedAccountId(meta.value().GetUFVKId());
+            }
+        },
+        [&](const CScriptID& addr) {
+            auto meta = self->GetUFVKMetadataForReceiver(addr);
+            if (meta.has_value()) {
+                result = self->GetUnifiedAccountId(meta.value().GetUFVKId());
+            }
+        },
+        [&](const libzcash::SproutPaymentAddress& addr) { },
+        [&](const libzcash::SproutViewingKey& vk) { },
+        [&](const libzcash::SaplingPaymentAddress& addr) {
+            auto meta = GetUFVKMetadataForReceiver(addr);
+            if (meta.has_value()) {
+                result = self->GetUnifiedAccountId(meta.value().GetUFVKId());
+            }
+        },
+        [&](const libzcash::SaplingExtendedFullViewingKey& vk) {
+            auto ufvkid = GetUFVKIdForViewingKey(vk);
+            if (ufvkid.has_value()) {
+                result = self->GetUnifiedAccountId(ufvkid.value());
+            }
+        },
+        [&](const libzcash::UnifiedAddress& addr) {
+            auto meta = GetUFVKMetadataForAddress(addr);
+            if (meta.has_value()) {
+                result = self->GetUnifiedAccountId(meta.value().GetUFVKId());
+            }
+        },
+        [&](const libzcash::UnifiedFullViewingKey& vk) {
+            result = self->GetUnifiedAccountId(vk.GetKeyID(Params()));
+        },
+        [&](const AccountZTXOPattern& acct) {
+            if (self->mnemonicHDChain.has_value() &&
+                self->mapUnifiedAccountKeys.count(
+                    std::make_pair(self->mnemonicHDChain.value().GetSeedFingerprint(), acct.GetAccountId())
+                ) > 0) {
+                result = acct.GetAccountId();
+            }
+        }
+    }, selector.GetPattern());
+    return result;
+}
+
+// SelectorMatchesAddress is overloaded for:
+// Transparent
+bool CWallet::SelectorMatchesAddress(
+        const ZTXOSelector& selector,
+        const CTxDestination& address) const {
+    auto self = this;
+    return std::visit(match {
+        [&](const CKeyID& keyId) {
+            CTxDestination keyIdDest = keyId;
+            return address == keyIdDest;
+        },
+        [&](const CScriptID& scriptId) {
+            CTxDestination scriptIdDest = scriptId;
+            return address == scriptIdDest;
+        },
+        [&](const libzcash::SproutPaymentAddress& addr) { return false; },
+        [&](const libzcash::SproutViewingKey& vk) { return false; },
+        [&](const libzcash::SaplingPaymentAddress& addr) { return false; },
+        [&](const libzcash::SaplingExtendedFullViewingKey& extfvk) { return false; },
+        [&](const libzcash::UnifiedAddress& uaSelector) {
+            // for a UA selector when matching transparent addresses, we only match addresses
+            // that explicitly appear as receivers in the UA.
+            for (const auto& receiver : uaSelector) {
+                bool matches = std::visit(match {
+                    [&](const libzcash::OrchardRawAddress& orchardAddr) { return false; },
+                    [&](const libzcash::SaplingPaymentAddress& saplingAddr) { return false; },
+                    [&](const libzcash::UnknownReceiver& receiver) { return false; },
+                    [&](const CScriptID& scriptId) {
+                        CTxDestination scriptIdDest = scriptId;
+                        return address == scriptIdDest;
+                    },
+                    [&](const CKeyID& keyId) {
+                        CTxDestination keyIdDest = keyId;
+                        return address == keyIdDest;
+                    }
+                }, receiver);
+                if (matches) return true;
+            }
+            return false;
+        },
+        [&](const libzcash::UnifiedFullViewingKey& ufvk) {
+            std::optional<AddressUFVKMetadata> meta;
+            std::visit(match {
+                [&](const CNoDestination& none) { meta = std::nullopt; },
+                [&](const auto& addr) { meta = self->GetUFVKMetadataForReceiver(addr); }
+            }, address);
+            return (meta.has_value() && meta.value().GetUFVKId() == ufvk.GetKeyID(Params()));
+        },
+        [&](const AccountZTXOPattern& acct) {
+            if (acct.IncludesP2PKH() || acct.IncludesP2SH()) {
+                std::optional<AddressUFVKMetadata> meta;
+                std::visit(match {
+                    [&](const CNoDestination& none) { meta = std::nullopt; },
+                    [&](const auto& addr) { meta = self->GetUFVKMetadataForReceiver(addr); }
+                }, address);
+                if (meta.has_value()) {
+                    // use the coin if the account id corresponding to the UFVK is
+                    // the payment source account.
+                    return self->GetUnifiedAccountId(meta.value().GetUFVKId()) == std::optional(acct.GetAccountId());
+                } else {
+                    // The legacy account is treated as a single pool of
+                    // transparent funds, reproducing wallet behavior prior to
+                    // the advent of unified addresses.
+                    return acct.GetAccountId() == ZCASH_LEGACY_ACCOUNT;
+                }
+            }
+            return false;
+        }
+    }, selector.GetPattern());
+}
+// Sprout
+bool CWallet::SelectorMatchesAddress(
+        const ZTXOSelector& selector,
+        const libzcash::SproutPaymentAddress& a0) const {
+    return std::visit(match {
+        [&](const libzcash::SproutPaymentAddress& a1) { return a0 == a1; },
+        [&](const libzcash::SproutViewingKey& vk) { return a0 == vk.address(); },
+        [&](const auto& addr) { return false; },
+    }, selector.GetPattern());
+}
+// Sapling
+bool CWallet::SelectorMatchesAddress(
+        const ZTXOSelector& selector,
+        const libzcash::SaplingPaymentAddress& a0) const {
+    auto self = this;
+    return std::visit(match {
+        [&](const CKeyID& keyId) { return false; },
+        [&](const CScriptID& scriptId) { return false; },
+        [&](const libzcash::SproutPaymentAddress& addr) { return false; },
+        [&](const libzcash::SproutViewingKey& vk) { return false; },
+        [&](const libzcash::SaplingPaymentAddress& a1) {
+            return a0 == a1;
+        },
+        [&](const libzcash::SaplingExtendedFullViewingKey& extfvk) {
+            auto j = extfvk.DecryptDiversifier(a0.d);
+            auto addr = extfvk.Address(j);
+            return addr.has_value() && addr.value() == a0;
+        },
+        [&](const libzcash::UnifiedAddress& ua) {
+            const auto a0Meta = self->GetUFVKMetadataForReceiver(a0);
+            auto saplingReceiver = ua.GetSaplingReceiver();
+            if (saplingReceiver.has_value()) {
+                const auto uaMeta = self->GetUFVKMetadataForReceiver(saplingReceiver.value());
+                // if the Sapling address is derived from any UFVK corresponding to
+                // the Sapling component of the unified address, we consider that a
+                // match
+                return  a0Meta.has_value() && uaMeta.has_value() &&
+                        a0Meta.value().GetUFVKId() == uaMeta.value().GetUFVKId();
+            }
+            return false;
+        },
+        [&](const libzcash::UnifiedFullViewingKey& ufvk) {
+            auto saplingKey = ufvk.GetSaplingKey();
+            if (saplingKey.has_value()) {
+                auto j = saplingKey.value().DecryptDiversifier(a0.d);
+                auto addr = saplingKey.value().Address(j);
+                return addr.has_value() && addr.value() == a0;
+            } else {
+                return false;
+            }
+        },
+        [&](const AccountZTXOPattern& acct) {
+            if (acct.IncludesSapling()) {
+                const auto meta = self->GetUFVKMetadataForReceiver(a0);
+                if (meta.has_value()) {
+                    // use the coin if the account id corresponding to the UFVK is
+                    // the payment source account.
+                    return self->GetUnifiedAccountId(meta.value().GetUFVKId()) == std::optional(acct.GetAccountId());
+                } else {
+                    return false;
+                }
+            }
+            return false;
+        }
+    }, selector.GetPattern());
+}
+
+std::optional<RecipientAddress> CWallet::GenerateChangeAddressForAccount(
+        libzcash::AccountId accountId,
+        std::set<OutputPool> changeOptions) {
+    AssertLockHeld(cs_wallet);
+
+    if (accountId == ZCASH_LEGACY_ACCOUNT) {
+        // We only call this method with this account ID for legacy transparent addresses.
+        for (OutputPool t : changeOptions) {
+            if (t == OutputPool::Transparent) {
+                return GenerateNewKey(false).GetID();
+            }
+        }
+    } else {
+        auto ufvk = this->GetUnifiedFullViewingKeyByAccount(accountId);
+        if (ufvk.has_value()) {
+            // changeOptions is sorted in preference order, so return
+            // the first (and therefore most preferred) change address that
+            // we're able to generate.
+            for (OutputPool t : changeOptions) {
+                std::optional<RecipientAddress> changeAddr;
+                switch (t) {
+                case OutputPool::Orchard:
+                    changeAddr = ufvk.value().GetChangeAddress(OrchardChangeRequest());
+                    break;
+                case OutputPool::Sapling:
+                    changeAddr = ufvk.value().GetChangeAddress(SaplingChangeRequest());
+                    break;
+                case OutputPool::Transparent:
+                    // UFVKs must have a shielded component, so we would only
+                    // reach this point if changeOptions contained no shielded
+                    // options. But we prefer to opportunistically shield funds
+                    // where possible, so we don't produce transparent change
+                    // addresses for accounts.
+                    break;
+                }
+                if (changeAddr.has_value()) {
+                    return changeAddr.value();
+                }
+            }
+        }
+    }
+
+    return std::nullopt;
+}
+
+SpendableInputs CWallet::FindSpendableInputs(
+        ZTXOSelector selector,
+        bool allowTransparentCoinbase,
+        uint32_t minDepth) const {
+    AssertLockHeld(cs_main);
+    AssertLockHeld(cs_wallet);
+
+    KeyIO keyIO(Params());
+
+    bool selectTransparent{selector.SelectsTransparent()};
+    bool selectSprout{selector.SelectsSprout()};
+    bool selectSapling{selector.SelectsSapling()};
+    bool selectOrchard{selector.SelectsOrchard()};
+
+    SpendableInputs unspent;
+    for (auto const& [wtxid, wtx] : mapWallet) {
+        bool isCoinbase = wtx.IsCoinBase();
+        auto nDepth = wtx.GetDepthInMainChain();
+
+        // Filter the transactions before checking for coins
+        if (!CheckFinalTx(wtx)) continue;
+        if (nDepth < 0 || nDepth < minDepth) continue;
+
+        if (selectTransparent &&
+            // skip transparent utxo selection if coinbase spend restrictions are not met
+            (!isCoinbase || (allowTransparentCoinbase && wtx.GetBlocksToMaturity() <= 0))) {
+
+            for (int i = 0; i < wtx.vout.size(); i++) {
+                const auto& output = wtx.vout[i];
+                isminetype mine = IsMine(output);
+
+                // skip spent utxos
+                if (IsSpent(wtxid, i)) continue;
+                // skip utxos that don't belong to the wallet
+                if (mine == ISMINE_NO) continue;
+                // skip utxos that for which we don't have the spending keys, if
+                // spending keys are required
+                bool isSpendable = (mine & ISMINE_SPENDABLE) != ISMINE_NO || (mine & ISMINE_WATCH_SOLVABLE) != ISMINE_NO;
+                if (selector.RequireSpendingKeys() && !isSpendable) continue;
+                // skip locked utxos
+                if (IsLockedCoin(wtxid, i)) continue;
+                // skip zero-valued utxos
+                if (output.nValue == 0) continue;
+
+                // check to see if the coin conforms to the payment source
+                CTxDestination address;
+                bool isSelectable =
+                    ExtractDestination(output.scriptPubKey, address) &&
+                    this->SelectorMatchesAddress(selector, address);
+                if (isSelectable) {
+                    unspent.utxos.push_back(COutput(&wtx, i, nDepth, true, isCoinbase));
+                }
+            }
+        }
+
+        if (selectSprout) {
+            for (auto const& [jsop, nd] : wtx.mapSproutNoteData) {
+                SproutPaymentAddress pa = nd.address;
+
+                // skip note which has been spent
+                if (nd.nullifier.has_value() && IsSproutSpent(nd.nullifier.value())) continue;
+                // skip notes which don't match the source
+                if (!this->SelectorMatchesAddress(selector, pa)) continue;
+                // skip notes for which we don't have the spending key
+                if (selector.RequireSpendingKeys() && !this->HaveSproutSpendingKey(pa)) continue;
+                // skip locked notes
+                if (IsLockedNote(jsop)) continue;
+
+                // Get cached decryptor
+                ZCNoteDecryption decryptor;
+                if (!GetNoteDecryptor(pa, decryptor)) {
+                    // Note decryptors are created when the wallet is loaded, so it should always exist
+                    throw std::runtime_error(strprintf(
+                                "Could not find note decryptor for payment address %s",
+                                keyIO.EncodePaymentAddress(pa)));
+                }
+
+                // determine amount of funds in the note
+                int i = jsop.js; // Index into CTransaction.vJoinSplit
+                auto hSig = ZCJoinSplit::h_sig(
+                    wtx.vJoinSplit[i].randomSeed,
+                    wtx.vJoinSplit[i].nullifiers,
+                    wtx.joinSplitPubKey);
+
+                try {
+                    int j = jsop.n; // Index into JSDescription.ciphertexts
+                    SproutNotePlaintext plaintext = SproutNotePlaintext::decrypt(
+                            decryptor,
+                            wtx.vJoinSplit[i].ciphertexts[j],
+                            wtx.vJoinSplit[i].ephemeralKey,
+                            hSig,
+                            (unsigned char) j);
+
+                    unspent.sproutNoteEntries.push_back(SproutNoteEntry {
+                        jsop, pa, plaintext.note(pa), plaintext.memo(), wtx.GetDepthInMainChain() });
+
+                } catch (const note_decryption_failed &err) {
+                    // Couldn't decrypt with this spending key
+                    throw std::runtime_error(strprintf(
+                            "Could not decrypt note for payment address %s",
+                            keyIO.EncodePaymentAddress(pa)));
+                } catch (const std::exception &exc) {
+                    // Unexpected failure
+                    throw std::runtime_error(strprintf(
+                            "Error while decrypting note for payment address %s: %s",
+                            keyIO.EncodePaymentAddress(pa), exc.what()));
+                }
+            }
+        }
+
+        if (selectSapling) {
+            for (auto const& [op, nd] : wtx.mapSaplingNoteData) {
+                auto optDeserialized = SaplingNotePlaintext::attempt_sapling_enc_decryption_deserialization(wtx.vShieldedOutput[op.n].encCiphertext, nd.ivk, wtx.vShieldedOutput[op.n].ephemeralKey);
+
+                // The transaction would not have entered the wallet unless
+                // its plaintext had been successfully decrypted previously.
+                assert(optDeserialized != std::nullopt);
+
+                auto notePt = optDeserialized.value();
+                auto maybe_pa = nd.ivk.address(notePt.d);
+                assert(maybe_pa.has_value());
+                auto pa = maybe_pa.value();
+
+                // skip notes which have been spent
+                if (nd.nullifier.has_value() && IsSaplingSpent(nd.nullifier.value())) continue;
+                // skip notes which do not match the source
+                if (!this->SelectorMatchesAddress(selector, pa)) continue;
+                // skip notes if we don't have the spending key
+                if (selector.RequireSpendingKeys() && !this->HaveSaplingSpendingKeyForAddress(pa)) continue;
+                // skip locked notes
+                if (IsLockedNote(op)) continue;
+
+                auto note = notePt.note(nd.ivk).value();
+                unspent.saplingNoteEntries.push_back(SaplingNoteEntry {
+                    op, pa, note, notePt.memo(), wtx.GetDepthInMainChain() });
+            }
+        }
+    }
+
+    if (selectOrchard) {
+        // for Orchard, we select both the internal and external IVKs.
+        auto orchardIvks = std::visit(match {
+            [&](const libzcash::UnifiedAddress& selectorUA) -> std::vector<OrchardIncomingViewingKey> {
+                auto orchardReceiver = selectorUA.GetOrchardReceiver();
+                if (orchardReceiver.has_value()) {
+                    auto meta = GetUFVKMetadataForReceiver(orchardReceiver.value());
+                    if (meta.has_value()) {
+                        auto ufvk = GetUnifiedFullViewingKey(meta.value().GetUFVKId());
+                        if (ufvk.has_value()) {
+                            auto fvk = ufvk->GetOrchardKey();
+                            if (fvk.has_value()) {
+                                return {fvk->ToIncomingViewingKey(), fvk->ToInternalIncomingViewingKey()};
+                            }
+                        }
+                    }
+                }
+                return {};
+            },
+            [&](const libzcash::UnifiedFullViewingKey& ufvk) -> std::vector<OrchardIncomingViewingKey> {
+                auto fvk = ufvk.GetOrchardKey();
+                if (fvk.has_value()) {
+                    return {fvk->ToIncomingViewingKey(), fvk->ToInternalIncomingViewingKey()};
+                }
+                return {};
+            },
+            [&](const AccountZTXOPattern& acct) -> std::vector<OrchardIncomingViewingKey> {
+                auto ufvk = GetUnifiedFullViewingKeyByAccount(acct.GetAccountId());
+                if (ufvk.has_value()) {
+                    auto fvk = ufvk->GetOrchardKey();
+                    if (fvk.has_value()) {
+                        return {fvk->ToIncomingViewingKey(), fvk->ToInternalIncomingViewingKey()};
+                    }
+                }
+                return {};
+            },
+            [&](const auto& addr) -> std::vector<OrchardIncomingViewingKey> { return {}; }
+        }, selector.GetPattern());
+
+        for (const auto& ivk : orchardIvks) {
+            std::vector<OrchardNoteMetadata> incomingNotes;
+            orchardWallet.GetFilteredNotes(incomingNotes, ivk, true, true);
+
+            for (auto& noteMeta : incomingNotes) {
+                if (IsOrchardSpent(noteMeta.GetOutPoint())) {
+                    continue;
+                }
+
+                auto mit = mapWallet.find(noteMeta.GetOutPoint().hash);
+                auto confirmations = mit->second.GetDepthInMainChain();
+                if (mit != mapWallet.end() && confirmations >= minDepth) {
+                    noteMeta.SetConfirmations(confirmations);
+                    unspent.orchardNoteMetadata.push_back(noteMeta);
+                }
+            }
+        }
+    }
+
+    return unspent;
+}
+
+/**
+ * Outpoint is spent if any non-conflicted transaction
  * spends it:
  */
 bool CWallet::IsSpent(const uint256& hash, unsigned int n) const
@@ -1035,6 +2350,16 @@ bool CWallet::IsSaplingSpent(const uint256& nullifier) const {
     return false;
 }
 
+bool CWallet::IsOrchardSpent(const OrchardOutPoint& outpoint) const {
+    for (const auto& txid : orchardWallet.GetPotentialSpends(outpoint)) {
+        std::map<uint256, CWalletTx>::const_iterator mit = mapWallet.find(txid);
+        if (mit != mapWallet.end() && mit->second.GetDepthInMainChain() >= 0) {
+            return true; // Spent
+        }
+    }
+    return false;
+}
+
 void CWallet::AddToTransparentSpends(const COutPoint& outpoint, const uint256& wtxid)
 {
     mapTxSpends.insert(make_pair(outpoint, wtxid));
@@ -1080,6 +2405,9 @@ void CWallet::AddToSpends(const uint256& wtxid)
     for (const SpendDescription &spend : thisTx.vShieldedSpend) {
         AddToSaplingSpends(spend.nullifier, wtxid);
     }
+
+    // for Orchard, the effects of this operation are performed by
+    // AddNotesIfInvolvingMe and LoadUnifiedCaches
 }
 
 void CWallet::ClearNoteWitnessCache()
@@ -1184,10 +2512,13 @@ void UpdateWitnessHeights(NoteDataMap& noteDataMap, int indexHeight, int64_t nWi
     }
 }
 
-void CWallet::IncrementNoteWitnesses(const CBlockIndex* pindex,
-                                     const CBlock* pblockIn,
-                                     SproutMerkleTree& sproutTree,
-                                     SaplingMerkleTree& saplingTree)
+void CWallet::IncrementNoteWitnesses(
+        const Consensus::Params& consensus,
+        const CBlockIndex* pindex,
+        const CBlock* pblockIn,
+        SproutMerkleTree& sproutTree,
+        SaplingMerkleTree& saplingTree,
+        bool performOrchardWalletUpdates)
 {
     LOCK(cs_wallet);
     for (std::pair<const uint256, CWalletTx>& wtxItem : mapWallet) {
@@ -1195,6 +2526,10 @@ void CWallet::IncrementNoteWitnesses(const CBlockIndex* pindex,
        ::CopyPreviousWitnesses(wtxItem.second.mapSaplingNoteData, pindex->nHeight, nWitnessCacheSize);
     }
 
+    if (performOrchardWalletUpdates && consensus.NetworkUpgradeActive(pindex->nHeight, Consensus::UPGRADE_NU5)) {
+        assert(orchardWallet.CheckpointNoteCommitmentTree(pindex->nHeight));
+    }
+
     if (nWitnessCacheSize < WITNESS_CACHE_SIZE) {
         nWitnessCacheSize += 1;
     }
@@ -1202,7 +2537,7 @@ void CWallet::IncrementNoteWitnesses(const CBlockIndex* pindex,
     const CBlock* pblock {pblockIn};
     CBlock block;
     if (!pblock) {
-        ReadBlockFromDisk(block, pindex, Params().GetConsensus());
+        ReadBlockFromDisk(block, pindex, consensus);
         pblock = &block;
     }
 
@@ -1246,6 +2581,12 @@ void CWallet::IncrementNoteWitnesses(const CBlockIndex* pindex,
         }
     }
 
+    // If we're at or beyond NU5 activation, update the Orchard note commitment tree.
+    if (performOrchardWalletUpdates && consensus.NetworkUpgradeActive(pindex->nHeight, Consensus::UPGRADE_NU5)) {
+        assert(orchardWallet.AppendNoteCommitments(pindex->nHeight, *pblock));
+        assert(pindex->hashFinalOrchardRoot == orchardWallet.GetLatestAnchor());
+    }
+
     // Update witness heights
     for (std::pair<const uint256, CWalletTx>& wtxItem : mapWallet) {
         ::UpdateWitnessHeights(wtxItem.second.mapSproutNoteData, pindex->nHeight, nWitnessCacheSize);
@@ -1297,7 +2638,7 @@ void DecrementNoteWitnesses(NoteDataMap& noteDataMap, int indexHeight, int64_t n
     }
 }
 
-void CWallet::DecrementNoteWitnesses(const CBlockIndex* pindex)
+void CWallet::DecrementNoteWitnesses(const Consensus::Params& consensus, const CBlockIndex* pindex)
 {
     LOCK(cs_wallet);
     for (std::pair<const uint256, CWalletTx>& wtxItem : mapWallet) {
@@ -1308,6 +2649,19 @@ void CWallet::DecrementNoteWitnesses(const CBlockIndex* pindex)
     // TODO: If nWitnessCache is zero, we need to regenerate the caches (#1302)
     assert(nWitnessCacheSize > 0);
 
+    // ORCHARD: rewind to the last checkpoint.
+    if (consensus.NetworkUpgradeActive(pindex->nHeight, Consensus::UPGRADE_NU5)) {
+        // pindex->nHeight is the height of the block being removed, so we rewind
+        // to the previous block height
+        uint32_t blocksRewound{0};
+        assert(pindex->nHeight >= 1);
+        assert(orchardWallet.Rewind(pindex->nHeight - 1, blocksRewound));
+        assert(blocksRewound == 1);
+        if (consensus.NetworkUpgradeActive(pindex->nHeight - 1, Consensus::UPGRADE_NU5)) {
+            assert(pindex->pprev->hashFinalOrchardRoot == orchardWallet.GetLatestAnchor());
+        }
+    }
+
     // For performance reasons, we write out the witness cache in
     // CWallet::SetBestChain() (which also ensures that overall consistency
     // of the wallet.dat is maintained).
@@ -1391,7 +2745,7 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase)
 
         Lock();
         Unlock(strWalletPassphrase);
-        NewKeyPool();
+        // TODO: migrate to a new mnemonic when encrypting an unencrypted wallet?
         Lock();
 
         // Need to completely rewrite the wallet file; if we don't, bdb might keep
@@ -1556,6 +2910,9 @@ void CWallet::UpdateSaplingNullifierNoteMapWithTx(CWalletTx& wtx) {
         SaplingNoteData nd = item.second;
 
         if (nd.witnesses.empty()) {
+            // The Sapling nullifier depends upon the position of the note in the
+            // note commitment tree.
+            //
             // If there are no witnesses, erase the nullifier and associated mapping.
             if (item.second.nullifier) {
                 mapSaplingNullifiersToNotes.erase(item.second.nullifier.value());
@@ -1608,21 +2965,21 @@ void CWallet::UpdateSaplingNullifierNoteMapForBlock(const CBlock *pblock) {
     }
 }
 
-bool CWallet::AddToWallet(const CWalletTx& wtxIn, bool fFromLoadWallet, CWalletDB* pwalletdb)
-{
+void CWallet::LoadWalletTx(const CWalletTx& wtxIn) {
     uint256 hash = wtxIn.GetHash();
+    mapWallet[hash] = wtxIn;
+    CWalletTx& wtx = mapWallet[hash];
+    wtx.BindWallet(this);
+    wtxOrdered.insert(make_pair(wtx.nOrderPos, &wtx));
+    UpdateNullifierNoteMapWithTx(mapWallet[hash]);
+    AddToSpends(hash);
+}
+
+bool CWallet::AddToWallet(const CWalletTx& wtxIn, CWalletDB* pwalletdb)
+{
+    { // additional scope left in place for backport whitespace compatibility
+        uint256 hash = wtxIn.GetHash();
 
-    if (fFromLoadWallet)
-    {
-        mapWallet[hash] = wtxIn;
-        CWalletTx& wtx = mapWallet[hash];
-        wtx.BindWallet(this);
-        wtxOrdered.insert(make_pair(wtx.nOrderPos, &wtx));
-        UpdateNullifierNoteMapWithTx(mapWallet[hash]);
-        AddToSpends(hash);
-    }
-    else
-    {
         LOCK(cs_wallet);
         // Inserts only if not already there, returns tx inserted or tx found
         pair<map<uint256, CWalletTx>::iterator, bool> ret = mapWallet.insert(make_pair(hash, wtxIn));
@@ -1724,7 +3081,6 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn, bool fFromLoadWallet, CWalletD
             boost::replace_all(strCmd, "%s", wtxIn.GetHash().GetHex());
             boost::thread t(runCommand, strCmd); // thread runs free
         }
-
     }
     return true;
 }
@@ -1763,7 +3119,12 @@ bool CWallet::UpdatedNoteData(const CWalletTx& wtxIn, CWalletTx& wtx)
         wtx.mapSaplingNoteData = tmp;
     }
 
-    return !unchangedSproutFlag || !unchangedSaplingFlag;
+    bool unchangedOrchardFlag = (wtxIn.orchardTxMeta.empty() || wtxIn.orchardTxMeta == wtx.orchardTxMeta);
+    if (!unchangedOrchardFlag) {
+        wtx.orchardTxMeta = wtxIn.orchardTxMeta;
+    }
+
+    return !unchangedSproutFlag || !unchangedSaplingFlag || !unchangedOrchardFlag;
 }
 
 /**
@@ -1778,24 +3139,46 @@ bool CWallet::UpdatedNoteData(const CWalletTx& wtxIn, CWalletTx& wtx)
  * updated; instead, the transaction being in the mempool or conflicted is determined on
  * the fly in CMerkleTx::GetDepthInMainChain().
  */
-bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pblock, const int nHeight, bool fUpdate)
-{
-    {
+bool CWallet::AddToWalletIfInvolvingMe(
+        const Consensus::Params& consensus,
+        const CTransaction& tx,
+        const CBlock* pblock,
+        const int nHeight,
+        bool fUpdate)
+{
+    { // extra scope left in place for backport whitespace compatibility
         AssertLockHeld(cs_wallet);
+
+        // Check whether the transaction is already known by the wallet.
         bool fExisted = mapWallet.count(tx.GetHash()) != 0;
         if (fExisted && !fUpdate) return false;
+
+        // Sprout
         auto sproutNoteData = FindMySproutNotes(tx);
+
+        // Sapling
         auto saplingNoteDataAndAddressesToAdd = FindMySaplingNotes(tx, nHeight);
         auto saplingNoteData = saplingNoteDataAndAddressesToAdd.first;
-        auto addressesToAdd = saplingNoteDataAndAddressesToAdd.second;
-        for (const auto &addressToAdd : addressesToAdd) {
-            if (!AddSaplingIncomingViewingKey(addressToAdd.second, addressToAdd.first)) {
+        auto saplingAddressesToAdd = saplingNoteDataAndAddressesToAdd.second;
+        for (const auto &addressToAdd : saplingAddressesToAdd) {
+            // Add mapping between address and IVK for easy future lookup.
+            if (!AddSaplingPaymentAddress(addressToAdd.second, addressToAdd.first)) {
                 return false;
             }
         }
-        if (fExisted || IsMine(tx) || IsFromMe(tx) || sproutNoteData.size() > 0 || saplingNoteData.size() > 0)
+
+        // Orchard
+        std::optional<OrchardWalletTxMeta> orchardTxMeta;
+        if (consensus.NetworkUpgradeActive(nHeight, Consensus::UPGRADE_NU5)) {
+            orchardTxMeta = orchardWallet.AddNotesIfInvolvingMe(tx);
+        }
+
+        if (fExisted || IsMine(tx) || IsFromMe(tx) ||
+            sproutNoteData.size() > 0 ||
+            saplingNoteData.size() > 0 ||
+            orchardTxMeta.has_value())
         {
-            CWalletTx wtx(this,tx);
+            CWalletTx wtx(this, tx);
 
             if (sproutNoteData.size() > 0) {
                 wtx.SetSproutNoteData(sproutNoteData);
@@ -1805,24 +3188,29 @@ bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pbl
                 wtx.SetSaplingNoteData(saplingNoteData);
             }
 
+            if (orchardTxMeta.has_value()) {
+                wtx.SetOrchardTxMeta(orchardTxMeta.value());
+            }
+
             // Get merkle branch if transaction was found in a block
             if (pblock)
                 wtx.SetMerkleBranch(*pblock);
 
-            // Do not flush the wallet here for performance reasons
-            // this is safe, as in case of a crash, we rescan the necessary blocks on startup through our SetBestChain-mechanism
+            // Do not flush the wallet here for performance reasons; this is
+            // safe, as in case of a crash, we rescan the necessary blocks on
+            // startup through our SetBestChain-mechanism
             CWalletDB walletdb(strWalletFile, "r+", false);
 
-            return AddToWallet(wtx, false, &walletdb);
+            return AddToWallet(wtx, &walletdb);
         }
+        return false;
     }
-    return false;
 }
 
 void CWallet::SyncTransaction(const CTransaction& tx, const CBlock* pblock, const int nHeight)
 {
     LOCK(cs_wallet);
-    if (!AddToWalletIfInvolvingMe(tx, pblock, nHeight, true))
+    if (!AddToWalletIfInvolvingMe(Params().GetConsensus(), tx, pblock, nHeight, true))
         return; // Not one of ours
 
     MarkAffectedTransactionsDirty(tx);
@@ -2021,7 +3409,7 @@ bool CWallet::IsSaplingNullifierFromMe(const uint256& nullifier) const
     return false;
 }
 
-void CWallet::GetSproutNoteWitnesses(std::vector<JSOutPoint> notes,
+void CWallet::GetSproutNoteWitnesses(const std::vector<JSOutPoint>& notes,
                                      std::vector<std::optional<SproutWitness>>& witnesses,
                                      uint256 &final_anchor)
 {
@@ -2048,7 +3436,7 @@ void CWallet::GetSproutNoteWitnesses(std::vector<JSOutPoint> notes,
     }
 }
 
-void CWallet::GetSaplingNoteWitnesses(std::vector<SaplingOutPoint> notes,
+void CWallet::GetSaplingNoteWitnesses(const std::vector<SaplingOutPoint>& notes,
                                       std::vector<std::optional<SaplingWitness>>& witnesses,
                                       uint256 &final_anchor)
 {
@@ -2075,6 +3463,13 @@ void CWallet::GetSaplingNoteWitnesses(std::vector<SaplingOutPoint> notes,
     }
 }
 
+std::vector<std::pair<libzcash::OrchardSpendingKey, orchard::SpendInfo>> CWallet::GetOrchardSpendInfo(
+    const std::vector<OrchardNoteMetadata>& orchardNoteMetadata) const
+{
+    AssertLockHeld(cs_wallet);
+    return orchardWallet.GetSpendInfo(orchardNoteMetadata);
+}
+
 isminetype CWallet::IsMine(const CTxIn &txin) const
 {
     {
@@ -2120,24 +3515,37 @@ CAmount CWallet::GetCredit(const CTxOut& txout, const isminefilter& filter) cons
 
 bool CWallet::IsChange(const CTxOut& txout) const
 {
-    // TODO: fix handling of 'change' outputs. The assumption is that any
-    // payment to a script that is ours, but is not in the address book
-    // is change. That assumption is likely to break when we implement multisignature
-    // wallets that return change back into a multi-signature-protected address;
-    // a better way of identifying which outputs are 'the send' and which are
-    // 'the change' will need to be implemented (maybe extend CWalletTx to remember
-    // which output, if any, was change).
-    if (::IsMine(*this, txout.scriptPubKey))
-    {
-        CTxDestination address;
-        if (!ExtractDestination(txout.scriptPubKey, address))
-            return true;
+    // Addresses must be ours to be change
+    if (!::IsMine(*this, txout.scriptPubKey))
+        return false;
 
-        LOCK(cs_wallet);
-        if (!mapAddressBook.count(address))
-            return true;
-    }
-    return false;
+    // Only p2pkh addresses are used for change
+    CTxDestination address;
+    if (!ExtractDestination(txout.scriptPubKey, address))
+        return true;
+
+    LOCK(cs_wallet);
+    // Any payment to a script that is in the address book is not change.
+    if (mapAddressBook.count(address))
+        return false;
+
+    // We look to key metadata to determine whether the address was generated
+    // using an internal key path. This could fail to identify some legacy
+    // change addresses as change outputs.
+    return std::visit(match {
+        [&](const CKeyID& key) {
+            auto keyMetaIt = mapKeyMetadata.find(key);
+            return
+                // If we don't have key metadata, it's a legacy address that is not
+                // in the address book, so we judge it to be change.
+                keyMetaIt == mapKeyMetadata.end() ||
+                keyMetaIt->second.hdKeypath == "" ||
+                // If we do have non-null key metadata, we inspect the metadata to
+                // make our determination
+                IsInternalKeyPath(44, BIP44CoinType(), keyMetaIt->second.hdKeypath);
+        },
+        [&](const auto& other) { return false; }
+    }, address);
 }
 
 CAmount CWallet::GetChange(const CTxOut& txout) const
@@ -2217,31 +3625,36 @@ bool CWallet::IsHDFullyEnabled() const
     return false;
 }
 
-void CWallet::GenerateNewSeed()
+void CWallet::GenerateNewSeed(Language language)
 {
     LOCK(cs_wallet);
 
-    auto seed = HDSeed::Random(HD_WALLET_SEED_LENGTH);
+    auto legacySeed = GetLegacyHDSeed();
+    auto seed = legacySeed.has_value() ?
+        MnemonicSeed::FromLegacySeed(legacySeed.value(), BIP44CoinType(), language) :
+        MnemonicSeed::Random(BIP44CoinType(), language, WALLET_MNEMONIC_ENTROPY_LENGTH);
 
     int64_t nCreationTime = GetTime();
 
     // If the wallet is encrypted and locked, this will fail.
-    if (!SetHDSeed(seed))
+    if (!SetMnemonicSeed(seed))
         throw std::runtime_error(std::string(__func__) + ": SetHDSeed failed");
 
     // store the key creation time together with
     // the child index counter in the database
     // as a hdchain object
-    CHDChain newHdChain;
-    newHdChain.nVersion = CHDChain::VERSION_HD_BASE;
-    newHdChain.seedFp = seed.Fingerprint();
-    newHdChain.nCreateTime = nCreationTime;
-    SetHDChain(newHdChain, false);
+    CHDChain newHdChain(seed.Fingerprint(), nCreationTime);
+    SetMnemonicHDChain(newHdChain, false);
+
+    // Now that we can derive keys deterministically, clear out the legacy
+    // transparent keypool of all randomly-generated keys, and fill it with
+    // internal keys (for use as change addresses or miner outputs).
+    NewKeyPool();
 }
 
-bool CWallet::SetHDSeed(const HDSeed& seed)
+bool CWallet::SetMnemonicSeed(const MnemonicSeed& seed)
 {
-    if (!CCryptoKeyStore::SetHDSeed(seed)) {
+    if (!CCryptoKeyStore::SetMnemonicSeed(seed)) {
         return false;
     }
 
@@ -2251,16 +3664,17 @@ bool CWallet::SetHDSeed(const HDSeed& seed)
 
     {
         LOCK(cs_wallet);
+        CWalletDB(strWalletFile).WriteNetworkInfo(networkIdString);
         if (!IsCrypted()) {
-            return CWalletDB(strWalletFile).WriteHDSeed(seed);
+            return CWalletDB(strWalletFile).WriteMnemonicSeed(seed);
         }
     }
     return true;
 }
 
-bool CWallet::SetCryptedHDSeed(const uint256& seedFp, const std::vector<unsigned char> &vchCryptedSecret)
+bool CWallet::SetCryptedMnemonicSeed(const uint256& seedFp, const std::vector<unsigned char> &vchCryptedSecret)
 {
-    if (!CCryptoKeyStore::SetCryptedHDSeed(seedFp, vchCryptedSecret)) {
+    if (!CCryptoKeyStore::SetCryptedMnemonicSeed(seedFp, vchCryptedSecret)) {
         return false;
     }
 
@@ -2271,41 +3685,86 @@ bool CWallet::SetCryptedHDSeed(const uint256& seedFp, const std::vector<unsigned
     {
         LOCK(cs_wallet);
         if (pwalletdbEncryption)
-            return pwalletdbEncryption->WriteCryptedHDSeed(seedFp, vchCryptedSecret);
+            return pwalletdbEncryption->WriteCryptedMnemonicSeed(seedFp, vchCryptedSecret);
         else
-            return CWalletDB(strWalletFile).WriteCryptedHDSeed(seedFp, vchCryptedSecret);
+            return CWalletDB(strWalletFile).WriteCryptedMnemonicSeed(seedFp, vchCryptedSecret);
     }
     return false;
 }
 
+bool CWallet::VerifyMnemonicSeed(const SecureString& mnemonic) {
+    LOCK(cs_wallet);
+
+    auto seed = GetMnemonicSeed();
+    if (seed.has_value() && mnemonicHDChain.has_value() && seed.value().GetMnemonic() == mnemonic) {
+        CHDChain& hdChain = mnemonicHDChain.value();
+        hdChain.SetMnemonicSeedBackupConfirmed();
+        // Update the persisted chain information
+        if (fFileBacked && !CWalletDB(strWalletFile).WriteMnemonicHDChain(hdChain)) {
+            throw std::runtime_error(
+                    "CWallet::VerifyMnemonicSeed(): Writing HD chain model failed");
+        }
+        return true;
+    } else {
+        return false;
+    }
+}
+
+bool CWallet::MnemonicVerified() {
+    return mnemonicHDChain.has_value() && mnemonicHDChain.value().IsMnemonicSeedBackupConfirmed();
+}
+
 HDSeed CWallet::GetHDSeedForRPC() const {
-    HDSeed seed;
-    if (!pwalletMain->GetHDSeed(seed)) {
+    auto seed = GetMnemonicSeed();
+    if (!seed.has_value()) {
         throw JSONRPCError(RPC_WALLET_ERROR, "HD seed not found");
     }
-    return seed;
+    return seed.value();
 }
 
-void CWallet::SetHDChain(const CHDChain& chain, bool memonly)
+// TODO: make private
+void CWallet::SetMnemonicHDChain(const CHDChain& chain, bool memonly)
 {
     LOCK(cs_wallet);
-    if (!memonly && fFileBacked && !CWalletDB(strWalletFile).WriteHDChain(chain))
+    if (!memonly && fFileBacked && !CWalletDB(strWalletFile).WriteMnemonicHDChain(chain))
         throw std::runtime_error(std::string(__func__) + ": writing chain failed");
 
-    hdChain = chain;
+    mnemonicHDChain = chain;
+}
+
+bool CWallet::CheckNetworkInfo(std::pair<std::string, std::string> readNetworkInfo) const
+{
+    LOCK(cs_wallet);
+    std::pair<string, string> networkInfo(PACKAGE_NAME, networkIdString);
+    return readNetworkInfo == networkInfo;
+}
+
+uint32_t CWallet::BIP44CoinType() const {
+    return Params(networkIdString).BIP44CoinType();
 }
 
-bool CWallet::LoadHDSeed(const HDSeed& seed)
+
+bool CWallet::LoadMnemonicSeed(const MnemonicSeed& seed)
+{
+    return CBasicKeyStore::SetMnemonicSeed(seed);
+}
+
+bool CWallet::LoadLegacyHDSeed(const HDSeed& seed)
 {
-    return CBasicKeyStore::SetHDSeed(seed);
+    return CBasicKeyStore::SetLegacyHDSeed(seed);
 }
 
-bool CWallet::LoadCryptedHDSeed(const uint256& seedFp, const std::vector<unsigned char>& seed)
+bool CWallet::LoadCryptedMnemonicSeed(const uint256& seedFp, const std::vector<unsigned char>& seed)
 {
-    return CCryptoKeyStore::SetCryptedHDSeed(seedFp, seed);
+    return CCryptoKeyStore::SetCryptedMnemonicSeed(seedFp, seed);
 }
 
-void CWalletTx::SetSproutNoteData(mapSproutNoteData_t &noteData)
+bool CWallet::LoadCryptedLegacyHDSeed(const uint256& seedFp, const std::vector<unsigned char>& seed)
+{
+    return CCryptoKeyStore::SetCryptedLegacyHDSeed(seedFp, seed);
+}
+
+void CWalletTx::SetSproutNoteData(const mapSproutNoteData_t& noteData)
 {
     mapSproutNoteData.clear();
     for (const std::pair<JSOutPoint, SproutNoteData> nd : noteData) {
@@ -2321,7 +3780,7 @@ void CWalletTx::SetSproutNoteData(mapSproutNoteData_t &noteData)
     }
 }
 
-void CWalletTx::SetSaplingNoteData(mapSaplingNoteData_t &noteData)
+void CWalletTx::SetSaplingNoteData(const mapSaplingNoteData_t& noteData)
 {
     mapSaplingNoteData.clear();
     for (const std::pair<SaplingOutPoint, SaplingNoteData> nd : noteData) {
@@ -2333,6 +3792,22 @@ void CWalletTx::SetSaplingNoteData(mapSaplingNoteData_t &noteData)
     }
 }
 
+void CWalletTx::SetOrchardTxMeta(OrchardWalletTxMeta txMeta)
+{
+    auto numActions = GetOrchardBundle().GetNumActions();
+    for (const auto& [action_idx, ivk] : txMeta.GetMyActionIVKs()) {
+        if (action_idx >= numActions) {
+            throw std::logic_error("CWalletTx::SetOrchardTxMeta(): Invalid action index");
+        }
+    }
+    for (uint32_t action_idx : txMeta.GetActionsSpendingMyNotes()) {
+        if (action_idx >= numActions) {
+            throw std::logic_error("CWalletTx::SetOrchardTxMeta(): Invalid action index");
+        }
+    }
+    orchardTxMeta = txMeta;
+}
+
 std::pair<SproutNotePlaintext, SproutPaymentAddress> CWalletTx::DecryptSproutNote(
     JSOutPoint jsop) const
 {
@@ -2519,6 +3994,12 @@ std::optional<std::pair<
     return std::nullopt;
 }
 
+OrchardActions CWalletTx::RecoverOrchardActions(const std::vector<uint256>& ovks) const
+{
+    return pwallet->orchardWallet.GetTxActions(*this, ovks);
+}
+
+
 int64_t CWalletTx::GetTxTime() const
 {
     int64_t n = nTimeSmart;
@@ -2742,11 +4223,15 @@ void CWallet::WitnessNoteCommitment(std::vector<uint256> commitments,
  * from or to us. If fUpdate is true, found transactions that already
  * exist in the wallet will be updated.
  */
-int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate)
+int CWallet::ScanForWalletTransactions(
+        CBlockIndex* pindexStart,
+        bool fUpdate,
+        bool isInitScan)
 {
     int ret = 0;
     int64_t nNow = GetTime();
     const CChainParams& chainParams = Params();
+    const auto& consensus = chainParams.GetConsensus();
 
     CBlockIndex* pindex = pindexStart;
 
@@ -2761,6 +4246,46 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate)
             pindex = chainActive.Next(pindex);
         }
 
+        // Attempt to rewind the orchard wallet to the rescan point if the wallet has any
+        // checkpoints. Note data will be restored by the calls to AddToWalletIfInvolvingMe,
+        // and then the call to `ChainTipAdded` that later occurs for each block will restore
+        // the witness data that is being removed in the rewind here.
+        auto nu5_height = chainParams.GetConsensus().GetActivationHeight(Consensus::UPGRADE_NU5);
+        bool performOrchardWalletUpdates{false};
+        if (orchardWallet.GetLastCheckpointHeight().has_value()) {
+            // We have a checkpoint, so attempt to rewind the Orchard wallet at most as
+            // far as the NU5 activation block.
+            // If there's no activation height, we shouldn't have a checkpoint already,
+            // and this is a programming error.
+            assert(nu5_height.has_value());
+            // Only attempt to perform scans for Orchard during wallet initialization,
+            // since we do not support Orchard key import.
+            if (isInitScan) {
+                int rewindHeight = std::max(nu5_height.value(), pindex->nHeight - 1);
+                uint32_t blocksRewound{0};
+                LogPrintf(
+                        "CWallet::ScanForWalletTransactions(): Rewinding Orchard wallet to height %d; current is %d",
+                        rewindHeight,
+                        orchardWallet.GetLastCheckpointHeight().value());
+                if (orchardWallet.Rewind(rewindHeight, blocksRewound)) {
+                    // rewind was successful or a no-op, so perform Orchard wallet updates
+                    performOrchardWalletUpdates = true;
+                } else {
+                    // Orchard witnesses will not be able to be correctly updated, because we
+                    // can't rewind far enough. This is an unrecoverable failure; it means that we
+                    // can't get back to a valid wallet state without resetting the wallet all
+                    // the way back to NU5 activation.
+
+                    throw std::runtime_error("CWallet::ScanForWalletTransactions(): Orchard wallet is out of sync. Please restart your node with -rescan.");
+                }
+            }
+        } else if (isInitScan && pindex->nHeight < nu5_height) {
+            // If it's the initial scan and we're starting below the nu5 activation
+            // height, we're effectively rescanning from genesis and so it's safe
+            // to update the note commitment tree as we progress.
+            performOrchardWalletUpdates = true;
+        }
+
         ShowProgress(_("Rescanning..."), 0); // show rescan progress in GUI as dialog or on splashscreen, if -rescan on startup
         double dProgressStart = Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), pindex, false);
         double dProgressTip = Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), chainActive.Tip(), false);
@@ -2770,10 +4295,10 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate)
                 ShowProgress(_("Rescanning..."), std::max(1, std::min(99, (int)((Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), pindex, false) - dProgressStart) / (dProgressTip - dProgressStart) * 100))));
 
             CBlock block;
-            ReadBlockFromDisk(block, pindex, Params().GetConsensus());
+            ReadBlockFromDisk(block, pindex, consensus);
             for (CTransaction& tx : block.vtx)
             {
-                if (AddToWalletIfInvolvingMe(tx, &block, pindex->nHeight, fUpdate)) {
+                if (AddToWalletIfInvolvingMe(consensus, tx, &block, pindex->nHeight, fUpdate)) {
                     myTxHashes.push_back(tx.GetHash());
                     ret++;
                 }
@@ -2785,28 +4310,33 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate)
             // state on the path to the tip of our chain
             assert(pcoinsTip->GetSproutAnchorAt(pindex->hashSproutAnchor, sproutTree));
             if (pindex->pprev) {
-                if (Params().GetConsensus().NetworkUpgradeActive(pindex->pprev->nHeight,  Consensus::UPGRADE_SAPLING)) {
+                if (consensus.NetworkUpgradeActive(pindex->pprev->nHeight,  Consensus::UPGRADE_SAPLING)) {
                     assert(pcoinsTip->GetSaplingAnchorAt(pindex->pprev->hashFinalSaplingRoot, saplingTree));
                 }
             }
             // Increment note witness caches
-            ChainTipAdded(pindex, &block, sproutTree, saplingTree);
+            ChainTipAdded(pindex, &block, sproutTree, saplingTree, performOrchardWalletUpdates);
 
             pindex = chainActive.Next(pindex);
             if (GetTime() >= nNow + 60) {
                 nNow = GetTime();
-                LogPrintf("Still rescanning. At block %d. Progress=%f\n", pindex->nHeight, Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), pindex));
+                LogPrintf(
+                        "Still rescanning. At block %d. Progress=%f\n",
+                        pindex->nHeight,
+                        Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), pindex));
             }
         }
 
-        // After rescanning, persist Sapling note data that might have changed, e.g. nullifiers.
-        // Do not flush the wallet here for performance reasons.
+        // After rescanning, persist Sapling & Orchard note data that might have changed,
+        // e.g. nullifiers. Do not flush the wallet here for performance reasons.
         CWalletDB walletdb(strWalletFile, "r+", false);
         for (auto hash : myTxHashes) {
             CWalletTx wtx = mapWallet[hash];
-            if (!wtx.mapSaplingNoteData.empty()) {
+            if (!wtx.mapSaplingNoteData.empty() || !wtx.orchardTxMeta.empty()) {
                 if (!walletdb.WriteTx(wtx)) {
-                    LogPrintf("Rescanning... WriteToDisk failed to update Sapling note data for: %s\n", hash.ToString());
+                    LogPrintf(
+                            "Rescanning... WriteToDisk failed to update Sapling/Orchard note data for tx: %s\n",
+                            hash.ToString());
                 }
             }
         }
@@ -3016,18 +4546,38 @@ CAmount CWalletTx::GetChange() const
     return nChangeCached;
 }
 
-bool CWalletTx::IsTrusted() const
+bool CWalletTx::IsFromMe(const isminefilter& filter) const
 {
-    // Quick answer in most cases
-    if (!CheckFinalTx(*this))
-        return false;
-    int nDepth = GetDepthInMainChain();
-    if (nDepth >= 1)
+    if (GetDebit(filter) > 0) {
         return true;
-    if (nDepth < 0)
-        return false;
-    if (!bSpendZeroConfChange || !IsFromMe(ISMINE_ALL)) // using wtx's cached debit
-        return false;
+    }
+    for (const JSDescription& jsdesc : vJoinSplit) {
+        for (const uint256& nullifier : jsdesc.nullifiers) {
+            if (pwallet->IsSproutNullifierFromMe(nullifier)) {
+                return true;
+            }
+        }
+    }
+    for (const SpendDescription &spend : vShieldedSpend) {
+        if (pwallet->IsSaplingNullifierFromMe(spend.nullifier)) {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool CWalletTx::IsTrusted() const
+{
+    // Quick answer in most cases
+    if (!CheckFinalTx(*this))
+        return false;
+    int nDepth = GetDepthInMainChain();
+    if (nDepth >= 1)
+        return true;
+    if (nDepth < 0)
+        return false;
+    if (!bSpendZeroConfChange || !IsFromMe(ISMINE_ALL)) // using wtx's cached debit
+        return false;
 
     // Trusted if all inputs are from us and are in the mempool:
     for (const CTxIn& txin : vin)
@@ -3327,7 +4877,7 @@ static void ApproximateBestSubset(vector<pair<CAmount, pair<const CWalletTx*,uns
 }
 
 bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int nConfTheirs, vector<COutput> vCoins,
-                                 set<pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet) const
+                                 set<pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet)
 {
     setCoinsRet.clear();
     nValueRet = 0;
@@ -3896,7 +5446,7 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, std::optional<std::reference_
 
             // Add tx to wallet, because if it has change it's also ours,
             // otherwise just for transaction history.
-            AddToWallet(wtxNew, false, pwalletdb);
+            AddToWallet(wtxNew, pwalletdb);
 
             // Notify that old coins are spent
             set<CWalletTx*> setCoins;
@@ -4073,8 +5623,9 @@ bool CWallet::SetDefaultKey(const CPubKey &vchPubKey)
 }
 
 /**
- * Mark old keypool keys as used,
- * and generate all new keys
+ * Mark old keypool keys as used, and derive new internal keys.
+ *
+ * This is only used when first migrating to HD-derived transparent keys.
  */
 bool CWallet::NewKeyPool()
 {
@@ -4092,7 +5643,7 @@ bool CWallet::NewKeyPool()
         for (int i = 0; i < nKeys; i++)
         {
             int64_t nIndex = i+1;
-            walletdb.WritePool(nIndex, CKeyPool(GenerateNewKey()));
+            walletdb.WritePool(nIndex, CKeyPool(GenerateNewKey(false)));
             setKeyPool.insert(nIndex);
         }
         LogPrintf("CWallet::NewKeyPool wrote %d new keys\n", nKeys);
@@ -4122,7 +5673,7 @@ bool CWallet::TopUpKeyPool(unsigned int kpSize)
             int64_t nEnd = 1;
             if (!setKeyPool.empty())
                 nEnd = *(--setKeyPool.end()) + 1;
-            if (!walletdb.WritePool(nEnd, CKeyPool(GenerateNewKey())))
+            if (!walletdb.WritePool(nEnd, CKeyPool(GenerateNewKey(false))))
                 throw runtime_error("TopUpKeyPool(): writing generated key failed");
             setKeyPool.insert(nEnd);
             LogPrintf("keypool added key %d, size=%u\n", nEnd, setKeyPool.size());
@@ -4179,25 +5730,6 @@ void CWallet::ReturnKey(int64_t nIndex)
     LogPrintf("keypool return %d\n", nIndex);
 }
 
-bool CWallet::GetKeyFromPool(CPubKey& result)
-{
-    int64_t nIndex = 0;
-    CKeyPool keypool;
-    {
-        LOCK(cs_wallet);
-        ReserveKeyFromKeyPool(nIndex, keypool);
-        if (nIndex == -1)
-        {
-            if (IsLocked()) return false;
-            result = GenerateNewKey();
-            return true;
-        }
-        KeepKey(nIndex);
-        result = keypool.vchPubKey;
-    }
-    return true;
-}
-
 int64_t CWallet::GetOldestKeyPoolTime()
 {
     int64_t nIndex = 0;
@@ -4406,7 +5938,7 @@ void CWallet::UpdatedTransaction(const uint256 &hashTx)
     }
 }
 
-void CWallet::GetAddressForMining(MinerAddress &minerAddress)
+void CWallet::GetAddressForMining(std::optional<MinerAddress> &minerAddress)
 {
     if (!GetArg("-mineraddress", "").empty()) {
         return;
@@ -4612,18 +6144,6 @@ void CWallet::GetKeyBirthTimes(std::map<CKeyID, int64_t> &mapKeyBirth) const {
     }
 }
 
-bool CWallet::AddDestData(const CTxDestination &dest, const std::string &key, const std::string &value)
-{
-    if (std::get_if<CNoDestination>(&dest))
-        return false;
-
-    mapAddressBook[dest].destdata.insert(std::make_pair(key, value));
-    if (!fFileBacked)
-        return true;
-    KeyIO keyIO(Params());
-    return CWalletDB(strWalletFile).WriteDestData(keyIO.EncodeDestination(dest), key, value);
-}
-
 bool CWallet::EraseDestData(const CTxDestination &dest, const std::string &key)
 {
     if (!mapAddressBook[dest].destdata.erase(key))
@@ -4679,6 +6199,7 @@ std::string CWallet::GetWalletHelpString(bool showDebug)
     strUsage += HelpMessageOpt("-walletnotify=<cmd>", _("Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)"));
     strUsage += HelpMessageOpt("-zapwallettxes=<mode>", _("Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup") +
                                " " + _("(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)"));
+    strUsage += HelpMessageOpt("-walletrequirebackup=<bool>", _("By default, the wallet will not allow generation of new spending keys & addresses from the mnemonic seed until the backup of that seed has been confirmed with the `zcashd-wallet-tool` utility. A user may start zcashd with `-walletrequirebackup=false` to allow generation of spending keys even if the backup has not yet been confirmed."));
 
     if (showDebug)
     {
@@ -4692,7 +6213,7 @@ std::string CWallet::GetWalletHelpString(bool showDebug)
     return strUsage;
 }
 
-bool CWallet::InitLoadWallet(bool clearWitnessCaches)
+bool CWallet::InitLoadWallet(const CChainParams& params, bool clearWitnessCaches)
 {
     std::string walletFile = GetArg("-wallet", DEFAULT_WALLET_DAT);
 
@@ -4702,7 +6223,7 @@ bool CWallet::InitLoadWallet(bool clearWitnessCaches)
     if (GetBoolArg("-zapwallettxes", false)) {
         uiInterface.InitMessage(_("Zapping all transactions from wallet..."));
 
-        CWallet *tempWallet = new CWallet(walletFile);
+        CWallet *tempWallet = new CWallet(params, walletFile);
         DBErrors nZapWalletRet = tempWallet->ZapWalletTx(vWtx);
         if (nZapWalletRet != DB_LOAD_OK) {
             return UIError(strprintf(_("Error loading %s: Wallet corrupted"), walletFile));
@@ -4716,7 +6237,7 @@ bool CWallet::InitLoadWallet(bool clearWitnessCaches)
 
     int64_t nStart = GetTimeMillis();
     bool fFirstRun = true;
-    CWallet *walletInstance = new CWallet(walletFile);
+    CWallet *walletInstance = new CWallet(params, walletFile);
     DBErrors nLoadWalletRet = walletInstance->LoadWallet(fFirstRun);
     if (nLoadWalletRet != DB_LOAD_OK)
     {
@@ -4735,6 +6256,10 @@ bool CWallet::InitLoadWallet(bool clearWitnessCaches)
         {
             return UIError(strprintf(_("Wallet needed to be rewritten: restart %s to complete"), _(PACKAGE_NAME)));
         }
+        else if (nLoadWalletRet == DB_WRONG_NETWORK)
+        {
+            return UIError(strprintf(_("Wallet %s is not for %s %s network"), walletFile, _(PACKAGE_NAME), params.NetworkIDString()));
+        }
         else
             return UIError(strprintf(_("Error loading %s"), walletFile));
     }
@@ -4757,7 +6282,7 @@ bool CWallet::InitLoadWallet(bool clearWitnessCaches)
         walletInstance->SetMaxVersion(nMaxVersion);
     }
 
-    if (!walletInstance->HaveHDSeed())
+    if (!walletInstance->HaveMnemonicSeed())
     {
         // We can't set the new HD seed until the wallet is decrypted.
         // https://github.com/zcash/zcash/issues/3607
@@ -4773,8 +6298,10 @@ bool CWallet::InitLoadWallet(bool clearWitnessCaches)
     if (fFirstRun)
     {
         // Create new keyUser and set as default key
-        CPubKey newDefaultKey;
-        if (walletInstance->GetKeyFromPool(newDefaultKey)) {
+        if (!walletInstance->IsCrypted()) {
+            LOCK(walletInstance->cs_wallet);
+
+            CPubKey newDefaultKey = walletInstance->GenerateNewKey(true);
             walletInstance->SetDefaultKey(newDefaultKey);
             if (!walletInstance->SetAddressBook(walletInstance->vchDefaultKey.GetID(), "", "receive"))
                 return UIError(_("Cannot write default address") += "\n");
@@ -4796,6 +6323,7 @@ bool CWallet::InitLoadWallet(bool clearWitnessCaches)
         if (walletdb.ReadBestBlock(locator))
             pindexRescan = FindForkInGlobalIndex(chainActive, locator);
     }
+
     if (chainActive.Tip() && chainActive.Tip() != pindexRescan)
     {
         // We can't rescan beyond non-pruned blocks, stop and throw an error.
@@ -4811,10 +6339,19 @@ bool CWallet::InitLoadWallet(bool clearWitnessCaches)
                 return UIError(_("Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)"));
         }
 
+        // If a rescan would begin at a point before NU5 activation height, reset
+        // the Orchard wallet state to empty.
+        if (pindexRescan->nHeight <= Params().GetConsensus().GetActivationHeight(Consensus::UPGRADE_NU5)) {
+            walletInstance->orchardWallet.Reset();
+        }
+
         uiInterface.InitMessage(_("Rescanning..."));
-        LogPrintf("Rescanning last %i blocks (from block %i)...\n", chainActive.Height() - pindexRescan->nHeight, pindexRescan->nHeight);
+        LogPrintf(
+                "CWallet::InitLoadWallet(): Rescanning last %i blocks (from block %i)...\n",
+                chainActive.Height() - pindexRescan->nHeight,
+                pindexRescan->nHeight);
         nStart = GetTimeMillis();
-        walletInstance->ScanForWalletTransactions(pindexRescan, true);
+        walletInstance->ScanForWalletTransactions(pindexRescan, true, true);
         LogPrintf(" rescan      %15dms\n", GetTimeMillis() - nStart);
         walletInstance->SetBestChain(chainActive.GetLocator());
         CWalletDB::IncrementUpdateCounter();
@@ -4849,7 +6386,7 @@ bool CWallet::InitLoadWallet(bool clearWitnessCaches)
     return true;
 }
 
-bool CWallet::ParameterInteraction()
+bool CWallet::ParameterInteraction(const CChainParams& params)
 {
     if (mapArgs.count("-mintxfee"))
     {
@@ -4899,15 +6436,22 @@ bool CWallet::ParameterInteraction()
     bSpendZeroConfChange = GetBoolArg("-spendzeroconfchange", DEFAULT_SPEND_ZEROCONF_CHANGE);
     fSendFreeTransactions = GetBoolArg("-sendfreetransactions", DEFAULT_SEND_FREE_TRANSACTIONS);
 
-    KeyIO keyIO(Params());
+    KeyIO keyIO(params);
     // Check Sapling migration address if set and is a valid Sapling address
     if (mapArgs.count("-migrationdestaddress")) {
         std::string migrationDestAddress = mapArgs["-migrationdestaddress"];
-        libzcash::PaymentAddress address = keyIO.DecodePaymentAddress(migrationDestAddress);
-        if (std::get_if<libzcash::SaplingPaymentAddress>(&address) == nullptr) {
+        std::optional<libzcash::PaymentAddress> address = keyIO.DecodePaymentAddress(migrationDestAddress);
+        if (!address.has_value() || std::get_if<libzcash::SaplingPaymentAddress>(&address.value()) == nullptr) {
             return UIError(_("-migrationdestaddress must be a valid Sapling address."));
         }
     }
+    if (mapArgs.count("-orchardanchorconfirmations")) {
+        int64_t confirmations = atoi64(mapArgs["-orchardanchorconfirmations"]);
+        if (confirmations < 1) {
+            return UIError(strprintf(_("Invalid value for -orchardanchorconfirmations='%u' (must be least 1)"), confirmations));
+        }
+        nOrchardAnchorConfirmations = confirmations;
+    }
 
     return true;
 }
@@ -4938,7 +6482,7 @@ void CMerkleTx::SetMerkleBranch(const CBlock& block)
 
     // Locate the transaction
     for (nIndex = 0; nIndex < (int)block.vtx.size(); nIndex++)
-        if (block.vtx[nIndex] == *(CTransaction*)this)
+        if (block.vtx[nIndex].GetHash() == this->GetHash())
             break;
     if (nIndex == (int)block.vtx.size())
     {
@@ -5001,46 +6545,85 @@ bool CMerkleTx::AcceptToMemoryPool(bool fLimitFree, bool fRejectAbsurdFee)
     return ::AcceptToMemoryPool(Params(), mempool, state, *this, fLimitFree, NULL, fRejectAbsurdFee);
 }
 
-/**
- * Find notes in the wallet filtered by payment address, min depth and ability to spend.
- * These notes are decrypted and added to the output parameter vector, outEntries.
- */
-void CWallet::GetFilteredNotes(
-    std::vector<SproutNoteEntry>& sproutEntries,
-    std::vector<SaplingNoteEntry>& saplingEntries,
-    std::string address,
-    int minDepth,
-    bool ignoreSpent,
-    bool requireSpendingKey)
-{
-    std::set<libzcash::RawAddress> filterAddresses;
+NoteFilter NoteFilter::ForPaymentAddresses(const std::vector<libzcash::PaymentAddress>& paymentAddrs) {
+    NoteFilter addrs;
+    for (const auto& addr: paymentAddrs) {
+        std::visit(match {
+            [&](const CKeyID& keyId) { },
+            [&](const CScriptID& scriptId) { },
+            [&](const libzcash::SproutPaymentAddress& addr) {
+                addrs.sproutAddresses.insert(addr);
+            },
+            [&](const libzcash::SaplingPaymentAddress& addr) {
+                addrs.saplingAddresses.insert(addr);
+            },
+            [&](const libzcash::UnifiedAddress& uaddr) {
+                for (auto& receiver : uaddr) {
+                    std::visit(match {
+                        [&](const libzcash::OrchardRawAddress& addr) {
+                            addrs.orchardAddresses.insert(addr);
+                        },
+                        [&](const libzcash::SaplingPaymentAddress& addr) {
+                            addrs.saplingAddresses.insert(addr);
+                        },
+                        [&](const auto& other) { }
+                    }, receiver);
+                }
+            },
+        }, addr);
+    }
+    return addrs;
+}
 
-    KeyIO keyIO(Params());
-    if (address.length() > 0) {
-        auto addr = keyIO.DecodePaymentAddress(address);
-        for (const auto ra : std::visit(GetRawAddresses(), addr)) {
-            filterAddresses.insert(ra);
+bool CWallet::HasSpendingKeys(const NoteFilter& addrSet) const {
+    for (const auto& zaddr : addrSet.GetSproutAddresses()) {
+        if (!HaveSproutSpendingKey(zaddr)) {
+            return false;
+        }
+    }
+
+    for (const auto& zaddr : addrSet.GetSaplingAddresses()) {
+        if (!HaveSaplingSpendingKeyForAddress(zaddr)) {
+            return false;
+        }
+    }
+
+    for (const auto& addr : addrSet.GetOrchardAddresses()) {
+        if (!orchardWallet.GetSpendingKeyForAddress(addr).has_value()) {
+            return false;
         }
     }
 
-    GetFilteredNotes(sproutEntries, saplingEntries, filterAddresses, minDepth, INT_MAX, ignoreSpent, requireSpendingKey);
+    return true;
 }
 
+
 /**
  * Find notes in the wallet filtered by payment addresses, min depth, max depth,
  * if the note is spent, if a spending key is required, and if the notes are locked.
  * These notes are decrypted and added to the output parameter vector, outEntries.
+ *
+ * For the `noteFilter` argument, `std::nullopt` will return every address; if a
+ * value is provided, all returned notes will correspond to the addresses in
+ * that address set. If the empty address set is provided, this function will
+ * return early and the return arguments `sproutEntries` and `saplingEntries`
+ * will be unmodified.
  */
 void CWallet::GetFilteredNotes(
-    std::vector<SproutNoteEntry>& sproutEntries,
-    std::vector<SaplingNoteEntry>& saplingEntries,
-    std::set<libzcash::RawAddress>& filterAddresses,
+    std::vector<SproutNoteEntry>& sproutEntriesRet,
+    std::vector<SaplingNoteEntry>& saplingEntriesRet,
+    std::vector<OrchardNoteMetadata>& orchardNotesRet,
+    const std::optional<NoteFilter>& noteFilter,
     int minDepth,
     int maxDepth,
     bool ignoreSpent,
     bool requireSpendingKey,
-    bool ignoreLocked)
+    bool ignoreLocked) const
 {
+    // Don't bother to do anything if the note filter would reject all notes
+    if (noteFilter.has_value() && noteFilter.value().IsEmpty())
+        return;
+
     LOCK2(cs_main, cs_wallet);
 
     KeyIO keyIO(Params());
@@ -5055,7 +6638,7 @@ void CWallet::GetFilteredNotes(
         }
 
         // Filter coinbase transactions that don't have Sapling outputs
-        if (wtx.IsCoinBase() && wtx.mapSaplingNoteData.empty()) {
+        if (wtx.IsCoinBase() && wtx.mapSaplingNoteData.empty() && true/* TODO ORCHARD */) {
             continue;
         }
 
@@ -5064,8 +6647,8 @@ void CWallet::GetFilteredNotes(
             SproutNoteData nd = pair.second;
             SproutPaymentAddress pa = nd.address;
 
-            // skip notes which belong to a different payment address in the wallet
-            if (!(filterAddresses.empty() || filterAddresses.count(pa))) {
+            // skip notes which do not conform to the filter, if supplied
+            if (noteFilter.has_value() && !noteFilter.value().HasSproutAddress(pa)) {
                 continue;
             }
 
@@ -5107,7 +6690,7 @@ void CWallet::GetFilteredNotes(
                         hSig,
                         (unsigned char) j);
 
-                sproutEntries.push_back(SproutNoteEntry {
+                sproutEntriesRet.push_back(SproutNoteEntry {
                     jsop, pa, plaintext.note(pa), plaintext.memo(), wtx.GetDepthInMainChain() });
 
             } catch (const note_decryption_failed &err) {
@@ -5134,17 +6717,17 @@ void CWallet::GetFilteredNotes(
             assert(static_cast<bool>(maybe_pa));
             auto pa = maybe_pa.value();
 
-            // skip notes which belong to a different payment address in the wallet
-            if (!(filterAddresses.empty() || filterAddresses.count(pa))) {
+            // skip notes which do not conform to the filter, if supplied
+            if (noteFilter.has_value() && !noteFilter.value().HasSaplingAddress(pa)) {
                 continue;
             }
 
-            if (ignoreSpent && nd.nullifier && IsSaplingSpent(*nd.nullifier)) {
+            if (ignoreSpent && nd.nullifier.has_value() && IsSaplingSpent(nd.nullifier.value())) {
                 continue;
             }
 
             // skip notes which cannot be spent
-            if (requireSpendingKey && !HaveSpendingKeyForPaymentAddress(this)(pa)) {
+            if (requireSpendingKey && !HaveSaplingSpendingKeyForAddress(pa)) {
                 continue;
             }
 
@@ -5154,147 +6737,252 @@ void CWallet::GetFilteredNotes(
             }
 
             auto note = notePt.note(nd.ivk).value();
-            saplingEntries.push_back(SaplingNoteEntry {
+            saplingEntriesRet.push_back(SaplingNoteEntry {
                 op, pa, note, notePt.memo(), wtx.GetDepthInMainChain() });
         }
     }
+
+    std::vector<OrchardNoteMetadata> orchardNotes;
+    if (noteFilter.has_value()) {
+        for (const OrchardRawAddress& addr: noteFilter.value().GetOrchardAddresses()) {
+            auto ivk = orchardWallet.GetIncomingViewingKeyForAddress(addr);
+            if (ivk.has_value()) {
+                orchardWallet.GetFilteredNotes(
+                        orchardNotes,
+                        ivk.value(),
+                        ignoreSpent,
+                        requireSpendingKey);
+            }
+        }
+    } else {
+        // return all Orchard notes
+        orchardWallet.GetFilteredNotes(
+                orchardNotes,
+                std::nullopt,
+                ignoreSpent,
+                requireSpendingKey);
+    }
+
+    for (auto& noteMeta : orchardNotes) {
+        if (ignoreSpent && IsOrchardSpent(noteMeta.GetOutPoint())) {
+            continue;
+        }
+
+        auto wtx = GetWalletTx(noteMeta.GetOutPoint().hash);
+        if (wtx) {
+            auto confirmations = wtx->GetDepthInMainChain();
+            if (confirmations >= minDepth && confirmations <= maxDepth) {
+                noteMeta.SetConfirmations(confirmations);
+                orchardNotesRet.push_back(noteMeta);
+            }
+        } else {
+            throw std::runtime_error("Wallet inconsistency: We have an Orchard WalletTx without a corresponding CWalletTx");
+        }
+    }
+}
+
+std::optional<libzcash::AccountId> CWallet::GetUnifiedAccountId(const libzcash::UFVKId& ufvkId) const {
+    auto addrMetaIt = mapUfvkAddressMetadata.find(ufvkId);
+    if (addrMetaIt != mapUfvkAddressMetadata.end()) {
+        return addrMetaIt->second.GetAccountId();
+    } else {
+        return std::nullopt;
+    }
 }
 
+std::optional<UnifiedAddress> CWallet::FindUnifiedAddressByReceiver(const Receiver& receiver) const {
+    return std::visit(UnifiedAddressForReceiver(*this), receiver);
+}
 
 //
-// Shielded key and address generalizations
+// Payment address operations
 //
 
+// PaymentAddressBelongsToWallet
+
+bool PaymentAddressBelongsToWallet::operator()(const CKeyID &addr) const
+{
+    CScript script = GetScriptForDestination(addr);
+    return m_wallet->HaveKey(addr) || m_wallet->HaveWatchOnly(script);
+}
+bool PaymentAddressBelongsToWallet::operator()(const CScriptID &addr) const
+{
+    CScript script = GetScriptForDestination(addr);
+    return m_wallet->HaveCScript(addr) || m_wallet->HaveWatchOnly(script);
+}
 bool PaymentAddressBelongsToWallet::operator()(const libzcash::SproutPaymentAddress &zaddr) const
 {
     return m_wallet->HaveSproutSpendingKey(zaddr) || m_wallet->HaveSproutViewingKey(zaddr);
 }
-
 bool PaymentAddressBelongsToWallet::operator()(const libzcash::SaplingPaymentAddress &zaddr) const
 {
     libzcash::SaplingIncomingViewingKey ivk;
-
-    // If we have a SaplingExtendedSpendingKey in the wallet, then we will
-    // also have the corresponding SaplingExtendedFullViewingKey.
-    return m_wallet->GetSaplingIncomingViewingKey(zaddr, ivk) &&
+    return
+        m_wallet->GetSaplingIncomingViewingKey(zaddr, ivk) &&
         m_wallet->HaveSaplingFullViewingKey(ivk);
 }
-
 bool PaymentAddressBelongsToWallet::operator()(const libzcash::UnifiedAddress &uaddr) const
 {
-    // TODO
-    return false;
+    return m_wallet->GetUFVKForAddress(uaddr).has_value();
 }
 
-bool PaymentAddressBelongsToWallet::operator()(const libzcash::InvalidEncoding& no) const
+// GetSourceForPaymentAddress
+
+PaymentAddressSource GetSourceForPaymentAddress::GetUnifiedSource(const libzcash::Receiver& receiver) const
 {
-    return false;
+    auto hdChain = m_wallet->GetMnemonicHDChain();
+    auto ufvkMeta = m_wallet->GetUFVKMetadataForReceiver(receiver);
+    if (ufvkMeta.has_value()) {
+        auto ufvkid = ufvkMeta.value().GetUFVKId();
+        // Look through the UFVKs that we have generated, and confirm that the
+        // seed fingerprint for the key we find for the ufvkid corresponds to
+        // the wallet's mnemonic seed.
+        for (const auto& [k, v] : m_wallet->mapUnifiedAccountKeys) {
+            if (v == ufvkid && hdChain.has_value() && k.first == hdChain.value().GetSeedFingerprint()) {
+                return PaymentAddressSource::MnemonicHDSeed;
+            }
+        }
+        return PaymentAddressSource::ImportedWatchOnly;
+    } else {
+        return PaymentAddressSource::AddressNotFound;
+    }
 }
 
-std::optional<libzcash::ViewingKey> GetViewingKeyForPaymentAddress::operator()(
-    const libzcash::SproutPaymentAddress &zaddr) const
+PaymentAddressSource GetSourceForPaymentAddress::operator()(const CKeyID &addr) const
 {
-    libzcash::SproutViewingKey vk;
-    if (!m_wallet->GetSproutViewingKey(zaddr, vk)) {
-        libzcash::SproutSpendingKey k;
-        if (!m_wallet->GetSproutSpendingKey(zaddr, k)) {
-            return std::nullopt;
+    auto ufvkSource = this->GetUnifiedSource(addr);
+    if (ufvkSource == PaymentAddressSource::AddressNotFound) {
+        if (m_wallet->HaveKey(addr)) {
+            return PaymentAddressSource::Random;
+        } else {
+            if (m_wallet->HaveWatchOnly(GetScriptForDestination(addr))) {
+                return PaymentAddressSource::ImportedWatchOnly;
+            }
         }
-        vk = k.viewing_key();
     }
-    return libzcash::ViewingKey(vk);
-}
 
-std::optional<libzcash::ViewingKey> GetViewingKeyForPaymentAddress::operator()(
-    const libzcash::SaplingPaymentAddress &zaddr) const
+    return ufvkSource;
+}
+PaymentAddressSource GetSourceForPaymentAddress::operator()(const CScriptID &addr) const
 {
-    libzcash::SaplingIncomingViewingKey ivk;
-    libzcash::SaplingExtendedFullViewingKey extfvk;
+    auto ufvkSource = this->GetUnifiedSource(addr);
+    if (ufvkSource == PaymentAddressSource::AddressNotFound) {
+        if (m_wallet->HaveCScript(addr)) {
+            return PaymentAddressSource::Imported;
+        } else if (m_wallet->HaveWatchOnly(GetScriptForDestination(addr))) {
+            return PaymentAddressSource::ImportedWatchOnly;
+        }
+    }
 
-    if (m_wallet->GetSaplingIncomingViewingKey(zaddr, ivk) &&
-        m_wallet->GetSaplingFullViewingKey(ivk, extfvk))
-    {
-        return libzcash::ViewingKey(extfvk);
+    return ufvkSource;
+}
+PaymentAddressSource GetSourceForPaymentAddress::operator()(const libzcash::SproutPaymentAddress &zaddr) const
+{
+    if (m_wallet->HaveSproutSpendingKey(zaddr)) {
+        return PaymentAddressSource::Random;
+    } else if (m_wallet->HaveSproutViewingKey(zaddr)) {
+        return PaymentAddressSource::ImportedWatchOnly;
     } else {
-        return std::nullopt;
+        return PaymentAddressSource::AddressNotFound;
+    }
+}
+PaymentAddressSource GetSourceForPaymentAddress::operator()(const libzcash::SaplingPaymentAddress &zaddr) const
+{
+    auto ufvkSource = this->GetUnifiedSource(zaddr);
+    if (ufvkSource == PaymentAddressSource::AddressNotFound) {
+        libzcash::SaplingIncomingViewingKey ivk;
+
+        // If we have a SaplingExtendedSpendingKey in the wallet, then we will
+        // also have the corresponding SaplingExtendedFullViewingKey.
+        if (m_wallet->GetSaplingIncomingViewingKey(zaddr, ivk)) {
+            if (m_wallet->HaveSaplingFullViewingKey(ivk)) {
+                // If we have the HD keypath, it's related to the legacy seed
+                if (m_wallet->mapSaplingZKeyMetadata.count(ivk) > 0 &&
+                        m_wallet->mapSaplingZKeyMetadata[ivk].hdKeypath != "") {
+                    return PaymentAddressSource::LegacyHDSeed;
+                } else if (m_wallet->HaveSaplingSpendingKeyForAddress(zaddr)) {
+                    return PaymentAddressSource::Imported;
+                } else {
+                    return PaymentAddressSource::ImportedWatchOnly;
+                }
+            } else {
+                return PaymentAddressSource::ImportedWatchOnly;
+            }
+        }
     }
-}
 
-std::optional<libzcash::ViewingKey> GetViewingKeyForPaymentAddress::operator()(
-    const libzcash::UnifiedAddress &uaddr) const
-{
-    // TODO
-    return libzcash::ViewingKey();
+    return ufvkSource;
 }
-
-std::optional<libzcash::ViewingKey> GetViewingKeyForPaymentAddress::operator()(
-    const libzcash::InvalidEncoding& no) const
+PaymentAddressSource GetSourceForPaymentAddress::operator()(const libzcash::UnifiedAddress &uaddr) const
 {
-    // Defaults to InvalidEncoding
-    return libzcash::ViewingKey();
+    auto hdChain = m_wallet->GetMnemonicHDChain();
+    auto ufvkMeta = m_wallet->GetUFVKMetadataForAddress(uaddr);
+    if (ufvkMeta.has_value()) {
+        // Look through the UFVKs that we have generated, and confirm that the
+        // seed fingerprint for the key we find for the ufvkMeta corresponds to
+        // the wallet's mnemonic seed.
+        for (const auto& [k, v] : m_wallet->mapUnifiedAccountKeys) {
+            if (v == ufvkMeta.value().GetUFVKId() && hdChain.has_value() && k.first == hdChain.value().GetSeedFingerprint()) {
+                return PaymentAddressSource::MnemonicHDSeed;
+            }
+        }
+        return PaymentAddressSource::ImportedWatchOnly;
+    } else {
+        return PaymentAddressSource::AddressNotFound;
+    }
 }
 
-bool HaveSpendingKeyForPaymentAddress::operator()(const libzcash::SproutPaymentAddress &zaddr) const
-{
-    return m_wallet->HaveSproutSpendingKey(zaddr);
-}
+// GetViewingKeyForPaymentAddress
 
-bool HaveSpendingKeyForPaymentAddress::operator()(const libzcash::SaplingPaymentAddress &zaddr) const
+std::optional<libzcash::ViewingKey> GetViewingKeyForPaymentAddress::operator()(
+    const CKeyID &zaddr) const
 {
-    libzcash::SaplingIncomingViewingKey ivk;
-    libzcash::SaplingExtendedFullViewingKey extfvk;
-
-    return m_wallet->GetSaplingIncomingViewingKey(zaddr, ivk) &&
-        m_wallet->GetSaplingFullViewingKey(ivk, extfvk) &&
-        m_wallet->HaveSaplingSpendingKey(extfvk);
+    return std::nullopt;
 }
-
-bool HaveSpendingKeyForPaymentAddress::operator()(const libzcash::UnifiedAddress &uaddr) const
+std::optional<libzcash::ViewingKey> GetViewingKeyForPaymentAddress::operator()(
+    const CScriptID &zaddr) const
 {
-    // TODO
-    return false;
+    return std::nullopt;
 }
 
-bool HaveSpendingKeyForPaymentAddress::operator()(const libzcash::InvalidEncoding& no) const
-{
-    return false;
-}
+// GetViewingKeyForPaymentAddress visitor
 
-std::optional<libzcash::SpendingKey> GetSpendingKeyForPaymentAddress::operator()(
+std::optional<libzcash::ViewingKey> GetViewingKeyForPaymentAddress::operator()(
     const libzcash::SproutPaymentAddress &zaddr) const
 {
-    libzcash::SproutSpendingKey k;
-    if (m_wallet->GetSproutSpendingKey(zaddr, k)) {
-        return libzcash::SpendingKey(k);
-    } else {
-        return std::nullopt;
+    libzcash::SproutViewingKey vk;
+    if (!m_wallet->GetSproutViewingKey(zaddr, vk)) {
+        libzcash::SproutSpendingKey k;
+        if (!m_wallet->GetSproutSpendingKey(zaddr, k)) {
+            return std::nullopt;
+        }
+        vk = k.viewing_key();
     }
+    return libzcash::ViewingKey(vk);
 }
-
-std::optional<libzcash::SpendingKey> GetSpendingKeyForPaymentAddress::operator()(
+std::optional<libzcash::ViewingKey> GetViewingKeyForPaymentAddress::operator()(
     const libzcash::SaplingPaymentAddress &zaddr) const
 {
-    libzcash::SaplingExtendedSpendingKey extsk;
-    if (m_wallet->GetSaplingExtendedSpendingKey(zaddr, extsk)) {
-        return libzcash::SpendingKey(extsk);
+    libzcash::SaplingIncomingViewingKey ivk;
+    libzcash::SaplingExtendedFullViewingKey extfvk;
+
+    if (m_wallet->GetSaplingIncomingViewingKey(zaddr, ivk) &&
+        m_wallet->GetSaplingFullViewingKey(ivk, extfvk))
+    {
+        return libzcash::ViewingKey(extfvk);
     } else {
         return std::nullopt;
     }
 }
-
-std::optional<libzcash::SpendingKey> GetSpendingKeyForPaymentAddress::operator()(
+std::optional<libzcash::ViewingKey> GetViewingKeyForPaymentAddress::operator()(
     const libzcash::UnifiedAddress &uaddr) const
 {
-    // TODO
-    return libzcash::SpendingKey();
+    auto zufvk = m_wallet->GetUFVKForAddress(uaddr);
+    if (!zufvk.has_value()) return std::nullopt;
+    return zufvk.value().ToFullViewingKey();
 }
 
-std::optional<libzcash::SpendingKey> GetSpendingKeyForPaymentAddress::operator()(
-    const libzcash::InvalidEncoding& no) const
-{
-    // Defaults to InvalidEncoding
-    return libzcash::SpendingKey();
-}
+// AddViewingKeyToWallet
 
 KeyAddResult AddViewingKeyToWallet::operator()(const libzcash::SproutViewingKey &vkey) const {
     auto addr = vkey.address();
@@ -5309,23 +6997,25 @@ KeyAddResult AddViewingKeyToWallet::operator()(const libzcash::SproutViewingKey
         return KeyNotAdded;
     }
 }
-
 KeyAddResult AddViewingKeyToWallet::operator()(const libzcash::SaplingExtendedFullViewingKey &extfvk) const {
     if (m_wallet->HaveSaplingSpendingKey(extfvk)) {
         return SpendingKeyExists;
-    } else if (m_wallet->HaveSaplingFullViewingKey(extfvk.fvk.in_viewing_key())) {
+    } else if (m_wallet->HaveSaplingFullViewingKey(extfvk.ToIncomingViewingKey())) {
         return KeyAlreadyExists;
-    } else if (m_wallet->AddSaplingFullViewingKey(extfvk)) {
+    } else if (
+            m_wallet->AddSaplingFullViewingKey(extfvk) &&
+            (!addDefaultAddress || m_wallet->AddSaplingPaymentAddress(extfvk.ToIncomingViewingKey(), extfvk.DefaultAddress()))) {
         return KeyAdded;
     } else {
         return KeyNotAdded;
     }
 }
-
-KeyAddResult AddViewingKeyToWallet::operator()(const libzcash::InvalidEncoding& no) const {
-    throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid viewing key");
+KeyAddResult AddViewingKeyToWallet::operator()(const libzcash::UnifiedFullViewingKey& no) const {
+    throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Unified full viewing key import is not yet supported.");
 }
 
+// AddSpendingKeyToWallet
+
 KeyAddResult AddSpendingKeyToWallet::operator()(const libzcash::SproutSpendingKey &sk) const {
     auto addr = sk.address();
     KeyIO keyIO(Params());
@@ -5341,43 +7031,632 @@ KeyAddResult AddSpendingKeyToWallet::operator()(const libzcash::SproutSpendingKe
         return KeyNotAdded;
     }
 }
-
 KeyAddResult AddSpendingKeyToWallet::operator()(const libzcash::SaplingExtendedSpendingKey &sk) const {
     auto extfvk = sk.ToXFVK();
-    auto ivk = extfvk.fvk.in_viewing_key();
+    auto ivk = extfvk.ToIncomingViewingKey();
+    auto addr = extfvk.DefaultAddress();
     KeyIO keyIO(Params());
-    {
-        if (log){
-            LogPrint("zrpc", "Importing zaddr %s...\n", keyIO.EncodePaymentAddress(sk.DefaultAddress()));
+    if (log){
+        LogPrint("zrpc", "Importing zaddr %s...\n", keyIO.EncodePaymentAddress(addr));
+    }
+    // Don't throw error in case a key is already there
+    if (m_wallet->HaveSaplingSpendingKey(extfvk)) {
+        return KeyAlreadyExists;
+    } else {
+        if (!(
+            m_wallet->AddSaplingZKey(sk) &&
+            (!addDefaultAddress || m_wallet->AddSaplingPaymentAddress(ivk, addr))
+        )) {
+            return KeyNotAdded;
         }
-        // Don't throw error in case a key is already there
-        if (m_wallet->HaveSaplingSpendingKey(extfvk)) {
-            return KeyAlreadyExists;
+
+        // Sapling addresses can't have been used in transactions prior to activation.
+        if (params.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight == Consensus::NetworkUpgrade::ALWAYS_ACTIVE) {
+            m_wallet->mapSaplingZKeyMetadata[ivk].nCreateTime = nTime;
         } else {
-            if (!m_wallet-> AddSaplingZKey(sk)) {
-                return KeyNotAdded;
+            // 154051200 seconds from epoch is Friday, 26 October 2018 00:00:00 GMT - definitely before Sapling activates
+            m_wallet->mapSaplingZKeyMetadata[ivk].nCreateTime = std::max((int64_t) 154051200, nTime);
+        }
+        if (hdKeypath.has_value()) {
+            m_wallet->mapSaplingZKeyMetadata[ivk].hdKeypath = hdKeypath.value();
+        }
+        if (seedFpStr.has_value()) {
+            uint256 seedFp;
+            seedFp.SetHex(seedFpStr.value());
+            m_wallet->mapSaplingZKeyMetadata[ivk].seedFp = seedFp;
+        }
+        return KeyAdded;
+    }
+}
+
+// UFVKForReceiver :: (CWallet&, Receiver) -> std::optional<ZcashdUnifiedFullViewingKey>
+
+std::optional<libzcash::ZcashdUnifiedFullViewingKey> UFVKForReceiver::operator()(const libzcash::OrchardRawAddress& orchardAddr) const {
+    auto ufvkMeta = wallet.GetUFVKMetadataForReceiver(orchardAddr);
+    if (ufvkMeta.has_value()) {
+        auto ufvkid = ufvkMeta.value().GetUFVKId();
+        auto ufvk = wallet.GetUnifiedFullViewingKey(ufvkid);
+        // If we have UFVK metadata, `GetUnifiedFullViewingKey` should always
+        // return a non-nullopt value, and since we obtained that metadata by
+        // lookup from an Orchard address, it should have a Orchard key component.
+        assert(ufvk.has_value() && ufvk.value().GetOrchardKey().has_value());
+        return ufvk.value();
+    } else {
+        return std::nullopt;
+    }
+}
+std::optional<libzcash::ZcashdUnifiedFullViewingKey> UFVKForReceiver::operator()(const libzcash::SaplingPaymentAddress& saplingAddr) const {
+    auto ufvkMeta = wallet.GetUFVKMetadataForReceiver(saplingAddr);
+    if (ufvkMeta.has_value()) {
+        auto ufvkid = ufvkMeta.value().GetUFVKId();
+        auto ufvk = wallet.GetUnifiedFullViewingKey(ufvkid);
+        // If we have UFVK metadata, `GetUnifiedFullViewingKey` should always
+        // return a non-nullopt value, and since we obtained that metadata by
+        // lookup from as Sapling address, it should have a Sapling key component.
+        assert(ufvk.has_value() && ufvk.value().GetSaplingKey().has_value());
+        return ufvk.value();
+    } else {
+        return std::nullopt;
+    }
+}
+std::optional<libzcash::ZcashdUnifiedFullViewingKey> UFVKForReceiver::operator()(const CScriptID& scriptId) const {
+    // We do not currently generate unified addresses containing P2SH components,
+    // so there's nothing to look up here.
+    return std::nullopt;
+}
+std::optional<libzcash::ZcashdUnifiedFullViewingKey> UFVKForReceiver::operator()(const CKeyID& keyId) const {
+    auto ufvkMeta = wallet.GetUFVKMetadataForReceiver(keyId);
+    if (ufvkMeta.has_value()) {
+        auto ufvkid = ufvkMeta.value().GetUFVKId();
+        // transparent address UFVK metadata is always accompanied by the child
+        // index at which the address was produced
+        assert(ufvkMeta.value().GetDiversifierIndex().has_value());
+        auto ufvk = wallet.GetUnifiedFullViewingKey(ufvkid);
+        assert(ufvk.has_value() && ufvk.value().GetTransparentKey().has_value());
+        return ufvk.value();
+    } else {
+        return std::nullopt;
+    }
+}
+std::optional<libzcash::ZcashdUnifiedFullViewingKey> UFVKForReceiver::operator()(const libzcash::UnknownReceiver& receiver) const {
+    return std::nullopt;
+}
+
+// UnifiedAddressForReceiver :: (CWallet&, Receiver) -> std::optional<UnifiedAddress>
+
+std::optional<libzcash::UnifiedAddress> UnifiedAddressForReceiver::operator()(
+        const libzcash::OrchardRawAddress& orchardAddr) const {
+    auto ufvkMeta = wallet.GetUFVKMetadataForReceiver(orchardAddr);
+    if (ufvkMeta.has_value()) {
+        auto ufvkid = ufvkMeta.value().GetUFVKId();
+        auto ufvk = wallet.GetUnifiedFullViewingKey(ufvkid);
+        assert(ufvk.has_value());
+
+        // If the wallet is missing metadata at this UFVK id, it is probably
+        // corrupt and the node should shut down.
+        const auto& metadata = wallet.mapUfvkAddressMetadata.at(ufvkid);
+        auto orchardKey = ufvk.value().GetOrchardKey();
+        if (orchardKey.has_value()) {
+            auto j = orchardKey.value().ToIncomingViewingKey().DecryptDiversifier(orchardAddr);
+            if (j.has_value()) {
+                auto receivers = metadata.GetReceivers(j.value());
+                if (receivers.has_value()) {
+                    auto addr = ufvk.value().Address(j.value(), receivers.value());
+                    auto addrPtr = std::get_if<std::pair<UnifiedAddress, diversifier_index_t>>(&addr);
+                    if (addrPtr != nullptr) {
+                        return addrPtr->first;
+                    }
+                }
             }
+        }
+    }
+    return std::nullopt;
+}
 
-            // Sapling addresses can't have been used in transactions prior to activation.
-            if (params.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight == Consensus::NetworkUpgrade::ALWAYS_ACTIVE) {
-                m_wallet->mapSaplingZKeyMetadata[ivk].nCreateTime = nTime;
-            } else {
-                // 154051200 seconds from epoch is Friday, 26 October 2018 00:00:00 GMT - definitely before Sapling activates
-                m_wallet->mapSaplingZKeyMetadata[ivk].nCreateTime = std::max((int64_t) 154051200, nTime);
+std::optional<libzcash::UnifiedAddress> UnifiedAddressForReceiver::operator()(const libzcash::SaplingPaymentAddress& saplingAddr) const {
+    auto ufvkMeta = wallet.GetUFVKMetadataForReceiver(saplingAddr);
+    if (ufvkMeta.has_value()) {
+        auto ufvkid = ufvkMeta.value().GetUFVKId();
+        auto ufvk = wallet.GetUnifiedFullViewingKey(ufvkid);
+        assert(ufvk.has_value());
+
+        // If the wallet is missing metadata at this UFVK id, it is probably
+        // corrupt and the node should shut down.
+        const auto& metadata = wallet.mapUfvkAddressMetadata.at(ufvkid);
+        auto saplingKey = ufvk.value().GetSaplingKey();
+        if (saplingKey.has_value()) {
+            diversifier_index_t j = saplingKey.value().DecryptDiversifier(saplingAddr.d);
+            auto receivers = metadata.GetReceivers(j);
+            if (receivers.has_value()) {
+                auto addr = ufvk.value().Address(j, receivers.value());
+                auto addrPtr = std::get_if<std::pair<UnifiedAddress, diversifier_index_t>>(&addr);
+                if (addrPtr != nullptr) {
+                    return addrPtr->first;
+                }
             }
-            if (hdKeypath) {
-                m_wallet->mapSaplingZKeyMetadata[ivk].hdKeypath = hdKeypath.value();
+        }
+    }
+    return std::nullopt;
+}
+std::optional<libzcash::UnifiedAddress> UnifiedAddressForReceiver::operator()(const CScriptID& scriptId) const {
+    // We do not currently generate unified addresses containing P2SH components,
+    // so there's nothing to look up here.
+    return std::nullopt;
+}
+std::optional<libzcash::UnifiedAddress> UnifiedAddressForReceiver::operator()(const CKeyID& keyId) const {
+    auto ufvkMeta = wallet.GetUFVKMetadataForReceiver(keyId);
+    if (ufvkMeta.has_value()) {
+        auto ufvkid = ufvkMeta.value().GetUFVKId();
+        // transparent address UFVK metadata is always accompanied by the child
+        // index at which the address was produced
+        assert(ufvkMeta.value().GetDiversifierIndex().has_value());
+        diversifier_index_t j = ufvkMeta.value().GetDiversifierIndex().value();
+        auto ufvk = wallet.GetUnifiedFullViewingKey(ufvkid);
+        if (!(ufvk.has_value() && ufvk.value().GetTransparentKey().has_value())) {
+            throw std::runtime_error("CWallet::UnifiedAddressForReceiver(): UFVK has no P2PKH key part.");
+        }
+
+        // If the wallet is missing metadata at this UFVK id, it is probably
+        // corrupt and the node should shut down.
+        const auto& metadata = wallet.mapUfvkAddressMetadata.at(ufvkid);
+
+        // Find the set of receivers at the diversifier index. If we do not
+        // know the receiver types for the address produced at this
+        // diversifier, we cannot reconstruct the address.
+        auto receivers = metadata.GetReceivers(j);
+        if (receivers.has_value()) {
+            auto addr = ufvk.value().Address(j, receivers.value());
+            auto addrPtr = std::get_if<std::pair<UnifiedAddress, diversifier_index_t>>(&addr);
+            if (addrPtr != nullptr) {
+                return addrPtr->first;
             }
-            if (seedFpStr) {
-                uint256 seedFp;
-                seedFp.SetHex(seedFpStr.value());
-                m_wallet->mapSaplingZKeyMetadata[ivk].seedFp = seedFp;
+        }
+    }
+
+    return std::nullopt;
+}
+std::optional<libzcash::UnifiedAddress> UnifiedAddressForReceiver::operator()(const libzcash::UnknownReceiver& receiver) const {
+    return std::nullopt;
+}
+
+std::optional<TransactionStrategy> TransactionStrategy::FromString(std::string privacyPolicy) {
+    TransactionStrategy strategy;
+
+    if (privacyPolicy == "FullPrivacy") {
+        strategy.privacy = PrivacyPolicy::FullPrivacy;
+    } else if (privacyPolicy == "AllowRevealedAmounts") {
+        strategy.privacy = PrivacyPolicy::AllowRevealedAmounts;
+    } else if (privacyPolicy == "AllowRevealedRecipients") {
+        strategy.privacy = PrivacyPolicy::AllowRevealedRecipients;
+    } else if (privacyPolicy == "AllowRevealedSenders") {
+        strategy.privacy = PrivacyPolicy::AllowRevealedSenders;
+    } else if (privacyPolicy == "AllowFullyTransparent") {
+        strategy.privacy = PrivacyPolicy::AllowFullyTransparent;
+    } else if (privacyPolicy == "AllowLinkingAccountAddresses") {
+        strategy.privacy = PrivacyPolicy::AllowLinkingAccountAddresses;
+    } else if (privacyPolicy == "NoPrivacy") {
+        strategy.privacy = PrivacyPolicy::NoPrivacy;
+    } else {
+        // Unknown privacy policy.
+        return std::nullopt;
+    }
+
+    return strategy;
+}
+
+bool TransactionStrategy::AllowRevealedAmounts() {
+    switch (privacy) {
+        case PrivacyPolicy::FullPrivacy:
+            return false;
+        case PrivacyPolicy::AllowRevealedAmounts:
+        case PrivacyPolicy::AllowRevealedRecipients:
+        case PrivacyPolicy::AllowRevealedSenders:
+        case PrivacyPolicy::AllowFullyTransparent:
+        case PrivacyPolicy::AllowLinkingAccountAddresses:
+        case PrivacyPolicy::NoPrivacy:
+            return true;
+        default:
+            // Fail closed.
+            return false;
+    }
+}
+
+bool TransactionStrategy::AllowRevealedRecipients() {
+    switch (privacy) {
+        case PrivacyPolicy::FullPrivacy:
+        case PrivacyPolicy::AllowRevealedAmounts:
+        case PrivacyPolicy::AllowRevealedSenders:
+        case PrivacyPolicy::AllowLinkingAccountAddresses:
+            return false;
+        case PrivacyPolicy::AllowRevealedRecipients:
+        case PrivacyPolicy::AllowFullyTransparent:
+        case PrivacyPolicy::NoPrivacy:
+            return true;
+        default:
+            // Fail closed.
+            return false;
+    }
+}
+
+bool TransactionStrategy::AllowRevealedSenders() {
+    switch (privacy) {
+        case PrivacyPolicy::FullPrivacy:
+        case PrivacyPolicy::AllowRevealedAmounts:
+        case PrivacyPolicy::AllowRevealedRecipients:
+            return false;
+        case PrivacyPolicy::AllowRevealedSenders:
+        case PrivacyPolicy::AllowFullyTransparent:
+        case PrivacyPolicy::AllowLinkingAccountAddresses:
+        case PrivacyPolicy::NoPrivacy:
+            return true;
+        default:
+            // Fail closed.
+            return false;
+    }
+}
+
+bool TransactionStrategy::AllowLinkingAccountAddresses() {
+    switch (privacy) {
+        case PrivacyPolicy::FullPrivacy:
+        case PrivacyPolicy::AllowRevealedAmounts:
+        case PrivacyPolicy::AllowRevealedRecipients:
+        case PrivacyPolicy::AllowRevealedSenders:
+        case PrivacyPolicy::AllowFullyTransparent:
+            return false;
+        case PrivacyPolicy::AllowLinkingAccountAddresses:
+        case PrivacyPolicy::NoPrivacy:
+            return true;
+        default:
+            // Fail closed.
+            return false;
+    }
+}
+
+bool ZTXOSelector::SelectsTransparent() const {
+    return std::visit(match {
+        [](const CKeyID& keyId) { return true; },
+        [](const CScriptID& scriptId) { return true; },
+        [](const libzcash::SproutPaymentAddress& addr) { return false; },
+        [](const libzcash::SproutViewingKey& vk) { return false; },
+        [](const libzcash::SaplingPaymentAddress& addr) { return false; },
+        [](const libzcash::SaplingExtendedFullViewingKey& vk) { return false; },
+        [](const libzcash::UnifiedAddress& ua) {
+            return ua.GetP2PKHReceiver().has_value() || ua.GetP2SHReceiver().has_value();
+        },
+        [](const libzcash::UnifiedFullViewingKey& ufvk) { return ufvk.GetTransparentKey().has_value(); },
+        [](const AccountZTXOPattern& acct) { return acct.IncludesP2PKH() || acct.IncludesP2SH(); }
+    }, this->pattern);
+}
+bool ZTXOSelector::SelectsSprout() const {
+    return std::visit(match {
+        [](const libzcash::SproutViewingKey& addr) { return true; },
+        [](const libzcash::SproutPaymentAddress& extfvk) { return true; },
+        [](const auto& addr) { return false; }
+    }, this->pattern);
+}
+bool ZTXOSelector::SelectsSapling() const {
+    return std::visit(match {
+        [](const libzcash::SaplingPaymentAddress& addr) { return true; },
+        [](const libzcash::SaplingExtendedSpendingKey& extfvk) { return true; },
+        [](const libzcash::UnifiedAddress& ua) { return ua.GetSaplingReceiver().has_value(); },
+        [](const libzcash::UnifiedFullViewingKey& ufvk) { return ufvk.GetSaplingKey().has_value(); },
+        [](const AccountZTXOPattern& acct) { return acct.IncludesSapling(); },
+        [](const auto& addr) { return false; }
+    }, this->pattern);
+}
+bool ZTXOSelector::SelectsOrchard() const {
+    return std::visit(match {
+        [](const libzcash::UnifiedAddress& ua) { return ua.GetOrchardReceiver().has_value(); },
+        [](const libzcash::UnifiedFullViewingKey& ufvk) { return ufvk.GetOrchardKey().has_value(); },
+        [](const AccountZTXOPattern& acct) { return acct.IncludesOrchard(); },
+        [](const auto& addr) { return false; }
+    }, this->pattern);
+}
+
+bool SpendableInputs::LimitToAmount(
+    const CAmount amountRequired,
+    const CAmount dustThreshold,
+    std::set<OutputPool> recipientPools)
+{
+    assert(amountRequired >= 0 && dustThreshold > 0);
+    // Calling this method twice is a programming error.
+    assert(!limited);
+
+    CAmount totalSelected{0};
+    auto haveSufficientFunds = [&]() {
+        // if the total would result in change below the dust threshold,
+        // we do not yet have sufficient funds
+        return totalSelected == amountRequired || totalSelected - amountRequired > dustThreshold;
+    };
+    auto wouldSuffice = [&](CAmount extra) {
+        auto totalWithExtra = totalSelected + extra;
+        return totalWithExtra == amountRequired || totalWithExtra - amountRequired > dustThreshold;
+    };
+
+    if (recipientPools.count(OutputPool::Orchard)) {
+        // We cannot select Sprout notes with Orchard recipients.
+        sproutNoteEntries.clear();
+    } else {
+        // Select Sprout notes for spending first - if possible, we want users to
+        // spend any notes that they still have in the Sprout pool.
+        std::sort(sproutNoteEntries.begin(), sproutNoteEntries.end(),
+            [](SproutNoteEntry i, SproutNoteEntry j) -> bool {
+                return i.note.value() > j.note.value();
+            });
+        auto sproutIt = sproutNoteEntries.begin();
+        while (sproutIt != sproutNoteEntries.end() && !haveSufficientFunds()) {
+            totalSelected += sproutIt->note.value();
+            ++sproutIt;
+        }
+        sproutNoteEntries.erase(sproutIt, sproutNoteEntries.end());
+    }
+
+    // Check what input pools we have available.
+    CAmount availableTransparent = std::accumulate(
+        utxos.begin(), utxos.end(), CAmount(0), [](CAmount acc, const COutput& utxo) {
+            return acc + utxo.Value();
+        });
+    CAmount availableSapling = std::accumulate(
+        saplingNoteEntries.begin(),
+        saplingNoteEntries.end(),
+        CAmount(0),
+        [](CAmount acc, const SaplingNoteEntry& entry) {
+            return acc + entry.note.value();
+        });
+    CAmount availableOrchard = std::accumulate(
+        orchardNoteMetadata.begin(),
+        orchardNoteMetadata.end(),
+        CAmount(0),
+        [](CAmount acc, const OrchardNoteMetadata& entry) {
+            return acc + entry.GetNoteValue();
+        });
+    assert(availableTransparent >= 0);
+    assert(availableSapling >= 0);
+    assert(availableOrchard >= 0);
+    bool haveTransparent = availableTransparent > 0;
+    bool haveSapling = availableSapling > 0;
+    bool haveOrchard = availableOrchard > 0;
+    std::set<OutputPool> available;
+    if (haveTransparent) {
+        available.insert(OutputPool::Transparent);
+    }
+    if (haveSapling) {
+        available.insert(OutputPool::Sapling);
+    }
+    if (haveOrchard) {
+        available.insert(OutputPool::Orchard);
+    }
+
+    // Now determine the order in which to select the remaining notes and coins.
+    // We do this in a way that minimizes information leakage while moving funds
+    // into the shielded pool where possible. The rules below follow several
+    // general principles:
+    //
+    // - If we have sufficient funds in a single shielded pool, we prefer to
+    //   select funds from that pool (especially if the pool matches a recipient
+    //   pool).
+    // - If we don't have sufficient funds in a single shielded pool, we prefer
+    //   to select funds from older shielded pools first, to generally migrate
+    //   funds towards newer shielded pools. We do not perform opportunistic
+    //   migration however (at this time).
+    // - If we have transparent recipients, we prefer to select funds across all
+    //   shielded pools before the transparent pool. The address and amount for
+    //   these recipients is necessarily revealed, but we can hide the sender.
+    // - If we don't have suffient funds in shielded pools and are required to
+    //   select transparent coins, we always select all transparent coins first.
+    //   Given that the transaction will necessarily reveal sender information,
+    //   we use it to opportunistically shield transparent coins.
+    //
+    // In the following table:
+    // - "Available" denotes the pools in which we have selectable notes.
+    // - "Recipients" lists the pools in which we are required to create outputs.
+    // - "Order" is a comma-separated list of pool selection orders. The order
+    //   used is the first order in the list that can select sufficient funds.
+    // - T: transparent pool
+    // - S: Sapling pool
+    // - O: Orchard pool
+    //
+    // Available | Recipients | Order  | Rationale
+    // ----------|------------|--------|----------
+    //    T      |    ***     |  T     | N/A
+    //     S     |    ***     |  S     | N/A
+    //      O    |    ***     |  O     | N/A
+    //    TS     |    T       |  S, TS | Hide sender,    opportunistic shielding
+    //    TS     |     S      |  S, TS | Fully shielded, opportunistic shielding
+    //    TS     |      O     |  S, TS | Hide sender,    opportunistic shielding
+    //    TS     |    TS      |  S, TS | Hide sender,    opportunistic shielding
+    //    TS     |    T O     |  S, TS | Hide sender,    opportunistic shielding
+    //    TS     |     SO     |  S, TS | Hide sender,    opportunistic shielding
+    //    TS     |    TSO     |  S, TS | Hide sender,    opportunistic shielding
+    //    T O    |    T       |  O, TO | Hide sender,    opportunistic shielding
+    //    T O    |     S      |  O, TO | Hide sender,    opportunistic shielding
+    //    T O    |      O     |  O, TO | Fully shielded, opportunistic shielding
+    //    T O    |    TS      |  O, TO | Hide sender,    opportunistic shielding
+    //    T O    |    T O     |  O, TO | Hide sender,    opportunistic shielding
+    //    T O    |     SO     |  O, TO | Hide sender,    opportunistic shielding
+    //    T O    |    TSO     |  O, TO | Hide sender,    opportunistic shielding
+    //     SO    |    T       |  O, SO | Fewer pools,    opportunistic migration
+    //     SO    |     S      |  S, SO | Fully shielded
+    //     SO    |      O     |  O, SO | Fully shielded, opportunistic migration
+    //     SO    |    TS      |  S, SO | Fewer pools
+    //     SO    |    T O     |  O, SO | Fewer pools,    opportunistic migration
+    //     SO    |     SO     |  S, SO | Opportunistic migration
+    //     SO    |    TSO     |  S, SO | Opportunistic migration
+    //    TSO    |    T       |  O, SO, TSO | Fewer pools,             hide sender, opportunistic shielding
+    //    TSO    |     S      |  S, SO, TSO | Fully shielded,          hide sender, opportunistic shielding
+    //    TSO    |      O     |  O, SO, TSO | Fully shielded,          hide sender, opportunistic shielding
+    //    TSO    |    TS      |  S, SO, TSO | Fewer pools,             hide sender, opportunistic shielding
+    //    TSO    |    T O     |  O, SO, TSO | Fewer pools,             hide sender, opportunistic shielding
+    //    TSO    |     SO     |  S, SO, TSO | Opportunistic migration, hide sender, opportunistic shielding
+    //    TSO    |    TSO     |  S, SO, TSO | Opportunistic migration, hide sender, opportunistic shielding
+    std::vector<OutputPool> selectionOrder;
+    bool opportunisticShielding = false;
+    if (available.size() <= 1) {
+        // We have at most one input pool, so we don't need selection logic.
+        selectionOrder.assign(available.begin(), available.end());
+    } else if (
+        recipientPools == std::set({OutputPool::Orchard}) &&
+        wouldSuffice(availableOrchard))
+    {
+        // Fully shielded.
+        selectionOrder = {
+            OutputPool::Orchard,
+            // Pools below here are erased.
+            OutputPool::Transparent,
+            OutputPool::Sapling,
+        };
+    } else if (
+        recipientPools.count(OutputPool::Transparent) &&
+        !recipientPools.count(OutputPool::Sapling) &&
+        wouldSuffice(availableOrchard))
+    {
+        // Fewer pools.
+        selectionOrder = {
+            OutputPool::Orchard,
+            // Pools below here are erased.
+            OutputPool::Transparent,
+            OutputPool::Sapling,
+        };
+    } else if (wouldSuffice(availableSapling + availableOrchard)) {
+        // Hide sender.
+        // This case also handles two other cases:
+        // - Fully shielded (recipientPools == S && wouldSuffice(S))
+        // - Fewer pools    (S in recipientPools && O not in recipientPools && wouldSuffice(S))
+        selectionOrder = {
+            OutputPool::Sapling,
+            OutputPool::Orchard,
+            // Pools below here are erased.
+            OutputPool::Transparent,
+        };
+    } else {
+        // Opportunistic shielding.
+        selectionOrder = {
+            OutputPool::Transparent,
+            OutputPool::Sapling,
+            OutputPool::Orchard,
+        };
+        opportunisticShielding = true;
+    }
+
+    // Ensure we provided a total selection order (so that all unselected notes
+    // and coins are erased).
+    for (auto pool : available) {
+        bool poolIsPresent = false;
+        for (auto entry : selectionOrder) {
+            poolIsPresent |= entry == pool;
+        }
+        assert(poolIsPresent);
+    }
+
+    // Finally, select the remaining notes and coins based on this order.
+    for (auto pool : selectionOrder) {
+        switch (pool) {
+            case OutputPool::Transparent:
+            {
+                std::sort(utxos.begin(), utxos.end(),
+                    [](COutput i, COutput j) -> bool {
+                        return i.Value() > j.Value();
+                    });
+                if (opportunisticShielding) {
+                    // Select all transparent coins.
+                    totalSelected += availableTransparent;
+                } else {
+                    // Only select as many as we need.
+                    auto utxoIt = utxos.begin();
+                    while (utxoIt != utxos.end() && !haveSufficientFunds()) {
+                        totalSelected += utxoIt->Value();
+                        ++utxoIt;
+                    }
+                    utxos.erase(utxoIt, utxos.end());
+                }
+                break;
+            }
+
+            case OutputPool::Sapling:
+            {
+                std::sort(saplingNoteEntries.begin(), saplingNoteEntries.end(),
+                    [](SaplingNoteEntry i, SaplingNoteEntry j) -> bool {
+                        return i.note.value() > j.note.value();
+                    });
+                auto saplingIt = saplingNoteEntries.begin();
+                while (saplingIt != saplingNoteEntries.end() && !haveSufficientFunds()) {
+                    totalSelected += saplingIt->note.value();
+                    ++saplingIt;
+                }
+                saplingNoteEntries.erase(saplingIt, saplingNoteEntries.end());
+                break;
+            }
+
+            case OutputPool::Orchard:
+            {
+                std::sort(orchardNoteMetadata.begin(), orchardNoteMetadata.end(),
+                    [](OrchardNoteMetadata i, OrchardNoteMetadata j) -> bool {
+                        return i.GetNoteValue() > j.GetNoteValue();
+                    });
+                auto orchardIt = orchardNoteMetadata.begin();
+                while (orchardIt != orchardNoteMetadata.end() && !haveSufficientFunds()) {
+                    totalSelected += orchardIt->GetNoteValue();
+                    ++orchardIt;
+                }
+                orchardNoteMetadata.erase(orchardIt, orchardNoteMetadata.end());
+                break;
             }
-            return KeyAdded;
         }
     }
+
+    limited = true;
+    return haveSufficientFunds();
 }
 
-KeyAddResult AddSpendingKeyToWallet::operator()(const libzcash::InvalidEncoding& no) const {
-    throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid spending key");
+bool SpendableInputs::HasTransparentCoinbase() const {
+    for (const auto& out : utxos) {
+        if (out.fIsCoinbase) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void SpendableInputs::LogInputs(const AsyncRPCOperationId& id) const {
+    for (const auto& utxo : utxos) {
+        LogPrint("zrpcunsafe", "%s: found unspent transparent UTXO (txid=%s, index=%d, amount=%s, isCoinbase=%s)\n",
+            id,
+            utxo.tx->GetHash().ToString(),
+            utxo.i,
+            FormatMoney(utxo.Value()),
+            utxo.fIsCoinbase);
+    }
+
+    for (const auto& entry : sproutNoteEntries) {
+        std::string data(entry.memo.begin(), entry.memo.end());
+        LogPrint("zrpcunsafe", "%s: found unspent Sprout note (txid=%s, vJoinSplit=%d, jsoutindex=%d, amount=%s, memo=%s)\n",
+            id,
+            entry.jsop.hash.ToString().substr(0, 10),
+            entry.jsop.js,
+            int(entry.jsop.n),  // uint8_t
+            FormatMoney(entry.note.value()),
+            HexStr(data).substr(0, 10)
+            );
+    }
+
+    for (const auto& entry : saplingNoteEntries) {
+        std::string data(entry.memo.begin(), entry.memo.end());
+        LogPrint("zrpcunsafe", "%s: found unspent Sapling note (txid=%s, vShieldedSpend=%d, amount=%s, memo=%s)\n",
+            id,
+            entry.op.hash.ToString().substr(0, 10),
+            entry.op.n,
+            FormatMoney(entry.note.value()),
+            HexStr(data).substr(0, 10));
+    }
+
+    for (const auto& entry : orchardNoteMetadata) {
+        std::string data(entry.GetMemo().begin(), entry.GetMemo().end());
+        LogPrint("zrpcunsafe", "%s: found unspent Orchard note (txid=%s, vActionsOrchard=%d, amount=%s, memo=%s)\n",
+            id,
+            entry.GetOutPoint().hash.ToString().substr(0, 10),
+            entry.GetOutPoint().n,
+            FormatMoney(entry.GetNoteValue()),
+            HexStr(data).substr(0, 10));
+    }
 }
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 7872ec4b843..53c8887d682 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -15,14 +15,18 @@
 #include "primitives/block.h"
 #include "primitives/transaction.h"
 #include "tinyformat.h"
+#include "transaction_builder.h"
 #include "ui_interface.h"
 #include "util.h"
 #include "utilstrencodings.h"
 #include "validationinterface.h"
 #include "script/ismine.h"
 #include "wallet/crypter.h"
+#include "wallet/orchard.h"
 #include "wallet/walletdb.h"
 #include "wallet/rpcwallet.h"
+#include "zcash/address/unified.h"
+#include "zcash/address/mnemonic.h"
 #include "zcash/Address.hpp"
 #include "zcash/Note.hpp"
 #include "base58.h"
@@ -49,6 +53,7 @@ extern unsigned int nTxConfirmTarget;
 extern bool bSpendZeroConfChange;
 extern bool fSendFreeTransactions;
 extern bool fPayAtLeastCustomFee;
+extern unsigned int nOrchardAnchorConfirmations;
 
 static const unsigned int DEFAULT_KEYPOOL_SIZE = 100;
 //! -paytxfee default
@@ -71,8 +76,10 @@ static const bool DEFAULT_WALLETBROADCAST = true;
 //  unless there is some exceptional network disruption.
 static const unsigned int WITNESS_CACHE_SIZE = MAX_REORG_LENGTH + 1;
 
-//! Size of HD seed in bytes
-static const size_t HD_WALLET_SEED_LENGTH = 32;
+//! Amount of entropy used in generation of the mnemonic seed, in bytes.
+static const size_t WALLET_MNEMONIC_ENTROPY_LENGTH = 32;
+//! -orchardanchorconfirmations default
+static const unsigned int DEFAULT_ORCHARD_ANCHOR_CONFIRMATIONS = 1;
 
 extern const char * DEFAULT_WALLET_DAT;
 
@@ -141,6 +148,15 @@ struct CRecipient
     bool fSubtractFeeFromAmount;
 };
 
+class RecipientMapping {
+public:
+    std::optional<libzcash::UnifiedAddress> ua;
+    libzcash::RecipientAddress address;
+
+    RecipientMapping(std::optional<libzcash::UnifiedAddress> ua_, libzcash::RecipientAddress address_) :
+        ua(ua_), address(address_) {}
+};
+
 typedef std::map<std::string, std::string> mapValue_t;
 
 
@@ -399,6 +415,17 @@ class CMerkleTx : public CTransaction
     bool AcceptToMemoryPool(bool fLimitFree=true, bool fRejectAbsurdFee=true);
 };
 
+enum class WalletUAGenerationError {
+    NoSuchAccount,
+    ExistingAddressMismatch,
+    WalletEncrypted
+};
+
+typedef std::variant<
+    std::pair<libzcash::UnifiedAddress, libzcash::diversifier_index_t>,
+    libzcash::UnifiedAddressGenerationError,
+    WalletUAGenerationError> WalletUAGenerationResult;
+
 /**
  * A transaction with a bunch of additional info that only the owner cares about.
  * It includes any unrecorded transactions needed to link it back to the block chain.
@@ -436,6 +463,8 @@ class CWalletTx : public CMerkleTx
     mapValue_t mapValue;
     mapSproutNoteData_t mapSproutNoteData;
     mapSaplingNoteData_t mapSaplingNoteData;
+    OrchardWalletTxMeta orchardTxMeta;
+
     std::vector<std::pair<std::string, std::string> > vOrderForm;
     unsigned int fTimeReceivedIsTxTime;
     unsigned int nTimeReceived; //!< time received by this node
@@ -548,6 +577,10 @@ class CWalletTx : public CMerkleTx
             READWRITE(mapSaplingNoteData);
         }
 
+        if (fOverwintered && nVersion >= ZIP225_TX_VERSION) {
+            READWRITE(orchardTxMeta);
+        }
+
         if (ser_action.ForRead())
         {
             ReadOrderPos(nOrderPos, mapValue);
@@ -580,8 +613,9 @@ class CWalletTx : public CMerkleTx
         MarkDirty();
     }
 
-    void SetSproutNoteData(mapSproutNoteData_t &noteData);
-    void SetSaplingNoteData(mapSaplingNoteData_t &noteData);
+    void SetSproutNoteData(const mapSproutNoteData_t& noteData);
+    void SetSaplingNoteData(const mapSaplingNoteData_t& noteData);
+    void SetOrchardTxMeta(OrchardWalletTxMeta actionData);
 
     std::pair<libzcash::SproutNotePlaintext, libzcash::SproutPaymentAddress> DecryptSproutNote(
         JSOutPoint jsop) const;
@@ -598,6 +632,7 @@ class CWalletTx : public CMerkleTx
     std::optional<std::pair<
         libzcash::SaplingNotePlaintext,
         libzcash::SaplingPaymentAddress>> RecoverSaplingNoteWithoutLeadByteCheck(SaplingOutPoint op, std::set<uint256>& ovks) const;
+    OrchardActions RecoverOrchardActions(const std::vector<uint256>& ovks) const;
 
     //! filter decides which addresses will count towards the debit
     CAmount GetDebit(const isminefilter& filter) const;
@@ -610,10 +645,7 @@ class CWalletTx : public CMerkleTx
     void GetAmounts(std::list<COutputEntry>& listReceived,
                     std::list<COutputEntry>& listSent, CAmount& nFee, const isminefilter& filter) const;
 
-    bool IsFromMe(const isminefilter& filter) const
-    {
-        return (GetDebit(filter) > 0);
-    }
+    bool IsFromMe(const isminefilter& filter) const;
 
     bool IsTrusted() const;
 
@@ -625,8 +657,48 @@ class CWalletTx : public CMerkleTx
     std::set<uint256> GetConflicts() const;
 };
 
+class NoteFilter {
+private:
+    std::set<libzcash::SproutPaymentAddress> sproutAddresses;
+    std::set<libzcash::SaplingPaymentAddress> saplingAddresses;
+    std::set<libzcash::OrchardRawAddress> orchardAddresses;
+
+    NoteFilter() {}
+public:
+    static NoteFilter Empty() { return NoteFilter(); }
+    static NoteFilter ForPaymentAddresses(const std::vector<libzcash::PaymentAddress>& addrs);
+
+    const std::set<libzcash::SproutPaymentAddress>& GetSproutAddresses() const {
+        return sproutAddresses;
+    }
+
+    const std::set<libzcash::SaplingPaymentAddress>& GetSaplingAddresses() const {
+        return saplingAddresses;
+    }
+
+    const std::set<libzcash::OrchardRawAddress>& GetOrchardAddresses() const {
+        return orchardAddresses;
+    }
 
+    bool IsEmpty() const {
+        return
+            sproutAddresses.empty() &&
+            saplingAddresses.empty() &&
+            orchardAddresses.empty();
+    }
+
+    bool HasSproutAddress(libzcash::SproutPaymentAddress addr) const {
+        return sproutAddresses.count(addr) > 0;
+    }
 
+    bool HasSaplingAddress(libzcash::SaplingPaymentAddress addr) const {
+        return saplingAddresses.count(addr) > 0;
+    }
+
+    bool HasOrchardAddress(libzcash::OrchardRawAddress addr) const {
+        return orchardAddresses.count(addr) > 0;
+    }
+};
 
 class COutput
 {
@@ -644,8 +716,183 @@ class COutput
     std::string ToString() const;
 };
 
+/**
+ * A strategy to use for managing privacy when constructing a transaction.
+ */
+enum class PrivacyPolicy {
+    FullPrivacy,
+    AllowRevealedAmounts,
+    AllowRevealedRecipients,
+    AllowRevealedSenders,
+    AllowFullyTransparent,
+    AllowLinkingAccountAddresses,
+    NoPrivacy,
+};
+
+class TransactionStrategy {
+    PrivacyPolicy privacy;
+
+public:
+    TransactionStrategy() : privacy(PrivacyPolicy::FullPrivacy) {}
+    TransactionStrategy(const TransactionStrategy& strategy) : privacy(strategy.privacy) {}
+    TransactionStrategy(PrivacyPolicy privacyPolicy) : privacy(privacyPolicy) {}
+
+    static std::optional<TransactionStrategy> FromString(std::string privacyPolicy);
 
+    bool AllowRevealedAmounts();
+    bool AllowRevealedRecipients();
+    bool AllowRevealedSenders();
+    bool AllowLinkingAccountAddresses();
+};
 
+/**
+ * A class representing the ZIP 316 unified spending authority associated with
+ * a ZIP 32 account and this wallet's mnemonic seed. This is intended to be
+ * used as a ZTXOPattern value to choose prior Zcash transaction outputs,
+ * including both transparent UTXOs and shielded notes.
+ *
+ * If the account ID is set to `ZCASH_LEGACY_ACCOUNT`, the instance instead
+ * represents the collective spend authorities of all legacy transparent addresses
+ * generated via the `getnewaddress` RPC method. Shielded notes will never be
+ * selected for this account ID.
+ *
+ * If the set of receiver types provided is non-empty, only outputs for
+ * protocols corresponding to the provided set of receiver types may be used.
+ * If the set of receiver types is empty, no restrictions are placed upon what
+ * protocols outputs are selected for.
+ */
+class AccountZTXOPattern {
+    libzcash::AccountId accountId;
+    std::set<libzcash::ReceiverType> receiverTypes;
+public:
+    AccountZTXOPattern(libzcash::AccountId accountIdIn, std::set<libzcash::ReceiverType> receiverTypesIn):
+        accountId(accountIdIn), receiverTypes(receiverTypesIn) {}
+
+    libzcash::AccountId GetAccountId() const {
+        return accountId;
+    }
+
+    const std::set<libzcash::ReceiverType>& GetReceiverTypes() const {
+        return receiverTypes;
+    }
+
+    bool IncludesP2PKH() const {
+        return receiverTypes.empty() || receiverTypes.count(libzcash::ReceiverType::P2PKH) > 0;
+    }
+
+    bool IncludesP2SH() const {
+        return receiverTypes.empty() || receiverTypes.count(libzcash::ReceiverType::P2SH) > 0;
+    }
+
+    bool IncludesSapling() const {
+        return receiverTypes.empty() || receiverTypes.count(libzcash::ReceiverType::Sapling) > 0;
+    }
+
+    bool IncludesOrchard() const {
+        return receiverTypes.empty() || receiverTypes.count(libzcash::ReceiverType::Orchard) > 0;
+    }
+
+    friend bool operator==(const AccountZTXOPattern &a, const AccountZTXOPattern &b) {
+        return a.accountId == b.accountId && a.receiverTypes == b.receiverTypes;
+    }
+};
+
+/**
+ * A selector which can be used to choose prior Zcash transaction outputs,
+ * including both transparent UTXOs and shielded notes.
+ */
+typedef std::variant<
+    CKeyID,
+    CScriptID,
+    libzcash::SproutPaymentAddress,
+    libzcash::SproutViewingKey,
+    libzcash::SaplingPaymentAddress,
+    libzcash::SaplingExtendedFullViewingKey,
+    libzcash::UnifiedAddress,
+    libzcash::UnifiedFullViewingKey,
+    AccountZTXOPattern> ZTXOPattern;
+
+class ZTXOSelector {
+private:
+    ZTXOPattern pattern;
+    bool requireSpendingKeys;
+
+    ZTXOSelector(ZTXOPattern patternIn, bool requireSpendingKeysIn):
+        pattern(patternIn), requireSpendingKeys(requireSpendingKeysIn) {}
+
+    friend class CWallet;
+public:
+    const ZTXOPattern& GetPattern() const {
+        return pattern;
+    }
+
+    bool RequireSpendingKeys() const {
+        return requireSpendingKeys;
+    }
+
+    bool SelectsTransparent() const;
+    bool SelectsSprout() const;
+    bool SelectsSapling() const;
+    bool SelectsOrchard() const;
+};
+
+class SpendableInputs {
+private:
+    bool limited = false;
+
+public:
+    std::vector<COutput> utxos;
+    std::vector<SproutNoteEntry> sproutNoteEntries;
+    std::vector<SaplingNoteEntry> saplingNoteEntries;
+    std::vector<OrchardNoteMetadata> orchardNoteMetadata;
+
+    /**
+     * Selectively discard notes that are not required to obtain the desired
+     * amount. Returns `false` if the available inputs do not add up to the
+     * desired amount.
+     *
+     * `recipientPools` is the set of `OutputPool`s to which the caller intends
+     * to send funds. This is used during note selection to minimise information
+     * leakage. The empty set is short-hand for "all pools".
+     *
+     * This method must only be called once.
+     */
+    bool LimitToAmount(
+        CAmount amount,
+        CAmount dustThreshold,
+        std::set<libzcash::OutputPool> recipientPools);
+
+    /**
+     * Compute the total ZEC amount of spendable inputs.
+     */
+    CAmount Total() const {
+        CAmount result = 0;
+        for (const auto& t : utxos) {
+            result += t.Value();
+        }
+        for (const auto& t : sproutNoteEntries) {
+            result += t.note.value();
+        }
+        for (const auto& t : saplingNoteEntries) {
+            result += t.note.value();
+        }
+        for (const auto& t : orchardNoteMetadata) {
+            result += t.GetNoteValue();
+        }
+        return result;
+    }
+
+    /**
+     * Return whether or not the set of selected UTXOs contains
+     * coinbase outputs.
+     */
+    bool HasTransparentCoinbase() const;
+
+    /**
+     * List spendable inputs in zrpcunsafe log entries.
+     */
+    void LogInputs(const AsyncRPCOperationId& id) const;
+};
 
 /** Private key that includes an expiration date in case it never gets used. */
 class CWalletKey
@@ -674,6 +921,84 @@ class CWalletKey
     }
 };
 
+class UFVKAddressMetadata
+{
+private:
+    // The account ID may be absent for imported UFVKs, and also may temporarily
+    // be absent when this data structure is in a partially-reconstructed state
+    // during the wallet load process.
+    std::optional<libzcash::AccountId> accountId;
+    std::map<libzcash::diversifier_index_t, std::set<libzcash::ReceiverType>> addressReceivers;
+public:
+    UFVKAddressMetadata() {}
+    UFVKAddressMetadata(libzcash::AccountId accountId): accountId(accountId) {}
+
+    /**
+     * Return all currently known diversifier indices for which addresses
+     * have been generated, each accompanied by the associated set of receiver
+     * types that were used when generating that address.
+     */
+    const std::map<libzcash::diversifier_index_t, std::set<libzcash::ReceiverType>>& GetKnownReceiverSetsByDiversifierIndex() const {
+        return addressReceivers;
+    }
+
+    std::optional<std::set<libzcash::ReceiverType>> GetReceivers(
+            const libzcash::diversifier_index_t& j) const {
+        auto receivers = addressReceivers.find(j);
+        if (receivers != addressReceivers.end()) {
+            return receivers->second;
+        } else {
+            return std::nullopt;
+        }
+    }
+
+    /**
+     * Add the specified set of receivers at the provided diversifier index.
+     *
+     * Returns `true` if this is a new entry or if the operation would not
+     * alter the existing set of receiver types at this index, `false`
+     * otherwise.
+     */
+    bool SetReceivers(
+            const libzcash::diversifier_index_t& j,
+            const std::set<libzcash::ReceiverType>& receivers) {
+        const auto [it, success] = addressReceivers.insert(std::make_pair(j, receivers));
+        if (success) {
+            return true;
+        } else {
+            return it->second == receivers;
+        }
+    }
+
+    std::optional<libzcash::AccountId> GetAccountId() const {
+        return accountId;
+    }
+
+    bool SetAccountId(libzcash::AccountId accountIdIn) {
+        if (accountId.has_value()) {
+            return (accountIdIn == accountId.value());
+        } else {
+            accountId = accountIdIn;
+            return true;
+        }
+    }
+
+    /**
+     * Search the for the maximum diversifier that has already been used to
+     * generate a new address, and return the next diversifier. Returns the
+     * zero diversifier index if no addresses have yet been generated,
+     * and returns std::nullopt if the increment operation would cause an
+     * overflow.
+     */
+    std::optional<libzcash::diversifier_index_t> GetNextDiversifierIndex() {
+        if (addressReceivers.empty()) {
+            return libzcash::diversifier_index_t(0);
+        } else {
+            return addressReceivers.rbegin()->first.succ();
+        }
+    }
+};
+
 /**
  * A CWallet is an extension of a keystore, which also maintains a set of transactions and balances,
  * and provides the ability to create new transactions.
@@ -681,6 +1006,8 @@ class CWalletKey
 class CWallet : public CCryptoKeyStore, public CValidationInterface
 {
 private:
+    friend class CWalletTx;
+
     /**
      * Select a set of coins such that nValueRet >= nTargetValue and at least
      * all coins from coinControl are selected; Never select unconfirmed coins
@@ -702,8 +1029,13 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     int nSetChainUpdates;
     bool fBroadcastTransactions;
 
+    /**
+     * A map from a protocol-specific transaction output identifier to
+     * a txid.
+     */
     template <class T>
     using TxSpendMap = std::multimap<T, uint256>;
+
     /**
      * Used to keep track of spent outpoints, and
      * detect and report conflicts (double-spends or
@@ -711,6 +1043,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      */
     typedef TxSpendMap<COutPoint> TxSpends;
     TxSpends mapTxSpends;
+
     /**
      * Used to keep track of spent Notes, and
      * detect and report conflicts (double-spends).
@@ -742,14 +1075,21 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     /**
      * pindex is the new tip being connected.
      */
-    void IncrementNoteWitnesses(const CBlockIndex* pindex,
-                                const CBlock* pblock,
-                                SproutMerkleTree& sproutTree,
-                                SaplingMerkleTree& saplingTree);
+    void IncrementNoteWitnesses(
+            const Consensus::Params& consensus,
+            const CBlockIndex* pindex,
+            const CBlock* pblock,
+            SproutMerkleTree& sproutTree,
+            SaplingMerkleTree& saplingTree,
+            bool performOrchardWalletUpdates
+            );
     /**
      * pindex is the old tip being disconnected.
      */
-    void DecrementNoteWitnesses(const CBlockIndex* pindex);
+    void DecrementNoteWitnesses(
+            const Consensus::Params& consensus,
+            const CBlockIndex* pindex
+            );
 
     template <typename WalletDB>
     void SetBestChainINTERNAL(WalletDB& walletdb, const CBlockLocator& loc) {
@@ -774,6 +1114,13 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
                     }
                 }
             }
+            // Add persistence of Orchard incremental witness tree
+            orchardWallet.GarbageCollect();
+            if (!walletdb.WriteOrchardWitnesses(orchardWallet)) {
+                LogPrintf("SetBestChain(): Failed to write Orchard witnesses, aborting atomic write\n");
+                walletdb.TxnAbort();
+                return;
+            }
             if (!walletdb.WriteWitnessCacheSize(nWitnessCacheSize)) {
                 LogPrintf("SetBestChain(): Failed to write nWitnessCacheSize, aborting atomic write\n");
                 walletdb.TxnAbort();
@@ -801,14 +1148,35 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
 private:
     template <class T>
     void SyncMetaData(std::pair<typename TxSpendMap<T>::iterator, typename TxSpendMap<T>::iterator>);
-    void ChainTipAdded(const CBlockIndex *pindex, const CBlock *pblock, SproutMerkleTree sproutTree, SaplingMerkleTree saplingTree);
+    void ChainTipAdded(
+            const CBlockIndex *pindex,
+            const CBlock *pblock,
+            SproutMerkleTree sproutTree,
+            SaplingMerkleTree saplingTree,
+            bool performOrchardWalletUpdates);
+
+    /* Add a transparent secret key to the wallet. Internal use only. */
+    CPubKey AddTransparentSecretKey(
+            const uint256& seedFingerprint,
+            const CKey& secret,
+            const HDKeyPath& keyPath);
+
+    std::map<libzcash::OrchardIncomingViewingKey, CKeyMetadata> mapOrchardZKeyMetadata;
 
 protected:
     bool UpdatedNoteData(const CWalletTx& wtxIn, CWalletTx& wtx);
     void MarkAffectedTransactionsDirty(const CTransaction& tx);
 
-    /* the hd chain data model (chain counters) */
-    CHDChain hdChain;
+    /* the hd chain metadata for keys derived from the mnemonic seed */
+    std::optional<CHDChain> mnemonicHDChain;
+
+    /* the network ID string for the network for which this wallet was created */
+    std::string networkIdString;
+
+    /* The Orchard subset of wallet data. As many operations as possible are
+     * delegated to the Orchard wallet.
+     */
+    OrchardWallet orchardWallet;
 
 public:
     /*
@@ -825,21 +1193,24 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
 
     std::set<int64_t> setKeyPool;
     std::map<CKeyID, CKeyMetadata> mapKeyMetadata;
+
     std::map<libzcash::SproutPaymentAddress, CKeyMetadata> mapSproutZKeyMetadata;
     std::map<libzcash::SaplingIncomingViewingKey, CKeyMetadata> mapSaplingZKeyMetadata;
+    std::map<std::pair<libzcash::SeedFingerprint, libzcash::AccountId>, libzcash::UFVKId> mapUnifiedAccountKeys;
+    std::map<libzcash::UFVKId, UFVKAddressMetadata> mapUfvkAddressMetadata;
 
     typedef std::map<unsigned int, CMasterKey> MasterKeyMap;
     MasterKeyMap mapMasterKeys;
     unsigned int nMasterKeyMaxID;
 
-    CWallet()
+    CWallet(const CChainParams& params)
     {
-        SetNull();
+        SetNull(params);
     }
 
-    CWallet(const std::string& strWalletFileIn)
+    CWallet(const CChainParams& params, const std::string& strWalletFileIn)
     {
-        SetNull();
+        SetNull(params);
 
         strWalletFile = strWalletFileIn;
         fFileBacked = true;
@@ -851,7 +1222,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
         pwalletdbEncryption = NULL;
     }
 
-    void SetNull()
+    void SetNull(const CChainParams& params)
     {
         nWalletVersion = FEATURE_BASE;
         nWalletMaxVersion = FEATURE_BASE;
@@ -866,6 +1237,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
         nTimeFirstKey = 0;
         fBroadcastTransactions = false;
         nWitnessCacheSize = 0;
+        networkIdString = params.NetworkIDString();
     }
 
     /**
@@ -922,6 +1294,8 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
 
     std::map<uint256, CWalletTx> mapWallet;
 
+    std::map<uint256, std::vector<RecipientMapping>> sendRecipients;
+
     typedef std::multimap<int64_t, CWalletTx*> TxItems;
     TxItems wtxOrdered;
 
@@ -961,11 +1335,88 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      * completion the coin set and corresponding actual target value is
      * assembled
      */
-    bool SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int nConfTheirs, std::vector<COutput> vCoins, std::set<std::pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet) const;
+    static bool SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int nConfTheirs, std::vector<COutput> vCoins, std::set<std::pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet);
+
+    /**
+     * Returns the ZTXO selector for the specified account ID.
+     *
+     * Returns `std::nullopt` if the account ID has not been generated yet by
+     * the wallet.
+     *
+     * If the `requireSpendingKey` flag is set, this will only return a selector
+     * that will choose outputs for which this wallet holds the spending keys.
+     */
+    std::optional<ZTXOSelector> ZTXOSelectorForAccount(
+            libzcash::AccountId account,
+            bool requireSpendingKey,
+            std::set<libzcash::ReceiverType> receiverTypes={}) const;
+
+    /**
+     * Returns the ZTXO selector for the specified payment address, if the
+     * address is known to the wallet. If the `requireSpendingKey` flag is set,
+     * this will only return a selector that will choose outputs for which this
+     * wallet holds the spending keys.
+     */
+    std::optional<ZTXOSelector> ZTXOSelectorForAddress(
+            const libzcash::PaymentAddress& addr,
+            bool requireSpendingKey,
+            bool allowAddressLinkability) const;
+
+    /**
+     * Returns the ZTXO selector for the specified viewing key, if that key
+     * is known to the wallet. If the `requireSpendingKey` flag is set, this
+     * will only return a selector that will choose outputs for which this
+     * wallet holds the spending keys.
+     */
+    std::optional<ZTXOSelector> ZTXOSelectorForViewingKey(
+            const libzcash::ViewingKey& vk,
+            bool requireSpendingKey) const;
+
+    /**
+     * Returns the ZTXO selector that will select UTXOs sent to legacy
+     * transparent addresses managed by this wallet.
+     */
+    static ZTXOSelector LegacyTransparentZTXOSelector(bool requireSpendingKey);
+
+    /**
+     * Look up the account for a given selector. This resolves the account ID
+     * even in the in that a bare transparent or Sapling address that
+     * corresponds to a non-legacy account is provided as a selector.  This is
+     * used in z_sendmany to ensure that we always correctly determine change
+     * addresses and OVKs on the basis of account UFVKs when possible.
+     */
+    std::optional<libzcash::AccountId> FindAccountForSelector(const ZTXOSelector& paymentSource) const;
+
+    /**
+     * Generate a change address for the specified account.
+     *
+     * If a shielded change address is requested, this will return the default
+     * unified address for the internal unified full viewing key.
+     *
+     * If a transparent change address is requested, this will generate a fresh
+     * diversified unified address from the internal unified full viewing key,
+     * and return the associated transparent change address.
+     *
+     * Returns `std::nullopt` if the account does not have an internal spending
+     * key matching the requested `OutputPool`.
+     */
+    std::optional<libzcash::RecipientAddress> GenerateChangeAddressForAccount(
+            libzcash::AccountId accountId,
+            std::set<libzcash::OutputPool> changeOptions);
+
+    SpendableInputs FindSpendableInputs(
+            ZTXOSelector paymentSource,
+            bool allowTransparentCoinbase,
+            uint32_t minDepth) const;
+
+    bool SelectorMatchesAddress(const ZTXOSelector& source, const CTxDestination& a0) const;
+    bool SelectorMatchesAddress(const ZTXOSelector& source, const libzcash::SproutPaymentAddress& a0) const;
+    bool SelectorMatchesAddress(const ZTXOSelector& source, const libzcash::SaplingPaymentAddress& a0) const;
 
     bool IsSpent(const uint256& hash, unsigned int n) const;
     bool IsSproutSpent(const uint256& nullifier) const;
     bool IsSaplingSpent(const uint256& nullifier) const;
+    bool IsOrchardSpent(const OrchardOutPoint& outpoint) const;
 
     bool IsLockedCoin(uint256 hash, unsigned int n) const;
     void LockCoin(COutPoint& output);
@@ -989,7 +1440,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      * keystore implementation
      * Generate a new key
      */
-    CPubKey GenerateNewKey();
+    CPubKey GenerateNewKey(bool external);
     //! Adds a key to the store, and saves it to disk.
     bool AddKeyPubKey(const CKey& key, const CPubKey &pubkey);
     //! Adds a key to the store, without saving it to disk (used by LoadWallet)
@@ -1006,8 +1457,6 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     bool AddCScript(const CScript& redeemScript);
     bool LoadCScript(const CScript& redeemScript);
 
-    //! Adds a destination data tuple to the store, and saves it to disk
-    bool AddDestData(const CTxDestination &dest, const std::string &key, const std::string &value);
     //! Erases a destination data tuple in the store and on disk
     bool EraseDestData(const CTxDestination &dest, const std::string &key);
     //! Adds a destination data tuple to the store, without saving it to disk
@@ -1055,8 +1504,15 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     /**
       * Sapling ZKeys
       */
-    //! Generates new Sapling key
-    libzcash::SaplingPaymentAddress GenerateNewSaplingZKey();
+
+    //! Generates new Sapling key, stores the newly generated spending
+    //! key to the wallet, and returns the default address for the newly generated key.
+    libzcash::SaplingPaymentAddress GenerateNewLegacySaplingZKey();
+    //! Generates Sapling key at the specified address index, and stores that
+    //! key to the wallet if it has not already been persisted. Returns the
+    //! default address for the key, and a flag that is true when the key
+    //! was newly generated (not already in the wallet).
+    std::pair<libzcash::SaplingPaymentAddress, bool> GenerateLegacySaplingZKey(uint32_t addrIndex);
     //! Adds Sapling spending key to the store, and saves it to disk
     bool AddSaplingZKey(const libzcash::SaplingExtendedSpendingKey &key);
     //! Add Sapling full viewing key to the wallet.
@@ -1065,8 +1521,9 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     //! full viewing key to disk. Inside CCryptoKeyStore and CBasicKeyStore,
     //! CBasicKeyStore::AddSaplingFullViewingKey is called directly when adding a
     //! full viewing key to the keystore, to avoid this override.
-    bool AddSaplingFullViewingKey(const libzcash::SaplingExtendedFullViewingKey &extfvk);
-    bool AddSaplingIncomingViewingKey(
+    bool AddSaplingFullViewingKey(
+            const libzcash::SaplingExtendedFullViewingKey &extfvk);
+    bool AddSaplingPaymentAddress(
         const libzcash::SaplingIncomingViewingKey &ivk,
         const libzcash::SaplingPaymentAddress &addr);
     bool AddCryptedSaplingSpendingKey(
@@ -1087,6 +1544,101 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     bool LoadCryptedSaplingZKey(const libzcash::SaplingExtendedFullViewingKey &extfvk,
                                 const std::vector<unsigned char> &vchCryptedSecret);
 
+    //
+    // Orchard Support
+    //
+
+    bool AddOrchardZKey(const libzcash::OrchardSpendingKey &sk);
+    bool AddOrchardFullViewingKey(const libzcash::OrchardFullViewingKey &fvk);
+    /**
+     * Adds an address/ivk mapping to the in-memory wallet. Returns `false` if
+     * the mapping could not be persisted, or the IVK does not correspond to an
+     * FVK known by the wallet.
+     */
+    bool AddOrchardRawAddress(
+        const libzcash::OrchardIncomingViewingKey &ivk,
+        const libzcash::OrchardRawAddress &addr);
+    /**
+     * Loads an address/ivk mapping to the in-memory wallet. Returns `true`
+     * if the provided IVK corresponds to an FVK known by the wallet.
+     */
+    bool LoadOrchardRawAddress(
+        const libzcash::OrchardRawAddress &addr,
+        const libzcash::OrchardIncomingViewingKey &ivk);
+
+    /**
+     * Returns a loader that can be used to read an Orchard note commitment
+     * tree from a stream into the Orchard wallet.
+     */
+    OrchardWalletNoteCommitmentTreeLoader GetOrchardNoteCommitmentTreeLoader();
+
+    //
+    // Unified keys, addresses, and accounts
+    //
+
+    //! Obtain the account key for the legacy account by deriving it from
+    //! the wallet's mnemonic seed.
+    libzcash::transparent::AccountKey GetLegacyAccountKey() const;
+
+    //! Generate the unified spending key from the wallet's mnemonic seed
+    //! for the next unused account identifier.
+    std::pair<libzcash::UnifiedFullViewingKey, libzcash::AccountId>
+        GenerateNewUnifiedSpendingKey();
+
+    //! Generate the unified spending key for the specified ZIP-32/BIP-44
+    //! account identifier from the wallet's mnemonic seed, or returns
+    //! std::nullopt if the account identifier does not produce a valid
+    //! spending key for all receiver types.
+    std::optional<libzcash::ZcashdUnifiedSpendingKey>
+        GenerateUnifiedSpendingKeyForAccount(libzcash::AccountId accountId);
+
+    //! Retrieves the UFVK derived from the wallet's mnemonic seed for the specified account.
+    std::optional<libzcash::ZcashdUnifiedFullViewingKey>
+        GetUnifiedFullViewingKeyByAccount(libzcash::AccountId account) const;
+
+    //! Generate a new unified address for the specified account, diversifier, and
+    //! set of receiver types.
+    //!
+    //! If no diversifier index is provided, the next unused diversifier index
+    //! will be selected.
+    WalletUAGenerationResult GenerateUnifiedAddress(
+        const libzcash::AccountId& accountId,
+        const std::set<libzcash::ReceiverType>& receivers,
+        std::optional<libzcash::diversifier_index_t> j = std::nullopt);
+
+    bool AddUnifiedFullViewingKey(const libzcash::UnifiedFullViewingKey &ufvk);
+
+    bool LoadUnifiedFullViewingKey(const libzcash::UnifiedFullViewingKey &ufvk);
+    bool LoadUnifiedAccountMetadata(const ZcashdUnifiedAccountMetadata &skmeta);
+    bool LoadUnifiedAddressMetadata(const ZcashdUnifiedAddressMetadata &addrmeta);
+
+    libzcash::PaymentAddress GetPaymentAddressForRecipient(
+            const uint256& txid,
+            const libzcash::RecipientAddress& recipient) const;
+    bool IsInternalRecipient(
+            const libzcash::RecipientAddress& recipient) const;
+
+    void LoadRecipientMapping(const uint256& txid, const RecipientMapping& mapping);
+
+    //! Reconstructs (in memory) caches and mappings for unified accounts,
+    //! addresses and keying material. This should be called once, after the
+    //! remainder of the on-disk wallet data has been loaded.
+    //!
+    //! Returns true if and only if there were no detected inconsistencies or
+    //! failures in reconstructing the cache.
+    bool LoadCaches();
+
+    std::optional<libzcash::AccountId> GetUnifiedAccountId(const libzcash::UFVKId& ufvkId) const;
+
+    /**
+     * Reconstructs a unified address by determining the UFVK that the receiver
+     * is associated with, combined with the set of receiver types that were
+     * associated with the diversifier index that the provided receiver
+     * corresponds to.
+     */
+    std::optional<libzcash::UnifiedAddress> FindUnifiedAddressByReceiver(
+            const libzcash::Receiver& receiver) const;
+
     /**
      * Increment the next transaction order id
      * @return next transaction order id
@@ -1100,15 +1652,25 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     void UpdateNullifierNoteMapWithTx(const CWalletTx& wtx);
     void UpdateSaplingNullifierNoteMapWithTx(CWalletTx& wtx);
     void UpdateSaplingNullifierNoteMapForBlock(const CBlock* pblock);
-    bool AddToWallet(const CWalletTx& wtxIn, bool fFromLoadWallet, CWalletDB* pwalletdb);
+    void LoadWalletTx(const CWalletTx& wtxIn);
+    bool AddToWallet(const CWalletTx& wtxIn, CWalletDB* pwalletdb);
     void SyncTransaction(const CTransaction& tx, const CBlock* pblock, const int nHeight);
-    bool AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pblock, const int nHeight, bool fUpdate);
+    bool AddToWalletIfInvolvingMe(
+            const Consensus::Params& consensus,
+            const CTransaction& tx,
+            const CBlock* pblock,
+            const int nHeight,
+            bool fUpdate
+            );
     void EraseFromWallet(const uint256 &hash);
     void WitnessNoteCommitment(
          std::vector<uint256> commitments,
          std::vector<std::optional<SproutWitness>>& witnesses,
          uint256 &final_anchor);
-    int ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate = false);
+    int ScanForWalletTransactions(
+        CBlockIndex* pindexStart,
+        bool fUpdate,
+        bool isInitScan);
     void ReacceptWalletTransactions();
     void ResendWalletTransactions(int64_t nBestBlockTime);
     std::vector<uint256> ResendWalletTransactionsBefore(int64_t nTime);
@@ -1131,6 +1693,32 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      */
     bool CreateTransaction(const std::vector<CRecipient>& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, CAmount& nFeeRet, int& nChangePosRet,
                            std::string& strFailReason, const CCoinControl *coinControl = NULL, bool sign = true);
+
+    /**
+     * Save a set of (txid, RecipientAddress, std::optional<UnifiedAddress>) mappings to the wallet.
+     * This information is persisted so that it's possible to correctly display the unified
+     * address to which a payment was sent.
+     */
+    template <typename RecipientMapping>
+    bool SaveRecipientMappings(const uint256& txid, const std::vector<RecipientMapping>& recipients)
+    {
+        LOCK2(cs_main, cs_wallet);
+
+        for (const auto& recipient : recipients)
+        {
+            sendRecipients[txid].push_back(recipient);
+            if (recipient.ua.has_value()) {
+                assert(CWalletDB(strWalletFile).WriteRecipientMapping(
+                    txid,
+                    recipient.address,
+                    recipient.ua.value()
+                ));
+            }
+        }
+
+        return true;
+    }
+
     bool CommitTransaction(CWalletTx& wtxNew, std::optional<std::reference_wrapper<CReserveKey>> reservekey);
 
     static CFeeRate minTxFee;
@@ -1145,12 +1733,19 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      */
     static CAmount GetRequiredFee(unsigned int nTxBytes);
 
+    /**
+     * The current set of default receiver types used when the wallet generates
+     * unified addresses
+     */
+    static std::set<libzcash::ReceiverType> DefaultReceiverTypes();
+
+private:
     bool NewKeyPool();
+public:
     bool TopUpKeyPool(unsigned int kpSize = 0);
     void ReserveKeyFromKeyPool(int64_t& nIndex, CKeyPool& keypool);
     void KeepKey(int64_t nIndex);
     void ReturnKey(int64_t nIndex);
-    bool GetKeyFromPool(CPubKey &key);
     int64_t GetOldestKeyPoolTime();
     void GetAllReserveKeys(std::set<CKeyID>& setAddress) const;
 
@@ -1169,13 +1764,15 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     bool IsSaplingNullifierFromMe(const uint256& nullifier) const;
 
     void GetSproutNoteWitnesses(
-         std::vector<JSOutPoint> notes,
+         const std::vector<JSOutPoint>& notes,
          std::vector<std::optional<SproutWitness>>& witnesses,
          uint256 &final_anchor);
     void GetSaplingNoteWitnesses(
-         std::vector<SaplingOutPoint> notes,
+         const std::vector<SaplingOutPoint>& notes,
          std::vector<std::optional<SaplingWitness>>& witnesses,
          uint256 &final_anchor);
+    std::vector<std::pair<libzcash::OrchardSpendingKey, orchard::SpendInfo>> GetOrchardSpendInfo(
+        const std::vector<OrchardNoteMetadata>& orchardNoteMetadata) const;
 
     isminetype IsMine(const CTxIn& txin) const;
     CAmount GetDebit(const CTxIn& txin, const isminefilter& filter) const;
@@ -1197,9 +1794,20 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     void AddPendingSaplingMigrationTx(const CTransaction& tx);
     /** Saves witness caches and best block locator to disk. */
     void SetBestChain(const CBlockLocator& loc);
-    std::set<std::pair<libzcash::RawAddress, uint256>> GetNullifiersForAddresses(const std::set<libzcash::RawAddress> & addresses);
-    bool IsNoteSproutChange(const std::set<std::pair<libzcash::RawAddress, uint256>> & nullifierSet, const libzcash::RawAddress & address, const JSOutPoint & entry);
-    bool IsNoteSaplingChange(const std::set<std::pair<libzcash::RawAddress, uint256>> & nullifierSet, const libzcash::RawAddress & address, const SaplingOutPoint & entry);
+
+    std::set<std::pair<libzcash::SproutPaymentAddress, uint256>> GetSproutNullifiers(
+            const std::set<libzcash::SproutPaymentAddress>& addresses);
+    bool IsNoteSproutChange(
+            const std::set<std::pair<libzcash::SproutPaymentAddress, uint256>> & nullifierSet,
+            const libzcash::SproutPaymentAddress& address,
+            const JSOutPoint & entry);
+
+    std::set<std::pair<libzcash::SaplingPaymentAddress, uint256>> GetSaplingNullifiers(
+            const std::set<libzcash::SaplingPaymentAddress>& addresses);
+    bool IsNoteSaplingChange(
+            const std::set<std::pair<libzcash::SaplingPaymentAddress, uint256>> & nullifierSet,
+            const libzcash::SaplingPaymentAddress& address,
+            const SaplingOutPoint & entry);
 
     DBErrors LoadWallet(bool& fFirstRunRet);
     DBErrors ZapWalletTx(std::vector<CWalletTx>& vWtx);
@@ -1220,7 +1828,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
         }
     }
 
-    void GetAddressForMining(MinerAddress &minerAddress);
+    void GetAddressForMining(std::optional<MinerAddress> &minerAddress);
     void ResetRequestCount(const uint256 &hash)
     {
         LOCK(cs_wallet);
@@ -1284,53 +1892,66 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     bool IsHDFullyEnabled() const;
 
     /* Generates a new HD seed (will reset the chain child index counters)
-       Sets the seed's version based on the current wallet version (so the
-       caller must ensure the current wallet version is correct before calling
-       this function). */
-    void GenerateNewSeed();
-
-    bool SetHDSeed(const HDSeed& seed);
-    bool SetCryptedHDSeed(const uint256& seedFp, const std::vector<unsigned char> &vchCryptedSecret);
+     * by randomly generating a mnemonic phrase that can be used for wallet
+     * recovery, and deriving the HD seed from that phrase in accordance with
+     * BIP 39 / ZIP 339. Sets the seed's version based on the current wallet
+     * version (the caller must ensure the current wallet version is correct
+     * before calling this function). */
+    void GenerateNewSeed(Language language = English);
+
+    bool SetMnemonicSeed(const MnemonicSeed& seed);
+    bool SetCryptedMnemonicSeed(const uint256& seedFp, const std::vector<unsigned char> &vchCryptedSecret);
+    /* Checks the wallet's seed against the specified mnemonic, and marks the
+     * wallet's seed as having been backed up if the phrases match. */
+    bool VerifyMnemonicSeed(const SecureString& mnemonic);
+    bool MnemonicVerified();
+
+    /* Set the current mnemonic phrase, without saving it to disk (used by LoadWallet) */
+    bool LoadMnemonicSeed(const MnemonicSeed& seed);
+    /* Set the legacy HD seed, without saving it to disk (used by LoadWallet) */
+    bool LoadLegacyHDSeed(const HDSeed& seed);
+
+    /* Set the current encrypted mnemonic phrase, without saving it to disk (used by LoadWallet) */
+    bool LoadCryptedMnemonicSeed(const uint256& seedFp, const std::vector<unsigned char>& seed);
+    /* Set the legacy encrypted HD seed, without saving it to disk (used by LoadWallet) */
+    bool LoadCryptedLegacyHDSeed(const uint256& seedFp, const std::vector<unsigned char>& seed);
 
     /* Returns the wallet's HD seed or throw JSONRPCError(...) */
     HDSeed GetHDSeedForRPC() const;
 
-    /* Set the HD chain model (chain child index counters) */
-    void SetHDChain(const CHDChain& chain, bool memonly);
-    const CHDChain& GetHDChain() const { return hdChain; }
+    /* Set the metadata for the mnemonic HD seed (chain child index counters) */
+    void SetMnemonicHDChain(const CHDChain& chain, bool memonly);
+    const std::optional<CHDChain>& GetMnemonicHDChain() const { return mnemonicHDChain; }
 
-    /* Set the current HD seed, without saving it to disk (used by LoadWallet) */
-    bool LoadHDSeed(const HDSeed& key);
-    /* Set the current encrypted HD seed, without saving it to disk (used by LoadWallet) */
-    bool LoadCryptedHDSeed(const uint256& seedFp, const std::vector<unsigned char>& seed);
+    bool CheckNetworkInfo(std::pair<std::string, std::string> networkInfo) const;
+    uint32_t BIP44CoinType() const;
 
-    /* Find notes filtered by payment address, min depth, ability to spend */
-    void GetFilteredNotes(std::vector<SproutNoteEntry>& sproutEntries,
-                          std::vector<SaplingNoteEntry>& saplingEntries,
-                          std::string address,
-                          int minDepth=1,
-                          bool ignoreSpent=true,
-                          bool requireSpendingKey=true);
+    /**
+     * Check whether the wallet contains spending keys for all the addresses
+     * contained in the given address set.
+     */
+    bool HasSpendingKeys(const NoteFilter& noteFilter) const;
 
     /* Find notes filtered by payment addresses, min depth, max depth, if they are spent,
        if a spending key is required, and if they are locked */
-    void GetFilteredNotes(std::vector<SproutNoteEntry>& sproutEntries,
-                          std::vector<SaplingNoteEntry>& saplingEntries,
-                          std::set<libzcash::RawAddress>& filterAddresses,
+    void GetFilteredNotes(std::vector<SproutNoteEntry>& sproutEntriesRet,
+                          std::vector<SaplingNoteEntry>& saplingEntriesRet,
+                          std::vector<OrchardNoteMetadata>& orchardNotesRet,
+                          const std::optional<NoteFilter>& noteFilter,
                           int minDepth=1,
                           int maxDepth=INT_MAX,
                           bool ignoreSpent=true,
                           bool requireSpendingKey=true,
-                          bool ignoreLocked=true);
+                          bool ignoreLocked=true) const;
 
     /* Returns the wallets help message */
     static std::string GetWalletHelpString(bool showDebug);
 
     /* Initializes the wallet, returns a new CWallet instance or a null pointer in case of an error */
-    static bool InitLoadWallet(bool clearWitnessCaches);
+    static bool InitLoadWallet(const CChainParams& params, bool clearWitnessCaches);
 
     /* Wallets parameter interaction */
-    static bool ParameterInteraction();
+    static bool ParameterInteraction(const CChainParams& params);
 };
 
 /** A key allocated from the key pool. */
@@ -1362,6 +1983,7 @@ class CReserveKey : public CReserveScript
 // Shielded key and address generalizations
 //
 
+// PaymentAddressBelongsToWallet visitor :: (CWallet&, PaymentAddress) -> bool
 class PaymentAddressBelongsToWallet
 {
 private:
@@ -1369,12 +1991,14 @@ class PaymentAddressBelongsToWallet
 public:
     PaymentAddressBelongsToWallet(CWallet *wallet) : m_wallet(wallet) {}
 
+    bool operator()(const CKeyID &zaddr) const;
+    bool operator()(const CScriptID &zaddr) const;
     bool operator()(const libzcash::SproutPaymentAddress &zaddr) const;
     bool operator()(const libzcash::SaplingPaymentAddress &zaddr) const;
     bool operator()(const libzcash::UnifiedAddress &uaddr) const;
-    bool operator()(const libzcash::InvalidEncoding& no) const;
 };
 
+// GetViewingKeyForPaymentAddress visitor :: (CWallet&, PaymentAddress) -> std::optional<ViewingKey>
 class GetViewingKeyForPaymentAddress
 {
 private:
@@ -1382,36 +2006,37 @@ class GetViewingKeyForPaymentAddress
 public:
     GetViewingKeyForPaymentAddress(CWallet *wallet) : m_wallet(wallet) {}
 
+    std::optional<libzcash::ViewingKey> operator()(const CKeyID &zaddr) const;
+    std::optional<libzcash::ViewingKey> operator()(const CScriptID &zaddr) const;
     std::optional<libzcash::ViewingKey> operator()(const libzcash::SproutPaymentAddress &zaddr) const;
     std::optional<libzcash::ViewingKey> operator()(const libzcash::SaplingPaymentAddress &zaddr) const;
     std::optional<libzcash::ViewingKey> operator()(const libzcash::UnifiedAddress &uaddr) const;
-    std::optional<libzcash::ViewingKey> operator()(const libzcash::InvalidEncoding& no) const;
 };
 
-class HaveSpendingKeyForPaymentAddress
-{
-private:
-    CWallet *m_wallet;
-public:
-    HaveSpendingKeyForPaymentAddress(CWallet *wallet) : m_wallet(wallet) {}
-
-    bool operator()(const libzcash::SproutPaymentAddress &zaddr) const;
-    bool operator()(const libzcash::SaplingPaymentAddress &zaddr) const;
-    bool operator()(const libzcash::UnifiedAddress &uaddr) const;
-    bool operator()(const libzcash::InvalidEncoding& no) const;
+enum class PaymentAddressSource {
+    Random,
+    LegacyHDSeed,
+    MnemonicHDSeed,
+    Imported,
+    ImportedWatchOnly,
+    AddressNotFound,
 };
 
-class GetSpendingKeyForPaymentAddress
+// GetSourceForPaymentAddress visitor :: (CWallet&, PaymentAddress) -> PaymentAddressSource
+class GetSourceForPaymentAddress
 {
 private:
     CWallet *m_wallet;
 public:
-    GetSpendingKeyForPaymentAddress(CWallet *wallet) : m_wallet(wallet) {}
+    GetSourceForPaymentAddress(CWallet *wallet) : m_wallet(wallet) {}
+
+    PaymentAddressSource GetUnifiedSource(const libzcash::Receiver& receiver) const;
 
-    std::optional<libzcash::SpendingKey> operator()(const libzcash::SproutPaymentAddress &zaddr) const;
-    std::optional<libzcash::SpendingKey> operator()(const libzcash::SaplingPaymentAddress &zaddr) const;
-    std::optional<libzcash::SpendingKey> operator()(const libzcash::UnifiedAddress &uaddr) const;
-    std::optional<libzcash::SpendingKey> operator()(const libzcash::InvalidEncoding& no) const;
+    PaymentAddressSource operator()(const CKeyID &zaddr) const;
+    PaymentAddressSource operator()(const CScriptID &zaddr) const;
+    PaymentAddressSource operator()(const libzcash::SproutPaymentAddress &zaddr) const;
+    PaymentAddressSource operator()(const libzcash::SaplingPaymentAddress &zaddr) const;
+    PaymentAddressSource operator()(const libzcash::UnifiedAddress &uaddr) const;
 };
 
 enum KeyAddResult {
@@ -1421,18 +2046,22 @@ enum KeyAddResult {
     KeyNotAdded,
 };
 
+// AddViewingKeyToWallet visitor :: (CWallet&, ViewingKey) -> KeyAddResult
 class AddViewingKeyToWallet
 {
 private:
     CWallet *m_wallet;
+    bool addDefaultAddress;
 public:
-    AddViewingKeyToWallet(CWallet *wallet) : m_wallet(wallet) {}
+    AddViewingKeyToWallet(CWallet *wallet, bool addDefaultAddressIn) : m_wallet(wallet), addDefaultAddress(addDefaultAddressIn) {}
 
     KeyAddResult operator()(const libzcash::SproutViewingKey &sk) const;
     KeyAddResult operator()(const libzcash::SaplingExtendedFullViewingKey &sk) const;
-    KeyAddResult operator()(const libzcash::InvalidEncoding& no) const;
+    KeyAddResult operator()(const libzcash::UnifiedFullViewingKey &sk) const;
 };
 
+// AddSpendingKeyToWallet visitor ::
+// (CWallet&, Consensus::Params, ..., ViewingKey) -> KeyAddResult
 class AddSpendingKeyToWallet
 {
 private:
@@ -1442,23 +2071,53 @@ class AddSpendingKeyToWallet
     std::optional<std::string> hdKeypath; // currently sapling only
     std::optional<std::string> seedFpStr; // currently sapling only
     bool log;
+    bool addDefaultAddress;
 public:
     AddSpendingKeyToWallet(CWallet *wallet, const Consensus::Params &params) :
-        m_wallet(wallet), params(params), nTime(1), hdKeypath(std::nullopt), seedFpStr(std::nullopt), log(false) {}
+        m_wallet(wallet), params(params), nTime(1), hdKeypath(std::nullopt), seedFpStr(std::nullopt), log(false), addDefaultAddress(true) {}
     AddSpendingKeyToWallet(
         CWallet *wallet,
         const Consensus::Params &params,
         int64_t _nTime,
         std::optional<std::string> _hdKeypath,
         std::optional<std::string> _seedFp,
-        bool _log
-    ) : m_wallet(wallet), params(params), nTime(_nTime), hdKeypath(_hdKeypath), seedFpStr(_seedFp), log(_log) {}
+        bool _log,
+        bool _addDefaultAddress
+    ) : m_wallet(wallet), params(params), nTime(_nTime), hdKeypath(_hdKeypath), seedFpStr(_seedFp), log(_log), addDefaultAddress(_addDefaultAddress) {}
 
 
     KeyAddResult operator()(const libzcash::SproutSpendingKey &sk) const;
     KeyAddResult operator()(const libzcash::SaplingExtendedSpendingKey &sk) const;
-    KeyAddResult operator()(const libzcash::InvalidEncoding& no) const;
 };
 
+// UFVKForReceiver :: (CWallet&, Receiver) -> std::optional<ZcashdUnifiedFullViewingKey>
+class UFVKForReceiver {
+private:
+    const CWallet& wallet;
+
+public:
+    UFVKForReceiver(const CWallet& wallet): wallet(wallet) {}
+
+    std::optional<libzcash::ZcashdUnifiedFullViewingKey> operator()(const libzcash::OrchardRawAddress& orchardAddr) const;
+    std::optional<libzcash::ZcashdUnifiedFullViewingKey> operator()(const libzcash::SaplingPaymentAddress& saplingAddr) const;
+    std::optional<libzcash::ZcashdUnifiedFullViewingKey> operator()(const CScriptID& scriptId) const;
+    std::optional<libzcash::ZcashdUnifiedFullViewingKey> operator()(const CKeyID& keyId) const;
+    std::optional<libzcash::ZcashdUnifiedFullViewingKey> operator()(const libzcash::UnknownReceiver& receiver) const;
+};
+
+// UnifiedAddressForReceiver :: (CWallet&, Receiver) -> std::optional<UnifiedAddress>
+class UnifiedAddressForReceiver {
+private:
+    const CWallet& wallet;
+
+public:
+    UnifiedAddressForReceiver(const CWallet& wallet): wallet(wallet) {}
+
+    std::optional<libzcash::UnifiedAddress> operator()(const libzcash::OrchardRawAddress& orchardAddr) const;
+    std::optional<libzcash::UnifiedAddress> operator()(const libzcash::SaplingPaymentAddress& saplingAddr) const;
+    std::optional<libzcash::UnifiedAddress> operator()(const CScriptID& scriptId) const;
+    std::optional<libzcash::UnifiedAddress> operator()(const CKeyID& keyId) const;
+    std::optional<libzcash::UnifiedAddress> operator()(const libzcash::UnknownReceiver& receiver) const;
+};
 
 #endif // BITCOIN_WALLET_WALLET_H
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index 6643100b909..7ce281bf2f9 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -12,6 +12,7 @@
 #include "proof_verifier.h"
 #include "protocol.h"
 #include "serialize.h"
+#include "script/standard.h"
 #include "sync.h"
 #include "util.h"
 #include "utiltime.h"
@@ -138,7 +139,7 @@ bool CWalletDB::WriteCryptedSaplingZKey(
 {
     const bool fEraseUnencryptedKey = true;
     nWalletDBUpdateCounter++;
-    auto ivk = extfvk.fvk.in_viewing_key();
+    auto ivk = extfvk.ToIncomingViewingKey();
 
     if (!Write(std::make_pair(std::string("sapzkeymeta"), ivk), keyMeta))
         return false;
@@ -169,6 +170,7 @@ bool CWalletDB::WriteZKey(const libzcash::SproutPaymentAddress& addr, const libz
     // pair is: tuple_key("zkey", paymentaddress) --> secretkey
     return Write(std::make_pair(std::string("zkey"), addr), key, false);
 }
+
 bool CWalletDB::WriteSaplingZKey(const libzcash::SaplingIncomingViewingKey &ivk,
                 const libzcash::SaplingExtendedSpendingKey &key,
                 const CKeyMetadata &keyMeta)
@@ -216,6 +218,44 @@ bool CWalletDB::EraseSaplingExtendedFullViewingKey(
     return Erase(std::make_pair(std::string("sapextfvk"), extfvk));
 }
 
+//
+// Orchard wallet persistence
+//
+
+bool CWalletDB::WriteOrchardWitnesses(const OrchardWallet& wallet) {
+    nWalletDBUpdateCounter++;
+    return Write(
+            std::string("orchard_note_commitment_tree"),
+            OrchardWalletNoteCommitmentTreeWriter(wallet));
+}
+
+//
+// Unified address & key storage
+//
+
+bool CWalletDB::WriteUnifiedAccountMetadata(const ZcashdUnifiedAccountMetadata& keymeta)
+{
+    nWalletDBUpdateCounter++;
+    return Write(std::make_pair(std::string("unifiedaccount"), keymeta), 0x00);
+}
+
+bool CWalletDB::WriteUnifiedFullViewingKey(const libzcash::UnifiedFullViewingKey& ufvk)
+{
+    nWalletDBUpdateCounter++;
+    auto ufvkId = ufvk.GetKeyID(Params());
+    return Write(std::make_pair(std::string("unifiedfvk"), ufvkId), ufvk.Encode(Params()));
+}
+
+bool CWalletDB::WriteUnifiedAddressMetadata(const ZcashdUnifiedAddressMetadata& addrmeta)
+{
+    nWalletDBUpdateCounter++;
+    return Write(std::make_pair(std::string("unifiedaddrmeta"), addrmeta), 0x00);
+}
+
+//
+//
+//
+
 bool CWalletDB::WriteCScript(const uint160& hash, const CScript& redeemScript)
 {
     nWalletDBUpdateCounter++;
@@ -285,6 +325,19 @@ bool CWalletDB::WriteMinVersion(int nVersion)
     return Write(std::string("minversion"), nVersion);
 }
 
+bool CWalletDB::WriteRecipientMapping(const uint256& txid, const libzcash::RecipientAddress& address, const libzcash::UnifiedAddress& ua)
+{
+    auto recipientReceiver = libzcash::RecipientAddressToReceiver(address);
+    // Check that recipient address exists in given UA.
+    if (!ua.ContainsReceiver(recipientReceiver)) {
+        return false;
+    }
+
+    std::pair<uint256, CSerializeRecipientAddress> key = std::make_pair(txid, CSerializeRecipientAddress(address));
+    std::string uaString = KeyIO(Params()).EncodePaymentAddress(ua);
+    return Write(std::make_pair(std::string("recipientmapping"), key), uaString);
+}
+
 class CWalletScanState {
 public:
     unsigned int nKeys;
@@ -298,8 +351,9 @@ class CWalletScanState {
     bool fAnyUnordered;
     int nFileVersion;
     vector<uint256> vWalletUpgrade;
+    orchard::AuthValidator orchardAuth;
 
-    CWalletScanState() {
+    CWalletScanState(): orchardAuth(orchard::AuthValidator::Batch()) {
         nKeys = nCKeys = nKeyMeta = nZKeys = nCZKeys = nZKeyMeta = nSapZAddrs = 0;
         fIsEncrypted = false;
         fAnyUnordered = false;
@@ -338,11 +392,9 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
             ssValue >> wtx;
             CValidationState state;
             auto verifier = ProofVerifier::Strict();
-            auto orchardAuth = orchard::AuthValidator::Batch();
             if (!(
-                CheckTransaction(wtx, state, verifier, orchardAuth) &&
+                CheckTransaction(wtx, state, verifier, wss.orchardAuth) &&
                 (wtx.GetHash() == hash) &&
-                orchardAuth.Validate() &&
                 state.IsValid())
             ) {
                 return false;
@@ -372,7 +424,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
             if (wtx.nOrderPos == -1)
                 wss.fAnyUnordered = true;
 
-            pwallet->AddToWallet(wtx, true, NULL);
+            pwallet->LoadWalletTx(wtx);
         }
         else if (strType == "watchs")
         {
@@ -633,6 +685,62 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
         {
             ssValue >> pwallet->vchDefaultKey;
         }
+        else if (strType == "unifiedfvk")
+        {
+            libzcash::UFVKId fp;
+            ssKey >> fp;
+
+            std::string ufvkenc;
+            ssValue >> ufvkenc;
+
+            auto ufvkopt = libzcash::UnifiedFullViewingKey::Decode(ufvkenc, Params());
+            if (ufvkopt.has_value()) {
+                auto ufvk = ufvkopt.value();
+                if (fp != ufvk.GetKeyID(Params())) {
+                    strErr = "Error reading wallet database: key fingerprint did not match decoded key";
+                    return false;
+                }
+                if (!pwallet->LoadUnifiedFullViewingKey(ufvk)) {
+                    strErr = "Error reading wallet database: LoadUnifiedFullViewingKey failed.";
+                    return false;
+                }
+            } else {
+                strErr = "Error reading wallet database: failed to decode unified full viewing key.";
+                return false;
+            }
+        }
+        else if (strType == "unifiedaccount")
+        {
+            auto acct = ZcashdUnifiedAccountMetadata::Read(ssKey);
+
+            uint8_t value;
+            ssValue >> value;
+            if (value != 0x00) {
+                strErr = "Error reading wallet database: invalid unified account metadata.";
+                return false;
+            }
+
+            if (!pwallet->LoadUnifiedAccountMetadata(acct)) {
+                strErr = "Error reading wallet database: account ID mismatch for unified spending key.";
+                return false;
+            };
+        }
+        else if (strType == "unifiedaddrmeta")
+        {
+            auto keymeta = ZcashdUnifiedAddressMetadata::Read(ssKey);
+
+            uint8_t value;
+            ssValue >> value;
+            if (value != 0x00) {
+                strErr = "Error reading wallet database: invalid unified address metadata.";
+                return false;
+            }
+
+            if (!pwallet->LoadUnifiedAddressMetadata(keymeta)) {
+                strErr = "Error reading wallet database: cannot reproduce previously generated unified address.";
+                return false;
+            }
+        }
         else if (strType == "pool")
         {
             int64_t nIndex;
@@ -686,6 +794,37 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
         {
             ssValue >> pwallet->nWitnessCacheSize;
         }
+        else if (strType == "mnemonicphrase")
+        {
+            uint256 seedFp;
+            ssKey >> seedFp;
+            auto seed = MnemonicSeed::Read(ssValue);
+
+            if (seed.Fingerprint() != seedFp)
+            {
+                strErr = "Error reading wallet database: mnemonic phrase corrupt";
+                return false;
+            }
+
+            if (!pwallet->LoadMnemonicSeed(seed))
+            {
+                strErr = "Error reading wallet database: LoadMnemonicSeed failed";
+                return false;
+            }
+        }
+        else if (strType == "cmnemonicphrase")
+        {
+            uint256 seedFp;
+            vector<unsigned char> vchCryptedSecret;
+            ssKey >> seedFp;
+            ssValue >> vchCryptedSecret;
+            if (!pwallet->LoadCryptedMnemonicSeed(seedFp, vchCryptedSecret))
+            {
+                strErr = "Error reading wallet database: LoadCryptedMnemonicSeed failed";
+                return false;
+            }
+            wss.fIsEncrypted = true;
+        }
         else if (strType == "hdseed")
         {
             uint256 seedFp;
@@ -700,7 +839,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
                 return false;
             }
 
-            if (!pwallet->LoadHDSeed(seed))
+            if (!pwallet->LoadLegacyHDSeed(seed))
             {
                 strErr = "Error reading wallet database: LoadHDSeed failed";
                 return false;
@@ -712,18 +851,54 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
             vector<unsigned char> vchCryptedSecret;
             ssKey >> seedFp;
             ssValue >> vchCryptedSecret;
-            if (!pwallet->LoadCryptedHDSeed(seedFp, vchCryptedSecret))
+            if (!pwallet->LoadCryptedLegacyHDSeed(seedFp, vchCryptedSecret))
             {
                 strErr = "Error reading wallet database: LoadCryptedHDSeed failed";
                 return false;
             }
             wss.fIsEncrypted = true;
         }
-        else if (strType == "hdchain")
+        else if (strType == "mnemonichdchain")
         {
-            CHDChain chain;
-            ssValue >> chain;
-            pwallet->SetHDChain(chain, true);
+            auto chain = CHDChain::Read(ssValue);
+            pwallet->SetMnemonicHDChain(chain, true);
+        }
+        else if (strType == "networkinfo")
+        {
+            std::pair<std::string, std::string> networkInfo;
+            ssValue >> networkInfo;
+            if (!pwallet->CheckNetworkInfo(networkInfo)) {
+                strErr = "Error in wallet database: unexpected network";
+                return false;
+            }
+        }
+        else if (strType == "recipientmapping")
+        {
+            uint256 txid;
+            std::string rawUa;
+            ssKey >> txid;
+            auto recipient = CSerializeRecipientAddress::Read(ssKey);
+            ssValue >> rawUa;
+
+            auto ua = libzcash::UnifiedAddress::Parse(Params(), rawUa);
+            if (!ua.has_value()) {
+                strErr = "Error in wallet database: non-UnifiedAddress in recipientmapping";
+                return false;
+            }
+
+            auto recipientReceiver = libzcash::RecipientAddressToReceiver(recipient);
+
+            if (!ua.value().ContainsReceiver(recipientReceiver)) {
+                strErr = "Error in wallet database: recipientmapping UA does not contain recipient";
+                return false;
+            }
+
+            pwallet->LoadRecipientMapping(txid, RecipientMapping(ua.value(), recipient));
+        }
+        else if (strType == "orchard_note_commitment_tree")
+        {
+            auto loader = pwallet->GetOrchardNoteCommitmentTreeLoader();
+            ssValue >> loader;
         }
     } catch (...)
     {
@@ -736,6 +911,7 @@ static bool IsKeyType(string strType)
 {
     return (strType== "key" || strType == "wkey" ||
             strType == "hdseed" || strType == "chdseed" ||
+            strType == "mnemonicphrase" || strType == "cmnemonicphrase" ||
             strType == "zkey" || strType == "czkey" ||
             strType == "sapzkey" || strType == "csapzkey" ||
             strType == "vkey" || strType == "sapextfvk" ||
@@ -785,23 +961,39 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet)
             string strType, strErr;
             if (!ReadKeyValue(pwallet, ssKey, ssValue, wss, strType, strErr))
             {
-                // losing keys is considered a catastrophic error, anything else
-                // we assume the user can live with:
-                if (IsKeyType(strType))
+                if (strType == "networkinfo") {
+                    // example: running mainnet, but this wallet.dat is from testnet
+                    result = DB_WRONG_NETWORK;
+                } else if (result != DB_WRONG_NETWORK && IsKeyType(strType)) {
+                    // losing keys is considered a catastrophic error
                     result = DB_CORRUPT;
-                else
-                {
+                } else {
                     // Leave other errors alone, if we try to fix them we might make things worse.
                     fNoncriticalErrors = true; // ... but do warn the user there is something wrong.
-                    if (strType == "tx")
+                    if (strType == "tx") {
                         // Rescan if there is a bad transaction record:
                         SoftSetBoolArg("-rescan", true);
+                    }
                 }
             }
             if (!strErr.empty())
                 LogPrintf("%s\n", strErr);
         }
         pcursor->close();
+
+        // Load unified address/account/key caches based on what was loaded
+        if (!pwallet->LoadCaches()) {
+            // We can be more permissive of certain kinds of failures during
+            // loading; for now we'll interpret failure to reconstruct the
+            // caches to be "as bad" as losing keys.
+            result = DB_CORRUPT;
+        }
+
+        // Run the Orchard batch validator; if it fails, treat it like a bad transaction record.
+        if (!wss.orchardAuth.Validate()) {
+            fNoncriticalErrors = true;
+            SoftSetBoolArg("-rescan", true);
+        }
     }
     catch (const boost::thread_interrupted&) {
         throw;
@@ -1082,7 +1274,7 @@ bool CWalletDB::Recover(CDBEnv& dbenv, const std::string& filename, bool fOnlyKe
         LogPrintf("Cannot create database file %s\n", filename);
         return false;
     }
-    CWallet dummyWallet;
+    CWallet dummyWallet(Params());
     CWalletScanState wss;
 
     DbTxn* ptxn = dbenv.TxnBegin();
@@ -1117,6 +1309,13 @@ bool CWalletDB::Recover(CDBEnv& dbenv, const std::string& filename, bool fOnlyKe
     ptxn->commit(0);
     pdbCopy->close(0);
 
+    // Try to load the wallet's caches, uncovering inconsistencies in wallet
+    // records like missing viewing key records despite existing account
+    // records.
+    if (!dummyWallet.LoadCaches()) {
+        LogPrintf("WARNING: wallet caches could not be reconstructed; salvaged wallet file may have omissions");
+    }
+
     return fSuccess;
 }
 
@@ -1137,23 +1336,29 @@ bool CWalletDB::EraseDestData(const std::string &address, const std::string &key
     return Erase(std::make_pair(std::string("destdata"), std::make_pair(address, key)));
 }
 
+bool CWalletDB::WriteNetworkInfo(const std::string& networkId)
+{
+    nWalletDBUpdateCounter++;
+    std::pair<std::string, std::string> networkInfo(PACKAGE_NAME, networkId);
+    return Write(std::string("networkinfo"), networkInfo);
+}
 
-bool CWalletDB::WriteHDSeed(const HDSeed& seed)
+bool CWalletDB::WriteMnemonicSeed(const MnemonicSeed& seed)
 {
     nWalletDBUpdateCounter++;
-    return Write(std::make_pair(std::string("hdseed"), seed.Fingerprint()), seed.RawSeed());
+    return Write(std::make_pair(std::string("mnemonicphrase"), seed.Fingerprint()), seed);
 }
 
-bool CWalletDB::WriteCryptedHDSeed(const uint256& seedFp, const std::vector<unsigned char>& vchCryptedSecret)
+bool CWalletDB::WriteCryptedMnemonicSeed(const uint256& seedFp, const std::vector<unsigned char>& vchCryptedSecret)
 {
     nWalletDBUpdateCounter++;
-    return Write(std::make_pair(std::string("chdseed"), seedFp), vchCryptedSecret);
+    return Write(std::make_pair(std::string("cmnemonicphrase"), seedFp), vchCryptedSecret);
 }
 
-bool CWalletDB::WriteHDChain(const CHDChain& chain)
+bool CWalletDB::WriteMnemonicHDChain(const CHDChain& chain)
 {
     nWalletDBUpdateCounter++;
-    return Write(std::string("hdchain"), chain);
+    return Write(std::string("mnemonichdchain"), chain);
 }
 
 void CWalletDB::IncrementUpdateCounter()
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index 6c03c14edb3..d26d0f3c7d4 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -37,22 +37,42 @@ enum DBErrors
     DB_NONCRITICAL_ERROR,
     DB_TOO_NEW,
     DB_LOAD_FAIL,
-    DB_NEED_REWRITE
+    DB_NEED_REWRITE,
+    DB_WRONG_NETWORK,
 };
 
-/* simple hd chain data model */
+/* hd chain metadata */
 class CHDChain
 {
-public:
-    static const int VERSION_HD_BASE = 1;
-    static const int CURRENT_VERSION = VERSION_HD_BASE;
+private:
     int nVersion;
     uint256 seedFp;
     int64_t nCreateTime; // 0 means unknown
-    uint32_t saplingAccountCounter;
+    uint32_t accountCounter;
+    uint32_t legacyTKeyExternalCounter;
+    uint32_t legacyTKeyInternalCounter;
+    uint32_t legacySaplingKeyCounter;
+    bool mnemonicSeedBackupConfirmed;
 
     CHDChain() { SetNull(); }
 
+    void SetNull()
+    {
+        nVersion = CHDChain::CURRENT_VERSION;
+        seedFp.SetNull();
+        nCreateTime = 0;
+        accountCounter = 0;
+        legacyTKeyExternalCounter = 0;
+        legacyTKeyInternalCounter = 0;
+        legacySaplingKeyCounter = 0;
+        mnemonicSeedBackupConfirmed = false;
+    }
+public:
+    static const int VERSION_HD_BASE = 1;
+    static const int CURRENT_VERSION = VERSION_HD_BASE;
+
+    CHDChain(uint256 seedFpIn, int64_t nCreateTimeIn): nVersion(CHDChain::CURRENT_VERSION), seedFp(seedFpIn), nCreateTime(nCreateTimeIn), accountCounter(0), legacyTKeyExternalCounter(0), legacyTKeyInternalCounter(0), legacySaplingKeyCounter(0), mnemonicSeedBackupConfirmed(false) {}
+
     ADD_SERIALIZE_METHODS;
 
     template <typename Stream, typename Operation>
@@ -61,15 +81,59 @@ class CHDChain
         READWRITE(nVersion);
         READWRITE(seedFp);
         READWRITE(nCreateTime);
-        READWRITE(saplingAccountCounter);
+        READWRITE(accountCounter);
+        READWRITE(legacyTKeyExternalCounter);
+        READWRITE(legacyTKeyInternalCounter);
+        READWRITE(legacySaplingKeyCounter);
+        READWRITE(mnemonicSeedBackupConfirmed);
     }
 
-    void SetNull()
-    {
-        nVersion = CHDChain::CURRENT_VERSION;
-        seedFp.SetNull();
-        nCreateTime = 0;
-        saplingAccountCounter = 0;
+    template <typename Stream>
+    static CHDChain Read(Stream& stream) {
+        CHDChain chain;
+        stream >> chain;
+        return chain;
+    }
+
+    const uint256 GetSeedFingerprint() const {
+        return seedFp;
+    }
+
+    uint32_t GetAccountCounter() const {
+        return accountCounter;
+    }
+
+    void IncrementAccountCounter() {
+        // TODO: We should check for overflow somewhere and handle it.
+        accountCounter += 1;
+    }
+
+    uint32_t GetLegacyTKeyCounter(bool external) {
+        return external ? legacyTKeyExternalCounter : legacyTKeyInternalCounter;
+    }
+
+    void IncrementLegacyTKeyCounter(bool external) {
+        if (external) {
+            legacyTKeyExternalCounter += 1;
+        } else {
+            legacyTKeyInternalCounter += 1;
+        }
+    }
+
+    uint32_t GetLegacySaplingKeyCounter() const {
+        return legacySaplingKeyCounter;
+    }
+
+    void IncrementLegacySaplingKeyCounter() {
+        legacySaplingKeyCounter += 1;
+    }
+
+    void SetMnemonicSeedBackupConfirmed() {
+        mnemonicSeedBackupConfirmed = true;
+    }
+
+    bool IsMnemonicSeedBackupConfirmed() {
+        return mnemonicSeedBackupConfirmed;
     }
 };
 
@@ -116,6 +180,213 @@ class CKeyMetadata
     }
 };
 
+class ZcashdUnifiedAccountMetadata {
+private:
+    libzcash::SeedFingerprint seedFp;
+    uint32_t bip44CoinType;
+    libzcash::AccountId accountId;
+    libzcash::UFVKId ufvkId;
+
+    ZcashdUnifiedAccountMetadata() {}
+public:
+    ZcashdUnifiedAccountMetadata(
+            libzcash::SeedFingerprint seedFp,
+            uint32_t bip44CoinType,
+            libzcash::AccountId accountId,
+            libzcash::UFVKId ufvkId):
+            seedFp(seedFp), bip44CoinType(bip44CoinType), accountId(accountId), ufvkId(ufvkId) {}
+
+    /** Returns the fingerprint of the HD seed used to generate this key. */
+    const libzcash::SeedFingerprint& GetSeedFingerprint() const {
+        return seedFp;
+    }
+    /** Returns the ZIP 32 account id for which this key was generated. */
+    uint32_t GetBip44CoinType() const {
+        return bip44CoinType;
+    }
+    /** Returns the ZIP 32 account id for which this key was generated. */
+    libzcash::AccountId GetAccountId() const {
+        return accountId;
+    }
+    /** Returns the fingerprint of the ufvk this key was generated. */
+    const libzcash::UFVKId& GetKeyID() const {
+        return ufvkId;
+    }
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action) {
+        READWRITE(seedFp);
+        READWRITE(bip44CoinType);
+        READWRITE(accountId);
+        READWRITE(ufvkId);
+    }
+
+    template <typename Stream>
+    static ZcashdUnifiedAccountMetadata Read(Stream& stream) {
+        ZcashdUnifiedAccountMetadata meta;
+        stream >> meta;
+        return meta;
+    }
+};
+
+class ZcashdUnifiedAddressMetadata;
+
+// Serialization wrapper for reading and writing ReceiverType
+// in CompactSize format.
+class ReceiverTypeSer {
+private:
+    libzcash::ReceiverType t;
+
+    friend class ZcashdUnifiedAddressMetadata;
+public:
+    ReceiverTypeSer() {} // for serialization only
+    ReceiverTypeSer(libzcash::ReceiverType t): t(t) {}
+
+    template<typename Stream>
+    void Serialize(Stream &s) const {
+        WriteCompactSize<Stream>(s, (uint64_t) t);
+    }
+
+    template<typename Stream>
+    void Unserialize(Stream& s) {
+        t = (libzcash::ReceiverType) ReadCompactSize<Stream>(s);
+    }
+};
+
+class ZcashdUnifiedAddressMetadata {
+private:
+    libzcash::UFVKId ufvkId;
+    libzcash::diversifier_index_t diversifierIndex;
+    std::set<libzcash::ReceiverType> receiverTypes;
+
+    ZcashdUnifiedAddressMetadata() {}
+public:
+    ZcashdUnifiedAddressMetadata(
+            libzcash::UFVKId ufvkId,
+            libzcash::diversifier_index_t diversifierIndex,
+            std::set<libzcash::ReceiverType> receiverTypes):
+            ufvkId(ufvkId), diversifierIndex(diversifierIndex), receiverTypes(receiverTypes) {}
+
+    libzcash::UFVKId GetKeyID() const {
+        return ufvkId;
+    }
+    libzcash::diversifier_index_t GetDiversifierIndex() const {
+        return diversifierIndex;
+    }
+    const std::set<libzcash::ReceiverType>& GetReceiverTypes() const {
+        return receiverTypes;
+    }
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action) {
+        READWRITE(ufvkId);
+        READWRITE(diversifierIndex);
+        if (ser_action.ForRead()) {
+            std::vector<ReceiverTypeSer> serReceiverTypes;
+            READWRITE(serReceiverTypes);
+            receiverTypes.clear();
+            for (ReceiverTypeSer r : serReceiverTypes)
+                receiverTypes.insert(r.t);
+        } else {
+            std::vector<ReceiverTypeSer> serReceiverTypes;
+            for (libzcash::ReceiverType r : receiverTypes)
+                serReceiverTypes.push_back(ReceiverTypeSer(r));
+            READWRITE(serReceiverTypes);
+        }
+    }
+
+    template <typename Stream>
+    static ZcashdUnifiedAddressMetadata Read(Stream& stream) {
+        ZcashdUnifiedAddressMetadata meta;
+        stream >> meta;
+        return meta;
+    }
+
+    friend inline bool operator==(const ZcashdUnifiedAddressMetadata& a, const ZcashdUnifiedAddressMetadata& b) {
+        return
+            a.ufvkId == b.ufvkId &&
+            a.diversifierIndex == b.diversifierIndex &&
+            a.receiverTypes == b.receiverTypes;
+    }
+};
+
+// Serialization wrapper for reading and writing RecipientAddress
+// as a pair of typecode and address bytes, similar to how unified address
+// receivers are written (but excluding the unknown receiver case)
+class CSerializeRecipientAddress {
+    libzcash::RecipientAddress recipient;
+    libzcash::ReceiverType typecode;
+    CSerializeRecipientAddress() {} // for serialization only
+
+    public:
+        CSerializeRecipientAddress(libzcash::RecipientAddress recipient): recipient(recipient) {}
+
+        template<typename Stream>
+        void Serialize(Stream& s) const {
+            std::visit(match {
+                [&](const CKeyID& keyId) {
+                    ReceiverTypeSer(libzcash::ReceiverType::P2PKH).Serialize(s);
+                    s << keyId;
+                },
+                [&](const CScriptID& scriptId) {
+                    ReceiverTypeSer(libzcash::ReceiverType::P2SH).Serialize(s);
+                    s << scriptId;
+                },
+                [&](const libzcash::SaplingPaymentAddress& saplingAddr) {
+                    ReceiverTypeSer(libzcash::ReceiverType::Sapling).Serialize(s);
+                    s << saplingAddr;
+                },
+                [&](const libzcash::OrchardRawAddress& orchardAddr) {
+                    ReceiverTypeSer(libzcash::ReceiverType::Orchard).Serialize(s);
+                    s << orchardAddr;
+                }
+            }, recipient);
+        }
+
+        template<typename Stream>
+        void Unserialize(Stream& s) {
+            // This cast is fine because ZIP 316 uses CompactSize serialization including the
+            // size limit, which means it is at most a uint32_t.
+            typecode = (libzcash::ReceiverType) ReadCompactSize(s);
+            switch (typecode) {
+                case libzcash::ReceiverType::P2PKH: {
+                    CKeyID key;
+                    s >> key;
+                    recipient = key;
+                    break;
+                }
+                case libzcash::ReceiverType::P2SH: {
+                    CScriptID script;
+                    s >> script;
+                    recipient = script;
+                    break;
+                }
+                case libzcash::ReceiverType::Sapling: {
+                    libzcash::SaplingPaymentAddress saplingAddr;
+                    s >> saplingAddr;
+                    recipient = saplingAddr;
+                    break;
+                }
+                case libzcash::ReceiverType::Orchard: {
+                    auto orchardAddr = libzcash::OrchardRawAddress::Read(s);
+                    recipient = orchardAddr;
+                    break;
+                }
+            }
+        }
+
+        template <typename Stream>
+        static libzcash::RecipientAddress Read(Stream& stream) {
+            CSerializeRecipientAddress csr;
+            stream >> csr;
+            return csr.recipient;
+        }
+};
+
 /** Access to the wallet database */
 class CWalletDB : public CDB
 {
@@ -157,6 +428,8 @@ class CWalletDB : public CDB
 
     bool WriteMinVersion(int nVersion);
 
+    bool WriteRecipientMapping(const uint256& txid, const libzcash::RecipientAddress& address, const libzcash::UnifiedAddress& ua);
+
     /// Write destination data key,value tuple to database
     bool WriteDestData(const std::string &address, const std::string &key, const std::string &value);
     /// Erase destination data tuple from wallet database
@@ -168,10 +441,10 @@ class CWalletDB : public CDB
     static bool Recover(CDBEnv& dbenv, const std::string& filename, bool fOnlyKeys);
     static bool Recover(CDBEnv& dbenv, const std::string& filename);
 
-    bool WriteHDSeed(const HDSeed& seed);
-    bool WriteCryptedHDSeed(const uint256& seedFp, const std::vector<unsigned char>& vchCryptedSecret);
-    //! write the hdchain model (external chain child index counter)
-    bool WriteHDChain(const CHDChain& chain);
+    bool WriteNetworkInfo(const std::string& networkId);
+    bool WriteMnemonicSeed(const MnemonicSeed& seed);
+    bool WriteCryptedMnemonicSeed(const uint256& seedFp, const std::vector<unsigned char>& vchCryptedSecret);
+    bool WriteMnemonicHDChain(const CHDChain& chain);
 
     /// Write spending key to wallet database, where key is payment address and value is spending key.
     bool WriteZKey(const libzcash::SproutPaymentAddress& addr, const libzcash::SproutSpendingKey& key, const CKeyMetadata &keyMeta);
@@ -193,6 +466,15 @@ class CWalletDB : public CDB
     bool WriteSaplingExtendedFullViewingKey(const libzcash::SaplingExtendedFullViewingKey &extfvk);
     bool EraseSaplingExtendedFullViewingKey(const libzcash::SaplingExtendedFullViewingKey &extfvk);
 
+    /// Orchard support.
+    bool WriteOrchardWitnesses(const OrchardWallet& wallet);
+
+    /// Unified key support.
+
+    bool WriteUnifiedAccountMetadata(const ZcashdUnifiedAccountMetadata& keymeta);
+    bool WriteUnifiedFullViewingKey(const libzcash::UnifiedFullViewingKey& ufvk);
+    bool WriteUnifiedAddressMetadata(const ZcashdUnifiedAddressMetadata& addrmeta);
+
     static void IncrementUpdateCounter();
     static unsigned int GetUpdateCounter();
 private:
diff --git a/src/zcash/Address.cpp b/src/zcash/Address.cpp
index dd9893e69fb..bef337ea7ab 100644
--- a/src/zcash/Address.cpp
+++ b/src/zcash/Address.cpp
@@ -1,6 +1,10 @@
 #include "Address.hpp"
+#include "zcash/address/unified.h"
+#include "utilstrencodings.h"
 
 #include <algorithm>
+#include <iostream>
+#include <rust/address.h>
 
 const uint8_t ZCASH_UA_TYPECODE_P2PKH = 0x00;
 const uint8_t ZCASH_UA_TYPECODE_P2SH = 0x01;
@@ -8,6 +12,85 @@ const uint8_t ZCASH_UA_TYPECODE_SAPLING = 0x02;
 
 namespace libzcash {
 
+//
+// Unified Addresses
+//
+
+static bool AddOrchardReceiver(void* ua, OrchardRawAddressPtr* ptr)
+{
+    return reinterpret_cast<libzcash::UnifiedAddress*>(ua)->AddReceiver(
+        libzcash::OrchardRawAddress::KeyIoOnlyFromReceiver(ptr));
+}
+
+/**
+ * `raw` MUST be 43 bytes.
+ */
+static bool AddSaplingReceiver(void* ua, const unsigned char* raw)
+{
+    CDataStream ss(
+        reinterpret_cast<const char*>(raw),
+        reinterpret_cast<const char*>(raw + 43),
+        SER_NETWORK,
+        PROTOCOL_VERSION);
+    libzcash::SaplingPaymentAddress receiver;
+    ss >> receiver;
+    return reinterpret_cast<libzcash::UnifiedAddress*>(ua)->AddReceiver(receiver);
+}
+
+/**
+ * `raw` MUST be 20 bytes.
+ */
+static bool AddP2SHReceiver(void* ua, const unsigned char* raw)
+{
+    CDataStream ss(
+        reinterpret_cast<const char*>(raw),
+        reinterpret_cast<const char*>(raw + 20),
+        SER_NETWORK,
+        PROTOCOL_VERSION);
+    CScriptID receiver;
+    ss >> receiver;
+    return reinterpret_cast<libzcash::UnifiedAddress*>(ua)->AddReceiver(receiver);
+}
+
+/**
+ * `raw` MUST be 20 bytes.
+ */
+static bool AddP2PKHReceiver(void* ua, const unsigned char* raw)
+{
+    CDataStream ss(
+        reinterpret_cast<const char*>(raw),
+        reinterpret_cast<const char*>(raw + 20),
+        SER_NETWORK,
+        PROTOCOL_VERSION);
+    CKeyID receiver;
+    ss >> receiver;
+    return reinterpret_cast<libzcash::UnifiedAddress*>(ua)->AddReceiver(receiver);
+}
+
+static bool AddUnknownReceiver(void* ua, uint32_t typecode, const unsigned char* data, size_t len)
+{
+    libzcash::UnknownReceiver receiver(typecode, std::vector(data, data + len));
+    return reinterpret_cast<libzcash::UnifiedAddress*>(ua)->AddReceiver(receiver);
+}
+
+std::optional<UnifiedAddress> UnifiedAddress::Parse(const KeyConstants& keyConstants, const std::string& str) {
+    libzcash::UnifiedAddress ua;
+    if (zcash_address_parse_unified(
+        str.c_str(),
+        keyConstants.NetworkIDString().c_str(),
+        &ua,
+        AddOrchardReceiver,
+        AddSaplingReceiver,
+        AddP2SHReceiver,
+        AddP2PKHReceiver,
+        AddUnknownReceiver)
+    ) {
+        return ua;
+    } else {
+        return std::nullopt;
+    }
+}
+
 std::vector<const Receiver*> UnifiedAddress::GetSorted() const {
     std::vector<const libzcash::Receiver*> sorted;
     for (const auto& receiver : receivers) {
@@ -24,8 +107,8 @@ bool UnifiedAddress::AddReceiver(Receiver receiver) {
         auto t = std::visit(TypecodeForReceiver(), r);
         if (
             (t == typecode) ||
-            (std::holds_alternative<P2PKHAddress>(r) && std::holds_alternative<P2SHAddress>(receiver)) ||
-            (std::holds_alternative<P2SHAddress>(r) && std::holds_alternative<P2PKHAddress>(receiver))
+            (std::holds_alternative<CKeyID>(r) && std::holds_alternative<CScriptID>(receiver)) ||
+            (std::holds_alternative<CScriptID>(r) && std::holds_alternative<CKeyID>(receiver))
         ) {
             return false;
         }
@@ -35,144 +118,264 @@ bool UnifiedAddress::AddReceiver(Receiver receiver) {
     return true;
 }
 
-std::pair<std::string, PaymentAddress> AddressInfoFromSpendingKey::operator()(const SproutSpendingKey &sk) const {
-    return std::make_pair("sprout", sk.address());
+bool UnifiedAddress::ContainsReceiver(const Receiver& receiver) const {
+    for (const auto& r : GetReceiversAsParsed()) {
+        if (r == receiver) {
+            return true;
+        }
+    }
+    return false;
 }
-std::pair<std::string, PaymentAddress> AddressInfoFromSpendingKey::operator()(const SaplingExtendedSpendingKey &sk) const {
-    return std::make_pair("sapling", sk.DefaultAddress());
+
+std::optional<CKeyID> UnifiedAddress::GetP2PKHReceiver() const {
+    for (const auto& r : receivers) {
+        if (std::holds_alternative<CKeyID>(r)) {
+            return std::get<CKeyID>(r);
+        }
+    }
+
+    return std::nullopt;
 }
-std::pair<std::string, PaymentAddress> AddressInfoFromSpendingKey::operator()(const InvalidEncoding&) const {
-    throw std::invalid_argument("Cannot derive default address from invalid spending key");
+
+std::optional<CScriptID> UnifiedAddress::GetP2SHReceiver() const {
+    for (const auto& r : receivers) {
+        if (std::holds_alternative<CScriptID>(r)) {
+            return std::get<CScriptID>(r);
+        }
+    }
+
+    return std::nullopt;
 }
 
-std::pair<std::string, PaymentAddress> AddressInfoFromViewingKey::operator()(const SproutViewingKey &sk) const {
-    return std::make_pair("sprout", sk.address());
+std::optional<SaplingPaymentAddress> UnifiedAddress::GetSaplingReceiver() const {
+    for (const auto& r : receivers) {
+        if (std::holds_alternative<SaplingPaymentAddress>(r)) {
+            return std::get<SaplingPaymentAddress>(r);
+        }
+    }
+
+    return std::nullopt;
 }
-std::pair<std::string, PaymentAddress> AddressInfoFromViewingKey::operator()(const SaplingExtendedFullViewingKey &sk) const {
-    return std::make_pair("sapling", sk.DefaultAddress());
+
+std::optional<OrchardRawAddress> UnifiedAddress::GetOrchardReceiver() const {
+    for (const auto& r : receivers) {
+        if (std::holds_alternative<OrchardRawAddress>(r)) {
+            return std::get<OrchardRawAddress>(r);
+        }
+    }
+
+    return std::nullopt;
 }
-std::pair<std::string, PaymentAddress> AddressInfoFromViewingKey::operator()(const InvalidEncoding&) const {
-    throw std::invalid_argument("Cannot derive default address from invalid viewing key");
+
+std::optional<RecipientAddress> UnifiedAddress::GetPreferredRecipientAddress(
+    const Consensus::Params& consensus, int height) const
+{
+    bool nu5Active = consensus.NetworkUpgradeActive(height, Consensus::UPGRADE_NU5);
+
+    // Return the first receiver type we recognize; receivers are sorted in
+    // order from most-preferred to least.
+    std::optional<RecipientAddress> result;
+    for (const auto& receiver : *this) {
+        std::visit(match {
+            [&](const OrchardRawAddress& addr) { if (nu5Active) result = addr; },
+            [&](const SaplingPaymentAddress& addr) { result = addr; },
+            [&](const CScriptID& addr) { result = addr; },
+            [&](const CKeyID& addr) { result = addr; },
+            [&](const UnknownReceiver& addr) { }
+        }, receiver);
+
+        if (result.has_value()) {
+            return result;
+        }
+    }
+    return std::nullopt;
 }
 
+bool HasKnownReceiverType(const Receiver& receiver) {
+    return std::visit(match {
+        [](const OrchardRawAddress& addr) { return true; },
+        [](const SaplingPaymentAddress& addr) { return true; },
+        [](const CScriptID& addr) { return true; },
+        [](const CKeyID& addr) { return true; },
+        [](const UnknownReceiver& addr) { return false; }
+    }, receiver);
 }
 
-bool IsValidPaymentAddress(const libzcash::PaymentAddress& zaddr) {
-    return !std::holds_alternative<libzcash::InvalidEncoding>(zaddr);
+std::pair<std::string, PaymentAddress> AddressInfoFromSpendingKey::operator()(const SproutSpendingKey &sk) const {
+    return std::make_pair("sprout", sk.address());
+}
+std::pair<std::string, PaymentAddress> AddressInfoFromSpendingKey::operator()(const SaplingExtendedSpendingKey &sk) const {
+    return std::make_pair("sapling", sk.ToXFVK().DefaultAddress());
 }
 
-bool IsValidViewingKey(const libzcash::ViewingKey& vk) {
-    return !std::holds_alternative<libzcash::InvalidEncoding>(vk);
+std::pair<std::string, PaymentAddress> AddressInfoFromViewingKey::operator()(const SproutViewingKey &sk) const {
+    return std::make_pair("sprout", sk.address());
+}
+std::pair<std::string, PaymentAddress> AddressInfoFromViewingKey::operator()(const SaplingExtendedFullViewingKey &xfvk) const {
+    return std::make_pair("sapling", xfvk.DefaultAddress());
 }
+std::pair<std::string, PaymentAddress> AddressInfoFromViewingKey::operator()(const UnifiedFullViewingKey &ufvk) const {
+    // using std::get here is safe because we're searching from 0
+    auto addr = std::get<std::pair<UnifiedAddress, diversifier_index_t>>(
+        ZcashdUnifiedFullViewingKey::FromUnifiedFullViewingKey(keyConstants, ufvk)
+            .FindAddress(diversifier_index_t(0))
+    );
+    return std::make_pair("unified", addr.first);
+}
+
+} // namespace libzcash
 
-bool IsValidSpendingKey(const libzcash::SpendingKey& zkey) {
-    return !std::holds_alternative<libzcash::InvalidEncoding>(zkey);
+uint32_t TypecodeForReceiver::operator()(
+    const libzcash::OrchardRawAddress &zaddr) const
+{
+    return static_cast<uint32_t>(libzcash::ReceiverType::Orchard);
 }
 
-uint8_t TypecodeForReceiver::operator()(
+uint32_t TypecodeForReceiver::operator()(
     const libzcash::SaplingPaymentAddress &zaddr) const
 {
     return ZCASH_UA_TYPECODE_SAPLING;
 }
-
-uint8_t TypecodeForReceiver::operator()(
-    const libzcash::P2SHAddress &p2sh) const
+uint32_t TypecodeForReceiver::operator()(
+    const CScriptID &p2sh) const
 {
     return ZCASH_UA_TYPECODE_P2SH;
 }
-
-uint8_t TypecodeForReceiver::operator()(
-    const libzcash::P2PKHAddress &p2sh) const
+uint32_t TypecodeForReceiver::operator()(
+    const CKeyID &p2sh) const
 {
     return ZCASH_UA_TYPECODE_P2PKH;
 }
-
-uint8_t TypecodeForReceiver::operator()(
+uint32_t TypecodeForReceiver::operator()(
     const libzcash::UnknownReceiver &unknown) const
 {
     return unknown.typecode;
 }
 
-std::optional<libzcash::RawAddress> ReceiverToRawAddress::operator()(
-    const libzcash::SaplingPaymentAddress &zaddr) const
-{
-    return zaddr;
-}
+//
+// Unified full viewing keys
+//
 
-std::optional<libzcash::RawAddress> ReceiverToRawAddress::operator()(
-    const libzcash::P2SHAddress &p2sh) const
-{
-    return std::nullopt;
+std::optional<libzcash::UnifiedFullViewingKey> libzcash::UnifiedFullViewingKey::Decode(
+        const std::string& str,
+        const KeyConstants& keyConstants) {
+    UnifiedFullViewingKeyPtr* ptr = unified_full_viewing_key_parse(
+        keyConstants.NetworkIDString().c_str(),
+        str.c_str());
+    if (ptr == nullptr) {
+        return std::nullopt;
+    } else {
+        return UnifiedFullViewingKey(ptr);
+    }
 }
 
-std::optional<libzcash::RawAddress> ReceiverToRawAddress::operator()(
-    const libzcash::P2PKHAddress &p2sh) const
-{
-    return std::nullopt;
+std::string libzcash::UnifiedFullViewingKey::Encode(const KeyConstants& keyConstants) const {
+    auto encoded = unified_full_viewing_key_serialize(
+                        keyConstants.NetworkIDString().c_str(),
+                        inner.get());
+    // Copy the C-string into C++.
+    std::string res(encoded);
+    // Free the C-string.
+    zcash_address_string_free(encoded);
+    return res;
 }
 
-std::optional<libzcash::RawAddress> ReceiverToRawAddress::operator()(
-    const libzcash::UnknownReceiver &p2sh) const
-{
-    return std::nullopt;
+std::optional<libzcash::OrchardFullViewingKey> libzcash::UnifiedFullViewingKey::GetOrchardKey() const {
+    std::vector<uint8_t> buffer(96);
+    if (unified_full_viewing_key_read_orchard(inner.get(), buffer.data())) {
+        CDataStream ss(buffer, SER_NETWORK, PROTOCOL_VERSION);
+        return OrchardFullViewingKey::Read(ss);
+    } else {
+        return std::nullopt;
+    }
 }
 
-std::optional<libzcash::RawAddress> RecipientForPaymentAddress::operator()(
-    const libzcash::InvalidEncoding& no) const
-{
-    return std::nullopt;
+std::optional<libzcash::SaplingDiversifiableFullViewingKey> libzcash::UnifiedFullViewingKey::GetSaplingKey() const {
+    std::vector<uint8_t> buffer(128);
+    if (unified_full_viewing_key_read_sapling(inner.get(), buffer.data())) {
+        CDataStream ss(buffer, SER_NETWORK, PROTOCOL_VERSION);
+        return SaplingDiversifiableFullViewingKey::Read(ss);
+    } else {
+        return std::nullopt;
+    }
 }
 
-std::optional<libzcash::RawAddress> RecipientForPaymentAddress::operator()(
-    const libzcash::SproutPaymentAddress &zaddr) const
-{
-    return zaddr;
+std::optional<libzcash::transparent::AccountPubKey> libzcash::UnifiedFullViewingKey::GetTransparentKey() const {
+    std::vector<uint8_t> buffer(65);
+    if (unified_full_viewing_key_read_transparent(inner.get(), buffer.data())) {
+        CDataStream ss(buffer, SER_NETWORK, PROTOCOL_VERSION);
+        return libzcash::transparent::AccountPubKey(CChainablePubKey::Read(ss));
+    } else {
+        return std::nullopt;
+    }
 }
 
-std::optional<libzcash::RawAddress> RecipientForPaymentAddress::operator()(
-    const libzcash::SaplingPaymentAddress &zaddr) const
-{
-    return zaddr;
+bool libzcash::UnifiedFullViewingKeyBuilder::AddTransparentKey(const transparent::AccountPubKey& key) {
+    if (t_bytes.has_value()) return false;
+    CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
+    ss << key.GetChainablePubKey();
+    assert(ss.size() == 65);
+    std::vector<uint8_t> ss_bytes(ss.begin(), ss.end());
+    t_bytes = ss_bytes;
+    return true;
 }
 
-std::optional<libzcash::RawAddress> RecipientForPaymentAddress::operator()(
-    const libzcash::UnifiedAddress &uaddr) const
-{
-    for (auto& receiver : uaddr) {
-        // Return the first one.
-        return std::visit(ReceiverToRawAddress(), receiver);
-    }
-
-    return std::nullopt;
+bool libzcash::UnifiedFullViewingKeyBuilder::AddSaplingKey(const SaplingDiversifiableFullViewingKey& key) {
+    if (sapling_bytes.has_value()) return false;
+    CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
+    ss << key;
+    assert(ss.size() == 128);
+    std::vector<uint8_t> ss_bytes(ss.begin(), ss.end());
+    sapling_bytes = ss_bytes;
+    return true;
 }
 
-std::set<libzcash::RawAddress> GetRawAddresses::operator()(
-    const libzcash::InvalidEncoding& no) const
-{
-    return {};
+bool libzcash::UnifiedFullViewingKeyBuilder::AddOrchardKey(const OrchardFullViewingKey& key) {
+    if (orchard_bytes.has_value()) return false;
+    CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
+    ss << key;
+    assert(ss.size() == 96);
+    std::vector<uint8_t> ss_bytes(ss.begin(), ss.end());
+    orchard_bytes = ss_bytes;
+    return true;
 }
 
-std::set<libzcash::RawAddress> GetRawAddresses::operator()(
-    const libzcash::SproutPaymentAddress &zaddr) const
-{
-    return {zaddr};
-}
+std::optional<libzcash::UnifiedFullViewingKey> libzcash::UnifiedFullViewingKeyBuilder::build() const {
+    UnifiedFullViewingKeyPtr* ptr = unified_full_viewing_key_from_components(
+            t_bytes.has_value() ? t_bytes.value().data() : nullptr,
+            sapling_bytes.has_value() ? sapling_bytes.value().data() : nullptr,
+            orchard_bytes.has_value() ? orchard_bytes.value().data() : nullptr);
 
-std::set<libzcash::RawAddress> GetRawAddresses::operator()(
-    const libzcash::SaplingPaymentAddress &zaddr) const
-{
-    return {zaddr};
+    if (ptr == nullptr) {
+        return std::nullopt;
+    } else {
+        return UnifiedFullViewingKey(ptr);
+    }
 }
 
-std::set<libzcash::RawAddress> GetRawAddresses::operator()(
-    const libzcash::UnifiedAddress &uaddr) const
-{
-    std::set<libzcash::RawAddress> ret;
-    for (auto& receiver : uaddr) {
-        auto ra = std::visit(ReceiverToRawAddress(), receiver);
-        if (ra) {
-            ret.insert(*ra);
-        }
+libzcash::UnifiedFullViewingKey libzcash::UnifiedFullViewingKey::FromZcashdUFVK(const ZcashdUnifiedFullViewingKey& key) {
+    UnifiedFullViewingKeyBuilder builder;
+    if (key.GetTransparentKey().has_value()) {
+        builder.AddTransparentKey(key.GetTransparentKey().value());
     }
-    return ret;
+    if (key.GetSaplingKey().has_value()) {
+        builder.AddSaplingKey(key.GetSaplingKey().value());
+    }
+    if (key.GetOrchardKey().has_value()) {
+        builder.AddOrchardKey(key.GetOrchardKey().value());
+    }
+
+    auto result = builder.build();
+    if (!result.has_value()) {
+        throw std::invalid_argument("Cannot convert from invalid viewing key.");
+    }
+    return result.value();
+}
+
+libzcash::UFVKId libzcash::UnifiedFullViewingKey::GetKeyID(const KeyConstants& keyConstants) const {
+    // The ID of a ufvk is the blake2b hash of the serialized form of the
+    // ufvk with the receivers sorted in typecode order.
+    CBLAKE2bWriter h(SER_GETHASH, 0, ZCASH_UFVK_ID_PERSONAL);
+    h << Encode(keyConstants);
+    return libzcash::UFVKId(h.GetHash());
 }
diff --git a/src/zcash/Address.hpp b/src/zcash/Address.hpp
index d47c5ec4470..c4d230daa13 100644
--- a/src/zcash/Address.hpp
+++ b/src/zcash/Address.hpp
@@ -1,67 +1,30 @@
 #ifndef ZC_ADDRESS_H_
 #define ZC_ADDRESS_H_
 
+#include "consensus/params.h"
+#include "key_constants.h"
+#include "pubkey.h"
+#include "key_constants.h"
+#include "script/script.h"
 #include "uint256.h"
+#include "pubkey.h"
+#include "script/script.h"
+#include "util/match.h"
+#include "zcash/address/orchard.hpp"
 #include "zcash/address/sapling.hpp"
 #include "zcash/address/sprout.hpp"
+#include "zcash/address/unified.h"
 #include "zcash/address/zip32.h"
 
 #include <variant>
+#include <rust/unified_keys.h>
 
-namespace libzcash {
-// We use new classes here instead of CKeyID and CScriptID to prevent a cyclic dependency.
-class P2PKHAddress: public uint160 {
-public:
-    P2PKHAddress() {}
-    explicit P2PKHAddress(const std::vector<unsigned char>& vch) : uint160(vch) {}
-};
-class P2SHAddress: public uint160 {
-public:
-    P2SHAddress() {}
-    explicit P2SHAddress(const std::vector<unsigned char>& vch) : uint160(vch) {}
-};
-
-/** Protocol addresses that can receive funds in a transaction. */
-typedef std::variant<SproutPaymentAddress, SaplingPaymentAddress> RawAddress;
+const unsigned char ZCASH_UFVK_ID_PERSONAL[BLAKE2bPersonalBytes] =
+    {'Z', 'c', 'a', 's', 'h', '_', 'U', 'F', 'V', 'K', '_', 'I', 'd', '_', 'F', 'P'};
 
-class InvalidEncoding {
-public:
-    friend bool operator==(const InvalidEncoding &a, const InvalidEncoding &b) { return true; }
-    friend bool operator<(const InvalidEncoding &a, const InvalidEncoding &b) { return true; }
-};
-
-class UnknownReceiver {
-public:
-    uint8_t typecode;
-    std::vector<uint8_t> data;
-
-    UnknownReceiver(uint8_t typecode, std::vector<uint8_t> data) :
-        typecode(typecode), data(data) {}
-
-    friend inline bool operator==(const UnknownReceiver& a, const UnknownReceiver& b) {
-        return a.typecode == b.typecode && a.data == b.data;
-    }
-    friend inline bool operator<(const UnknownReceiver& a, const UnknownReceiver& b) {
-        // We don't know for certain the preference order of unknown receivers, but it is
-        // _likely_ that the higher typecode has higher preference. The exact sort order
-        // doesn't really matter, as unknown receivers have lower preference than known
-        // receivers.
-        return (a.typecode > b.typecode ||
-                (a.typecode == b.typecode && a.data < b.data));
-    }
-};
+namespace libzcash {
 
-/**
- * Receivers that can appear in a Unified Address.
- *
- * These types are given in order of preference (as defined in ZIP 316), so that sorting
- * variants by `operator<` is equivalent to sorting by preference.
- */
-typedef std::variant<
-    SaplingPaymentAddress,
-    P2SHAddress,
-    P2PKHAddress,
-    UnknownReceiver> Receiver;
+bool HasKnownReceiverType(const Receiver& receiver);
 
 struct ReceiverIterator {
     using iterator_category = std::random_access_iterator_tag;
@@ -95,6 +58,7 @@ struct ReceiverIterator {
     size_t cur;
 };
 
+
 class UnifiedAddress {
     std::vector<Receiver> receivers;
 
@@ -103,6 +67,21 @@ class UnifiedAddress {
 public:
     UnifiedAddress() {}
 
+    static UnifiedAddress ForSingleReceiver(Receiver receiver) {
+        UnifiedAddress ua;
+        ua.AddReceiver(receiver);
+        return ua;
+    }
+
+    static std::optional<UnifiedAddress> Parse(const KeyConstants& keyConstants, const std::string& str);
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action) {
+        READWRITE(receivers);
+    }
+
     /**
      * Adds the given receiver to this unified address.
      *
@@ -115,8 +94,33 @@ class UnifiedAddress {
      */
     bool AddReceiver(Receiver receiver);
 
+    bool ContainsReceiver(const Receiver& receiver) const;
+
     const std::vector<Receiver>& GetReceiversAsParsed() const { return receivers; }
 
+    std::set<ReceiverType> GetKnownReceiverTypes() const {
+        std::set<ReceiverType> result;
+        for (const auto& receiver : receivers) {
+            std::visit(match {
+                [&](const libzcash::OrchardRawAddress &zaddr) {
+                    result.insert(ReceiverType::Orchard);
+                },
+                [&](const libzcash::SaplingPaymentAddress &zaddr) {
+                    result.insert(ReceiverType::Sapling);
+                },
+                [&](const CScriptID &zaddr) {
+                    result.insert(ReceiverType::P2SH);
+                },
+                [&](const CKeyID &zaddr) {
+                    result.insert(ReceiverType::P2PKH);
+                },
+                [&](const libzcash::UnknownReceiver &uaddr) {
+                }
+            }, receiver);
+        }
+        return result;
+    }
+
     ReceiverIterator begin() const {
         return ReceiverIterator(GetSorted(), 0);
     }
@@ -127,47 +131,188 @@ class UnifiedAddress {
         return receivers.size();
     }
 
+    std::optional<CKeyID> GetP2PKHReceiver() const;
+
+    std::optional<CScriptID> GetP2SHReceiver() const;
+
+    std::optional<SaplingPaymentAddress> GetSaplingReceiver() const;
+
+    std::optional<OrchardRawAddress> GetOrchardReceiver() const;
+
+    /**
+     * Return the most-preferred receiver from among the receiver types
+     * that we recognize and can use at the given block height.
+     */
+    std::optional<RecipientAddress> GetPreferredRecipientAddress(
+        const Consensus::Params& consensus, int height) const;
+
     friend inline bool operator==(const UnifiedAddress& a, const UnifiedAddress& b) {
         return a.receivers == b.receivers;
     }
+    friend inline bool operator!=(const UnifiedAddress& a, const UnifiedAddress& b) {
+        return a.receivers != b.receivers;
+    }
     friend inline bool operator<(const UnifiedAddress& a, const UnifiedAddress& b) {
         return a.receivers < b.receivers;
     }
 };
 
+class UnifiedFullViewingKeyBuilder;
+
+/**
+ * Wrapper for a zcash_address::unified::Ufvk.
+ */
+class UnifiedFullViewingKey {
+private:
+    std::unique_ptr<UnifiedFullViewingKeyPtr, decltype(&unified_full_viewing_key_free)> inner;
+
+    UnifiedFullViewingKey() :
+        inner(nullptr, unified_full_viewing_key_free) {}
+
+    UnifiedFullViewingKey(UnifiedFullViewingKeyPtr* ptr) :
+        inner(ptr, unified_full_viewing_key_free) {}
+
+    friend class UnifiedFullViewingKeyBuilder;
+public:
+    UnifiedFullViewingKey(UnifiedFullViewingKey&& key) : inner(std::move(key.inner)) {}
+
+    UnifiedFullViewingKey(const UnifiedFullViewingKey& key) :
+        inner(unified_full_viewing_key_clone(key.inner.get()), unified_full_viewing_key_free) {}
+
+    /**
+     * This method should only be used for serialization of unified full
+     * viewing keys that have been generated internally from unified spending
+     * keys by Zcashd.  It is not suitable for use in any case where the
+     * ZcashdUnifiedFullViewingKey value may have been produced by a
+     * potentially-lossy conversion from a UnifiedFullViewingKey value that
+     * originated outside of zcashd.
+     */
+    static UnifiedFullViewingKey FromZcashdUFVK(const ZcashdUnifiedFullViewingKey&);
+
+    static std::optional<UnifiedFullViewingKey> Decode(
+            const std::string& str,
+            const KeyConstants& keyConstants);
+
+    std::string Encode(const KeyConstants& keyConstants) const;
+
+    std::optional<OrchardFullViewingKey> GetOrchardKey() const;
+
+    std::optional<SaplingDiversifiableFullViewingKey> GetSaplingKey() const;
+
+    std::optional<transparent::AccountPubKey> GetTransparentKey() const;
+
+    UFVKId GetKeyID(const KeyConstants& keyConstants) const;
+
+    std::set<ReceiverType> GetKnownReceiverTypes() const {
+        std::set<ReceiverType> result;
+        if (GetTransparentKey().has_value()) {
+            result.insert(ReceiverType::P2PKH);
+        }
+        if (GetSaplingKey().has_value()) {
+            result.insert(ReceiverType::Sapling);
+        }
+        if (GetOrchardKey().has_value()) {
+            result.insert(ReceiverType::Orchard);
+        }
+        return result;
+    }
+
+    UnifiedFullViewingKey& operator=(UnifiedFullViewingKey&& key)
+    {
+        if (this != &key) {
+            inner = std::move(key.inner);
+        }
+        return *this;
+    }
+
+    UnifiedFullViewingKey& operator=(const UnifiedFullViewingKey& key)
+    {
+        if (this != &key) {
+            inner.reset(unified_full_viewing_key_clone(key.inner.get()));
+        }
+        return *this;
+    }
+};
+
+class UnifiedFullViewingKeyBuilder {
+private:
+    std::optional<std::vector<uint8_t>> t_bytes;
+    std::optional<std::vector<uint8_t>> sapling_bytes;
+    std::optional<std::vector<uint8_t>> orchard_bytes;
+public:
+    UnifiedFullViewingKeyBuilder():
+        t_bytes(std::nullopt),
+        sapling_bytes(std::nullopt),
+        orchard_bytes(std::nullopt) {}
+
+    bool AddTransparentKey(const transparent::AccountPubKey&);
+    bool AddSaplingKey(const SaplingDiversifiableFullViewingKey&);
+    bool AddOrchardKey(const OrchardFullViewingKey&);
+
+    std::optional<UnifiedFullViewingKey> build() const;
+};
+
 /** Addresses that can appear in a string encoding. */
 typedef std::variant<
-    InvalidEncoding,
+    CKeyID,
+    CScriptID,
     SproutPaymentAddress,
     SaplingPaymentAddress,
     UnifiedAddress> PaymentAddress;
-typedef std::variant<InvalidEncoding, SproutViewingKey, SaplingExtendedFullViewingKey> ViewingKey;
-typedef std::variant<InvalidEncoding, SproutSpendingKey, SaplingExtendedSpendingKey> SpendingKey;
+/** Viewing keys that can have a string encoding. */
+typedef std::variant<
+    SproutViewingKey,
+    SaplingExtendedFullViewingKey,
+    UnifiedFullViewingKey> ViewingKey;
+/** Spending keys that can have a string encoding. */
+typedef std::variant<
+    SproutSpendingKey,
+    SaplingExtendedSpendingKey> SpendingKey;
+
+class IsShieldedRecipient {
+public:
+    bool operator()(const CKeyID& p2pkh) { return false; }
+    bool operator()(const CScriptID& p2sh) { return false; }
+    bool operator()(const SproutPaymentAddress& addr) { return true; }
+    bool operator()(const SaplingPaymentAddress& addr) { return true; }
+    bool operator()(const OrchardRawAddress& addr) { return true; }
+};
+
+class SelectRecipientAddress {
+    const Consensus::Params& consensus;
+    int height;
+
+public:
+    SelectRecipientAddress(const Consensus::Params& consensus, int height) :
+        consensus(consensus), height(height) {}
+
+    std::optional<RecipientAddress> operator()(const CKeyID& p2pkh) { return p2pkh; }
+    std::optional<RecipientAddress> operator()(const CScriptID& p2sh) { return p2sh; }
+    std::optional<RecipientAddress> operator()(const SproutPaymentAddress& addr) { return std::nullopt; }
+    std::optional<RecipientAddress> operator()(const SaplingPaymentAddress& addr) { return addr; }
+    std::optional<RecipientAddress> operator()(const UnifiedAddress& addr) {
+        return addr.GetPreferredRecipientAddress(consensus, height);
+    }
+};
 
 class AddressInfoFromSpendingKey {
 public:
     std::pair<std::string, PaymentAddress> operator()(const SproutSpendingKey&) const;
     std::pair<std::string, PaymentAddress> operator()(const struct SaplingExtendedSpendingKey&) const;
-    std::pair<std::string, PaymentAddress> operator()(const InvalidEncoding&) const;
 };
 
 class AddressInfoFromViewingKey {
+private:
+    const KeyConstants& keyConstants;
+
 public:
+    AddressInfoFromViewingKey(const KeyConstants& keyConstants): keyConstants(keyConstants) {}
     std::pair<std::string, PaymentAddress> operator()(const SproutViewingKey&) const;
     std::pair<std::string, PaymentAddress> operator()(const struct SaplingExtendedFullViewingKey&) const;
-    std::pair<std::string, PaymentAddress> operator()(const InvalidEncoding&) const;
+    std::pair<std::string, PaymentAddress> operator()(const UnifiedFullViewingKey&) const;
 };
 
-}
-
-/** Check whether a PaymentAddress is not an InvalidEncoding. */
-bool IsValidPaymentAddress(const libzcash::PaymentAddress& zaddr);
-
-/** Check whether a ViewingKey is not an InvalidEncoding. */
-bool IsValidViewingKey(const libzcash::ViewingKey& vk);
-
-/** Check whether a SpendingKey is not an InvalidEncoding. */
-bool IsValidSpendingKey(const libzcash::SpendingKey& zkey);
+} //namespace libzcash
 
 /**
  * Gets the typecode for the given UA receiver.
@@ -176,49 +321,11 @@ class TypecodeForReceiver {
 public:
     TypecodeForReceiver() {}
 
-    uint8_t operator()(const libzcash::SaplingPaymentAddress &zaddr) const;
-    uint8_t operator()(const libzcash::P2SHAddress &p2sh) const;
-    uint8_t operator()(const libzcash::P2PKHAddress &p2pkh) const;
-    uint8_t operator()(const libzcash::UnknownReceiver &p2pkh) const;
-};
-
-/**
- * Converts the given UA receiver to a protocol address, if it is a shielded receiver.
- */
-class ReceiverToRawAddress {
-public:
-    ReceiverToRawAddress() {}
-
-    std::optional<libzcash::RawAddress> operator()(const libzcash::SaplingPaymentAddress &zaddr) const;
-    std::optional<libzcash::RawAddress> operator()(const libzcash::P2SHAddress &p2sh) const;
-    std::optional<libzcash::RawAddress> operator()(const libzcash::P2PKHAddress &p2pkh) const;
-    std::optional<libzcash::RawAddress> operator()(const libzcash::UnknownReceiver &p2pkh) const;
-};
-
-/**
- * Returns the protocol address that should be used in transaction outputs.
- */
-class RecipientForPaymentAddress {
-public:
-    RecipientForPaymentAddress() {}
-
-    std::optional<libzcash::RawAddress> operator()(const libzcash::InvalidEncoding& no) const;
-    std::optional<libzcash::RawAddress> operator()(const libzcash::SproutPaymentAddress &zaddr) const;
-    std::optional<libzcash::RawAddress> operator()(const libzcash::SaplingPaymentAddress &zaddr) const;
-    std::optional<libzcash::RawAddress> operator()(const libzcash::UnifiedAddress &uaddr) const;
-};
-
-/**
- * Returns all protocol addresses contained within the given payment address.
- */
-class GetRawAddresses {
-public:
-    GetRawAddresses() {}
-
-    std::set<libzcash::RawAddress> operator()(const libzcash::InvalidEncoding& no) const;
-    std::set<libzcash::RawAddress> operator()(const libzcash::SproutPaymentAddress &zaddr) const;
-    std::set<libzcash::RawAddress> operator()(const libzcash::SaplingPaymentAddress &zaddr) const;
-    std::set<libzcash::RawAddress> operator()(const libzcash::UnifiedAddress &uaddr) const;
+    uint32_t operator()(const libzcash::OrchardRawAddress &zaddr) const;
+    uint32_t operator()(const libzcash::SaplingPaymentAddress &zaddr) const;
+    uint32_t operator()(const CScriptID &p2sh) const;
+    uint32_t operator()(const CKeyID &p2pkh) const;
+    uint32_t operator()(const libzcash::UnknownReceiver &p2pkh) const;
 };
 
 #endif // ZC_ADDRESS_H_
diff --git a/src/zcash/IncrementalMerkleTree.hpp b/src/zcash/IncrementalMerkleTree.hpp
index 3116da42be7..5c6d51899ec 100644
--- a/src/zcash/IncrementalMerkleTree.hpp
+++ b/src/zcash/IncrementalMerkleTree.hpp
@@ -12,7 +12,7 @@
 #include "zcash/util.h"
 
 #include <primitives/orchard.h>
-#include <rust/orchard/incremental_sinsemilla_tree.h>
+#include <rust/orchard/incremental_merkle_tree.h>
 
 namespace libzcash {
 
@@ -259,28 +259,28 @@ typedef libzcash::IncrementalMerkleTree<INCREMENTAL_MERKLE_TREE_DEPTH_TESTING, l
 typedef libzcash::IncrementalWitness<SAPLING_INCREMENTAL_MERKLE_TREE_DEPTH, libzcash::PedersenHash> SaplingWitness;
 typedef libzcash::IncrementalWitness<INCREMENTAL_MERKLE_TREE_DEPTH_TESTING, libzcash::PedersenHash> SaplingTestingWitness;
 
-class OrchardMerkleTree
+class OrchardMerkleFrontier
 {
 private:
     /// An incremental Sinsemilla tree; this pointer may never be null.
     /// Memory is allocated by Rust.
     std::unique_ptr<OrchardMerkleFrontierPtr, decltype(&orchard_merkle_frontier_free)> inner;
 public:
-    OrchardMerkleTree() : inner(orchard_merkle_frontier_empty(), orchard_merkle_frontier_free) {}
+    OrchardMerkleFrontier() : inner(orchard_merkle_frontier_empty(), orchard_merkle_frontier_free) {}
 
-    OrchardMerkleTree(OrchardMerkleTree&& frontier) : inner(std::move(frontier.inner)) {}
+    OrchardMerkleFrontier(OrchardMerkleFrontier&& frontier) : inner(std::move(frontier.inner)) {}
 
-    OrchardMerkleTree(const OrchardMerkleTree& frontier) :
+    OrchardMerkleFrontier(const OrchardMerkleFrontier& frontier) :
         inner(orchard_merkle_frontier_clone(frontier.inner.get()), orchard_merkle_frontier_free) {}
 
-    OrchardMerkleTree& operator=(OrchardMerkleTree&& frontier)
+    OrchardMerkleFrontier& operator=(OrchardMerkleFrontier&& frontier)
     {
         if (this != &frontier) {
             inner = std::move(frontier.inner);
         }
         return *this;
     }
-    OrchardMerkleTree& operator=(const OrchardMerkleTree& frontier)
+    OrchardMerkleFrontier& operator=(const OrchardMerkleFrontier& frontier)
     {
         if (this != &frontier) {
             inner.reset(orchard_merkle_frontier_clone(frontier.inner.get()));
@@ -323,7 +323,7 @@ class OrchardMerkleTree
 
     static uint256 empty_root() {
         uint256 value;
-        incremental_sinsemilla_tree_empty_root(value.begin());
+        orchard_merkle_tree_empty_root(value.begin());
         return value;
     }
 };
diff --git a/src/zcash/Zcash.h b/src/zcash/Zcash.h
index fcd16b87e24..a6eb53b22d4 100644
--- a/src/zcash/Zcash.h
+++ b/src/zcash/Zcash.h
@@ -28,4 +28,20 @@
 #define ZC_SAPLING_ENCCIPHERTEXT_SIZE (ZC_SAPLING_ENCPLAINTEXT_SIZE + NOTEENCRYPTION_AUTH_BYTES)
 #define ZC_SAPLING_OUTCIPHERTEXT_SIZE (ZC_SAPLING_OUTPLAINTEXT_SIZE + NOTEENCRYPTION_AUTH_BYTES)
 
+// - CompactSize is at least 1 byte
+#define ZC_ZIP225_ORCHARD_NUM_ACTIONS_SIZE 1
+#define ZC_ZIP225_ORCHARD_FLAGS_SIZE 1
+#define ZC_ZIP225_ORCHARD_VALUE_BALANCE_SIZE 8
+#define ZC_ZIP225_ORCHARD_ANCHOR_SIZE 32
+// - CompactSize is at least 2 bytes because sizeProofsOrchard >= 253
+#define ZC_ZIP225_ORCHARD_SIZE_PROOFS_BASE_SIZE 2
+#define ZC_ZIP225_ORCHARD_PROOF_BASE_SIZE 2720
+#define ZC_ZIP225_ORCHARD_BINDING_SIG_SIZE 64
+#define ZC_ZIP225_ORCHARD_BASE_SIZE (ZC_ZIP225_ORCHARD_NUM_ACTIONS_SIZE + ZC_ZIP225_ORCHARD_FLAGS_SIZE + ZC_ZIP225_ORCHARD_VALUE_BALANCE_SIZE + ZC_ZIP225_ORCHARD_ANCHOR_SIZE + ZC_ZIP225_ORCHARD_SIZE_PROOFS_BASE_SIZE + ZC_ZIP225_ORCHARD_PROOF_BASE_SIZE + ZC_ZIP225_ORCHARD_BINDING_SIG_SIZE)
+// Marginal transaction size per Orchard Action
+#define ZC_ZIP225_ORCHARD_ACTION_SIZE 820
+#define ZC_ZIP225_ORCHARD_SPEND_AUTH_SIG_SIZE 64
+#define ZC_ZIP225_ORCHARD_PROOF_MARGINAL_SIZE 2272
+#define ZC_ZIP225_ORCHARD_MARGINAL_SIZE (ZC_ZIP225_ORCHARD_ACTION_SIZE + ZC_ZIP225_ORCHARD_SPEND_AUTH_SIG_SIZE + ZC_ZIP225_ORCHARD_PROOF_MARGINAL_SIZE)
+
 #endif // ZCASH_ZCASH_ZCASH_H
diff --git a/src/zcash/address/mnemonic.cpp b/src/zcash/address/mnemonic.cpp
new file mode 100644
index 00000000000..9321975b579
--- /dev/null
+++ b/src/zcash/address/mnemonic.cpp
@@ -0,0 +1,68 @@
+// Copyright (c) 2018-2021 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+#include "random.h"
+
+#include "mnemonic.h"
+#include "unified.h"
+
+using namespace libzcash;
+
+std::optional<MnemonicSeed> MnemonicSeed::FromEntropy(const RawHDSeed& entropy, uint32_t bip44CoinType, Language language) {
+    const char* phrase = zip339_entropy_to_phrase(language, entropy.data(), entropy.size());
+    SecureString mnemonic(phrase);
+    zip339_free_phrase(phrase);
+
+    // The phrase returned from zip339_entropy_to_phrase should always be a
+    // valid UTF-8 string; this `.value()` unwrap will correctly throw a
+    // `std::bad_optional_access` exception if that invariant does not hold.
+    auto seed = MnemonicSeed::ForPhrase(language, mnemonic).value();
+
+    // Verify that the seed data is valid entropy for unified spending keys at
+    // account 0 and at both the public & private chain levels for account 0x7FFFFFFF.
+    // It is not necessary to check for a valid diversified Sapling address at
+    // account 0x7FFFFFFF because derivation via the legacy path can simply search
+    // for a valid diversifier; unlike in the unified spending key case, diversifier
+    // indices don't need to line up with anything.
+    if (ZcashdUnifiedSpendingKey::ForAccount(seed, bip44CoinType, 0).has_value() &&
+        transparent::AccountKey::ForAccount(seed, bip44CoinType, ZCASH_LEGACY_ACCOUNT).has_value())  {
+        return seed;
+    } else {
+        return std::nullopt;
+    }
+}
+
+MnemonicSeed MnemonicSeed::Random(uint32_t bip44CoinType, Language language, size_t entropyLen)
+{
+    assert(entropyLen >= 32);
+    while (true) { // loop until we find usable entropy
+        RawHDSeed entropy(entropyLen, 0);
+        GetRandBytes(entropy.data(), entropyLen);
+
+        auto seed = MnemonicSeed::FromEntropy(entropy, bip44CoinType, language);
+        if (seed.has_value()) {
+            return seed.value();
+        }
+    }
+}
+
+MnemonicSeed MnemonicSeed::FromLegacySeed(const HDSeed& legacySeed, uint32_t bip44CoinType, Language language)
+{
+    auto rawSeed = legacySeed.RawSeed();
+    if (rawSeed.size() != 32) {
+        throw std::runtime_error("Mnemonic seed derivation is only supported for 32-byte legacy seeds.");
+    }
+
+    for (int nonce = 0; nonce < 256; nonce++) {
+        auto seed = MnemonicSeed::FromEntropy(rawSeed, bip44CoinType, language);
+        if (seed.has_value()) {
+            return seed.value();
+        } else {
+            rawSeed[0]++;
+        }
+    }
+
+    throw std::runtime_error("Failed to find a valid mnemonic seed that could be derived from the legacy seed.");
+}
+
diff --git a/src/zcash/address/mnemonic.h b/src/zcash/address/mnemonic.h
new file mode 100644
index 00000000000..e93fd6fe463
--- /dev/null
+++ b/src/zcash/address/mnemonic.h
@@ -0,0 +1,119 @@
+// Copyright (c) 2021 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+#ifndef ZCASH_ZCASH_ADDRESS_MNEMONIC_H
+#define ZCASH_ZCASH_ADDRESS_MNEMONIC_H
+
+#include "zip32.h"
+
+class MnemonicSeed: public HDSeed {
+private:
+    Language language;
+    SecureString mnemonic;
+
+    bool SetSeedFromMnemonic() {
+        seed.resize(64);
+        return zip339_phrase_to_seed(language, mnemonic.c_str(), (uint8_t (*)[64])seed.data());
+    }
+
+    MnemonicSeed() {}
+public:
+    static std::optional<MnemonicSeed> ForPhrase(Language languageIn, SecureString mnemonicIn) {
+        MnemonicSeed seed;
+        seed.language = languageIn;
+        seed.mnemonic = mnemonicIn;
+        if (seed.SetSeedFromMnemonic()) {
+            return seed;
+        } else {
+            return std::nullopt;
+        }
+    }
+
+    /**
+     * Randomly generate a new mnemonic seed. A SLIP-44 coin type is required to make it possible
+     * to check that the generated seed can produce valid transparent and unified addresses at account
+     * numbers 0x7FFFFFFF and 0x00 respectively.
+     */
+    static MnemonicSeed Random(uint32_t bip44CoinType, Language language = English, size_t entropyLen = 32);
+
+    static MnemonicSeed FromLegacySeed(const HDSeed& legacySeed, uint32_t bip44CoinType, Language language = English);
+
+    static std::optional<MnemonicSeed> FromEntropy(const RawHDSeed& entropy, uint32_t bip44CoinType, Language language = English);
+
+    static std::string LanguageName(Language language) {
+        switch (language) {
+            case English:
+                return "English";
+            case SimplifiedChinese:
+                return "Simplified Chinese";
+            case TraditionalChinese:
+                return "Traditional Chinese";
+            case Czech:
+                return "Czech";
+            case French:
+                return "French";
+            case Italian:
+                return "Italian";
+            case Japanese:
+                return "Japanese";
+            case Korean:
+                return "Korean";
+            case Portuguese:
+                return "Portuguese";
+            case Spanish:
+                return "Spanish";
+            default:
+                return "INVALID";
+        }
+    }
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action) {
+        if (ser_action.ForRead()) {
+            uint32_t language0;
+
+            READWRITE(language0);
+            READWRITE(mnemonic);
+            language = (Language) language0;
+            if (!SetSeedFromMnemonic()) {
+                throw std::ios_base::failure("Could not interpret the mnemonic phrase as a valid UTF-8 string.");
+            }
+        } else {
+            uint32_t language0 = (uint32_t) language;
+
+            READWRITE(language0);
+            READWRITE(mnemonic);
+        }
+   }
+
+    template <typename Stream>
+    static MnemonicSeed Read(Stream& stream) {
+        MnemonicSeed seed;
+        stream >> seed;
+        return seed;
+    }
+
+    const Language GetLanguage() const {
+        return language;
+    }
+
+    const SecureString& GetMnemonic() const {
+        return mnemonic;
+    }
+
+    friend bool operator==(const MnemonicSeed& a, const MnemonicSeed& b)
+    {
+        return a.seed == b.seed;
+    }
+
+    friend bool operator!=(const MnemonicSeed& a, const MnemonicSeed& b)
+    {
+        return !(a == b);
+    }
+};
+
+#endif // ZCASH_ZCASH_ADDRESS_MNEMONIC_H
+
diff --git a/src/zcash/address/orchard.cpp b/src/zcash/address/orchard.cpp
new file mode 100644
index 00000000000..95d32e26d71
--- /dev/null
+++ b/src/zcash/address/orchard.cpp
@@ -0,0 +1,73 @@
+// Copyright (c) 2021 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+#include "zcash/address/orchard.hpp"
+
+namespace libzcash {
+
+OrchardRawAddress OrchardIncomingViewingKey::Address(const diversifier_index_t& j) const {
+    assert(inner.get() != nullptr);
+    return OrchardRawAddress(orchard_incoming_viewing_key_to_address(inner.get(), j.begin()));
+}
+
+std::optional<diversifier_index_t> OrchardIncomingViewingKey::DecryptDiversifier(const OrchardRawAddress& addr) const {
+    assert(inner.get() != nullptr);
+    diversifier_index_t j_ret;
+    if (orchard_incoming_viewing_key_decrypt_diversifier(inner.get(), addr.inner.get(), j_ret.begin())) {
+        return j_ret;
+    } else {
+        return std::nullopt;
+    }
+}
+
+OrchardIncomingViewingKey OrchardFullViewingKey::ToIncomingViewingKey() const {
+    assert(inner.get() != nullptr);
+    return OrchardIncomingViewingKey(orchard_full_viewing_key_to_incoming_viewing_key(inner.get()));
+}
+
+OrchardIncomingViewingKey OrchardFullViewingKey::ToInternalIncomingViewingKey() const {
+    assert(inner.get() != nullptr);
+    return OrchardIncomingViewingKey(orchard_full_viewing_key_to_internal_incoming_viewing_key(inner.get()));
+}
+
+uint256 OrchardFullViewingKey::ToExternalOutgoingViewingKey() const {
+    uint256 ovk;
+    orchard_full_viewing_key_to_external_outgoing_viewing_key(inner.get(), ovk.begin());
+    return ovk;
+}
+
+uint256 OrchardFullViewingKey::ToInternalOutgoingViewingKey() const {
+    uint256 ovk;
+    orchard_full_viewing_key_to_internal_outgoing_viewing_key(inner.get(), ovk.begin());
+    return ovk;
+}
+
+OrchardRawAddress OrchardFullViewingKey::GetChangeAddress() const {
+    return ToInternalIncomingViewingKey().Address(0);
+}
+
+OrchardSpendingKey OrchardSpendingKey::ForAccount(
+        const HDSeed& seed,
+        uint32_t bip44CoinType,
+        libzcash::AccountId accountId) {
+
+    auto ptr = orchard_spending_key_for_account(
+            seed.RawSeed().data(),
+            seed.RawSeed().size(),
+            bip44CoinType,
+            accountId);
+
+    if (ptr == nullptr) {
+        throw std::ios_base::failure("Unable to generate Orchard extended spending key.");
+    }
+
+    return OrchardSpendingKey(ptr);
+}
+
+OrchardFullViewingKey OrchardSpendingKey::ToFullViewingKey() const {
+    return OrchardFullViewingKey(orchard_spending_key_to_full_viewing_key(inner.get()));
+}
+
+} //namespace libzcash
+
diff --git a/src/zcash/address/orchard.hpp b/src/zcash/address/orchard.hpp
new file mode 100644
index 00000000000..a25d3cf7b6b
--- /dev/null
+++ b/src/zcash/address/orchard.hpp
@@ -0,0 +1,303 @@
+// Copyright (c) 2021 The Zcash Developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+#ifndef ZCASH_ADDRESS_ORCHARD_H
+#define ZCASH_ADDRESS_ORCHARD_H
+
+#include "streams.h"
+#include "zcash/address/zip32.h"
+#include <rust/orchard/keys.h>
+
+#include <optional>
+
+class OrchardWallet;
+namespace orchard {
+    class Builder;
+    class UnauthorizedBundle;
+}
+
+namespace libzcash {
+
+class OrchardFullViewingKey;
+class OrchardIncomingViewingKey;
+class OrchardSpendingKey;
+
+class OrchardRawAddress
+{
+private:
+    std::unique_ptr<OrchardRawAddressPtr, decltype(&orchard_address_free)> inner;
+
+    OrchardRawAddress() : inner(nullptr, orchard_address_free) {}
+
+    OrchardRawAddress(OrchardRawAddressPtr* ptr) : inner(ptr, orchard_address_free) {}
+
+    friend class OrchardIncomingViewingKey;
+    friend class ::OrchardWallet;
+    friend class ::orchard::Builder;
+public:
+    static OrchardRawAddress KeyIoOnlyFromReceiver(OrchardRawAddressPtr* ptr) {
+        return OrchardRawAddress(ptr);
+    }
+
+    OrchardRawAddress(OrchardRawAddress&& key) : inner(std::move(key.inner)) {}
+
+    OrchardRawAddress(const OrchardRawAddress& key) :
+        inner(orchard_address_clone(key.inner.get()), orchard_address_free) {}
+
+    OrchardRawAddress& operator=(OrchardRawAddress&& key)
+    {
+        if (this != &key) {
+            inner = std::move(key.inner);
+        }
+        return *this;
+    }
+
+    OrchardRawAddress& operator=(const OrchardRawAddress& key)
+    {
+        if (this != &key) {
+            inner.reset(orchard_address_clone(key.inner.get()));
+        }
+        return *this;
+    }
+
+    friend bool operator==(const OrchardRawAddress& c1, const OrchardRawAddress& c2) {
+        return orchard_address_eq(c1.inner.get(), c2.inner.get());
+    }
+
+    friend bool operator<(const OrchardRawAddress& c1, const OrchardRawAddress& c2) {
+        return orchard_address_lt(c1.inner.get(), c2.inner.get());
+    }
+
+    template<typename Stream>
+    void Serialize(Stream& s) const {
+        RustStream rs(s);
+        if (!orchard_raw_address_serialize(inner.get(), &rs, RustStream<Stream>::write_callback)) {
+            throw std::ios_base::failure("Failed to serialize Orchard raw address to bytes");
+        }
+    }
+
+    template<typename Stream>
+    void Unserialize(Stream& s) {
+        RustStream rs(s);
+        OrchardRawAddressPtr* addr = orchard_raw_address_parse(&rs, RustStream<Stream>::read_callback);
+        if (addr == nullptr) {
+            throw std::ios_base::failure("Failed to parse Orchard raw address bytes");
+        }
+        inner.reset(addr);
+    }
+
+    template<typename Stream>
+    static OrchardRawAddress Read(Stream& stream) {
+        OrchardRawAddress key;
+        stream >> key;
+        return key;
+    }
+};
+
+class OrchardIncomingViewingKey
+{
+private:
+    std::unique_ptr<OrchardIncomingViewingKeyPtr, decltype(&orchard_incoming_viewing_key_free)> inner;
+
+    OrchardIncomingViewingKey(OrchardIncomingViewingKeyPtr* key) :
+        inner(key, orchard_incoming_viewing_key_free) {}
+
+    friend class OrchardFullViewingKey;
+    friend class OrchardSpendingKey;
+    friend class ::OrchardWallet;
+public:
+    // DO NOT USE - this is exposed for serialization purposes only.
+    OrchardIncomingViewingKey() :
+        inner(nullptr, orchard_incoming_viewing_key_free) {}
+
+    OrchardIncomingViewingKey(OrchardIncomingViewingKey&& key) : inner(std::move(key.inner)) {}
+
+    OrchardIncomingViewingKey(const OrchardIncomingViewingKey& key) :
+        inner(orchard_incoming_viewing_key_clone(key.inner.get()), orchard_incoming_viewing_key_free) {}
+
+    OrchardRawAddress Address(const diversifier_index_t& j) const;
+
+    /**
+     * Decrypts the diversifier for the given raw address, and returns it if that
+     * address was derived from this IVK; otherwise returns std::nullopt;
+     */
+    std::optional<diversifier_index_t> DecryptDiversifier(const OrchardRawAddress& addr) const;
+
+    OrchardIncomingViewingKey& operator=(OrchardIncomingViewingKey&& key)
+    {
+        if (this != &key) {
+            inner = std::move(key.inner);
+        }
+        return *this;
+    }
+
+    OrchardIncomingViewingKey& operator=(const OrchardIncomingViewingKey& key)
+    {
+        if (this != &key) {
+            inner.reset(orchard_incoming_viewing_key_clone(key.inner.get()));
+        }
+        return *this;
+    }
+
+    friend bool operator==(const OrchardIncomingViewingKey& a, const OrchardIncomingViewingKey& b)
+    {
+        assert(a.inner.get() != nullptr);
+        assert(b.inner.get() != nullptr);
+        return orchard_incoming_viewing_key_eq(a.inner.get(), b.inner.get());
+    }
+
+    friend bool operator<(const OrchardIncomingViewingKey& c1, const OrchardIncomingViewingKey& c2) {
+        assert(c1.inner.get() != nullptr);
+        assert(c2.inner.get() != nullptr);
+        return orchard_incoming_viewing_key_lt(c1.inner.get(), c2.inner.get());
+    }
+
+    template<typename Stream>
+    void Serialize(Stream& s) const {
+        assert(inner.get() != nullptr);
+        RustStream rs(s);
+        if (!orchard_incoming_viewing_key_serialize(inner.get(), &rs, RustStream<Stream>::write_callback)) {
+            throw std::ios_base::failure("Failed to serialize Orchard incoming viewing key");
+        }
+    }
+
+    template<typename Stream>
+    void Unserialize(Stream& s) {
+        RustStream rs(s);
+        OrchardIncomingViewingKeyPtr* key = orchard_incoming_viewing_key_parse(&rs, RustStream<Stream>::read_callback);
+        if (key == nullptr) {
+            throw std::ios_base::failure("Failed to parse Orchard incoming viewing key");
+        }
+        inner.reset(key);
+    }
+
+    template<typename Stream>
+    static OrchardIncomingViewingKey Read(Stream& stream) {
+        OrchardIncomingViewingKey key;
+        stream >> key;
+        return key;
+    }
+};
+
+class OrchardFullViewingKey
+{
+private:
+    std::unique_ptr<OrchardFullViewingKeyPtr, decltype(&orchard_full_viewing_key_free)> inner;
+
+    OrchardFullViewingKey() : inner(nullptr, orchard_full_viewing_key_free) {}
+
+    OrchardFullViewingKey(OrchardFullViewingKeyPtr* ptr) :
+        inner(ptr, orchard_full_viewing_key_free) {}
+
+    friend class OrchardSpendingKey;
+    friend class ::OrchardWallet;
+public:
+    OrchardFullViewingKey(OrchardFullViewingKey&& key) : inner(std::move(key.inner)) {}
+
+    OrchardFullViewingKey(const OrchardFullViewingKey& key) :
+        inner(orchard_full_viewing_key_clone(key.inner.get()), orchard_full_viewing_key_free) {}
+
+    OrchardIncomingViewingKey ToIncomingViewingKey() const;
+
+    OrchardIncomingViewingKey ToInternalIncomingViewingKey() const;
+
+    uint256 ToExternalOutgoingViewingKey() const;
+
+    uint256 ToInternalOutgoingViewingKey() const;
+
+    libzcash::OrchardRawAddress GetChangeAddress() const;
+
+    OrchardFullViewingKey& operator=(OrchardFullViewingKey&& key)
+    {
+        if (this != &key) {
+            inner = std::move(key.inner);
+        }
+        return *this;
+    }
+
+    OrchardFullViewingKey& operator=(const OrchardFullViewingKey& key)
+    {
+        if (this != &key) {
+            inner.reset(orchard_full_viewing_key_clone(key.inner.get()));
+        }
+        return *this;
+    }
+
+    friend bool operator==(const OrchardFullViewingKey& a, const OrchardFullViewingKey& b)
+    {
+        return orchard_full_viewing_key_eq(a.inner.get(), b.inner.get());
+    }
+
+    template<typename Stream>
+    void Serialize(Stream& s) const {
+        RustStream rs(s);
+        if (!orchard_full_viewing_key_serialize(inner.get(), &rs, RustStream<Stream>::write_callback)) {
+            throw std::ios_base::failure("Failed to serialize Orchard full viewing key");
+        }
+    }
+
+    template<typename Stream>
+    void Unserialize(Stream& s) {
+        RustStream rs(s);
+        OrchardFullViewingKeyPtr* key = orchard_full_viewing_key_parse(&rs, RustStream<Stream>::read_callback);
+        if (key == nullptr) {
+            throw std::ios_base::failure("Failed to parse Orchard full viewing key");
+        }
+        inner.reset(key);
+    }
+
+    template<typename Stream>
+    static OrchardFullViewingKey Read(Stream& stream) {
+        OrchardFullViewingKey key;
+        stream >> key;
+        return key;
+    }
+};
+
+class OrchardSpendingKey
+{
+private:
+    std::unique_ptr<OrchardSpendingKeyPtr, decltype(&orchard_spending_key_free)> inner;
+
+    OrchardSpendingKey() : inner(nullptr, orchard_spending_key_free) {}
+
+    OrchardSpendingKey(OrchardSpendingKeyPtr* ptr) :
+        inner(ptr, orchard_spending_key_free) {}
+
+    friend class orchard::UnauthorizedBundle;
+    friend class ::OrchardWallet;
+public:
+    OrchardSpendingKey(OrchardSpendingKey&& key) : inner(std::move(key.inner)) {}
+
+    OrchardSpendingKey(const OrchardSpendingKey& key) :
+        inner(orchard_spending_key_clone(key.inner.get()), orchard_spending_key_free) {}
+
+    static OrchardSpendingKey ForAccount(
+            const HDSeed& seed,
+            uint32_t bip44CoinType,
+            libzcash::AccountId accountId);
+
+    OrchardFullViewingKey ToFullViewingKey() const;
+
+    OrchardSpendingKey& operator=(OrchardSpendingKey&& key)
+    {
+        if (this != &key) {
+            inner = std::move(key.inner);
+        }
+        return *this;
+    }
+
+    OrchardSpendingKey& operator=(const OrchardSpendingKey& key)
+    {
+        if (this != &key) {
+            inner.reset(orchard_spending_key_clone(key.inner.get()));
+        }
+        return *this;
+    }
+};
+
+} // namespace libzcash
+
+#endif // ZCASH_ADDRESS_ORCHARD_H
+
diff --git a/src/zcash/address/sapling.hpp b/src/zcash/address/sapling.hpp
index b4cccd0f135..9db3a605ddc 100644
--- a/src/zcash/address/sapling.hpp
+++ b/src/zcash/address/sapling.hpp
@@ -133,7 +133,7 @@ class SaplingSpendingKey : public uint256 {
     SaplingExpandedSpendingKey expanded_spending_key() const;
     SaplingFullViewingKey full_viewing_key() const;
 
-    // Can derive Sapling addr from default diversifier 
+    // Can derive Sapling addr from default diversifier
     SaplingPaymentAddress default_address() const;
 };
 
diff --git a/src/zcash/address/transparent.cpp b/src/zcash/address/transparent.cpp
new file mode 100644
index 00000000000..824debfe833
--- /dev/null
+++ b/src/zcash/address/transparent.cpp
@@ -0,0 +1,122 @@
+// Copyright (c) 2021 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+#include <rust/unified_keys.h>
+
+#include "streams.h"
+#include "transparent.h"
+
+namespace libzcash {
+namespace transparent {
+
+std::optional<CPubKey> AccountPubKey::DeriveExternal(uint32_t addrIndex) const {
+    auto externalKey = pubkey.Derive(0);
+    if (!externalKey.has_value()) return std::nullopt;
+    auto childKey = externalKey.value().Derive(addrIndex);
+    if (!childKey.has_value()) return std::nullopt;
+    return childKey.value().GetPubKey();
+}
+
+std::optional<CPubKey> AccountPubKey::DeriveInternal(uint32_t addrIndex) const {
+    auto internalKey = pubkey.Derive(1);
+    if (!internalKey.has_value()) return std::nullopt;
+    auto childKey = internalKey.value().Derive(addrIndex);
+    if (!childKey.has_value()) return std::nullopt;
+    return childKey.value().GetPubKey();
+}
+
+std::optional<CKeyID> AccountPubKey::GetChangeAddress(const diversifier_index_t& j) const {
+    auto childIndex = j.ToTransparentChildIndex();
+    if (!childIndex.has_value()) return std::nullopt;
+
+    auto changeKey = this->DeriveInternal(childIndex.value());
+    if (!changeKey.has_value())  return std::nullopt;
+
+    return changeKey.value().GetID();
+}
+
+std::pair<uint256, uint256> AccountPubKey::GetOVKsForShielding() const {
+    CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
+    ss << pubkey;
+    assert(ss.size() == 65);
+    CSerializeData ss_bytes(ss.begin(), ss.end());
+
+    uint256 internalOVK;
+    uint256 externalOVK;
+
+    assert(transparent_key_ovks(
+        reinterpret_cast<unsigned char*>(ss_bytes.data()),
+        internalOVK.begin(),
+        externalOVK.begin()));
+
+    return std::make_pair(internalOVK, externalOVK);
+}
+
+std::optional<std::pair<CKeyID, diversifier_index_t>> AccountPubKey::FindChangeAddress(diversifier_index_t j) const {
+    while (true) {
+        auto childIndex = j.ToTransparentChildIndex();
+        if (!childIndex.has_value()) return std::nullopt;
+
+        auto changeKey = this->DeriveInternal(childIndex.value());
+        if (changeKey.has_value()) {
+            return std::make_pair(changeKey.value().GetID(), j);
+        } else {
+            j.increment();
+        }
+    }
+    return std::nullopt;
+}
+
+std::optional<AccountKey> AccountKey::ForAccount(
+        const HDSeed& seed,
+        uint32_t bip44CoinType,
+        AccountId accountId) {
+    auto rawSeed = seed.RawSeed();
+    auto m = CExtKey::Master(rawSeed.data(), rawSeed.size());
+    if (!m.has_value()) return std::nullopt;
+
+    // We use a fixed keypath scheme of m/44'/coin_type'/account'
+    // Derive m/44'
+    auto m_44h = m.value().Derive(44 | HARDENED_KEY_LIMIT);
+    if (!m_44h.has_value()) return std::nullopt;
+
+    // Derive m/44'/coin_type'
+    auto m_44h_cth = m_44h.value().Derive(bip44CoinType | HARDENED_KEY_LIMIT);
+    if (!m_44h_cth.has_value()) return std::nullopt;
+
+    // Derive m/44'/coin_type'/account_id'
+    auto accountKeyOpt = m_44h_cth.value().Derive(accountId | HARDENED_KEY_LIMIT);
+    if (!accountKeyOpt.has_value()) return std::nullopt;
+
+    auto accountKey = accountKeyOpt.value();
+    auto external = accountKey.Derive(0);
+    auto internal = accountKey.Derive(1);
+
+    if (!(external.has_value() && internal.has_value())) return std::nullopt;
+
+    return AccountKey(accountKey, external.value(), internal.value());
+}
+
+std::optional<CKey> AccountKey::DeriveExternalSpendingKey(uint32_t addrIndex) const {
+    auto childKey = external.Derive(addrIndex);
+    if (!childKey.has_value()) return std::nullopt;
+
+    return childKey.value().key;
+}
+
+std::optional<CKey> AccountKey::DeriveInternalSpendingKey(uint32_t addrIndex) const {
+    auto childKey = internal.Derive(addrIndex);
+    if (!childKey.has_value()) return std::nullopt;
+
+    return childKey.value().key;
+}
+
+AccountPubKey AccountKey::ToAccountPubKey() const {
+    // The .value() call is safe here because we never derive
+    // non-compressed public keys.
+    return accountKey.Neuter().ToChainablePubKey().value();
+}
+
+} //namespace transparent
+} //namespace libzcash
diff --git a/src/zcash/address/transparent.h b/src/zcash/address/transparent.h
new file mode 100644
index 00000000000..dd8fd579d9d
--- /dev/null
+++ b/src/zcash/address/transparent.h
@@ -0,0 +1,112 @@
+// Copyright (c) 2021 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+#ifndef ZCASH_ZCASH_ADDRESS_TRANSPARENT_H
+#define ZCASH_ZCASH_ADDRESS_TRANSPARENT_H
+
+#include "zip32.h"
+
+namespace libzcash {
+namespace transparent {
+
+class AccountPubKey {
+private:
+    CChainablePubKey pubkey;
+public:
+    AccountPubKey(CChainablePubKey pubkey): pubkey(pubkey) {};
+
+    const CChainablePubKey& GetChainablePubKey() const {
+        return pubkey;
+    }
+
+    std::optional<CPubKey> DeriveExternal(uint32_t addrIndex) const;
+
+    std::optional<CPubKey> DeriveInternal(uint32_t addrIndex) const;
+
+    /**
+     * Return the transparent change address for this key a the given diversifier
+     * index, if that index is valid for a transparent address and if key
+     * derivation is successful.
+     */
+    std::optional<CKeyID> GetChangeAddress(const diversifier_index_t& j) const;
+
+    /**
+     * Search the space of valid child indices starting at the given index, and
+     * return the change address corresponding to the first index at which a
+     * valid address is derived, along with that index. This will always return
+     * a valid address unless the space of valid transparent child indices is
+     * exhausted or the provided diversifier index exceeds the maximum allowed
+     * non-hardened transparent child index.
+     */
+    std::optional<std::pair<CKeyID, diversifier_index_t>> FindChangeAddress(diversifier_index_t j) const;
+
+    /**
+     * Return the internal and external OVKs for shielding from transparent
+     * addresses derived from this key.
+     */
+    std::pair<uint256, uint256> GetOVKsForShielding() const;
+
+    friend bool operator==(const AccountPubKey& a, const AccountPubKey& b)
+    {
+        return a.pubkey == b.pubkey;
+    }
+};
+
+class AccountKey {
+private:
+    CExtKey accountKey;
+    CExtKey external;
+    CExtKey internal;
+
+    AccountKey(CExtKey accountKeyIn, CExtKey externalIn, CExtKey internalIn):
+        accountKey(accountKeyIn), external(externalIn), internal(internalIn) {}
+public:
+    static std::optional<AccountKey> ForAccount(
+            const HDSeed& mnemonic,
+            uint32_t bip44CoinType,
+            libzcash::AccountId accountId);
+
+    static HDKeyPath KeyPath(uint32_t bip44CoinType, libzcash::AccountId accountId) {
+        return
+            "m/44'/" +
+            std::to_string(bip44CoinType) + "'/" +
+            std::to_string(accountId) + "'";
+    }
+
+    static HDKeyPath KeyPath(uint32_t bip44CoinType, libzcash::AccountId accountId, bool external, uint32_t childIndex) {
+        return
+            AccountKey::KeyPath(bip44CoinType, accountId) + "/" +
+            (external ? "0/" : "1/") +
+            std::to_string(childIndex);
+    }
+
+    /**
+     * Generate the key corresponding to the specified index at the "external child"
+     * level of the TRANSPARENT path for the account.
+     */
+    std::optional<CKey> DeriveExternalSpendingKey(uint32_t addrIndex) const;
+
+    /**
+     * Generate the key corresponding to the specified index at the "internal child"
+     * level of the TRANSPARENT path for the account. This should probably only usually be
+     * used at address index 0, but ordinarily it won't need to be used at all since
+     * all change should be shielded by default.
+     */
+    std::optional<CKey> DeriveInternalSpendingKey(uint32_t addrIndex = 0) const;
+
+    /**
+     * Return the public key associated with this spending key.
+     */
+    AccountPubKey ToAccountPubKey() const;
+
+    friend bool operator==(const AccountKey& a, const AccountKey& b)
+    {
+        return a.accountKey == b.accountKey;
+    }
+};
+
+} //namespace transparent
+} //namespace libzcash
+
+#endif // ZCASH_ZCASH_ADDRESS_TRANSPARENT_H
diff --git a/src/zcash/address/unified.cpp b/src/zcash/address/unified.cpp
new file mode 100644
index 00000000000..dd82feb5182
--- /dev/null
+++ b/src/zcash/address/unified.cpp
@@ -0,0 +1,257 @@
+// Copyright (c) 2021 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+#include "tinyformat.h"
+#include "zcash/Address.hpp"
+#include "unified.h"
+#include "util/match.h"
+#include "utilstrencodings.h"
+
+#include <rust/unified_keys.h>
+
+using namespace libzcash;
+
+//
+// Unified Keys
+//
+
+bool libzcash::HasShielded(const std::set<ReceiverType>& receiverTypes) {
+    auto has_shielded = [](ReceiverType r) {
+        // TODO: update this as support for new shielded protocols is added.
+        return r == ReceiverType::Sapling || r == ReceiverType::Orchard;
+    };
+    return std::find_if(receiverTypes.begin(), receiverTypes.end(), has_shielded) != receiverTypes.end();
+}
+
+bool libzcash::HasTransparent(const std::set<ReceiverType>& receiverTypes) {
+    auto has_transparent = [](ReceiverType r) {
+        // TODO: update this as support for new transparent protocols is added.
+        return r == ReceiverType::P2PKH || r == ReceiverType::P2SH;
+    };
+    return std::find_if(receiverTypes.begin(), receiverTypes.end(), has_transparent) != receiverTypes.end();
+}
+
+Receiver libzcash::RecipientAddressToReceiver(const RecipientAddress& recipient) {
+    return std::visit(match {
+        [](const CKeyID& key) { return Receiver(key); },
+        [](const CScriptID& scriptId) { return Receiver(scriptId); },
+        [](const libzcash::OrchardRawAddress& addr) { return Receiver(addr); },
+        [](const libzcash::SaplingPaymentAddress& addr) { return Receiver(addr); }
+    }, recipient);
+}
+
+std::string libzcash::DebugPrintReceiver(const Receiver& receiver) {
+    return std::visit(match {
+        [&](const OrchardRawAddress &zaddr) {
+            CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
+            ss << zaddr;
+            return tfm::format("Orchard(%s)", HexStr(ss.begin(), ss.end()));
+        },
+        [&](const SaplingPaymentAddress &zaddr) {
+            CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
+            ss << zaddr;
+            return tfm::format("Sapling(%s)", HexStr(ss.begin(), ss.end()));
+        },
+        [&](const CScriptID &p2sh) {
+            return tfm::format("P2SH(%s)", p2sh.GetHex());
+        },
+        [&](const CKeyID &p2pkh) {
+            return tfm::format("P2PKH(%s)", p2pkh.GetHex());
+        },
+        [&](const UnknownReceiver &unknown) {
+            return tfm::format(
+                "Unknown(%x, %s)",
+                unknown.typecode,
+                HexStr(unknown.data.begin(), unknown.data.end()));
+        }
+    }, receiver);
+};
+
+std::string libzcash::DebugPrintRecipientAddress(const RecipientAddress& addr) {
+    return DebugPrintReceiver(RecipientAddressToReceiver(addr));
+}
+
+std::optional<ZcashdUnifiedSpendingKey> ZcashdUnifiedSpendingKey::ForAccount(
+        const HDSeed& seed,
+        uint32_t bip44CoinType,
+        AccountId accountId) {
+
+    auto transparentKey = transparent::AccountKey::ForAccount(seed, bip44CoinType, accountId);
+    if (!transparentKey.has_value()) return std::nullopt;
+
+    auto saplingKey = SaplingExtendedSpendingKey::ForAccount(seed, bip44CoinType, accountId);
+
+    auto orchardKey = OrchardSpendingKey::ForAccount(seed, bip44CoinType, accountId);
+
+    return ZcashdUnifiedSpendingKey(transparentKey.value(), saplingKey.first, orchardKey);
+}
+
+UnifiedFullViewingKey ZcashdUnifiedSpendingKey::ToFullViewingKey() const {
+    UnifiedFullViewingKeyBuilder builder;
+
+    builder.AddTransparentKey(transparentKey.ToAccountPubKey());
+    builder.AddSaplingKey(saplingKey.ToXFVK());
+    builder.AddOrchardKey(orchardKey.ToFullViewingKey());
+
+    // This call to .value() is safe as ZcashdUnifiedSpendingKey values are always
+    // constructed to contain all required components.
+    return builder.build().value();
+}
+
+ZcashdUnifiedFullViewingKey ZcashdUnifiedFullViewingKey::FromUnifiedFullViewingKey(
+        const KeyConstants& keyConstants,
+        const UnifiedFullViewingKey& ufvk) {
+    ZcashdUnifiedFullViewingKey result;
+    result.keyId = ufvk.GetKeyID(keyConstants);
+
+    auto transparentKey = ufvk.GetTransparentKey();
+    if (transparentKey.has_value()) {
+        result.transparentKey = transparentKey.value();
+    }
+
+    auto saplingKey = ufvk.GetSaplingKey();
+    if (saplingKey.has_value()) {
+        result.saplingKey = saplingKey.value();
+    }
+
+    auto orchardKey = ufvk.GetOrchardKey();
+    if (orchardKey.has_value()) {
+        result.orchardKey = orchardKey.value();
+    }
+
+    return result;
+}
+
+UnifiedAddressGenerationResult ZcashdUnifiedFullViewingKey::Address(
+        const diversifier_index_t& j,
+        const std::set<ReceiverType>& receiverTypes) const
+{
+    if (!HasShielded(receiverTypes)) {
+        return UnifiedAddressGenerationError::ShieldedReceiverNotFound;
+    }
+
+    if (receiverTypes.count(ReceiverType::P2SH) > 0) {
+        return UnifiedAddressGenerationError::ReceiverTypeNotAvailable;
+    }
+
+    UnifiedAddress ua;
+    if (receiverTypes.count(ReceiverType::Orchard) > 0) {
+        if (orchardKey.has_value()) {
+            ua.AddReceiver(orchardKey.value().ToIncomingViewingKey().Address(j));
+        } else {
+            return UnifiedAddressGenerationError::ReceiverTypeNotAvailable;
+        }
+    }
+
+    if (receiverTypes.count(ReceiverType::Sapling) > 0) {
+        if (saplingKey.has_value()) {
+            auto saplingAddress = saplingKey.value().Address(j);
+            if (saplingAddress.has_value()) {
+                ua.AddReceiver(saplingAddress.value());
+            } else {
+                return UnifiedAddressGenerationError::NoAddressForDiversifier;
+            }
+        } else {
+            return UnifiedAddressGenerationError::ReceiverTypeNotAvailable;
+        }
+    }
+
+    if (receiverTypes.count(ReceiverType::P2PKH) > 0) {
+        if (transparentKey.has_value()) {
+            const auto& tkey = transparentKey.value();
+
+            auto childIndex = j.ToTransparentChildIndex();
+            if (!childIndex.has_value()) return UnifiedAddressGenerationError::InvalidTransparentChildIndex;
+
+            auto externalPubkey = tkey.DeriveExternal(childIndex.value());
+            if (!externalPubkey.has_value()) return UnifiedAddressGenerationError::NoAddressForDiversifier;
+
+            ua.AddReceiver(externalPubkey.value().GetID());
+        } else {
+            return UnifiedAddressGenerationError::ReceiverTypeNotAvailable;
+        }
+    }
+
+    return std::make_pair(ua, j);
+}
+
+UnifiedAddressGenerationResult ZcashdUnifiedFullViewingKey::FindAddress(
+        const diversifier_index_t& j,
+        const std::set<ReceiverType>& receiverTypes) const {
+    diversifier_index_t j0(j);
+    bool hasTransparent = HasTransparent(receiverTypes);
+    do {
+        auto addr = Address(j0, receiverTypes);
+        if (addr != UnifiedAddressGenerationResult(UnifiedAddressGenerationError::NoAddressForDiversifier)) {
+            return addr;
+        }
+    } while (j0.increment());
+
+    return UnifiedAddressGenerationError::DiversifierSpaceExhausted;
+}
+
+UnifiedAddressGenerationResult ZcashdUnifiedFullViewingKey::FindAddress(
+        const diversifier_index_t& j) const {
+    return FindAddress(j, {ReceiverType::P2PKH, ReceiverType::Sapling, ReceiverType::Orchard});
+}
+
+std::optional<RecipientAddress> ZcashdUnifiedFullViewingKey::GetChangeAddress(const ChangeRequest& req) const {
+    std::optional<RecipientAddress> addr;
+    std::visit(match {
+        [&](const TransparentChangeRequest& req) {
+            if (transparentKey.has_value()) {
+                auto changeAddr = transparentKey.value().GetChangeAddress(req.GetIndex());
+                if (changeAddr.has_value()) {
+                    addr = changeAddr.value();
+                }
+            }
+        },
+        [&](const SaplingChangeRequest& req) {
+            if (saplingKey.has_value()) {
+                addr = saplingKey.value().GetChangeAddress();
+            }
+        },
+        [&](const OrchardChangeRequest& req) {
+            if (orchardKey.has_value()) {
+                addr = orchardKey.value().GetChangeAddress();
+            }
+        }
+    }, req);
+    return addr;
+}
+
+std::optional<RecipientAddress> ZcashdUnifiedFullViewingKey::GetChangeAddress(
+        const std::set<OutputPool>& allowedPools) const {
+    if (orchardKey.has_value() && allowedPools.count(OutputPool::Orchard) > 0) {
+        return orchardKey.value().GetChangeAddress();
+    }
+    if (saplingKey.has_value() && allowedPools.count(OutputPool::Sapling) > 0) {
+        return saplingKey.value().GetChangeAddress();
+    }
+    if (transparentKey.has_value() && allowedPools.count(OutputPool::Transparent) > 0) {
+        auto changeAddr = transparentKey.value().GetChangeAddress(diversifier_index_t(0));
+        if (changeAddr.has_value()) {
+            return changeAddr.value();
+        }
+    }
+    return std::nullopt;
+}
+
+UnifiedFullViewingKey ZcashdUnifiedFullViewingKey::ToFullViewingKey() const {
+    UnifiedFullViewingKeyBuilder builder;
+
+    if (transparentKey.has_value()) {
+        builder.AddTransparentKey(transparentKey.value());
+    }
+    if (saplingKey.has_value()) {
+        builder.AddSaplingKey(saplingKey.value());
+    }
+    if (orchardKey.has_value()) {
+        builder.AddOrchardKey(orchardKey.value());
+    }
+
+    // This call to .value() is safe as ZcashdUnifiedFullViewingKey values are always
+    // constructed to contain all required components.
+    return builder.build().value();
+}
diff --git a/src/zcash/address/unified.h b/src/zcash/address/unified.h
new file mode 100644
index 00000000000..b9e648e611b
--- /dev/null
+++ b/src/zcash/address/unified.h
@@ -0,0 +1,291 @@
+// Copyright (c) 2021 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+#ifndef ZCASH_ZCASH_ADDRESS_UNIFIED_H
+#define ZCASH_ZCASH_ADDRESS_UNIFIED_H
+
+#include "transparent.h"
+#include "key_constants.h"
+#include "script/script.h"
+#include "zcash/address/orchard.hpp"
+#include "zip32.h"
+
+#include <variant>
+
+namespace libzcash {
+
+// prototypes for the classes handling ZIP-316 encoding (in Address.hpp)
+// TODO: ZIP-316 encoding should probably be moved here
+class UnifiedAddress;
+class UnifiedFullViewingKey;
+
+enum class ReceiverType: uint32_t {
+    P2PKH = 0x00,
+    P2SH = 0x01,
+    Sapling = 0x02,
+    Orchard = 0x03
+};
+
+/**
+ * An enumeration of the fund pools for which a transaction may produce outputs.
+ * It is sorted in descending preference order, so that when iterating over a
+ * set of output pools the most-preferred pool is selected first.
+ */
+enum class OutputPool {
+    Orchard,
+    Sapling,
+    Transparent,
+};
+
+enum class UnifiedAddressGenerationError {
+    ShieldedReceiverNotFound,
+    ReceiverTypeNotAvailable,
+    NoAddressForDiversifier,
+    DiversifierSpaceExhausted,
+    InvalidTransparentChildIndex
+};
+
+typedef std::variant<
+    std::pair<UnifiedAddress, diversifier_index_t>,
+    UnifiedAddressGenerationError> UnifiedAddressGenerationResult;
+
+/** A recipient address to which a unified address can be resolved */
+typedef std::variant<
+    CKeyID,
+    CScriptID,
+    libzcash::SaplingPaymentAddress,
+    libzcash::OrchardRawAddress> RecipientAddress;
+
+std::string DebugPrintRecipientAddress(const RecipientAddress& add);
+
+class TransparentChangeRequest {
+private:
+    const diversifier_index_t& index;
+public:
+    TransparentChangeRequest(const diversifier_index_t& indexIn): index(indexIn) {}
+
+    const diversifier_index_t& GetIndex() const {
+        return index;
+    }
+};
+
+class SaplingChangeRequest {};
+class OrchardChangeRequest {};
+
+typedef std::variant<
+    TransparentChangeRequest,
+    SaplingChangeRequest,
+    OrchardChangeRequest> ChangeRequest;
+
+/**
+ * Test whether the specified list of receiver types contains a
+ * shielded receiver type
+ */
+bool HasShielded(const std::set<ReceiverType>& receiverTypes);
+
+/**
+ * Test whether the specified list of receiver types contains a
+ * shielded receiver type
+ */
+bool HasTransparent(const std::set<ReceiverType>& receiverTypes);
+
+class ZcashdUnifiedSpendingKey;
+
+class UnknownReceiver {
+public:
+    uint32_t typecode;
+    std::vector<uint8_t> data;
+
+    UnknownReceiver(uint32_t typecode, std::vector<uint8_t> data) :
+        typecode(typecode), data(data) {}
+
+    friend inline bool operator==(const UnknownReceiver& a, const UnknownReceiver& b) {
+        return a.typecode == b.typecode && a.data == b.data;
+    }
+    friend inline bool operator<(const UnknownReceiver& a, const UnknownReceiver& b) {
+        // We don't know for certain the preference order of unknown receivers, but it is
+        // _likely_ that the higher typecode has higher preference. The exact sort order
+        // doesn't really matter, as unknown receivers have lower preference than known
+        // receivers.
+        return (a.typecode > b.typecode ||
+                (a.typecode == b.typecode && a.data < b.data));
+    }
+};
+
+/**
+ * Receivers that can appear in a Unified Address.
+ *
+ * These types are given in order of preference (as defined in ZIP 316), so that sorting
+ * variants by `operator<` is equivalent to sorting by preference.
+ */
+typedef std::variant<
+    OrchardRawAddress,
+    SaplingPaymentAddress,
+    CScriptID,
+    CKeyID,
+    UnknownReceiver> Receiver;
+
+Receiver RecipientAddressToReceiver(const RecipientAddress& recipient);
+
+std::string DebugPrintReceiver(const Receiver& receiver);
+
+/**
+ * An internal identifier for a unified full viewing key, derived as a
+ * blake2b hash of the serialized form of the UFVK.
+ */
+class UFVKId: public uint256 {
+public:
+    UFVKId() : uint256() {}
+    UFVKId(const uint256& in) : uint256(in) {}
+};
+
+/**
+ * An internal-only type for unified full viewing keys that represents only the
+ * set of receiver types that are supported by zcashd. This type does not
+ * support round-trip serialization to and from the UnifiedFullViewingKey type,
+ * which should be used in most cases.
+ */
+class ZcashdUnifiedFullViewingKey {
+private:
+    UFVKId keyId;
+    std::optional<transparent::AccountPubKey> transparentKey;
+    std::optional<SaplingDiversifiableFullViewingKey> saplingKey;
+    std::optional<OrchardFullViewingKey> orchardKey;
+
+    ZcashdUnifiedFullViewingKey() {}
+
+    friend class ZcashdUnifiedSpendingKey;
+public:
+    /**
+     * This constructor is lossy; it ignores unknown receiver types
+     * and therefore does not support round-trip transformations.
+     */
+    static ZcashdUnifiedFullViewingKey FromUnifiedFullViewingKey(
+            const KeyConstants& keyConstants,
+            const UnifiedFullViewingKey& ufvk);
+
+    const UFVKId& GetKeyID() const {
+        return keyId;
+    }
+
+    /**
+     * Return the transparent key at the account level;
+     */
+    const std::optional<transparent::AccountPubKey>& GetTransparentKey() const {
+        return transparentKey;
+    }
+
+    const std::optional<SaplingDiversifiableFullViewingKey>& GetSaplingKey() const {
+        return saplingKey;
+    }
+
+    const std::optional<OrchardFullViewingKey>& GetOrchardKey() const {
+        return orchardKey;
+    }
+
+    /**
+     * Creates a new unified address having the specified receiver types, at the specified
+     * diversifier index, unless the diversifer index would generate an invalid receiver.
+     * Returns UnifiedAddressGenerationError::NoAddressForDiversifier if the diversifier
+     * index does not produce a valid receiver for one or more of the specified receiver
+     * types; under this circumstance, the caller should usually try successive diversifier
+     * indices until the operation returns a valid address. Returns
+     * `UnifiedAddressGenerationError::InvalidTransparentChildIndex` if a transparent
+     * receiver was requested but the specified diversifier was out of range.
+     *
+     * If successful in deriving an address, this method returns a `UnifiedAddressGenerationResult`
+     * holding a pair consisting of the newly derived address and the provided value `j`.
+     */
+    UnifiedAddressGenerationResult Address(
+            const diversifier_index_t& j,
+            const std::set<ReceiverType>& receiverTypes) const;
+
+    /**
+     * Find the smallest diversifier index >= `j` such that it generates a valid
+     * unified address according to the conditions specified in the documentation
+     * for the `Address` method above, and returns the newly created address along
+     * with the diversifier index used to produce it.
+     *
+     * Returns UnifiedAddressGenerationError::NoAddressForDiversifier if the
+     * diversifier space is exhausted, or if the set of receiver types contains a
+     * transparent receiver and the diversifier exceeds the maximum transparent
+     * child index.
+     */
+    UnifiedAddressGenerationResult FindAddress(
+            const diversifier_index_t& j,
+            const std::set<ReceiverType>& receiverTypes) const;
+
+    /**
+     * Find the next available address that contains all supported receiver types.
+     */
+    UnifiedAddressGenerationResult FindAddress(const diversifier_index_t& j) const;
+
+    /**
+     * Return the change address for this UFVK, given the provided
+     * set of receiver types for pools involved in this transaction.
+     * If the provided set is empty, return the change address
+     * corresponding to the most-preferred pool. Returns `std::nullopt`
+     * if the request cannot be satisfied; for example, if a transparent
+     * change address is requested but derivation fails for the requested
+     * child index, or if the set of requested protocols does not intersect
+     * with those supported by the this UFVKs constituent keys.
+     */
+    std::optional<RecipientAddress> GetChangeAddress(const ChangeRequest& req) const;
+
+    /**
+     * Return the "best available" change address. This returns `std::nullopt`
+     * only in the case of derivation failure for all key types. This will only
+     * return a transparent change address under highly exceptional
+     * circumstances, (i.e. it was not possible to derive a change address for
+     * *any* shielded pool) in which case the change address returned will be
+     * associated with diversifier index 0.
+     */
+    std::optional<RecipientAddress> GetChangeAddress(const std::set<OutputPool>& allowedPools) const;
+
+    UnifiedFullViewingKey ToFullViewingKey() const;
+
+    friend bool operator==(const ZcashdUnifiedFullViewingKey& a, const ZcashdUnifiedFullViewingKey& b)
+    {
+        return a.transparentKey == b.transparentKey && a.saplingKey == b.saplingKey;
+    }
+};
+
+/**
+ * The type of unified spending keys supported by zcashd.
+ */
+class ZcashdUnifiedSpendingKey {
+private:
+    transparent::AccountKey transparentKey;
+    SaplingExtendedSpendingKey saplingKey;
+    OrchardSpendingKey orchardKey;
+
+    ZcashdUnifiedSpendingKey(
+            transparent::AccountKey tkey,
+            SaplingExtendedSpendingKey skey,
+            OrchardSpendingKey okey): transparentKey(tkey), saplingKey(skey), orchardKey(okey) {}
+public:
+    static std::optional<ZcashdUnifiedSpendingKey> ForAccount(
+            const HDSeed& seed,
+            uint32_t bip44CoinType,
+            libzcash::AccountId accountId);
+
+    const transparent::AccountKey& GetTransparentKey() const {
+        return transparentKey;
+    }
+
+    const SaplingExtendedSpendingKey& GetSaplingKey() const {
+        return saplingKey;
+    }
+
+    const OrchardSpendingKey& GetOrchardKey() const {
+        return orchardKey;
+    }
+
+    UnifiedFullViewingKey ToFullViewingKey() const;
+};
+
+} //namespace libzcash
+
+#endif // ZCASH_ZCASH_ADDRESS_UNIFIED_H
+
diff --git a/src/zcash/address/zip32.cpp b/src/zcash/address/zip32.cpp
index d366189602c..026dfc389f1 100644
--- a/src/zcash/address/zip32.cpp
+++ b/src/zcash/address/zip32.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2018 The Zcash developers
+// Copyright (c) 2018-2021 The Zcash developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
@@ -19,14 +19,6 @@ const unsigned char ZCASH_HD_SEED_FP_PERSONAL[BLAKE2bPersonalBytes] =
 const unsigned char ZCASH_TADDR_OVK_PERSONAL[BLAKE2bPersonalBytes] =
     {'Z', 'c', 'T', 'a', 'd', 'd', 'r', 'T', 'o', 'S', 'a', 'p', 'l', 'i', 'n', 'g'};
 
-HDSeed HDSeed::Random(size_t len)
-{
-    assert(len >= 32);
-    RawHDSeed rawSeed(len, 0);
-    GetRandBytes(rawSeed.data(), len);
-    return HDSeed(rawSeed);
-}
-
 uint256 HDSeed::Fingerprint() const
 {
     CBLAKE2bWriter h(SER_GETHASH, 0, ZCASH_HD_SEED_FP_PERSONAL);
@@ -54,6 +46,19 @@ uint256 ovkForShieldingFromTaddr(HDSeed& seed) {
 
 namespace libzcash {
 
+std::optional<uint32_t> diversifier_index_t::ToTransparentChildIndex() const {
+    // ensure that the diversifier index is small enough for a t-addr
+    if (MAX_TRANSPARENT_CHILD_IDX < *this) {
+        return std::nullopt;
+    } else {
+        return (uint32_t) GetUint64(0);
+    }
+}
+
+//
+// SaplingExtendedFullViewingKey
+//
+
 std::optional<SaplingExtendedFullViewingKey> SaplingExtendedFullViewingKey::Derive(uint32_t i) const
 {
     CDataStream ss_p(SER_NETWORK, PROTOCOL_VERSION);
@@ -61,7 +66,7 @@ std::optional<SaplingExtendedFullViewingKey> SaplingExtendedFullViewingKey::Deri
     CSerializeData p_bytes(ss_p.begin(), ss_p.end());
 
     CSerializeData i_bytes(ZIP32_XFVK_SIZE);
-    if (librustzcash_zip32_xfvk_derive(
+    if (librustzcash_zip32_sapling_xfvk_derive(
         reinterpret_cast<unsigned char*>(p_bytes.data()),
         i,
         reinterpret_cast<unsigned char*>(i_bytes.data())
@@ -75,44 +80,97 @@ std::optional<SaplingExtendedFullViewingKey> SaplingExtendedFullViewingKey::Deri
     }
 }
 
-std::optional<std::pair<diversifier_index_t, libzcash::SaplingPaymentAddress>>
-    SaplingExtendedFullViewingKey::Address(diversifier_index_t j) const
+//
+// SaplingDiversifiableFullViewingKey
+//
+
+std::optional<libzcash::SaplingPaymentAddress>
+    SaplingDiversifiableFullViewingKey::Address(diversifier_index_t j) const
 {
-    CDataStream ss_xfvk(SER_NETWORK, PROTOCOL_VERSION);
-    ss_xfvk << *this;
-    CSerializeData xfvk_bytes(ss_xfvk.begin(), ss_xfvk.end());
+    CDataStream ss_fvk(SER_NETWORK, PROTOCOL_VERSION);
+    ss_fvk << fvk;
+    CSerializeData fvk_bytes(ss_fvk.begin(), ss_fvk.end());
 
-    diversifier_index_t j_ret;
     CSerializeData addr_bytes(libzcash::SerializedSaplingPaymentAddressSize);
-    if (librustzcash_zip32_xfvk_address(
-        reinterpret_cast<unsigned char*>(xfvk_bytes.data()),
-        j.begin(), j_ret.begin(),
+    if (librustzcash_zip32_sapling_address(
+        reinterpret_cast<unsigned char*>(fvk_bytes.data()),
+        dk.begin(),
+        j.begin(),
         reinterpret_cast<unsigned char*>(addr_bytes.data()))) {
         CDataStream ss_addr(addr_bytes, SER_NETWORK, PROTOCOL_VERSION);
         libzcash::SaplingPaymentAddress addr;
         ss_addr >> addr;
-        return std::make_pair(j_ret, addr);
+        return addr;
     } else {
         return std::nullopt;
     }
 }
 
-libzcash::SaplingPaymentAddress SaplingExtendedFullViewingKey::DefaultAddress() const
+libzcash::SaplingPaymentAddress SaplingDiversifiableFullViewingKey::DefaultAddress() const
 {
-    diversifier_index_t j0;
-    auto addr = Address(j0);
-    // If we can't obtain a default address, we are *very* unlucky...
-    if (!addr) {
-        throw std::runtime_error("SaplingExtendedFullViewingKey::DefaultAddress(): No valid diversifiers out of 2^88!");
+    CDataStream ss_fvk(SER_NETWORK, PROTOCOL_VERSION);
+    ss_fvk << fvk;
+    CSerializeData fvk_bytes(ss_fvk.begin(), ss_fvk.end());
+
+    diversifier_index_t j_default;
+    diversifier_index_t j_ret;
+    CSerializeData addr_bytes_ret(libzcash::SerializedSaplingPaymentAddressSize);
+    if (librustzcash_zip32_find_sapling_address(
+        reinterpret_cast<unsigned char*>(fvk_bytes.data()),
+        dk.begin(),
+        j_default.begin(), j_ret.begin(),
+        reinterpret_cast<unsigned char*>(addr_bytes_ret.data()))) {
+        CDataStream ss_addr(addr_bytes_ret, SER_NETWORK, PROTOCOL_VERSION);
+        libzcash::SaplingPaymentAddress addr;
+        ss_addr >> addr;
+        return addr;
+    } else {
+        // If we can't obtain a default address, we are *very* unlucky...
+        throw std::runtime_error("SaplingDiversifiableFullViewingKey::DefaultAddress(): No valid diversifiers out of 2^88!");
     }
-    return addr.value().second;
 }
 
+libzcash::SaplingDiversifiableFullViewingKey SaplingDiversifiableFullViewingKey::GetInternalDFVK() const {
+    CDataStream ss_fvk(SER_NETWORK, PROTOCOL_VERSION);
+    ss_fvk << fvk;
+    CSerializeData fvk_bytes(ss_fvk.begin(), ss_fvk.end());
+
+    SaplingDiversifiableFullViewingKey internalDFVK;
+    CSerializeData fvk_bytes_ret(libzcash::SerializedSaplingFullViewingKeySize);
+    librustzcash_zip32_sapling_derive_internal_fvk(
+        reinterpret_cast<unsigned char*>(fvk_bytes.data()),
+        dk.begin(),
+        reinterpret_cast<unsigned char*>(fvk_bytes_ret.data()),
+        internalDFVK.dk.begin());
+
+    CDataStream ss_fvk_ret(fvk_bytes_ret, SER_NETWORK, PROTOCOL_VERSION);
+    ss_fvk_ret >> internalDFVK.fvk;
+    return internalDFVK;
+}
+
+libzcash::SaplingIncomingViewingKey SaplingDiversifiableFullViewingKey::GetChangeIVK() const {
+    auto internalDFVK = this->GetInternalDFVK();
+    return internalDFVK.fvk.in_viewing_key();
+}
+
+libzcash::SaplingPaymentAddress SaplingDiversifiableFullViewingKey::GetChangeAddress() const {
+    auto internalDFVK = this->GetInternalDFVK();
+    return internalDFVK.DefaultAddress();
+}
+
+std::pair<uint256, uint256> SaplingDiversifiableFullViewingKey::GetOVKs() const {
+    return std::make_pair(this->GetInternalDFVK().fvk.ovk, fvk.ovk);
+}
+
+//
+// SaplingExtendedSpendingKey
+//
+
 SaplingExtendedSpendingKey SaplingExtendedSpendingKey::Master(const HDSeed& seed)
 {
     auto rawSeed = seed.RawSeed();
     CSerializeData m_bytes(ZIP32_XSK_SIZE);
-    librustzcash_zip32_xsk_master(
+    librustzcash_zip32_sapling_xsk_master(
         rawSeed.data(),
         rawSeed.size(),
         reinterpret_cast<unsigned char*>(m_bytes.data()));
@@ -130,7 +188,7 @@ SaplingExtendedSpendingKey SaplingExtendedSpendingKey::Derive(uint32_t i) const
     CSerializeData p_bytes(ss_p.begin(), ss_p.end());
 
     CSerializeData i_bytes(ZIP32_XSK_SIZE);
-    librustzcash_zip32_xsk_derive(
+    librustzcash_zip32_sapling_xsk_derive(
         reinterpret_cast<unsigned char*>(p_bytes.data()),
         i,
         reinterpret_cast<unsigned char*>(i_bytes.data()));
@@ -141,6 +199,43 @@ SaplingExtendedSpendingKey SaplingExtendedSpendingKey::Derive(uint32_t i) const
     return xsk_i;
 }
 
+std::pair<SaplingExtendedSpendingKey, HDKeyPath> SaplingExtendedSpendingKey::ForAccount(const HDSeed& seed, uint32_t bip44CoinType, libzcash::AccountId accountId) {
+    auto m = Master(seed);
+
+    // We use a fixed keypath scheme of m/32'/coin_type'/account'
+    // Derive m/32'
+    auto m_32h = m.Derive(32 | HARDENED_KEY_LIMIT);
+    // Derive m/32'/coin_type'
+    auto m_32h_cth = m_32h.Derive(bip44CoinType | HARDENED_KEY_LIMIT);
+
+    // Derive account key at the given account index
+    auto xsk = m_32h_cth.Derive(accountId | HARDENED_KEY_LIMIT);
+
+    return std::make_pair(xsk, libzcash::Zip32AccountKeyPath(bip44CoinType, accountId));
+}
+
+std::pair<SaplingExtendedSpendingKey, HDKeyPath> SaplingExtendedSpendingKey::Legacy(const HDSeed& seed, uint32_t bip44CoinType, uint32_t addressIndex) {
+    auto m = Master(seed);
+
+    // We use a fixed keypath scheme of m/32'/coin_type'/0x7FFFFFFF'/addressIndex'
+    // This is not a "standard" path, but instead is a predictable location for
+    // legacy zcashd-derived keys that is minimally different from the UA account
+    // path, while unlikely to collide with normal UA account usage.
+
+    // Derive m/32'
+    auto m_32h = m.Derive(32 | HARDENED_KEY_LIMIT);
+    // Derive m/32'/coin_type'
+    auto m_32h_cth = m_32h.Derive(bip44CoinType | HARDENED_KEY_LIMIT);
+
+    // Derive account key at the legacy account index
+    auto m_32h_cth_l = m_32h_cth.Derive(ZCASH_LEGACY_ACCOUNT | HARDENED_KEY_LIMIT);
+
+    // Derive key at the specified address index
+    auto xsk = m_32h_cth_l.Derive(addressIndex | HARDENED_KEY_LIMIT);
+
+    return std::make_pair(xsk, libzcash::Zip32AccountKeyPath(bip44CoinType, ZCASH_LEGACY_ACCOUNT, addressIndex));
+}
+
 SaplingExtendedFullViewingKey SaplingExtendedSpendingKey::ToXFVK() const
 {
     SaplingExtendedFullViewingKey ret;
@@ -153,9 +248,51 @@ SaplingExtendedFullViewingKey SaplingExtendedSpendingKey::ToXFVK() const
     return ret;
 }
 
-libzcash::SaplingPaymentAddress SaplingExtendedSpendingKey::DefaultAddress() const
-{
-    return ToXFVK().DefaultAddress();
+SaplingExtendedSpendingKey SaplingExtendedSpendingKey::DeriveInternalKey() const {
+    CDataStream ss_p(SER_NETWORK, PROTOCOL_VERSION);
+    ss_p << *this;
+    CSerializeData external_key_bytes(ss_p.begin(), ss_p.end());
+
+    CSerializeData internal_key_bytes(ZIP32_XSK_SIZE);
+    librustzcash_zip32_sapling_xsk_derive_internal(
+        reinterpret_cast<unsigned char*>(external_key_bytes.data()),
+        reinterpret_cast<unsigned char*>(internal_key_bytes.data()));
+
+    CDataStream ss_i(internal_key_bytes, SER_NETWORK, PROTOCOL_VERSION);
+    SaplingExtendedSpendingKey xsk_internal;
+    ss_i >> xsk_internal;
+    return xsk_internal;
 }
 
+HDKeyPath Zip32AccountKeyPath(
+        uint32_t bip44CoinType,
+        libzcash::AccountId accountId,
+        std::optional<uint32_t> legacyAddressIndex) {
+    HDKeyPath addrSuffix = "";
+    if (legacyAddressIndex.has_value()) {
+        addrSuffix = "/" + std::to_string(legacyAddressIndex.value()) + "'";
+    }
+    return "m/32'/" + std::to_string(bip44CoinType) + "'/" + std::to_string(accountId) + "'" + addrSuffix;
 }
+
+std::optional<unsigned long> ParseHDKeypathAccount(uint32_t purpose, uint32_t coinType, const std::string& keyPath) {
+    std::regex pattern("m/" + std::to_string(purpose)  + "'/" + std::to_string(coinType) + "'/([0-9]+)'.*");
+    std::smatch matches;
+    if (std::regex_match(keyPath, matches, pattern)) {
+        return stoul(matches[1]);
+    } else {
+        return std::nullopt;
+    }
+}
+
+bool IsInternalKeyPath(uint32_t purpose, uint32_t coinType, const std::string& keyPath) {
+    std::regex pattern("m/" + std::to_string(purpose)  + "'/" + std::to_string(coinType) + "'/[0-9]+'/([01])/.*");
+    std::smatch matches;
+    if (std::regex_match(keyPath, matches, pattern)) {
+        return stoul(matches[1]) == 1;
+    } else {
+        return false;
+    }
+}
+
+} //namespace libzcash
diff --git a/src/zcash/address/zip32.h b/src/zcash/address/zip32.h
index 50e5516ae5c..d275d1cee88 100644
--- a/src/zcash/address/zip32.h
+++ b/src/zcash/address/zip32.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2018 The Zcash developers
+// Copyright (c) 2018-2021 The Zcash developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
@@ -6,28 +6,43 @@
 #define ZCASH_ZCASH_ADDRESS_ZIP32_H
 
 #include "serialize.h"
+#include "key.h"
 #include "support/allocators/secure.h"
 #include "uint256.h"
+#include "utiltime.h"
 #include "zcash/address/sapling.hpp"
+#include <librustzcash.h>
+#include <rust/zip339.h>
 
 #include <optional>
+#include <string>
+#include <regex>
 
-const uint32_t ZIP32_HARDENED_KEY_LIMIT = 0x80000000;
+// The minimum value for BIP-32 or ZIP-32 hardened key path element
+const uint32_t HARDENED_KEY_LIMIT = 0x80000000;
 const size_t ZIP32_XFVK_SIZE = 169;
 const size_t ZIP32_XSK_SIZE = 169;
 
 typedef std::vector<unsigned char, secure_allocator<unsigned char>> RawHDSeed;
 
+typedef std::string HDKeyPath;
+
 class HDSeed {
-private:
+protected:
     RawHDSeed seed;
 
-public:
     HDSeed() {}
+public:
     HDSeed(RawHDSeed& seedIn) : seed(seedIn) {}
 
-    static HDSeed Random(size_t len = 32);
-    bool IsNull() const { return seed.empty(); };
+    template <typename Stream>
+    static HDSeed ReadLegacy(Stream& stream) {
+        RawHDSeed rawSeed;
+        stream >> rawSeed;
+        HDSeed seed(rawSeed);
+        return seed;
+    }
+
     uint256 Fingerprint() const;
     RawHDSeed RawSeed() const { return seed; }
 
@@ -42,20 +57,165 @@ class HDSeed {
     }
 };
 
+
 // This is not part of ZIP 32, but is here because it's linked to the HD seed.
 uint256 ovkForShieldingFromTaddr(HDSeed& seed);
 
 namespace libzcash {
 
-typedef blob88 diversifier_index_t;
+typedef uint256 SeedFingerprint;
+typedef uint32_t AccountId;
+
+/**
+ * The account identifier used for HD derivation of
+ * transparent and Sapling addresses via the legacy
+ * `getnewaddress` and `z_getnewaddress` code paths,
+ */
+const AccountId ZCASH_LEGACY_ACCOUNT = HARDENED_KEY_LIMIT - 1;
+
+/**
+ * 88-bit diversifier index. This would ideally derive from base_uint
+ * but those values must have bit widths that are multiples of 32.
+ */
+class diversifier_index_t : public base_blob<88> {
+public:
+    diversifier_index_t() {}
+    diversifier_index_t(const base_blob<88>& b) : base_blob<88>(b) {}
+    diversifier_index_t(uint64_t i): base_blob<88>() {
+        data[0] = i & 0xFF;
+        data[1] = (i >> 8) & 0xFF;
+        data[2] = (i >> 16) & 0xFF;
+        data[3] = (i >> 24) & 0xFF;
+        data[4] = (i >> 32) & 0xFF;
+        data[5] = (i >> 40) & 0xFF;
+        data[6] = (i >> 48) & 0xFF;
+        data[7] = (i >> 56) & 0xFF;
+    }
+    explicit diversifier_index_t(const std::vector<unsigned char>& vch) : base_blob<88>(vch) {}
+
+    bool increment() {
+        for (int i = 0; i < 11; i++) {
+            this->data[i] += 1;
+            if (this->data[i] != 0) {
+                return true; // no overflow
+            }
+        }
+
+        return false; //overflow
+    }
+
+    std::optional<diversifier_index_t> succ() const {
+        diversifier_index_t next(*this);
+        if (next.increment()) {
+            return next;
+        } else {
+            return std::nullopt;
+        }
+    }
+
+    std::optional<uint32_t> ToTransparentChildIndex() const;
+
+    friend bool operator<(const diversifier_index_t& a, const diversifier_index_t& b) {
+        for (int i = 10; i >= 0; i--) {
+            if (a.data[i] == b.data[i]) {
+                continue;
+            } else {
+                return a.data[i] < b.data[i];
+            }
+        }
+
+        return false;
+    }
+};
+
+// The maximum allowed transparent child index according to BIP-44
+const libzcash::diversifier_index_t MAX_TRANSPARENT_CHILD_IDX(0x7FFFFFFF);
+
+class SaplingDiversifiableFullViewingKey {
+protected:
+    SaplingDiversifiableFullViewingKey GetInternalDFVK() const;
+
+public:
+    libzcash::SaplingFullViewingKey fvk;
+    uint256 dk;
+
+    // Attempts to construct a valid payment address with diversifier index
+    // `j`; returns std::nullopt if `j` does not result in a valid diversifier
+    // given this xfvk.
+    std::optional<libzcash::SaplingPaymentAddress> Address(diversifier_index_t j) const;
+
+    // Returns the first index starting from j that generates a valid
+    // payment address, along with the corresponding address. Throws
+    // a runtime error if the diversifier space is exhausted.
+    std::pair<SaplingPaymentAddress, diversifier_index_t> FindAddress(diversifier_index_t j) const {
+        auto addr = Address(j);
+        while (!addr.has_value()) {
+            if (!j.increment())
+                throw std::runtime_error(std::string(__func__) + ": diversifier index overflow.");;
+            addr = Address(j);
+        }
+        return std::make_pair(addr.value(), j);
+    }
+
+    libzcash::SaplingIncomingViewingKey ToIncomingViewingKey() const {
+        return fvk.in_viewing_key();
+    }
+
+    libzcash::SaplingPaymentAddress DefaultAddress() const;
 
-struct SaplingExtendedFullViewingKey {
+    libzcash::SaplingIncomingViewingKey GetChangeIVK() const;
+    libzcash::SaplingPaymentAddress GetChangeAddress() const;
+
+    /**
+     * Returns the (internal, external) OVKs for shielded spends
+     * from the associated spend authority.
+     */
+    std::pair<uint256, uint256> GetOVKs() const;
+
+    diversifier_index_t DecryptDiversifier(const diversifier_t& d) const {
+        diversifier_index_t j;
+        librustzcash_sapling_diversifier_index(dk.begin(), d.begin(), j.begin());
+        return j;
+    }
+
+    // Attempts to construct a valid internal payment address with diversifier
+    // index `j`; returns std::nullopt if `j` does not result in a valid diversifier
+    // given this xfvk.
+    std::optional<libzcash::SaplingPaymentAddress> InternalAddress(diversifier_index_t j) const {
+        return GetInternalDFVK().Address(j);
+    }
+
+    diversifier_index_t DecryptInternalDiversifier(const diversifier_t& d) const {
+        return GetInternalDFVK().DecryptDiversifier(d);
+    }
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action) {
+        READWRITE(fvk);
+        READWRITE(dk);
+    }
+
+    template <typename Stream>
+    static SaplingDiversifiableFullViewingKey Read(Stream& stream) {
+        SaplingDiversifiableFullViewingKey key;
+        stream >> key;
+        return key;
+    }
+
+    friend inline bool operator==(const SaplingDiversifiableFullViewingKey& a, const SaplingDiversifiableFullViewingKey& b) {
+        return (a.fvk == b.fvk && a.dk == b.dk);
+    }
+
+};
+
+class SaplingExtendedFullViewingKey: public SaplingDiversifiableFullViewingKey {
+public:
     uint8_t depth;
     uint32_t parentFVKTag;
     uint32_t childIndex;
     uint256 chaincode;
-    libzcash::SaplingFullViewingKey fvk;
-    uint256 dk;
 
     ADD_SERIALIZE_METHODS;
 
@@ -71,14 +231,6 @@ struct SaplingExtendedFullViewingKey {
 
     std::optional<SaplingExtendedFullViewingKey> Derive(uint32_t i) const;
 
-    // Returns the first index starting from j that generates a valid
-    // payment address, along with the corresponding address. Returns
-    // an error if the diversifier space is exhausted.
-    std::optional<std::pair<diversifier_index_t, libzcash::SaplingPaymentAddress>>
-        Address(diversifier_index_t j) const;
-
-    libzcash::SaplingPaymentAddress DefaultAddress() const;
-
     friend inline bool operator==(const SaplingExtendedFullViewingKey& a, const SaplingExtendedFullViewingKey& b) {
         return (
             a.depth == b.depth &&
@@ -116,12 +268,14 @@ struct SaplingExtendedSpendingKey {
     }
 
     static SaplingExtendedSpendingKey Master(const HDSeed& seed);
+    static std::pair<SaplingExtendedSpendingKey, HDKeyPath> ForAccount(const HDSeed& seed, uint32_t bip44CoinType, libzcash::AccountId accountId);
+    static std::pair<SaplingExtendedSpendingKey, HDKeyPath> Legacy(const HDSeed& seed, uint32_t bip44CoinType, uint32_t addressIndex);
 
     SaplingExtendedSpendingKey Derive(uint32_t i) const;
 
     SaplingExtendedFullViewingKey ToXFVK() const;
 
-    libzcash::SaplingPaymentAddress DefaultAddress() const;
+    SaplingExtendedSpendingKey DeriveInternalKey() const;
 
     friend bool operator==(const SaplingExtendedSpendingKey& a, const SaplingExtendedSpendingKey& b)
     {
@@ -134,6 +288,21 @@ struct SaplingExtendedSpendingKey {
     }
 };
 
-}
+HDKeyPath Zip32AccountKeyPath(
+        uint32_t bip44CoinType,
+        libzcash::AccountId accountId,
+        std::optional<uint32_t> legacyAddressIndex = std::nullopt);
+
+std::optional<unsigned long> ParseHDKeypathAccount(
+        uint32_t purpose,
+        uint32_t coinType,
+        const std::string& keyPath);
+
+bool IsInternalKeyPath(
+        uint32_t purpose,
+        uint32_t coinType,
+        const std::string& keyPath);
+
+} //namespace libzcash
 
 #endif // ZCASH_ZCASH_ADDRESS_ZIP32_H
diff --git a/src/zcbenchmarks.cpp b/src/zcbenchmarks.cpp
index 54a1a256076..4f2b658b842 100644
--- a/src/zcbenchmarks.cpp
+++ b/src/zcbenchmarks.cpp
@@ -212,8 +212,7 @@ double benchmark_verify_equihash()
 double benchmark_large_tx(size_t nInputs)
 {
     // Create priv/pub key
-    CKey priv;
-    priv.MakeNewKey(false);
+    CKey priv = CKey::TestOnlyRandomKey(true);
     auto pub = priv.GetPubKey();
     CBasicKeyStore tempKeystore;
     tempKeystore.AddKey(priv);
@@ -271,7 +270,7 @@ double benchmark_large_tx(size_t nInputs)
 // wallet. We call assert(...) to ensure that this is true.
 double benchmark_try_decrypt_sprout_notes(size_t nKeys)
 {
-    CWallet wallet;
+    CWallet wallet(Params());
     for (int i = 0; i < nKeys; i++) {
         auto sk = libzcash::SproutSpendingKey::random();
         wallet.AddSproutSpendingKey(sk);
@@ -295,7 +294,7 @@ double benchmark_try_decrypt_sapling_notes(size_t nKeys)
 
     auto masterKey = GetTestMasterSaplingSpendingKey();
 
-    CWallet wallet;
+    CWallet wallet(Params());
 
     for (int i = 0; i < nKeys; i++) {
         auto sk = masterKey.Derive(i);
@@ -332,7 +331,7 @@ double benchmark_increment_sprout_note_witnesses(size_t nTxs)
 {
     const Consensus::Params& consensusParams = Params().GetConsensus();
 
-    CWallet wallet;
+    CWallet wallet(Params());
     SproutMerkleTree sproutTree;
     SaplingMerkleTree saplingTree;
 
@@ -343,7 +342,7 @@ double benchmark_increment_sprout_note_witnesses(size_t nTxs)
     CBlock block1;
     for (int i = 0; i < nTxs; ++i) {
         auto wtx = CreateSproutTxWithNoteData(sproutSpendingKey);
-        wallet.AddToWallet(wtx, true, NULL);
+        wallet.LoadWalletTx(wtx);
         block1.vtx.push_back(wtx);
     }
 
@@ -358,7 +357,7 @@ double benchmark_increment_sprout_note_witnesses(size_t nTxs)
     block2.hashPrevBlock = block1.GetHash();
     {
         auto sproutTx = CreateSproutTxWithNoteData(sproutSpendingKey);
-        wallet.AddToWallet(sproutTx, true, NULL);
+        wallet.LoadWalletTx(sproutTx);
         block2.vtx.push_back(sproutTx);
     }
 
@@ -375,7 +374,7 @@ CWalletTx CreateSaplingTxWithNoteData(const Consensus::Params& consensusParams,
                                       CBasicKeyStore& keyStore,
                                       const libzcash::SaplingExtendedSpendingKey &sk) {
     auto wtx = GetValidSaplingReceive(consensusParams, keyStore, sk, 10);
-    auto testNote = GetTestSaplingNote(sk.DefaultAddress(), 10);
+    auto testNote = GetTestSaplingNote(sk.ToXFVK().DefaultAddress(), 10);
     auto fvk = sk.expsk.full_viewing_key();
     auto nullifier = testNote.note.nullifier(fvk, testNote.tree.witness().position()).value();
 
@@ -394,7 +393,7 @@ double benchmark_increment_sapling_note_witnesses(size_t nTxs)
 {
     const Consensus::Params& consensusParams = Params().GetConsensus();
 
-    CWallet wallet;
+    CWallet wallet(Params());
     SproutMerkleTree sproutTree;
     SaplingMerkleTree saplingTree;
 
@@ -405,7 +404,7 @@ double benchmark_increment_sapling_note_witnesses(size_t nTxs)
     CBlock block1;
     for (int i = 0; i < nTxs; ++i) {
         auto wtx = CreateSaplingTxWithNoteData(consensusParams, wallet, saplingSpendingKey);
-        wallet.AddToWallet(wtx, true, NULL);
+        wallet.LoadWalletTx(wtx);
         block1.vtx.push_back(wtx);
     }
 
@@ -420,7 +419,7 @@ double benchmark_increment_sapling_note_witnesses(size_t nTxs)
     block2.hashPrevBlock = block1.GetHash();
     {
         auto saplingTx = CreateSaplingTxWithNoteData(consensusParams, wallet, saplingSpendingKey);
-        wallet.AddToWallet(saplingTx, true, NULL);
+        wallet.LoadWalletTx(saplingTx);
         block1.vtx.push_back(saplingTx);
     }
 
@@ -448,6 +447,7 @@ class FakeCoinsViewDB : public CCoinsView {
     uint256 hash;
     SproutMerkleTree sproutTree;
     SaplingMerkleTree saplingTree;
+    OrchardMerkleFrontier orchardTree;
 
 public:
     FakeCoinsViewDB(std::string dbName, uint256& hash) : db(GetDataDir() / dbName, 100, false, false), hash(hash) {}
@@ -468,6 +468,14 @@ class FakeCoinsViewDB : public CCoinsView {
         return false;
     }
 
+    bool GetOrchardAnchorAt(const uint256 &rt, OrchardMerkleFrontier &tree) const {
+        if (rt == orchardTree.root()) {
+            tree = orchardTree;
+            return true;
+        }
+        return false;
+    }
+
     bool GetNullifier(const uint256 &nf, ShieldedType type) const {
         return false;
     }
@@ -490,6 +498,8 @@ class FakeCoinsViewDB : public CCoinsView {
                 return sproutTree.root();
             case SAPLING:
                 return saplingTree.root();
+            case ORCHARD:
+                return orchardTree.root();
             default:
                 throw new std::runtime_error("Unknown shielded type");
         }
@@ -499,10 +509,14 @@ class FakeCoinsViewDB : public CCoinsView {
                     const uint256 &hashBlock,
                     const uint256 &hashSproutAnchor,
                     const uint256 &hashSaplingAnchor,
+                    const uint256 &hashOrchardAnchor,
                     CAnchorsSproutMap &mapSproutAnchors,
                     CAnchorsSaplingMap &mapSaplingAnchors,
+                    CAnchorsOrchardMap &mapOrchardAnchors,
                     CNullifiersMap &mapSproutNullifiers,
-                    CNullifiersMap &mapSaplingNullifiers) {
+                    CNullifiersMap &mapSaplingNullifiers,
+                    CNullifiersMap &mapOrchardNullifiers,
+                    CHistoryCacheMap &historyCacheMap) {
         return false;
     }
 
@@ -572,7 +586,7 @@ double benchmark_loadwallet()
     struct timeval tv_start;
     bool fFirstRunRet=true;
     timer_start(tv_start);
-    pwalletMain = new CWallet("wallet.dat");
+    pwalletMain = new CWallet(Params(), "wallet.dat");
     DBErrors nLoadWalletRet = pwalletMain->LoadWallet(fFirstRunRet);
     auto res = timer_stop(tv_start);
     post_wallet_load();
diff --git a/test/lint/lint-includes.sh b/test/lint/lint-includes.sh
index a9fdab331c6..ece95d7a5d6 100755
--- a/test/lint/lint-includes.sh
+++ b/test/lint/lint-includes.sh
@@ -46,6 +46,7 @@ EXPECTED_BOOST_INCLUDES=(
     boost/algorithm/string/predicate.hpp
     boost/algorithm/string/replace.hpp
     boost/algorithm/string/split.hpp
+    boost/algorithm/string/trim.hpp
     boost/assert.hpp
     boost/assign/list_of.hpp
     boost/assign/std/vector.hpp
diff --git a/zcutil/clean.sh b/zcutil/clean.sh
index 01738dcb092..596cb3e099b 100755
--- a/zcutil/clean.sh
+++ b/zcutil/clean.sh
@@ -80,6 +80,7 @@ clean_dirs __pycache__
 clean_exe src/bench/bench_bitcoin
 clean_exe src/zcash-cli
 clean_exe src/zcashd
+clean_exe src/zcashd-wallet-tool
 clean_exe src/zcash-gtest
 clean_exe src/zcash-tx
 clean_exe src/test/test_bitcoin
diff --git a/zcutil/fetch-params.sh b/zcutil/fetch-params.sh
index fba5de0787d..69d2e964db4 100755
--- a/zcutil/fetch-params.sh
+++ b/zcutil/fetch-params.sh
@@ -21,7 +21,7 @@ DOWNLOAD_URL="https://download.z.cash/downloads"
 IPFS_HASH="/ipfs/QmXRHVGLQBiKwvNq7c2vPxAKz1zRVmMYbmt7G5TQss7tY7"
 
 SHA256CMD="$(command -v sha256sum || echo shasum)"
-SHA256ARGS="$(command -v sha256sum >/dev/null || echo \"-a 256\")"
+SHA256ARGS="$(command -v sha256sum >/dev/null || echo '-a 256')"
 
 WGETCMD="$(command -v wget || echo '')"
 IPFSCMD="$(command -v ipfs || echo '')"