Milestone 3 (#101 )

This PR contains all the enhancements needed for the completion of Milestone 3 of the Zenith Full Node wallet. - Implementation of Rust Sapling parameters - Implementation of native Haskell commitment trees - Optimization of transaction creation Reviewed-on: https://git.vergara.tech///Vergara_Tech/zcash-haskell/pulls/101 Co-authored-by: Rene Vergara <rene@vergara.network> Co-committed-by: Rene Vergara <rene@vergara.network>
2024-11-21 14:19:43 +00:00
13 changed files with 1716 additions and 528 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,6 +5,105 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

+## [0.7.5.0]
+
+### Added
+
+- Sapling commitment node functions
+- Sapling Merkle path test
+
+### Changed
+
+- Upgraded Rust dependencies to latest versions:
+	- `zcash_primitives` 0.19.0
+	- `zcash_client_backend` 0.14.0
+	- `orchard` 0.10.0
+	- `sapling-crypto` 0.3.0
+	- `incrementalmerkletree` 0.7.0
+	- `zip32` 0.1.2
+
+## [0.7.4.0]
+
+### Added
+
+- `MerklePath` 
+
+## [0.7.3.0]
+
+### Added
+
+- Function to create an Orchard hash from a note commitment
+- Function to hash Orchard commitments
+
+### Changed
+
+- Modified frontiers to use `HexString` for ommers
+- Optimized `createTransaction`
+
+## [0.7.2.0]
+
+### Changed
+
+- Modified Sapling commitment trees to use Frontier
+
+## [0.7.1.1]
+
+### Added
+
+- `ToJSON` instance for `BlockResponse`
+
+### Changed
+
+- Updated libraries:
+	- conduit
+	- data-fix
+	- happy
+	- happy-lib
+	- http-conduit
+	- iproute
+	- mono-traversable
+	- network
+	- secp256k1-haskell
+	- strict
+	- typed-process
+
+## [0.7.1.0]
+
+### Added
+
+- Type `OrchardFrontier`
+
+### Changed
+
+- Modified Orchard commitment trees functions to use Frontier
+
+## [0.7.0.2]
+
+### Changed
+
+- Modified witness update functions to skip the process if no commitments are present
+
+## [0.7.0.1]
+
+### Added
+- New error type `PrivacyPolicyError`
+
+## [0.7.0.0]
+
+- Implement `wagyu-zcash-parameters` in Rust bindings
+
+## [0.6.2.3]
+
+### Fixed
+
+- Decoding of unified addresses with no transparent receivers
+
+## [0.6.2.2]
+
+- Added JSON instances for `ZcashNet`
+- Added JSON instances for `Transaction`
+- Added `ValidAddress`
+
 ## [0.6.2.1]

 ### Changed
--- a/cabal.project.freeze
+++ b/cabal.project.freeze
@ -54,7 +54,7 @@ constraints: any.Cabal ==3.10.3.0,
             any.colour ==2.3.6,
             any.comonad ==5.0.8,
             comonad +containers +distributive +indexed-traversable,
-             any.conduit ==1.3.5,
+             any.conduit ==1.3.6,
             any.conduit-extra ==1.3.6,
             any.containers ==0.6.7,
             any.contravariant ==1.5.5,
@ -74,7 +74,7 @@ constraints: any.Cabal ==3.10.3.0,
             any.data-default-instances-containers ==0.0.1,
             any.data-default-instances-dlist ==0.0.1,
             any.data-default-instances-old-locale ==0.0.1,
-             any.data-fix ==0.3.3,
+             any.data-fix ==0.3.4,
             any.deepseq ==1.4.8.1,
             any.directory ==1.3.8.4,
             any.distributive ==0.6.2.1,
@ -93,7 +93,8 @@ constraints: any.Cabal ==3.10.3.0,
             any.ghc-boot-th ==9.6.5,
             any.ghc-prim ==0.10.0,
             any.half ==0.3.1,
-             any.happy ==1.20.1.1,
+             any.happy ==2.0.2,
+             any.happy-lib ==2.0.2,
             any.hashable ==1.4.7.0,
             hashable -arch-native +integer-gmp -random-initial-seed,
             any.haskell-lexer ==1.1.1,
@ -109,7 +110,7 @@ constraints: any.Cabal ==3.10.3.0,
             any.http-client ==0.7.17,
             http-client +network-uri,
             any.http-client-tls ==0.3.6.3,
-             any.http-conduit ==2.3.8.3,
+             any.http-conduit ==2.3.9,
             http-conduit +aeson,
             any.http-types ==0.12.4,
             any.indexed-traversable ==0.1.4,
@ -118,16 +119,16 @@ constraints: any.Cabal ==3.10.3.0,
             any.integer-gmp ==1.1,
             any.integer-logarithms ==1.0.3.1,
             integer-logarithms -check-bounds +integer-gmp,
-             any.iproute ==1.7.12,
+             any.iproute ==1.7.14,
             any.language-c ==0.9.3,
             language-c -allwarnings +iecfpextension +usebytestrings,
             any.memory ==0.18.0,
             memory +support_bytestring +support_deepseq,
             any.mime-types ==0.1.2.0,
-             any.mono-traversable ==1.0.17.0,
+             any.mono-traversable ==1.0.20.0,
             any.mtl ==2.3.1,
             any.murmur3 ==1.0.5,
-             any.network ==3.2.1.0,
+             any.network ==3.2.4.0,
             network -devel,
             any.network-uri ==2.6.4.2,
             any.old-locale ==1.0.0.7,
@ -150,7 +151,7 @@ constraints: any.Cabal ==3.10.3.0,
             any.safe ==0.3.21,
             any.scientific ==0.3.8.0,
             scientific -integer-simple,
-             any.secp256k1-haskell ==1.2.0,
+             any.secp256k1-haskell ==1.4.0,
             any.semialign ==1.3.1,
             semialign +semigroupoids,
             any.semigroupoids ==6.0.1,
@ -165,7 +166,7 @@ constraints: any.Cabal ==3.10.3.0,
             any.stm ==2.5.1.0,
             any.streaming-commons ==0.2.2.6,
             streaming-commons -use-bytestring-builder,
-             any.strict ==0.5,
+             any.strict ==0.5.1,
             any.string-conversions ==0.4.0.1,
             any.tagged ==0.8.8,
             tagged +deepseq +transformers,
@ -185,7 +186,7 @@ constraints: any.Cabal ==3.10.3.0,
             any.transformers ==0.6.1.0,
             any.transformers-compat ==0.7.2,
             transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
-             any.typed-process ==0.2.11.1,
+             any.typed-process ==0.2.12.0,
             any.unix ==2.8.4.0,
             any.unix-time ==0.4.15,
             any.unliftio-core ==0.2.1.0,
@ -204,4 +205,4 @@ constraints: any.Cabal ==3.10.3.0,
             any.witherable ==0.5,
             any.zlib ==0.7.1.0,
             zlib -bundled-c-zlib +non-blocking-ffi +pkg-config
-index-state: hackage.haskell.org 2024-07-01T20:28:56Z
+index-state: hackage.haskell.org 2024-10-11T12:55:31Z
--- a/librustzcash-wrapper/Cargo.lock
+++ b/librustzcash-wrapper/Cargo.lock
@ -60,15 +60,15 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"

 [[package]]
 name = "base64"
-version = "0.21.2"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"

 [[package]]
 name = "base64ct"
-version = "1.0.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a32fd6af2b5827bce66c29053ba0e7c42b9dcab01835835058558c10851a46b"
+checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"

 [[package]]
 name = "bech32"
@ -120,9 +120,9 @@ dependencies = [

 [[package]]
 name = "bip0039"
-version = "0.10.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef0f0152ec5cf17f49a5866afaa3439816207fd4f0a224c0211ffaf5e278426"
+checksum = "568b6890865156d9043af490d4c4081c385dd68ea10acd6ca15733d511e6b51c"
 dependencies = [
 "hmac",
 "pbkdf2",
@ -132,6 +132,22 @@ dependencies = [
 "zeroize",
 ]

+[[package]]
+name = "bip32"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa13fae8b6255872fd86f7faf4b41168661d7d78609f7bfe6771b85c6739a15b"
+dependencies = [
+ "bs58 0.5.0",
+ "hmac",
+ "rand_core",
+ "ripemd",
+ "secp256k1",
+ "sha2 0.10.6",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@ -318,12 +334,6 @@ dependencies = [
 "tinyvec",
 ]

-[[package]]
-name = "bumpalo"
-version = "3.15.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b"
-
 [[package]]
 name = "byteorder"
 version = "1.4.3"
@ -709,19 +719,6 @@ dependencies = [
 "syn 1.0.109",
 ]

-[[package]]
-name = "hdwallet"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a03ba7d4c9ea41552cd4351965ff96883e629693ae85005c501bb4b9e1c48a7"
-dependencies = [
- "lazy_static",
- "rand_core",
- "ring",
- "secp256k1",
- "thiserror",
-]
-
 [[package]]
 name = "heck"
 version = "0.4.1"
@ -760,9 +757,9 @@ dependencies = [

 [[package]]
 name = "incrementalmerkletree"
-version = "0.5.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb1872810fb725b06b8c153dde9e86f3ec26747b9b60096da7a869883b549cbe"
+checksum = "d45063fbc4b0a37837f6bfe0445f269d13d730ad0aa3b5a7f74aa7bf27a0f4df"
 dependencies = [
 "either",
 ]
@ -815,15 +812,6 @@ dependencies = [
 "either",
 ]

-[[package]]
-name = "js-sys"
-version = "0.3.68"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
-dependencies = [
- "wasm-bindgen",
-]
-
 [[package]]
 name = "jubjub"
 version = "0.10.0"
@ -999,9 +987,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"

 [[package]]
 name = "orchard"
-version = "0.7.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb255c3ffdccd3c84fe9ebed72aef64fdc72e6a3e4180dd411002d47abaad42"
+checksum = "4f18e997fa121de5c73e95cdc7e8512ae43b7de38904aeea5e5713cc48f3c0ba"
 dependencies = [
 "aes",
 "bitvec",
@ -1022,6 +1010,7 @@ dependencies = [
 "serde",
 "subtle",
 "tracing",
+ "visibility",
 "zcash_note_encryption",
 "zcash_spec",
 "zip32",
@ -1038,9 +1027,9 @@ dependencies = [

 [[package]]
 name = "password-hash"
-version = "0.3.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d791538a6dcc1e7cb7fe6f6b58aca40e7f79403c45b2bc274008b5e647af1d8"
+checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166"
 dependencies = [
 "base64ct",
 "rand_core",
@ -1064,9 +1053,9 @@ dependencies = [

 [[package]]
 name = "pbkdf2"
-version = "0.10.1"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7"
+checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
 dependencies = [
 "digest 0.10.7",
 "password-hash",
@ -1147,9 +1136,9 @@ dependencies = [

 [[package]]
 name = "prost"
-version = "0.12.3"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a"
+checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f"
 dependencies = [
 "bytes",
 "prost-derive",
@ -1157,9 +1146,9 @@ dependencies = [

 [[package]]
 name = "prost-build"
-version = "0.12.3"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2"
+checksum = "0c1318b19085f08681016926435853bbf7858f9c082d0999b80550ff5d9abe15"
 dependencies = [
 "bytes",
 "heck",
@ -1174,14 +1163,13 @@ dependencies = [
 "regex",
 "syn 2.0.32",
 "tempfile",
- "which",
 ]

 [[package]]
 name = "prost-derive"
-version = "0.12.3"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e"
+checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5"
 dependencies = [
 "anyhow",
 "itertools",
@ -1192,9 +1180,9 @@ dependencies = [

 [[package]]
 name = "prost-types"
-version = "0.12.3"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e"
+checksum = "4759aa0d3a6232fb8dbdb97b61de2c20047c68aca932c7ed76da9d788508d670"
 dependencies = [
 "prost",
 ]
@ -1341,21 +1329,6 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"

-[[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.3"
@ -1384,6 +1357,7 @@ name = "rustzcash-wrapper"
 version = "0.1.0"
 dependencies = [
 "bech32 0.11.0",
+ "bip0039",
 "borsh 0.10.3",
 "f4jumble",
 "haskell-ffi",
@ -1395,6 +1369,7 @@ dependencies = [
 "rand_core",
 "sapling-crypto",
 "secp256k1",
+ "wagyu-zcash-parameters",
 "zcash_address 0.2.0",
 "zcash_client_backend",
 "zcash_note_encryption",
@ -1404,9 +1379,9 @@ dependencies = [

 [[package]]
 name = "sapling-crypto"
-version = "0.1.3"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02f4270033afcb0c74c5c7d59c73cfd1040367f67f224fe7ed9a919ae618f1b7"
+checksum = "cfff8cfce16aeb38da50b8e2ed33c9018f30552beff2210c266662a021b17f38"
 dependencies = [
 "aes",
 "bellman",
@ -1442,9 +1417,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"

 [[package]]
 name = "secp256k1"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4124a35fe33ae14259c490fd70fa199a32b9ce9502f2ee6bc4f81ec06fa65894"
+checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f"
 dependencies = [
 "secp256k1-sys",
 ]
@ -1513,9 +1488,9 @@ dependencies = [

 [[package]]
 name = "shardtree"
-version = "0.2.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbf20c7a2747d9083092e3a3eeb9a7ed75577ae364896bebbc5e0bdcd4e97735"
+checksum = "b5f2390975ebfe8838f9e861f7a588123d49a7a7a0a08568ea831d8ad53fc9b4"
 dependencies = [
 "bitflags 2.4.2",
 "either",
@ -1648,13 +1623,14 @@ dependencies = [

 [[package]]
 name = "tonic-build"
-version = "0.10.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889"
+checksum = "9557ce109ea773b399c9b9e5dca39294110b74f1f342cb347a80d1fce8c26a11"
 dependencies = [
 "prettyplease",
 "proc-macro2",
 "prost-build",
+ "prost-types",
 "quote",
 "syn 2.0.32",
 ]
@ -1717,9 +1693,9 @@ checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"

 [[package]]
 name = "unicode-normalization"
-version = "0.1.22"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
 dependencies = [
 "tinyvec",
 ]
@ -1734,88 +1710,79 @@ dependencies = [
 "subtle",
 ]

-[[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-
 [[package]]
 name = "version_check"
 version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"

+[[package]]
+name = "visibility"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d674d135b4a8c1d7e813e2f8d1c9a58308aee4a680323066025e53132218bd91"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.32",
+]
+
+[[package]]
+name = "wagyu-zcash-parameters"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61c904628658374e651288f000934c33ef738b2d8b3e65d4100b70b395dbe2bb"
+dependencies = [
+ "wagyu-zcash-parameters-1",
+ "wagyu-zcash-parameters-2",
+ "wagyu-zcash-parameters-3",
+ "wagyu-zcash-parameters-4",
+ "wagyu-zcash-parameters-5",
+ "wagyu-zcash-parameters-6",
+]
+
+[[package]]
+name = "wagyu-zcash-parameters-1"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bf2e21bb027d3f8428c60d6a720b54a08bf6ce4e6f834ef8e0d38bb5695da8"
+
+[[package]]
+name = "wagyu-zcash-parameters-2"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a616ab2e51e74cc48995d476e94de810fb16fc73815f390bf2941b046cc9ba2c"
+
+[[package]]
+name = "wagyu-zcash-parameters-3"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14da1e2e958ff93c0830ee68e91884069253bf3462a67831b02b367be75d6147"
+
+[[package]]
+name = "wagyu-zcash-parameters-4"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f058aeef03a2070e8666ffb5d1057d8bb10313b204a254a6e6103eb958e9a6d6"
+
+[[package]]
+name = "wagyu-zcash-parameters-5"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ffe916b30e608c032ae1b734f02574a3e12ec19ab5cc5562208d679efe4969d"
+
+[[package]]
+name = "wagyu-zcash-parameters-6"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7b6d5a78adc3e8f198e9cd730f219a695431467f7ec29dcfc63ade885feebe1"
+
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"

-[[package]]
-name = "wasm-bindgen"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn 2.0.32",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.32",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
-
-[[package]]
-name = "web-sys"
-version = "0.3.68"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "which"
 version = "4.4.0"
@ -1827,28 +1794,6 @@ dependencies = [
 "once_cell",
 ]

-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@ -1938,21 +1883,22 @@ dependencies = [

 [[package]]
 name = "zcash_address"
-version = "0.3.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bce173f1d9ed4f806e310bc3a873301531e7a6dc209928584d6404e3f8228ef4"
+checksum = "4ff95eac82f71286a79c750e674550d64fb2b7aadaef7b89286b2917f645457d"
 dependencies = [
 "bech32 0.9.1",
 "bs58 0.5.0",
 "f4jumble",
 "zcash_encoding",
+ "zcash_protocol",
 ]

 [[package]]
 name = "zcash_client_backend"
-version = "0.11.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "001ec65dc2828ee648dc6d29f0944d7a877fe68ad06e001a203c11770ab1b3d4"
+checksum = "cbeeede366fdb642710d3c59fc2090489affd075f66db53ed11bb7138d2d0258"
 dependencies = [
 "base64",
 "bech32 0.9.1",
@ -1978,19 +1924,21 @@ dependencies = [
 "tonic-build",
 "tracing",
 "which",
- "zcash_address 0.3.1",
+ "zcash_address 0.6.0",
 "zcash_encoding",
 "zcash_keys",
 "zcash_note_encryption",
 "zcash_primitives",
+ "zcash_protocol",
 "zip32",
+ "zip321",
 ]

 [[package]]
 name = "zcash_encoding"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f03391b81727875efa6ac0661a20883022b6fba92365dc121c48fa9b00c5aac0"
+checksum = "052d8230202f0a018cd9b5d1b56b94cd25e18eccc2d8665073bcea8261ab87fc"
 dependencies = [
 "byteorder",
 "nonempty",
@ -1998,11 +1946,12 @@ dependencies = [

 [[package]]
 name = "zcash_keys"
-version = "0.1.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f22d3407fdd6992b49f037f23862ab376be6013be6f2d0bc85948a635edc1f5"
+checksum = "e8162c94957f1e379b8e2fb30f97b95cfa93ac9c6bc02895946ca6392d1abb81"
 dependencies = [
 "bech32 0.9.1",
+ "blake2b_simd",
 "bls12_381",
 "bs58 0.5.0",
 "document-features",
@ -2011,11 +1960,13 @@ dependencies = [
 "nonempty",
 "rand_core",
 "sapling-crypto",
+ "secrecy",
 "subtle",
 "tracing",
- "zcash_address 0.3.1",
+ "zcash_address 0.6.0",
 "zcash_encoding",
 "zcash_primitives",
+ "zcash_protocol",
 "zip32",
 ]

@ -2034,20 +1985,20 @@ dependencies = [

 [[package]]
 name = "zcash_primitives"
-version = "0.14.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9070e084570bb78aed4f8d71fd6254492e62c87a5d01e084183980e98117092d"
+checksum = "6ab47d526d7fd6f88b3a2854ad81b54757a80c2aeadd1d8b06f690556af9743c"
 dependencies = [
 "aes",
- "bip0039",
+ "bip32",
 "blake2b_simd",
+ "bs58 0.5.0",
 "byteorder",
 "document-features",
 "equihash",
 "ff",
 "fpe",
 "group",
- "hdwallet",
 "hex",
 "incrementalmerkletree",
 "jubjub",
@ -2063,18 +2014,29 @@ dependencies = [
 "sha2 0.10.6",
 "subtle",
 "tracing",
- "zcash_address 0.3.1",
+ "zcash_address 0.6.0",
 "zcash_encoding",
 "zcash_note_encryption",
+ "zcash_protocol",
 "zcash_spec",
 "zip32",
 ]

 [[package]]
-name = "zcash_spec"
-version = "0.1.0"
+name = "zcash_protocol"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7a3bf58b673cb3dacd8ae09ba345998923a197ab0da70d6239d8e8838949e9b"
+checksum = "6bc22b9155b2c7eb20105cd06de170d188c1bc86489b92aa3fda7b8da8d96acf"
+dependencies = [
+ "document-features",
+ "memuse",
+]
+
+[[package]]
+name = "zcash_spec"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cede95491c2191d3e278cab76e097a44b17fde8d6ca0d4e3a22cf4807b2d857"
 dependencies = [
 "blake2b_simd",
 ]
@ -2101,11 +2063,25 @@ dependencies = [

 [[package]]
 name = "zip32"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4226d0aee9c9407c27064dfeec9d7b281c917de3374e1e5a2e2cfad9e09de19e"
+checksum = "92022ac1e47c7b78f9cee29efac8a1a546e189506f3bb5ad46d525be7c519bf6"
 dependencies = [
 "blake2b_simd",
 "memuse",
 "subtle",
+ "zcash_spec",
+]
+
+[[package]]
+name = "zip321"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3e613defb0940acef1f54774b51c7f48f2fa705613dd800870dc69f35cd2ea"
+dependencies = [
+ "base64",
+ "nom",
+ "percent-encoding",
+ "zcash_address 0.6.0",
+ "zcash_protocol",
 ]
--- a/librustzcash-wrapper/Cargo.toml
+++ b/librustzcash-wrapper/Cargo.toml
@ -11,18 +11,20 @@ f4jumble = "0.1"
 zcash_address = "0.2.0"
 borsh = "0.10"
 bech32 = "0.11"
-orchard = "0.7.1"
+orchard = "0.10.0"
 zcash_note_encryption = "0.4.0"
-zcash_primitives = { version = "0.14.0", features = ["transparent-inputs"]}
-zcash_client_backend = "0.11.1"
-sapling-crypto = "0.1.3"
-zip32 = "0.1.0"
+zcash_primitives = { version = "0.19.0", features = ["transparent-inputs"]}
+zcash_client_backend = "0.14.0"
+sapling-crypto = "0.3"
+zip32 = "0.1.2"
 proc-macro2 = "1.0.66"
 nonempty = "0.7.0"
-incrementalmerkletree = "0.5.0"
-secp256k1 = "0.26.0"
+incrementalmerkletree = "0.7.0"
+secp256k1 = "0.27.0"
 jubjub = "0.10.0"
 rand_core = { version = "0.6.4", features = ["getrandom"]}
+wagyu-zcash-parameters = "0.2.0"
+bip0039 = "0.12.0"


 [features]
--- a/librustzcash-wrapper/src/lib.rs
+++ b/librustzcash-wrapper/src/lib.rs
--- a/src/C/Zcash.chs
+++ b/src/C/Zcash.chs
@ -204,15 +204,15 @@ import ZcashHaskell.Types
 #}

 {# fun unsafe rust_wrapper_read_sapling_commitment_tree as rustWrapperReadSaplingCommitmentTree
-     { toBorshVar* `BS.ByteString'&
+     { toBorshVar* `SaplingFrontier'&
     , toBorshVar* `BS.ByteString'&
-     , getVarBuffer `Buffer HexString'&
+     , getVarBuffer `Buffer SaplingFrontier'&
     }
  -> `()'
 #}

 {# fun unsafe rust_wrapper_read_sapling_witness as rustWrapperReadSaplingWitness
-     { toBorshVar* `BS.ByteString'&
+     { toBorshVar* `SaplingFrontier'&
     , getVarBuffer `Buffer HexString'&
     }
  -> `()'
@ -232,6 +232,13 @@ import ZcashHaskell.Types
  -> `()'
 #}

+{# fun unsafe rust_wrapper_read_sapling_frontier as rustWrapperReadSaplingFrontier
+     { toBorshVar* `BS.ByteString'&
+     , getVarBuffer `Buffer SaplingFrontier'&
+     }
+  -> `()'
+#}
+
 {# fun unsafe rust_wrapper_decode_sapling_address as rustWrapperDecodeSaplingAddress
     { toBorshVar* `BS.ByteString'&
     , getVarBuffer `Buffer (BS.ByteString)'&
@ -239,16 +246,120 @@ import ZcashHaskell.Types
  -> `()'
 #}

-{# fun unsafe rust_wrapper_read_orchard_commitment_tree as rustWrapperReadOrchardCommitmentTree
+{# fun unsafe rust_wrapper_read_sapling_node as rustWrapperReadSaplingNode
     { toBorshVar* `BS.ByteString'&
+     , getVarBuffer `Buffer HexString'&
+     }
+  -> `()'
+#}
+
+{# fun unsafe rust_wrapper_combine_sapling_nodes as rustWrapperCombineSaplingNodes
+     { `Int8'
+     , toBorshVar* `BS.ByteString'&
     , toBorshVar* `BS.ByteString'&
     , getVarBuffer `Buffer HexString'&
     }
  -> `()'
 #}

-{# fun unsafe rust_wrapper_read_orchard_witness as rustWrapperReadOrchardWitness
+{# fun unsafe rust_wrapper_get_sapling_root as rustWrapperGetSaplingRootTest
+     { `Int8'
+     , getVarBuffer `Buffer HexString'&
+     }
+  -> `()'
+#}
+
+{# fun unsafe rust_wrapper_read_sapling_commitment_tree_parts as rustWrapperReadSaplingTreeParts
     { toBorshVar* `BS.ByteString'&
+     , getVarBuffer `Buffer SaplingRawTree'&
+     }
+  -> `()'
+#}
+
+{# fun unsafe rust_wrapper_read_sapling_tree_anchor as rustWrapperReadSaplingTreeAnchor
+     { toBorshVar* `BS.ByteString'&
+     , getVarBuffer `Buffer HexString'&
+     }
+  -> `()'
+#}
+
+{# fun unsafe rust_wrapper_read_sapling_path_anchor as rustWrapperReadSaplingPathAnchor
+     { toBorshVar* `MerklePath'&
+     , toBorshVar* `BS.ByteString'&
+     , getVarBuffer `Buffer HexString'&
+     }
+  -> `()'
+#}
+
+{# fun unsafe rust_wrapper_read_orchard_node as rustWrapperReadOrchardNode
+     { toBorshVar* `BS.ByteString'&
+     , getVarBuffer `Buffer HexString'&
+     }
+  -> `()'
+#}
+
+{# fun unsafe rust_wrapper_combine_orchard_nodes as rustWrapperCombineOrchardNodes
+     { `Int8'
+     , toBorshVar* `BS.ByteString'&
+     , toBorshVar* `BS.ByteString'&
+     , getVarBuffer `Buffer HexString'&
+     }
+  -> `()'
+#}
+
+{# fun unsafe rust_wrapper_read_orchard_tree_anchor as rustWrapperReadOrchardTreeAnchor
+     { toBorshVar* `BS.ByteString'&
+     , getVarBuffer `Buffer HexString'&
+     }
+  -> `()'
+#}
+
+{# fun unsafe rust_wrapper_read_orchard_witness_anchor as rustWrapperReadOrchardWitnessAnchor
+     { toBorshVar* `BS.ByteString'&
+     , getVarBuffer `Buffer HexString'&
+     }
+  -> `()'
+#} 
+
+{# fun unsafe rust_wrapper_read_orchard_path_anchor as rustWrapperReadOrchardPathAnchor
+     { toBorshVar* `MerklePath'&
+     , toBorshVar* `BS.ByteString'&
+     , getVarBuffer `Buffer HexString'&
+     }
+  -> `()'
+#}
+
+{# fun unsafe rust_wrapper_get_orchard_root as rustWrapperGetOrchardRootTest
+     { `Int8'
+     , getVarBuffer `Buffer HexString'&
+     }
+  -> `()'
+#}
+
+{# fun unsafe rust_wrapper_read_orchard_commitment_tree as rustWrapperReadOrchardCommitmentTree
+     { toBorshVar* `OrchardFrontier'&
+     , toBorshVar* `BS.ByteString'&
+     , getVarBuffer `Buffer OrchardFrontier'&
+     }
+  -> `()'
+#}
+
+{# fun unsafe rust_wrapper_read_orchard_commitment_tree_parts as rustWrapperReadOrchardTreeParts
+     { toBorshVar* `BS.ByteString'&
+     , getVarBuffer `Buffer OrchardRawTree'&
+     }
+  -> `()'
+#}
+
+{# fun unsafe rust_wrapper_read_orchard_frontier as rustWrapperReadOrchardFrontier
+     { toBorshVar* `BS.ByteString'&
+     , getVarBuffer `Buffer OrchardFrontier'&
+     }
+  -> `()'
+#}
+
+{# fun unsafe rust_wrapper_read_orchard_witness as rustWrapperReadOrchardWitness
+     { toBorshVar* `OrchardFrontier'&
     , getVarBuffer `Buffer HexString'&
     }
  -> `()'
@ -260,6 +371,15 @@ import ZcashHaskell.Types
  -> `Word64'
 #}

+{# fun unsafe rust_wrapper_orchard_add_node as rustWrapperOrchardAddNodeTest
+     { `Int8'
+     , toBorshVar* `BS.ByteString'&
+     , getVarBuffer `Buffer HexString'&
+     }
+  -> `()'
+
+#}
+
 {# fun unsafe rust_wrapper_update_sapling_witness as rustWrapperUpdateSaplingWitness
     { toBorshVar* `BS.ByteString'&
     , toBorshVar* `[BS.ByteString]'&
@ -283,8 +403,6 @@ import ZcashHaskell.Types
     , toBorshVar* `[SaplingTxSpend]'&
     , toBorshVar* `[OrchardTxSpend]'&
     , toBorshVar* `[OutgoingNote]'&
-     , toBorshVar* `BS.ByteString'&
-     , toBorshVar* `BS.ByteString'&
     , `Bool'
     , `Word64'
     , `Bool'
--- a/src/ZcashHaskell/Orchard.hs
+++ b/src/ZcashHaskell/Orchard.hs
@ -18,14 +18,23 @@
 module ZcashHaskell.Orchard where

 import C.Zcash
-  ( rustWrapperGenOrchardReceiver
+  ( rustWrapperCombineOrchardNodes
+  , rustWrapperGenOrchardReceiver
  , rustWrapperGenOrchardSpendKey
+  , rustWrapperGetOrchardRootTest
+  , rustWrapperOrchardAddNodeTest
  , rustWrapperOrchardCheck
  , rustWrapperOrchardNoteDecode
  , rustWrapperOrchardNoteDecodeSK
  , rustWrapperReadOrchardCommitmentTree
+  , rustWrapperReadOrchardFrontier
+  , rustWrapperReadOrchardNode
+  , rustWrapperReadOrchardPathAnchor
  , rustWrapperReadOrchardPosition
+  , rustWrapperReadOrchardTreeAnchor
+  , rustWrapperReadOrchardTreeParts
  , rustWrapperReadOrchardWitness
+  , rustWrapperReadOrchardWitnessAnchor
  , rustWrapperUADecode
  , rustWrapperUfvkDecode
  , rustWrapperUpdateOrchardWitness
@ -37,6 +46,11 @@ import qualified Data.Text as T
 import qualified Data.Text.Encoding as E
 import Data.Word
 import Foreign.Rust.Marshall.Variable
+import ZcashHaskell.Sapling (decodeSaplingAddress)
+import ZcashHaskell.Transparent
+  ( decodeExchangeAddress
+  , decodeTransparentAddress
+  )
 import ZcashHaskell.Types
 import ZcashHaskell.Utils (encodeBech32, encodeBech32m, f4Jumble)

@ -98,9 +112,9 @@ isValidUnifiedAddress str =
        (if BS.length (raw_s x) == 43
           then Just $ SaplingReceiver (raw_s x)
           else Nothing)
-        (if not (BS.null (raw_t x))
+        (if BS.length (raw_t x) > 1
           then Just $ TransparentReceiver P2PKH (fromRawBytes $ raw_t x)
-           else if not (BS.null (raw_to x))
+           else if BS.length (raw_to x) > 1
                  then Just $ TransparentReceiver P2SH (fromRawBytes $ raw_to x)
                  else Nothing)

@ -189,40 +203,137 @@ decryptOrchardActionSK sk scope oa =
      withPureBorshVarBuffer $
      rustWrapperOrchardNoteDecodeSK (getBytes sk) oa (scope == External)

-- | Update a Orchard commitment tree
-updateOrchardCommitmentTree ::
-     OrchardCommitmentTree -- ^ the base tree
-  -> HexString -- ^ the new note commitment
-  -> Maybe OrchardCommitmentTree
-updateOrchardCommitmentTree tree cmx =
-  if BS.length (hexBytes updatedTree) > 1
-    then Just $ OrchardCommitmentTree updatedTree
+getOrchardFrontier :: OrchardCommitmentTree -> Maybe OrchardFrontier
+getOrchardFrontier tree =
+  if of_pos updatedTree > 1
+    then Just updatedTree
    else Nothing
  where
    updatedTree =
      withPureBorshVarBuffer $
-      rustWrapperReadOrchardCommitmentTree
-        (hexBytes $ orchTree tree)
-        (hexBytes cmx)
+      rustWrapperReadOrchardFrontier $ toBytes $ orchTree tree
+
+getOrchardTreeAnchor :: OrchardCommitmentTree -> HexString
+getOrchardTreeAnchor tree =
+  withPureBorshVarBuffer $
+  rustWrapperReadOrchardTreeAnchor $ toBytes $ orchTree tree
+
+getOrchardWitnessAnchor :: OrchardWitness -> HexString
+getOrchardWitnessAnchor wit =
+  withPureBorshVarBuffer $
+  rustWrapperReadOrchardWitnessAnchor $ toBytes $ orchWit wit
+
+getOrchardRootTest :: Int -> HexString
+getOrchardRootTest level =
+  withPureBorshVarBuffer $ rustWrapperGetOrchardRootTest $ fromIntegral level
+
+addOrchardNodeGetRoot :: Int -> BS.ByteString -> HexString
+addOrchardNodeGetRoot l n =
+  withPureBorshVarBuffer $ rustWrapperOrchardAddNodeTest (fromIntegral l) n
+
+getOrchardTreeParts :: OrchardCommitmentTree -> Maybe OrchardTree
+getOrchardTreeParts h =
+  if isBlank (ort_left tree) && isBlank (ort_right tree)
+    then Nothing
+    else Just $
+         OrchardTree
+           (parseHex $ ort_left tree)
+           (parseHex $ ort_right tree)
+           (map parseHex (ort_parents tree))
+  where
+    isBlank h = (BS.length $ hexBytes $ h) == 1
+    parseHex h =
+      if (BS.length $ hexBytes $ h) > 1
+        then Just h
+        else Nothing
+    tree =
+      withPureBorshVarBuffer $
+      rustWrapperReadOrchardTreeParts $ toBytes $ orchTree h
+
+getOrchardPathAnchor :: HexString -> MerklePath -> HexString
+getOrchardPathAnchor hex p =
+  withPureBorshVarBuffer $ rustWrapperReadOrchardPathAnchor p (hexBytes hex)
+
+-- | Update a Orchard commitment tree
+updateOrchardCommitmentTree ::
+     OrchardFrontier -- ^ the base tree
+  -> HexString -- ^ the new note commitment
+  -> Maybe OrchardFrontier
+updateOrchardCommitmentTree tree cmx =
+  if of_pos updatedTree > 1
+    then Just updatedTree
+    else Nothing
+  where
+    updatedTree =
+      withPureBorshVarBuffer $
+      rustWrapperReadOrchardCommitmentTree tree (hexBytes cmx)

 -- | Get the Orchard incremental witness from a commitment tree
-getOrchardWitness :: OrchardCommitmentTree -> Maybe OrchardWitness
+getOrchardWitness :: OrchardFrontier -> Maybe OrchardWitness
 getOrchardWitness tree =
  if BS.length (hexBytes wit) > 1
    then Just $ OrchardWitness wit
    else Nothing
  where
-    wit =
-      withPureBorshVarBuffer $
-      rustWrapperReadOrchardWitness (hexBytes $ orchTree tree)
+    wit = withPureBorshVarBuffer $ rustWrapperReadOrchardWitness tree

 -- | Get the Sapling note position from a witness
 getOrchardNotePosition :: OrchardWitness -> Integer
 getOrchardNotePosition =
  fromIntegral . rustWrapperReadOrchardPosition . hexBytes . orchWit

+-- | Update the witness of an Orchard note
 updateOrchardWitness :: OrchardWitness -> [HexString] -> OrchardWitness
 updateOrchardWitness wit cmus =
-  OrchardWitness $
-  withPureBorshVarBuffer $
-  rustWrapperUpdateOrchardWitness (toBytes $ orchWit wit) (map toBytes cmus)
+  if not (null cmus)
+    then OrchardWitness $
+         withPureBorshVarBuffer $
+         rustWrapperUpdateOrchardWitness
+           (toBytes $ orchWit wit)
+           (map toBytes cmus)
+    else wit
+
+getOrchardNodeValue :: BS.ByteString -> Maybe HexString
+getOrchardNodeValue cmx =
+  if BS.length (hexBytes n) > 1
+    then Just n
+    else Nothing
+  where
+    n = withPureBorshVarBuffer $ rustWrapperReadOrchardNode cmx
+
+combineOrchardNodes :: Integer -> HexString -> HexString -> Maybe HexString
+combineOrchardNodes level n1 n2 =
+  if BS.length (hexBytes r) > 1
+    then Just r
+    else Nothing
+  where
+    r =
+      withPureBorshVarBuffer $
+      rustWrapperCombineOrchardNodes
+        (fromIntegral level)
+        (toBytes n1)
+        (toBytes n2)
+
+-- | Parse a potential Zcash address
+parseAddress :: BS.ByteString -> Maybe ValidAddress
+parseAddress t =
+  case isValidUnifiedAddress t of
+    Nothing ->
+      case decodeSaplingAddress t of
+        Nothing ->
+          case decodeTransparentAddress t of
+            Nothing ->
+              case decodeExchangeAddress t of
+                Nothing -> Nothing
+                Just x -> Just $ Exchange x
+            Just t -> Just $ Transparent t
+        Just s -> Just $ Sapling s
+    Just u -> Just $ Unified u
+
+compareAddress :: ValidAddress -> UnifiedAddress -> Bool
+compareAddress a u =
+  case a of
+    Unified i -> i == u
+    Sapling s -> s_rec u == Just (sa_receiver s) && ua_net u == net_type s
+    Transparent t -> t_rec u == Just (ta_receiver t) && ua_net u == ta_network t
+    Exchange x -> False
--- a/src/ZcashHaskell/Sapling.hs
+++ b/src/ZcashHaskell/Sapling.hs
@ -18,10 +18,17 @@
 module ZcashHaskell.Sapling where

 import C.Zcash
-  ( rustWrapperDecodeSaplingAddress
+  ( rustWrapperCombineSaplingNodes
+  , rustWrapperDecodeSaplingAddress
+  , rustWrapperGetSaplingRootTest
  , rustWrapperIsShielded
  , rustWrapperReadSaplingCommitmentTree
+  , rustWrapperReadSaplingFrontier
+  , rustWrapperReadSaplingNode
+  , rustWrapperReadSaplingPathAnchor
  , rustWrapperReadSaplingPosition
+  , rustWrapperReadSaplingTreeAnchor
+  , rustWrapperReadSaplingTreeParts
  , rustWrapperReadSaplingWitness
  , rustWrapperSaplingCheck
  , rustWrapperSaplingChgPaymentAddress
@ -37,6 +44,7 @@ import Data.Aeson
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Char8 as C
 import Data.HexString (HexString(..), fromText, hexString, toBytes, toText)
+import Data.Int (Int8)
 import qualified Data.Text as T
 import Data.Word
 import Foreign.Rust.Marshall.Variable
@ -184,32 +192,88 @@ genSaplingInternalAddress sk =
    res =
      withPureBorshVarBuffer (rustWrapperSaplingChgPaymentAddress $ getBytes sk)

-- | Update a Sapling commitment tree
-updateSaplingCommitmentTree ::
-     SaplingCommitmentTree -- ^ the base tree
-  -> HexString -- ^ the new note commitment
-  -> Maybe SaplingCommitmentTree
-updateSaplingCommitmentTree tree cmu =
-  if BS.length (hexBytes updatedTree) > 1
-    then Just $ SaplingCommitmentTree updatedTree
+getSaplingNodeValue :: BS.ByteString -> Maybe HexString
+getSaplingNodeValue cmu =
+  if BS.length (hexBytes n) > 1
+    then Just n
+    else Nothing
+  where
+    n = withPureBorshVarBuffer $ rustWrapperReadSaplingNode cmu
+
+combineSaplingNodes :: Int8 -> HexString -> HexString -> Maybe HexString
+combineSaplingNodes level n1 n2 =
+  if BS.length (hexBytes r) > 1
+    then Just r
+    else Nothing
+  where
+    r =
+      withPureBorshVarBuffer $
+      rustWrapperCombineSaplingNodes level (toBytes n1) (toBytes n2)
+
+getSaplingRootTest :: Int8 -> HexString
+getSaplingRootTest level =
+  withPureBorshVarBuffer $ rustWrapperGetSaplingRootTest level
+
+getSaplingTreeParts :: SaplingCommitmentTree -> Maybe SaplingTree
+getSaplingTreeParts h =
+  if isBlank (srt_left tree) && isBlank (srt_right tree)
+    then Nothing
+    else Just $
+         SaplingTree
+           (parseHex $ srt_left tree)
+           (parseHex $ srt_right tree)
+           (map parseHex (srt_parents tree))
+  where
+    isBlank h = (BS.length $ hexBytes $ h) == 1
+    parseHex h =
+      if (BS.length $ hexBytes $ h) > 1
+        then Just h
+        else Nothing
+    tree =
+      withPureBorshVarBuffer $
+      rustWrapperReadSaplingTreeParts $ toBytes $ sapTree h
+
+getSaplingTreeAnchor :: SaplingCommitmentTree -> HexString
+getSaplingTreeAnchor tree =
+  withPureBorshVarBuffer $
+  rustWrapperReadSaplingTreeAnchor $ toBytes $ sapTree tree
+
+getSaplingPathAnchor :: HexString -> MerklePath -> HexString
+getSaplingPathAnchor hex p =
+  withPureBorshVarBuffer $ rustWrapperReadSaplingPathAnchor p (hexBytes hex)
+
+getSaplingFrontier :: SaplingCommitmentTree -> Maybe SaplingFrontier
+getSaplingFrontier tree =
+  if sf_pos updatedTree > 1
+    then Just updatedTree
    else Nothing
  where
    updatedTree =
      withPureBorshVarBuffer $
-      rustWrapperReadSaplingCommitmentTree
-        (hexBytes $ sapTree tree)
-        (hexBytes cmu)
+      rustWrapperReadSaplingFrontier $ toBytes $ sapTree tree
+
+-- | Update a Sapling commitment tree
+updateSaplingCommitmentTree ::
+     SaplingFrontier -- ^ the base tree
+  -> HexString -- ^ the new note commitment
+  -> Maybe SaplingFrontier
+updateSaplingCommitmentTree tree cmu =
+  if sf_pos updatedTree > 1
+    then Just updatedTree
+    else Nothing
+  where
+    updatedTree =
+      withPureBorshVarBuffer $
+      rustWrapperReadSaplingCommitmentTree tree (hexBytes cmu)

 -- | Get the Sapling incremental witness from a commitment tree
-getSaplingWitness :: SaplingCommitmentTree -> Maybe SaplingWitness
+getSaplingWitness :: SaplingFrontier -> Maybe SaplingWitness
 getSaplingWitness tree =
  if BS.length (hexBytes wit) > 1
    then Just $ SaplingWitness wit
    else Nothing
  where
-    wit =
-      withPureBorshVarBuffer $
-      rustWrapperReadSaplingWitness (hexBytes $ sapTree tree)
+    wit = withPureBorshVarBuffer $ rustWrapperReadSaplingWitness tree

 -- | Get the Sapling note position from a witness
 getSaplingNotePosition :: SaplingWitness -> Integer
@ -218,9 +282,13 @@ getSaplingNotePosition =

 updateSaplingWitness :: SaplingWitness -> [HexString] -> SaplingWitness
 updateSaplingWitness wit cmus =
-  SaplingWitness $
-  withPureBorshVarBuffer $
-  rustWrapperUpdateSaplingWitness (toBytes $ sapWit wit) (map toBytes cmus)
+  if not (null cmus)
+    then SaplingWitness $
+         withPureBorshVarBuffer $
+         rustWrapperUpdateSaplingWitness
+           (toBytes $ sapWit wit)
+           (map toBytes cmus)
+    else wit

 -- | Encode a SaplingReceiver into HRF text
 encodeSaplingAddress :: ZcashNet -> SaplingReceiver -> Maybe T.Text
--- a/src/ZcashHaskell/Transparent.hs
+++ b/src/ZcashHaskell/Transparent.hs
@ -1,3 +1,5 @@
+{-# LANGUAGE OverloadedStrings #-}
+
 -- Copyright 2022-2024 Vergara Technologies LLC
 -- 
 -- This file is part of Zcash-Haskell.
@ -172,27 +174,27 @@ decodeTransparentAddress taddress = do
 -- | Encode an Exchange Addresss into HRF from TransparentReceiver
 encodeExchangeAddress :: ZcashNet -> TransparentReceiver -> Maybe T.Text
 encodeExchangeAddress net tr = do
-  case (tr_type tr) of
+  case tr_type tr of
    P2PKH -> do
      case net of
        MainNet -> do
-          let vhash = encodeBech32m (BC.pack "tex") (toBytes (tr_bytes tr))
+          let vhash = encodeBech32m "tex" (toBytes (tr_bytes tr))
          Just vhash
        TestNet -> do
-          let vhash = encodeBech32m (BC.pack "textest") (toBytes (tr_bytes tr))
+          let vhash = encodeBech32m "textest" (toBytes (tr_bytes tr))
          Just vhash
-    _ -> Nothing
+    _any -> Nothing

 -- | Decode an Exchange Address into a ExchangeAddress
-decodeExchangeAddress :: T.Text -> Maybe ExchangeAddress
+decodeExchangeAddress :: BS.ByteString -> Maybe ExchangeAddress
 decodeExchangeAddress ex = do
-  if (T.length ex) > 1
+  if BS.length ex > 1
    then do
-      let rawd = decodeBech32 (E.encodeUtf8 ex)
-      let tMain = BS.unpack (BC.pack "tex")
-      let tTest = BS.unpack (BC.pack "textest")
-      let tFail = BS.unpack (BC.pack "fail")
-      let hr = BS.unpack (hrp rawd)
+      let rawd = decodeBech32 ex
+      let tMain = "tex"
+      let tTest = "textest"
+      let tFail = "fail"
+      let hr = hrp rawd
      if hr /= tFail
        then do
          let transparentReceiver = bytes rawd
--- a/src/ZcashHaskell/Types.hs
+++ b/src/ZcashHaskell/Types.hs
@ -38,6 +38,7 @@ import Data.Maybe (fromJust, fromMaybe)
 import Data.Structured
 import qualified Data.Text as T
 import qualified Data.Text.Encoding as E
+import qualified Data.Vector as V
 import Data.Word
 import qualified GHC.Generics as GHC
 import qualified Generics.SOP as SOP
@ -90,7 +91,7 @@ data ZcashNet
  = MainNet
  | TestNet
  | RegTestNet
-  deriving (Eq, Prelude.Show, Read)
+  deriving (Eq, Prelude.Show, Read, GHC.Generic, ToJSON, FromJSON)

 type AccountId = Int

@ -133,6 +134,18 @@ data Transaction = Transaction
  , tx_orchardBundle :: !(Maybe OrchardBundle)
  } deriving (Prelude.Show, Eq, Read)

+instance ToJSON Transaction where
+  toJSON (Transaction t h c e tb sb ob) =
+    object
+      [ "txid" .= t
+      , "height" .= h
+      , "confirmations" .= c
+      , "expiry" .= e
+      , "transparent" .= tb
+      , "sapling" .= sb
+      , "orchard" .= ob
+      ]
+
 -- | The transparent portion of a Zcash transaction
 data TransparentBundle = TransparentBundle
  { tb_vin :: ![H.TxIn]
@ -140,6 +153,10 @@ data TransparentBundle = TransparentBundle
  , tb_coinbase :: !Bool
  } deriving (Eq, Prelude.Show, Read)

+instance ToJSON TransparentBundle where
+  toJSON (TransparentBundle vin vout c) =
+    object ["vin" .= vin, "vout" .= vout, "coinbase" .= c]
+
 -- | Read a raw transparent bundle into the Haskell type
 fromRawTBundle :: RawTBundle -> Maybe TransparentBundle
 fromRawTBundle rtb =
@ -239,7 +256,8 @@ instance FromJSON RpcError where
 -- ** `zcashd`
 -- | Type to represent response from the `zcashd` RPC `getblock` method
 data BlockResponse = BlockResponse
-  { bl_confirmations :: !Integer -- ^ Block confirmations
+  { bl_hash :: !HexString
+  , bl_confirmations :: !Integer -- ^ Block confirmations
  , bl_height :: !Integer -- ^ Block height
  , bl_time :: !Integer -- ^ Block time
  , bl_txs :: ![HexString] -- ^ List of transaction IDs in the block
@ -252,7 +270,18 @@ instance FromJSON BlockResponse where
      h <- obj .: "height"
      t <- obj .:? "time"
      txs <- obj .: "tx"
-      pure $ BlockResponse c h (fromMaybe 0 t) txs
+      hash <- obj .: "hash"
+      pure $ BlockResponse hash c h (fromMaybe 0 t) txs
+
+instance ToJSON BlockResponse where
+  toJSON (BlockResponse h c ht t txs) =
+    object
+      [ "hash" .= h
+      , "confirmations" .= c
+      , "height" .= ht
+      , "time" .= t
+      , "tx" .= txs
+      ]

 -- | Type to represent response from the `zcashd` RPC `getrawtransaction`
 data RawTxResponse = RawTxResponse
@ -324,6 +353,10 @@ data SaplingBundle = SaplingBundle
  , sbSig :: !HexString
  } deriving stock (Eq, Prelude.Show, GHC.Generic, Read)

+instance ToJSON SaplingBundle where
+  toJSON (SaplingBundle s o v sig) =
+    object ["spends" .= s, "outputs" .= o, "value" .= v, "sig" .= sig]
+
 fromRawSBundle :: RawSBundle -> Maybe SaplingBundle
 fromRawSBundle b =
  if zsb_empty b
@ -355,6 +388,17 @@ data OrchardBundle = OrchardBundle
  , obSig :: !HexString
  } deriving stock (Eq, Prelude.Show, GHC.Generic, Read)

+instance ToJSON OrchardBundle where
+  toJSON (OrchardBundle a f v an p s) =
+    object
+      [ "actions" .= a
+      , "flags" .= f
+      , "value" .= v
+      , "anchor" .= an
+      , "proof" .= p
+      , "sig" .= s
+      ]
+
 fromRawOBundle :: RawOBundle -> Maybe OrchardBundle
 fromRawOBundle b =
  if zob_empty b
@ -377,6 +421,10 @@ data OrchardFlags = OrchardFlags
    deriving anyclass (Data.Structured.Show)
    deriving (BorshSize, ToBorsh, FromBorsh) via AsStruct OrchardFlags

+instance ToJSON OrchardFlags where
+  toJSON (OrchardFlags s o) =
+    Data.Aeson.Array $ V.fromList [Data.Aeson.Bool s, Data.Aeson.Bool o]
+
 -- | Type for the response from the `zebrad` RPC method `getinfo`
 data ZebraGetInfo = ZebraGetInfo
  { zgi_build :: !T.Text
@ -501,6 +549,17 @@ data ShieldedSpend = ShieldedSpend
    deriving anyclass (Data.Structured.Show)
    deriving (BorshSize, ToBorsh, FromBorsh) via AsStruct ShieldedSpend

+instance ToJSON ShieldedSpend where
+  toJSON (ShieldedSpend cv a n rk p au) =
+    object
+      [ "cv" .= cv
+      , "anchor" .= a
+      , "nullifier" .= n
+      , "rk" .= rk
+      , "proof" .= p
+      , "spendAuthSig" .= au
+      ]
+
 instance FromJSON ShieldedSpend where
  parseJSON =
    withObject "ShieldedSpend" $ \obj -> do
@ -525,6 +584,17 @@ data ShieldedOutput = ShieldedOutput
    deriving anyclass (Data.Structured.Show)
    deriving (BorshSize, ToBorsh, FromBorsh) via AsStruct ShieldedOutput

+instance ToJSON ShieldedOutput where
+  toJSON (ShieldedOutput c cm e enc o p) =
+    object
+      [ "cv" .= c
+      , "cmu" .= cm
+      , "ephemeralKey" .= e
+      , "encCiphertext" .= enc
+      , "outCiphertext" .= o
+      , "proof" .= p
+      ]
+
 instance FromJSON ShieldedOutput where
  parseJSON =
    withObject "ShieldedOutput" $ \obj -> do
@ -541,6 +611,30 @@ newtype SaplingCommitmentTree = SaplingCommitmentTree
  { sapTree :: HexString
  } deriving (Eq, Prelude.Show, Read)

+data SaplingRawTree = SaplingRawTree
+  { srt_left :: !HexString
+  , srt_right :: !HexString
+  , srt_parents :: ![HexString]
+  } deriving stock (Eq, Prelude.Show, GHC.Generic)
+    deriving anyclass (SOP.Generic, SOP.HasDatatypeInfo)
+    deriving anyclass (Data.Structured.Show)
+    deriving (BorshSize, ToBorsh, FromBorsh) via AsStruct SaplingRawTree
+
+data SaplingTree = SaplingTree
+  { st_left :: !(Maybe HexString)
+  , st_right :: !(Maybe HexString)
+  , st_parents :: ![Maybe HexString]
+  } deriving (Eq, Prelude.Show, Read)
+
+data SaplingFrontier = SaplingFrontier
+  { sf_pos :: !Int64
+  , sf_leaf :: !HexString
+  , sf_ommers :: ![HexString]
+  } deriving stock (Eq, Prelude.Show, GHC.Generic)
+    deriving anyclass (SOP.Generic, SOP.HasDatatypeInfo)
+    deriving anyclass (Data.Structured.Show)
+    deriving (BorshSize, ToBorsh, FromBorsh) via AsStruct SaplingFrontier
+
 -- | Type for a Sapling incremental witness
 newtype SaplingWitness = SaplingWitness
  { sapWit :: HexString
@ -583,6 +677,14 @@ data RawUA = RawUA
    deriving anyclass (Data.Structured.Show)
    deriving (BorshSize, ToBorsh, FromBorsh) via AsStruct RawUA

+-- | A type to handle user-entered addresses
+data ValidAddress
+  = Unified !UnifiedAddress
+  | Sapling !SaplingAddress
+  | Transparent !TransparentAddress
+  | Exchange !ExchangeAddress
+  deriving stock (Eq, Prelude.Show)
+
 -- | Type to represent a Unified Full Viewing Key
 data UnifiedFullViewingKey = UnifiedFullViewingKey
  { net :: !Word8 -- ^ Number representing the network the key belongs to. @1@ for @mainnet@, @2@ for @testnet@ and @3@ for @regtestnet@.
@ -609,6 +711,19 @@ data OrchardAction = OrchardAction
    deriving anyclass (Data.Structured.Show)
    deriving (BorshSize, ToBorsh, FromBorsh) via AsStruct OrchardAction

+instance ToJSON OrchardAction where
+  toJSON (OrchardAction n r c e en o cv a) =
+    object
+      [ "nullifier" .= n
+      , "rk" .= r
+      , "cmx" .= c
+      , "ephemeralKey" .= e
+      , "encCiphertext" .= en
+      , "outCiphertext" .= o
+      , "cv" .= cv
+      , "spendAuthSig" .= a
+      ]
+
 instance FromJSON OrchardAction where
  parseJSON =
    withObject "OrchardAction" $ \obj -> do
@ -622,11 +737,43 @@ instance FromJSON OrchardAction where
      a <- obj .: "spendAuthSig"
      pure $ OrchardAction n r c ephKey encText outText cval a

+data MerklePath = MerklePath
+  { mp_position :: !Int32
+  , mp_path :: ![HexString]
+  } deriving stock (Eq, Prelude.Show, GHC.Generic)
+    deriving anyclass (SOP.Generic, SOP.HasDatatypeInfo)
+    deriving anyclass (Data.Structured.Show)
+    deriving (BorshSize, ToBorsh, FromBorsh) via AsStruct MerklePath
+
 -- | Type for a Orchard note commitment tree
 newtype OrchardCommitmentTree = OrchardCommitmentTree
  { orchTree :: HexString
  } deriving (Eq, Prelude.Show, Read)

+data OrchardRawTree = OrchardRawTree
+  { ort_left :: !HexString
+  , ort_right :: !HexString
+  , ort_parents :: ![HexString]
+  } deriving stock (Eq, Prelude.Show, GHC.Generic)
+    deriving anyclass (SOP.Generic, SOP.HasDatatypeInfo)
+    deriving anyclass (Data.Structured.Show)
+    deriving (BorshSize, ToBorsh, FromBorsh) via AsStruct OrchardRawTree
+
+data OrchardTree = OrchardTree
+  { ot_left :: !(Maybe HexString)
+  , ot_right :: !(Maybe HexString)
+  , ot_parents :: ![Maybe HexString]
+  } deriving (Eq, Prelude.Show, Read)
+
+data OrchardFrontier = OrchardFrontier
+  { of_pos :: !Int64
+  , of_leaf :: !HexString
+  , of_ommers :: ![HexString]
+  } deriving stock (Eq, Prelude.Show, GHC.Generic)
+    deriving anyclass (SOP.Generic, SOP.HasDatatypeInfo)
+    deriving anyclass (Data.Structured.Show)
+    deriving (BorshSize, ToBorsh, FromBorsh) via AsStruct OrchardFrontier
+
 -- | Type for a Sapling incremental witness
 newtype OrchardWitness = OrchardWitness
  { orchWit :: HexString
@ -665,7 +812,7 @@ data TransparentTxSpend = TransparentTxSpend
 data SaplingTxSpend = SaplingTxSpend
  { ss_sk :: !BS.ByteString
  , ss_note :: !DecodedNote
-  , ss_iw :: !BS.ByteString
+  , ss_iw :: !MerklePath
  } deriving stock (Eq, Prelude.Show, GHC.Generic)
    deriving anyclass (SOP.Generic, SOP.HasDatatypeInfo)
    deriving anyclass (Data.Structured.Show)
@ -674,7 +821,7 @@ data SaplingTxSpend = SaplingTxSpend
 data OrchardTxSpend = OrchardTxSpend
  { ss_sk :: !BS.ByteString
  , ss_note :: !DecodedNote
-  , ss_iw :: !BS.ByteString
+  , ss_iw :: !MerklePath
  } deriving stock (Eq, Prelude.Show, GHC.Generic)
    deriving anyclass (SOP.Generic, SOP.HasDatatypeInfo)
    deriving anyclass (Data.Structured.Show)
@ -712,6 +859,7 @@ data TxError
  | OrchardRecipient
  | SaplingBuilderNotAvailable
  | OrchardBuilderNotAvailable
+  | PrivacyPolicyError !T.Text
  | ZHError
  deriving (Eq, Prelude.Show, Read)

--- a/src/ZcashHaskell/Utils.hs
+++ b/src/ZcashHaskell/Utils.hs
@ -123,53 +123,41 @@ readZebraTransaction hex =
    rawTx = (withPureBorshVarBuffer . rustWrapperTxRead) $ hexBytes hex

 createTransaction ::
-     Maybe SaplingCommitmentTree -- ^ to obtain the Sapling anchor
-  -> Maybe OrchardCommitmentTree -- ^ to obtain the Orchard anchor
+     HexString -- ^ to obtain the Sapling anchor
+  -> HexString -- ^ to obtain the Orchard anchor
  -> [TransparentTxSpend] -- ^ the list of transparent notes to spend
  -> [SaplingTxSpend] -- ^ the list of Sapling notes to spend
  -> [OrchardTxSpend] -- ^ the list of Orchard notes to spend
  -> [OutgoingNote] -- ^ the list of outgoing notes, including change notes
-  -> SaplingSpendParams -- ^ the Sapling circuit spending parameters
-  -> SaplingOutputParams -- ^ the Sapling circuit output parameters
  -> ZcashNet -- ^ the network to be used
  -> Int -- ^ target block height
  -> Bool -- ^ True to build, False to estimate fee
-  -> Either TxError HexString
-createTransaction sapAnchor orchAnchor tSpend sSpend oSpend outgoing sParams oParams znet bh build =
-  processResult $! txResult
-  where
-    processResult :: HexString -> Either TxError HexString
-    processResult input =
-      if BS.length (hexBytes input) > 1
-        then Right input
-        else case head (BS.unpack $ hexBytes input) of
-               0 -> Left InsufficientFunds
-               1 -> Left ChangeRequired
-               2 -> Left Fee
-               3 -> Left Balance
-               4 -> Left TransparentBuild
-               5 -> Left SaplingBuild
-               6 -> Left OrchardBuild
-               7 -> Left OrchardSpend
-               8 -> Left OrchardRecipient
-               9 -> Left SaplingBuilderNotAvailable
-               10 -> Left OrchardBuilderNotAvailable
-               _ -> Left ZHError
-    txResult =
-      withPureBorshVarBuffer $
-      rustWrapperCreateTx
-        (case sapAnchor of
-           Nothing -> "0"
-           Just sA -> toBytes $ sapTree sA)
-        (case orchAnchor of
-           Nothing -> "0"
-           Just oA -> toBytes $ orchTree oA)
-        tSpend
-        sSpend
-        oSpend
-        outgoing
-        (sapSParams sParams)
-        (sapOParams oParams)
-        (znet == MainNet)
-        (fromIntegral bh)
-        build
+  -> IO (Either TxError HexString)
+createTransaction sapAnchor orchAnchor tSpend sSpend oSpend outgoing znet bh build = do
+  txResult <-
+    withBorshBufferOfInitSize 51200 $
+    rustWrapperCreateTx
+      (hexBytes sapAnchor)
+      (hexBytes orchAnchor)
+      tSpend
+      sSpend
+      oSpend
+      outgoing
+      (znet == MainNet)
+      (fromIntegral bh)
+      build
+  if BS.length (hexBytes txResult) > 1
+    then pure $ Right txResult
+    else case head (BS.unpack $ hexBytes txResult) of
+           0 -> pure $ Left InsufficientFunds
+           1 -> pure $ Left ChangeRequired
+           2 -> pure $ Left Fee
+           3 -> pure $ Left Balance
+           4 -> pure $ Left TransparentBuild
+           5 -> pure $ Left SaplingBuild
+           6 -> pure $ Left OrchardBuild
+           7 -> pure $ Left OrchardSpend
+           8 -> pure $ Left OrchardRecipient
+           9 -> pure $ Left SaplingBuilderNotAvailable
+           10 -> pure $ Left OrchardBuilderNotAvailable
+           _ -> pure $ Left ZHError
--- a/test/Spec.hs
+++ b/test/Spec.hs
@ -40,6 +40,7 @@ import GHC.Float.RealFracMethods (properFractionDoubleInteger)
 import Haskoin.Crypto.Hash (ripemd160)
 import Haskoin.Crypto.Keys.Extended
 import Haskoin.Transaction.Common
+import Network.HTTP.Simple (Response(..))
 import Test.HUnit
 import Test.Hspec
 import Test.Hspec.QuickCheck
@ -54,6 +55,7 @@ import ZcashHaskell.Sapling
  , genSaplingInternalAddress
  , genSaplingPaymentAddress
  , genSaplingSpendingKey
+  , getSaplingFrontier
  , getSaplingNotePosition
  , getSaplingWitness
  , getShieldedOutputs
@ -72,6 +74,7 @@ import ZcashHaskell.Types
  , OrchardAction(..)
  , OrchardBundle(..)
  , OrchardCommitmentTree(..)
+  , OrchardFrontier(..)
  , OrchardSpendingKey(..)
  , OrchardWitness(..)
  , Phrase(..)
@ -82,9 +85,12 @@ import ZcashHaskell.Types
  , RawTxOut(..)
  , RawTxResponse(..)
  , RawZebraTx(..)
+  , RpcError(..)
+  , RpcResponse(..)
  , SaplingAddress(..)
  , SaplingBundle(..)
  , SaplingCommitmentTree(..)
+  , SaplingFrontier(..)
  , SaplingReceiver(..)
  , SaplingSpendingKey(..)
  , SaplingWitness(..)
@ -892,34 +898,36 @@ main = do
            Just t' -> do
              let tb = zt_tBundle t'
              show tb `shouldNotBe` ""
-      describe "Sapling commitment trees" $ do
-        let tree =
-              SaplingCommitmentTree $
-              hexString
-                "01916df07670600aefa3b412a120d6b8d9a3d2ff9466a7ec770cd52d34ddb42313001000013c60b031a5e44650059fcc7101a3f551b807ab8b3a116a5a9c7fa0f3babbe735017c0d36686294ff19d59e58b6a2ac6a7ad607a804bc202c84012d8e94f233970c0128dbde5180af5304d8577376d78297130b615a327974c10881f6d876869aea05011b80b4ca60f74dfe33c78b062df73c84b8b44dab4604db16f5b61eea40134373010c96e4cc8a6a80fba0d41e4eb3070d80769104dc33fb61133b1304c15bf9e23e000107114fe4bb4cd08b47f6ae47477c182d5da9fe5c189061808c1091e9bf3b4524000001447d6b9100cddd5f80c8cf4ddee2b87eba053bd987465aec2293bd0514e68b0d015f6c95e75f4601a0a31670a7deb970fc8988c611685161d2e1629d0a1a0ebd07015f8b9205e0514fa235d75c150b87e23866b882b39786852d1ab42aab11d31a4a0117ddeb3a5f8d2f6b2d0a07f28f01ab25e03a05a9319275bb86d72fcaef6fc01501f08f39275112dd8905b854170b7f247cf2df18454d4fa94e6e4f9320cca05f24011f8322ef806eb2430dc4a7a41c1b344bea5be946efc7b4349c1c9edb14ff9d39"
-        let cmu1 =
-              hexString
-                "45e47c5df6f5c5e48aa3526e977b2d1b57eda57214e36f06128008cb17b0125f"
-        let cmu2 =
-              hexString
-                "426ef44b3b22e0eeda7e4d2b62bac63966572b224e50f97ee56c9490cde4910d"
-        let tree2 =
-              hexString
-                "01a47029e9b43722c57143a5d07681bff3e2315c9a28ad49d69e7c1f2f6e81ac160010000000000000012f4f72c03f8c937a94919a01a07f21165cc8394295291cb888ca91ed003810390107114fe4bb4cd08b47f6ae47477c182d5da9fe5c189061808c1091e9bf3b4524000001447d6b9100cddd5f80c8cf4ddee2b87eba053bd987465aec2293bd0514e68b0d015f6c95e75f4601a0a31670a7deb970fc8988c611685161d2e1629d0a1a0ebd07015f8b9205e0514fa235d75c150b87e23866b882b39786852d1ab42aab11d31a4a0117ddeb3a5f8d2f6b2d0a07f28f01ab25e03a05a9319275bb86d72fcaef6fc01501f08f39275112dd8905b854170b7f247cf2df18454d4fa94e6e4f9320cca05f24011f8322ef806eb2430dc4a7a41c1b344bea5be946efc7b4349c1c9edb14ff9d39"
-        it "Commitment tree is updated correctly" $ do
-          let t1 = updateSaplingCommitmentTree tree cmu1
-          t1 `shouldNotBe` Nothing
-        it "Incremental witness is generated" $ do
-          let t1 = updateSaplingCommitmentTree tree cmu1
-          case t1 of
-            Nothing -> assertFailure "Failed to append node to tree"
-            Just t -> getSaplingWitness t `shouldNotBe` Nothing
-        it "Position of note is obtained" $ do
-          let p =
-                getSaplingNotePosition <$>
-                (getSaplingWitness =<< updateSaplingCommitmentTree tree cmu1)
-          p `shouldBe` Just 129405
-      describe "Orchard commitment trees" $ do
+      {-
+       -describe "Sapling commitment trees" $ do
+       -  let tree =
+       -        SaplingCommitmentTree $
+       -        hexString
+       -          "01916df07670600aefa3b412a120d6b8d9a3d2ff9466a7ec770cd52d34ddb42313001000013c60b031a5e44650059fcc7101a3f551b807ab8b3a116a5a9c7fa0f3babbe735017c0d36686294ff19d59e58b6a2ac6a7ad607a804bc202c84012d8e94f233970c0128dbde5180af5304d8577376d78297130b615a327974c10881f6d876869aea05011b80b4ca60f74dfe33c78b062df73c84b8b44dab4604db16f5b61eea40134373010c96e4cc8a6a80fba0d41e4eb3070d80769104dc33fb61133b1304c15bf9e23e000107114fe4bb4cd08b47f6ae47477c182d5da9fe5c189061808c1091e9bf3b4524000001447d6b9100cddd5f80c8cf4ddee2b87eba053bd987465aec2293bd0514e68b0d015f6c95e75f4601a0a31670a7deb970fc8988c611685161d2e1629d0a1a0ebd07015f8b9205e0514fa235d75c150b87e23866b882b39786852d1ab42aab11d31a4a0117ddeb3a5f8d2f6b2d0a07f28f01ab25e03a05a9319275bb86d72fcaef6fc01501f08f39275112dd8905b854170b7f247cf2df18454d4fa94e6e4f9320cca05f24011f8322ef806eb2430dc4a7a41c1b344bea5be946efc7b4349c1c9edb14ff9d39"
+       -  let cmu1 =
+       -        hexString
+       -          "45e47c5df6f5c5e48aa3526e977b2d1b57eda57214e36f06128008cb17b0125f"
+       -  let cmu2 =
+       -        hexString
+       -          "426ef44b3b22e0eeda7e4d2b62bac63966572b224e50f97ee56c9490cde4910d"
+       -  let tree2 =
+       -        hexString
+       -          "01a47029e9b43722c57143a5d07681bff3e2315c9a28ad49d69e7c1f2f6e81ac160010000000000000012f4f72c03f8c937a94919a01a07f21165cc8394295291cb888ca91ed003810390107114fe4bb4cd08b47f6ae47477c182d5da9fe5c189061808c1091e9bf3b4524000001447d6b9100cddd5f80c8cf4ddee2b87eba053bd987465aec2293bd0514e68b0d015f6c95e75f4601a0a31670a7deb970fc8988c611685161d2e1629d0a1a0ebd07015f8b9205e0514fa235d75c150b87e23866b882b39786852d1ab42aab11d31a4a0117ddeb3a5f8d2f6b2d0a07f28f01ab25e03a05a9319275bb86d72fcaef6fc01501f08f39275112dd8905b854170b7f247cf2df18454d4fa94e6e4f9320cca05f24011f8322ef806eb2430dc4a7a41c1b344bea5be946efc7b4349c1c9edb14ff9d39"
+       -  it "Commitment tree is updated correctly" $ do
+       -    let t1 = updateSaplingCommitmentTree tree cmu1
+       -    t1 `shouldNotBe` Nothing
+       -  it "Incremental witness is generated" $ do
+       -    let t1 = updateSaplingCommitmentTree tree cmu1
+       -    case t1 of
+       -      Nothing -> assertFailure "Failed to append node to tree"
+       -      Just t -> getSaplingWitness t `shouldNotBe` Nothing
+       -  it "Position of note is obtained" $ do
+       -    let p =
+       -          getSaplingNotePosition <$>
+       -          (getSaplingWitness =<< updateSaplingCommitmentTree tree cmu1)
+       -    p `shouldBe` Just 129405
+       -}
+  {-  describe "Orchard commitment trees" $ do
        let tree =
              OrchardCommitmentTree $
              hexString
@ -939,7 +947,7 @@ main = do
          let p =
                getOrchardNotePosition <$>
                (getOrchardWitness =<< updateOrchardCommitmentTree tree cmx)
-          p `shouldBe` Just 39432
+          p `shouldBe` Just 39432 -}
      describe "Extract Sapling Address - UA Valid" $ do
        let sr =
              getSaplingFromUA
@ -1058,18 +1066,22 @@ main = do
              (hexString
                 "97e5f003d16720844ba1bd157688a7697133f4bb4a33a7c91974937a1351d7af56d16d4a10bd196ddda700fcd8be517f8f9e39a17ba0eea235d98450a626be3a998ac31f35e8e082106a31fe94da11d02b73748db4aa519df6bbf25c1d62a2cf0b192c6a486bca2632fee9e4124ce2dba6f3366a14850f6a3b784d863119f52458ed774f8d63105b4f6a3d2e09cc74e3a02ec8386213087b4c849172ded6724a45c9c12744ec4a0f86a29b803b17187df5dd5f90e71d1f3f4578d4e1496e8892")
      it "Sap output 1" $ do
-        let pos =
-              getSaplingNotePosition <$>
-              (getSaplingWitness =<<
-               updateSaplingCommitmentTree
-                 tree
-                 (fromText
-                    "fa430c51bb108db782764cff55de9c6b11bbecd2493d2e0fa9f646428feef858"))
-        case pos of
-          Nothing -> assertFailure "couldn't get note position"
-          Just p -> do
-            let dn = decodeSaplingOutputEsk sk so1 TestNet External p
-            dn `shouldBe` Nothing
+        case getSaplingFrontier tree of
+          Nothing -> assertFailure "failed to read comm tree"
+          Just tree' -> do
+            let pos =
+                  sf_pos <$>
+                  updateSaplingCommitmentTree
+                    tree'
+                    (fromText
+                       "fa430c51bb108db782764cff55de9c6b11bbecd2493d2e0fa9f646428feef858")
+            case pos of
+              Nothing -> assertFailure "couldn't get note position"
+              Just p -> do
+                let dn =
+                      decodeSaplingOutputEsk sk so1 TestNet External $
+                      fromIntegral p
+                dn `shouldBe` Nothing
      it "Sap output 2" $ do
        case readZebraTransaction txHex2 of
          Nothing -> assertFailure "Failed to read Tx"
@ -1079,24 +1091,27 @@ main = do
              Nothing -> assertFailure "Failed to get sapling bundle"
              Just sB -> do
                let sOuts = sbOutputs sB
-                let pos =
-                      getSaplingNotePosition <$>
-                      (getSaplingWitness =<<
-                       updateSaplingCommitmentTree
-                         tree
-                         (fromText
-                            "d163c69029e8cb05d874b798c7973b3b1b1b0e04f984a252b73c848698320843"))
-                case pos of
-                  Nothing -> assertFailure "couldn't get note position"
-                  Just p -> do
-                    let dn =
-                          decodeSaplingOutputEsk
-                            sk
-                            (head . tail $ sOuts)
-                            TestNet
-                            External
-                            p
-                    dn `shouldBe` Nothing
+                case getSaplingFrontier tree of
+                  Nothing -> assertFailure "Failed to read tree"
+                  Just tree' -> do
+                    let pos =
+                          getSaplingNotePosition <$>
+                          (getSaplingWitness =<<
+                           updateSaplingCommitmentTree
+                             tree'
+                             (fromText
+                                "d163c69029e8cb05d874b798c7973b3b1b1b0e04f984a252b73c848698320843"))
+                    case pos of
+                      Nothing -> assertFailure "couldn't get note position"
+                      Just p -> do
+                        let dn =
+                              decodeSaplingOutputEsk
+                                sk
+                                (head . tail $ sOuts)
+                                TestNet
+                                External
+                                p
+                        dn `shouldBe` Nothing
      it "Decode Sapling Output from Zingo" $ do
        case readZebraTransaction txHex of
          Nothing -> assertFailure "Failed to read Tx"
@ -1109,24 +1124,26 @@ main = do
                  Nothing -> assertFailure "Failed to get sapling bundle"
                  Just sB -> do
                    let sOuts = sbOutputs sB
-                    let pos =
-                          getSaplingNotePosition <$>
-                          (getSaplingWitness =<<
-                           updateSaplingCommitmentTree
-                             tree
-                             (fromText
-                                "d163c69029e8cb05d874b798c7973b3b1b1b0e04f984a252b73c848698320843"))
-                    case pos of
-                      Nothing -> assertFailure "couldn't get note position"
-                      Just p -> do
-                        let dn =
-                              decodeSaplingOutputEsk
-                                sK'
-                                (head . tail $ sOuts)
-                                MainNet
-                                External
-                                p
-                        dn `shouldNotBe` Nothing
+                    case getSaplingFrontier tree of
+                      Nothing -> assertFailure "failed to read comm tree"
+                      Just tree' -> do
+                        let pos =
+                              sf_pos <$>
+                              updateSaplingCommitmentTree
+                                tree'
+                                (fromText
+                                   "d163c69029e8cb05d874b798c7973b3b1b1b0e04f984a252b73c848698320843")
+                        case pos of
+                          Nothing -> assertFailure "couldn't get note position"
+                          Just p -> do
+                            let dn =
+                                  decodeSaplingOutputEsk
+                                    sK'
+                                    (head . tail $ sOuts)
+                                    MainNet
+                                    External
+                                    (fromIntegral p)
+                            dn `shouldNotBe` Nothing
      describe "Generate an ExchangeAddress (MainNet) from transparent address" $ do
        let ta = decodeTransparentAddress "t1dMjvesbzdG41xgKaGU3HgwYJwSgbCK54e"
        it "Try to generate valid ExchangeAddress from Transparent Address" $ do
@ -1143,8 +1160,44 @@ main = do
                  case exch of
                    Nothing -> assertFailure "Failed to encode Exchange address"
                    Just addr -> do
-                      let eadr = decodeExchangeAddress addr
+                      let eadr = decodeExchangeAddress (E.encodeUtf8 addr)
                      eadr `shouldNotBe` Nothing
+    describe "Tree updates" $ do
+      it "Orchard" $ do
+        let tree =
+              OrchardCommitmentTree $
+              hexString
+                "0136a7886d7d73bc1845223165fd9cb0cef02046c707e8f88a7f61564720bd0f3501dca1fbdd7b5ba92a0809af5e85874626ce0db14d0532a48e41dde6f0f81b46011f0001fb48c27bd07e68f27aba47cd6e93fa961e0ef8c63f993963a614e56855d2013c0001ea572db9c5c2d24c7ad9132ae32b27179466bf67a580d59901d13b281d3f530b01c160348f10b9ad893d9731317ebe36ac8665e01c52cbe15a56aa9b72e4e6c41e000001cd7695156de2debdc5b13ea84d32e4e3ac020fb0aa7cd372c57ce765103bd70401746e6bc066a10e7f80a9ff8993dcb25c819edd64f2ca10ac248ef7848d41450500011e6191f91b3fceb62dc881a156e1b9d2e88e09dca25093cf9c4936c8869fb41a013bf8b923e4187754e85175748d9cce4824a6787e4258977b5bfe1ba59012c032000001f3bbdc62260c4fca5c84bf3487246d4542da48eeeec8ec40c1029b6908eef83c00000000000000000000000000000000"
+        let cmx1 =
+              hexString
+                "1712ead46028d4349e234abf59e94e0640fe7a0829e2e2e17e1a931631810400"
+        let cmx2 =
+              hexString
+                "39f5ad39817fb432fa07c5feb3a957189fbe7662a4b5555ca95093b6d853cf07"
+        let cmx3 =
+              hexString
+                "84f7fbc4b9f87215c653078d7fdd90756c3ba370c745065167da9eb73a65a83f"
+        let cmx4 =
+              hexString
+                "e55ad64e1ea2b261893fdea6ad0509b66e5f62d3142f351298c7135c4498d429"
+        let finalTree =
+              getOrchardFrontier $
+              OrchardCommitmentTree $
+              hexString
+                "0184f7fbc4b9f87215c653078d7fdd90756c3ba370c745065167da9eb73a65a83f01e55ad64e1ea2b261893fdea6ad0509b66e5f62d3142f351298c7135c4498d4291f0000014b1a76d3820087b26cd087ca84e17f3067a25ebed82ad23a93fa485affb5530b01ea572db9c5c2d24c7ad9132ae32b27179466bf67a580d59901d13b281d3f530b01c160348f10b9ad893d9731317ebe36ac8665e01c52cbe15a56aa9b72e4e6c41e000001cd7695156de2debdc5b13ea84d32e4e3ac020fb0aa7cd372c57ce765103bd70401746e6bc066a10e7f80a9ff8993dcb25c819edd64f2ca10ac248ef7848d41450500011e6191f91b3fceb62dc881a156e1b9d2e88e09dca25093cf9c4936c8869fb41a013bf8b923e4187754e85175748d9cce4824a6787e4258977b5bfe1ba59012c032000001f3bbdc62260c4fca5c84bf3487246d4542da48eeeec8ec40c1029b6908eef83c00000000000000000000000000000000"
+        case getOrchardFrontier tree of
+          Nothing -> assertFailure "Failed to get frontier"
+          Just t1 ->
+            case updateOrchardCommitmentTree t1 cmx1 of
+              Nothing -> assertFailure "Failed to update frontier with cmx"
+              Just t2 -> do
+                case getOrchardWitness t2 of
+                  Nothing -> assertFailure "Failed to get witness"
+                  Just wit -> do
+                    let uWit = updateOrchardWitness wit [cmx2, cmx3, cmx4]
+                    Just (getOrchardWitnessAnchor uWit) `shouldBe`
+                      getOrchardTreeAnchor <$>
+                      finalTree
    describe "Witness updates" $ do
      it "Sapling" $ do
        let wit =
@ -1179,7 +1232,7 @@ main = do
        updateOrchardWitness wit cmxs `shouldBe`
          OrchardWitness
            (hexString
-               "016225b41339a00dd764b452fca190a0245e7118224965942e3a6d798365c34631001f0000011d6f5da3f619bfaab957fc643c17eb144db0101c90f422da2fcbe0e80d74412e000000000001746e6bc066a10e7f80a9ff8993dcb25c819edd64f2ca10ac248ef7848d41450500011e6191f91b3fceb62dc881a156e1b9d2e88e09dca25093cf9c4936c8869fb41a013bf8b923e4187754e85175748d9cce4824a6787e4258977b5bfe1ba59012c032000001f3bbdc62260c4fca5c84bf3487246d4542da48eeeec8ec40c1029b6908eef83c00000000000000000000000000000000040e02c864db8b574f165f616d48e2f12eb25099b5c90186af26d9e50f5058863e0504bfbc12edc35e05042c16bbfb8fed591f01f18fe128eeb57f2c456c9eb222d6d261c549e95d9007bce4c6ae0b86bc865711cdd9f0fa92e2d5b5e149b51f3be127df3b1d2372adf6c811b2e456c1d64d0e9eb167a995f9c6b66a03c9cbda250101c094201bae3b4ef582a3e8654f65a72fbd41e20e1ec9a43d3f4101afc868731e0002010cfb50d8c877eb39e9c07082a032dd99d34be7c19fa7f30e9fecf5f14736240f019df5b9366d0f21caa678d1567390b5bfd3cfa0438271bcfe301b5558a2863301")
+               "016225b41339a00dd764b452fca190a0245e7118224965942e3a6d798365c34631001f0000011d6f5da3f619bfaab957fc643c17eb144db0101c90f422da2fcbe0e80d74412e000000000001746e6bc066a10e7f80a9ff8993dcb25c819edd64f2ca10ac248ef7848d41450500011e6191f91b3fceb62dc881a156e1b9d2e88e09dca25093cf9c4936c8869fb41a013bf8b923e4187754e85175748d9cce4824a6787e4258977b5bfe1ba59012c032000001f3bbdc62260c4fca5c84bf3487246d4542da48eeeec8ec40c1029b6908eef83c00000000000000000000000000000000040e02c864db8b574f165f616d48e2f12eb25099b5c90186af26d9e50f5058863e0504bfbc12edc35e05042c16bbfb8fed591f01f18fe128eeb57f2c456c9eb222d6d261c549e95d9007bce4c6ae0b86bc865711cdd9f0fa92e2d5b5e149b51f3be127df3b1d2372adf6c811b2e456c1d64d0e9eb167a995f9c6b66a03c9cbda250101c094201bae3b4ef582a3e8654f65a72fbd41e20e1ec9a43d3f4101afc868731e01ac20b8170b008888c19fc6e16f5e30a5ef1653e5219d0cd0c9353c3aa8f7982302010cfb50d8c877eb39e9c07082a032dd99d34be7c19fa7f30e9fecf5f14736240f019df5b9366d0f21caa678d1567390b5bfd3cfa0438271bcfe301b5558a2863301")

 -- | Properties
 prop_PhraseLength :: Property
--- a/zcash-haskell.cabal
+++ b/zcash-haskell.cabal
@ -5,7 +5,7 @@ cabal-version: 3.0
 -- see: https://github.com/sol/hpack

 name:           zcash-haskell
-version:        0.6.2.1
+version:        0.7.5.0
 synopsis:       Utilities to interact with the Zcash blockchain
 description:    Please see the README on the repo at <https://git.vergara.tech/Vergara_Tech/zcash-haskell#readme>
 category:       Blockchain
@ -59,6 +59,7 @@ library
    , text
    , haskoin-core
    , secp256k1-haskell >= 1.1
+    , vector
    , utf8-string
  build-tool-depends:
    c2hs:c2hs
@ -85,5 +86,6 @@ test-suite zcash-haskell-test
    , binary
    , cryptonite
    , secp256k1-haskell
+    , http-conduit
  pkgconfig-depends: rustzcash_wrapper
  default-language: Haskell2010