diff --git a/.gitmodules b/.gitmodules index 06aa04a..1c89539 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "haskoin-core"] path = haskoin-core url = https://github.com/khazaddum/haskoin-core.git +[submodule "zcash-haskell"] + path = zcash-haskell + url = git@git.vergara.tech:Vergara_Tech/zcash-haskell.git diff --git a/src/Zenith.hs b/src/Zenith.hs index e1abd2f..d4a8cdf 100644 --- a/src/Zenith.hs +++ b/src/Zenith.hs @@ -337,7 +337,7 @@ getAddresses ag = agtransparent ag <> agsapling ag <> agunified ag validateAddress :: T.Text -> Maybe ZcashPool validateAddress txt --(tReg || sReg && isJust chk) || (uReg && isJust chk) | tReg = Just Transparent - | sReg = Just Sapling + | sReg && chkS = Just Sapling | uReg && chk = Just Orchard | otherwise = Nothing where @@ -348,6 +348,7 @@ validateAddress txt --(tReg || sReg && isJust chk) || (uReg && isJust chk) sReg = T.unpack txt =~ shieldedRegex :: Bool uReg = T.unpack txt =~ unifiedRegex :: Bool chk = isValidUnifiedAddress $ E.encodeUtf8 txt + chkS = isValidShieldedAddress $ E.encodeUtf8 txt -- | RPC methods -- | List addresses diff --git a/zcash-haskell b/zcash-haskell new file mode 160000 index 0000000..1261a58 --- /dev/null +++ b/zcash-haskell @@ -0,0 +1 @@ +Subproject commit 1261a585e6f775049e772bccae55233a9fa04b05