Vergara_Tech/zenith
Vergara_Tech/zenith
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 6 Packages Wiki Activity

Implement full shielded address validation

Browse source
This commit is contained in:
Rene Vergara 2023-04-18 14:03:29 -05:00
parent 9e1ee2985e
commit c4fc57c0b7
Signed by: pitmutt
GPG key ID: 65122AD495A7F5B2
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -1,3 +1,6 @@
[submodule "haskoin-core"] [submodule "haskoin-core"]
path = haskoin-core path = haskoin-core
url = https://github.com/khazaddum/haskoin-core.git url = https://github.com/khazaddum/haskoin-core.git
[submodule "zcash-haskell"]
path = zcash-haskell
url = git@git.vergara.tech:Vergara_Tech/zcash-haskell.git

3
src/Zenith.hs
View file

@ -337,7 +337,7 @@ getAddresses ag = agtransparent ag <> agsapling ag <> agunified ag
validateAddress :: T.Text -> Maybe ZcashPool validateAddress :: T.Text -> Maybe ZcashPool
validateAddress txt --(tReg || sReg && isJust chk) || (uReg && isJust chk) validateAddress txt --(tReg || sReg && isJust chk) || (uReg && isJust chk)
| tReg = Just Transparent | tReg = Just Transparent
| sReg = Just Sapling | sReg && chkS = Just Sapling
| uReg && chk = Just Orchard | uReg && chk = Just Orchard
| otherwise = Nothing | otherwise = Nothing
where where
@ -348,6 +348,7 @@ validateAddress txt --(tReg || sReg && isJust chk) || (uReg && isJust chk)
sReg = T.unpack txt =~ shieldedRegex :: Bool sReg = T.unpack txt =~ shieldedRegex :: Bool
uReg = T.unpack txt =~ unifiedRegex :: Bool uReg = T.unpack txt =~ unifiedRegex :: Bool
chk = isValidUnifiedAddress $ E.encodeUtf8 txt chk = isValidUnifiedAddress $ E.encodeUtf8 txt
chkS = isValidShieldedAddress $ E.encodeUtf8 txt
-- | RPC methods -- | RPC methods
-- | List addresses -- | List addresses

1
zcash-haskell Submodule

@ -0,0 +1 @@
Subproject commit 1261a585e6f775049e772bccae55233a9fa04b05