Vergara_Tech/zcash-haskell
2
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity

Allow for optional shielded receivers #25

Merged
pitmutt merged 3 commits from rav001 into dev040 2024-03-08 19:45:03 +00:00
Conversation 0 Commits 3 Files changed 4 +20 -13
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 9c4e26c9f2 - Show all commits

19
src/ZcashHaskell/Orchard.hs
View file

@ -76,8 +76,12 @@ isValidUnifiedAddress str =
makeUA x = makeUA x =
UnifiedAddress UnifiedAddress
whichNet whichNet
(raw_o x) (if BS.length (raw_o x) == 43
(raw_s x) then Just (raw_o x)
else Nothing)
(if BS.length (raw_s x) == 43
then Just (raw_s x)
else Nothing)
(if not (BS.null (raw_t x)) (if not (BS.null (raw_t x))
then Just $ TransparentAddress P2PKH whichNet (raw_t x) then Just $ TransparentAddress P2PKH whichNet (raw_t x)
else if not (BS.null (raw_to x)) else if not (BS.null (raw_to x))
@ -98,18 +102,21 @@ encodeUnifiedAddress ua = encodeBech32m (E.encodeUtf8 hr) b
Nothing -> BS.empty Nothing -> BS.empty
Just t -> Just t ->
case ta_type t of case ta_type t of
P2SH -> packReceiver 0x01 $ ta_bytes t P2SH -> packReceiver 0x01 $ Just $ ta_bytes t
P2PKH -> packReceiver 0x00 $ ta_bytes t P2PKH -> packReceiver 0x00 $ Just $ ta_bytes t
sReceiver = packReceiver 0x02 $ s_rec ua sReceiver = packReceiver 0x02 $ s_rec ua
oReceiver = packReceiver 0x03 $ o_rec ua oReceiver = packReceiver 0x03 $ o_rec ua
padding = E.encodeUtf8 $ T.justifyLeft 16 '\NUL' hr padding = E.encodeUtf8 $ T.justifyLeft 16 '\NUL' hr
packReceiver :: Word8 -> BS.ByteString -> BS.ByteString packReceiver :: Word8 -> Maybe BS.ByteString -> BS.ByteString
packReceiver typeCode receiver = packReceiver typeCode receiver' =
case receiver' of
Just receiver ->
if BS.length receiver > 1 if BS.length receiver > 1
then BS.singleton typeCode `BS.append` then BS.singleton typeCode `BS.append`
(BS.singleton . toEnum . BS.length) receiver `BS.append` (BS.singleton . toEnum . BS.length) receiver `BS.append`
receiver receiver
else BS.empty else BS.empty
Nothing -> BS.empty
-- | Attempts to decode the given bytestring into a Unified Full Viewing Key -- | Attempts to decode the given bytestring into a Unified Full Viewing Key
decodeUfvk :: BS.ByteString -> Maybe UnifiedFullViewingKey decodeUfvk :: BS.ByteString -> Maybe UnifiedFullViewingKey

4
src/ZcashHaskell/Types.hs
View file

@ -280,8 +280,8 @@ instance FromJSON ShieldedOutput where
-- | Type to represent a Unified Address -- | Type to represent a Unified Address
data UnifiedAddress = UnifiedAddress data UnifiedAddress = UnifiedAddress
{ ua_net :: !ZcashNet { ua_net :: !ZcashNet
, o_rec :: !OrchardReceiver , o_rec :: !(Maybe OrchardReceiver)
, s_rec :: !SaplingReceiver , s_rec :: !(Maybe SaplingReceiver)
, t_rec :: !(Maybe TransparentAddress) , t_rec :: !(Maybe TransparentAddress)
} deriving (Prelude.Show, Eq, Read) } deriving (Prelude.Show, Eq, Read)