From 3e4aaf647c7d792534873f78fe592f3edb9139b2 Mon Sep 17 00:00:00 2001
From: Rene Vergara <rene@vergara.network>
Date: Fri, 6 Oct 2023 14:28:07 -0500
Subject: [PATCH] Use address validation

---
 src/Zenith.hs   |  3 ++-
 stack.yaml      | 24 +++++++++++++-----------
 stack.yaml.lock | 11 +++++++++++
 zcash-haskell   |  1 -
 4 files changed, 26 insertions(+), 13 deletions(-)
 delete mode 160000 zcash-haskell

diff --git a/src/Zenith.hs b/src/Zenith.hs
index d4a8cdf..d597ac2 100644
--- a/src/Zenith.hs
+++ b/src/Zenith.hs
@@ -28,7 +28,8 @@ import qualified Data.Text.IO as TIO
 import qualified Data.Vector as V
 import Data.Word
 import GHC.Generics
-import Zcash
+import ZcashHaskell.Orchard (isValidUnifiedAddress)
+import ZcashHaskell.Sapling (isValidShieldedAddress)
 
 {-import Haskoin.Address.Bech32-}
 import Network.HTTP.Simple
diff --git a/stack.yaml b/stack.yaml
index 56d3cd9..545b925 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -31,7 +31,7 @@ resolver: lts-20.16
 packages:
 - .
 #- haskoin-core
-- zcash-haskell
+#- zcash-haskell
 # Dependency packages to be pulled from upstream that are not in the resolver.
 # These entries can reference officially published versions as well as
 # forks / in-progress versions pinned to a git hash. For example:
@@ -43,16 +43,18 @@ packages:
 #
 # extra-deps: []
 extra-deps:
- - git: https://git.vergara.tech/Vergara_Tech/haskell-foreign-rust.git
-   commit: 787c2e813eb3a5d16c375d4b37dfefbd2adcdf05
- - git: https://github.com/reach-sh/haskell-hexstring.git
-   commit: 085c16fb21b9f856a435a3faab980e7e0b319341
- - git: https://github.com/well-typed/borsh.git
-   commit: d2fcfa159e0a844b1ec5e8ed3e232d4b380fa831
- - vector-0.13.0.0@sha256:fa5cac81a17a5af388716792e8b99c24b3b66770086756d0d8b23f8272a0244c,9112
- - aeson-2.1.2.1@sha256:f10f3c661bd5cf57aee46b94420e47736240b8e209ac15f4bfc1a4e4d55831fa,6344
- - generically-0.1.1
- - vector-algorithms-0.9.0.1
+  - git: https://git.vergara.tech/Vergara_Tech/zcash-haskell.git
+    commit: fef3d3af35a09db718cddb8fc9166b2d2691a744
+  - git: https://git.vergara.tech/Vergara_Tech/haskell-foreign-rust.git
+    commit: 787c2e813eb3a5d16c375d4b37dfefbd2adcdf05
+  - git: https://github.com/reach-sh/haskell-hexstring.git
+    commit: 085c16fb21b9f856a435a3faab980e7e0b319341
+  - git: https://github.com/well-typed/borsh.git
+    commit: d2fcfa159e0a844b1ec5e8ed3e232d4b380fa831
+  - vector-0.13.0.0@sha256:fa5cac81a17a5af388716792e8b99c24b3b66770086756d0d8b23f8272a0244c,9112
+  - aeson-2.1.2.1@sha256:f10f3c661bd5cf57aee46b94420e47736240b8e209ac15f4bfc1a4e4d55831fa,6344
+  - generically-0.1.1
+  - vector-algorithms-0.9.0.1
  #- vector-0.12.3.1@sha256:abbfe8830e13549596e1295219d340eb01bd00e1c7124d0dd16586911a291c59,8218
 #extra-lib-dirs: [/home/rav/Documents/programs/haskoin]
 #
diff --git a/stack.yaml.lock b/stack.yaml.lock
index cd0b544..e9952c5 100644
--- a/stack.yaml.lock
+++ b/stack.yaml.lock
@@ -4,6 +4,17 @@
 #   https://docs.haskellstack.org/en/stable/lock_files
 
 packages:
+- completed:
+    commit: fef3d3af35a09db718cddb8fc9166b2d2691a744
+    git: https://git.vergara.tech/Vergara_Tech/zcash-haskell.git
+    name: zcash-haskell
+    pantry-tree:
+      sha256: ec7782cf2646da17548d59af0ea98dcbaac1b6c2176258c696a7f508db6dbc21
+      size: 1126
+    version: 0.1.0
+  original:
+    commit: fef3d3af35a09db718cddb8fc9166b2d2691a744
+    git: https://git.vergara.tech/Vergara_Tech/zcash-haskell.git
 - completed:
     commit: 787c2e813eb3a5d16c375d4b37dfefbd2adcdf05
     git: https://git.vergara.tech/Vergara_Tech/haskell-foreign-rust.git
diff --git a/zcash-haskell b/zcash-haskell
deleted file mode 160000
index 1261a58..0000000
--- a/zcash-haskell
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1261a585e6f775049e772bccae55233a9fa04b05