Generalize parsing of addresses

src/Zenith/CLI.hs

@@ -82,8 +82,7 @@ import ZcashHaskell.Keys (generateWalletSeedPhrase, getWalletSeed)
 import ZcashHaskell.Orchard (getSaplingFromUA, isValidUnifiedAddress)
 import ZcashHaskell.Sapling (decodeSaplingAddress, isValidShieldedAddress)
 import ZcashHaskell.Transparent
-  ( decodeExchangeAddress
+  ( decodeTransparentAddress
-  , decodeTransparentAddress
   , encodeTransparentReceiver
   )
 import ZcashHaskell.Types
@@ -100,7 +99,9 @@ import Zenith.Types
 import Zenith.Utils
   ( displayTaz
   , displayZec
+  , isRecipientValid
   , jsonNumber
+  , parseAddress
   , showAddress
   , validBarValue
   )
@@ -508,19 +509,6 @@ mkSendForm bal =
     label s w =
       padBottom (Pad 1) $ vLimit 1 (hLimit 15 $ str s <+> fill ' ') <+> w
 
-isRecipientValid :: T.Text -> Bool
-isRecipientValid a =
-  case isValidUnifiedAddress (E.encodeUtf8 a) of
-    Just _a1 -> True
-    Nothing ->
-      isValidShieldedAddress (E.encodeUtf8 a) ||
-      (case decodeTransparentAddress (E.encodeUtf8 a) of
-         Just _a3 -> True
-         Nothing ->
-           case decodeExchangeAddress a of
-             Just _a4 -> True
-             Nothing -> False)
-
 listDrawElement :: (Show a) => Bool -> a -> Widget Name
 listDrawElement sel a =
   let selStr s =
@@ -1288,36 +1276,22 @@ sendTransaction ::
   -> IO ()
 sendTransaction pool chan zHost zPort znet accId bl amt ua memo = do
   BC.writeBChan chan $ TickMsg "Preparing transaction..."
-  outUA <- parseAddress ua
+  case parseAddress ua znet of
-  res <-
+    Nothing -> BC.writeBChan chan $ TickMsg "Incorrect address"
-    runFileLoggingT "zenith.log" $
+    Just outUA -> do
-    prepareTx pool zHost zPort znet accId bl amt outUA memo
+      res <-
-  BC.writeBChan chan $ TickMsg "Transaction ready, sending to Zebra..."
+        runFileLoggingT "zenith.log" $
-  case res of
+        prepareTx pool zHost zPort znet accId bl amt outUA memo
-    Left e -> BC.writeBChan chan $ TickMsg $ show e
+      BC.writeBChan chan $ TickMsg "Transaction ready, sending to Zebra..."
-    Right rawTx -> do
+      case res of
-      resp <-
+        Left e -> BC.writeBChan chan $ TickMsg $ show e
-        makeZebraCall
+        Right rawTx -> do
-          zHost
+          resp <-
-          zPort
+            makeZebraCall
-          "sendrawtransaction"
+              zHost
-          [Data.Aeson.String $ toText rawTx]
+              zPort
-      case resp of
+              "sendrawtransaction"
-        Left e1 -> BC.writeBChan chan $ TickMsg $ "Zebra error: " ++ show e1
+              [Data.Aeson.String $ toText rawTx]
-        Right txId -> BC.writeBChan chan $ TickTx txId
+          case resp of
-  where
+            Left e1 -> BC.writeBChan chan $ TickMsg $ "Zebra error: " ++ show e1
-    parseAddress :: T.Text -> IO UnifiedAddress
+            Right txId -> BC.writeBChan chan $ TickTx txId
-    parseAddress a =
-      case isValidUnifiedAddress (E.encodeUtf8 a) of
-        Just a1 -> return a1
-        Nothing ->
-          case decodeSaplingAddress (E.encodeUtf8 a) of
-            Just a2 ->
-              return $
-              UnifiedAddress znet Nothing (Just $ sa_receiver a2) Nothing
-            Nothing ->
-              case decodeTransparentAddress (E.encodeUtf8 a) of
-                Just a3 ->
-                  return $
-                  UnifiedAddress znet Nothing Nothing (Just $ ta_receiver a3)
-                Nothing -> throwIO $ userError "Incorrect address"

src/Zenith/Utils.hs

@@ -12,8 +12,17 @@ import qualified Data.Text.Encoding as E
 import System.Process (createProcess_, shell)
 import Text.Regex.Posix
 import ZcashHaskell.Orchard (encodeUnifiedAddress, isValidUnifiedAddress)
-import ZcashHaskell.Sapling (isValidShieldedAddress)
+import ZcashHaskell.Sapling (decodeSaplingAddress, isValidShieldedAddress)
-import ZcashHaskell.Types (ZcashNet(..))
+import ZcashHaskell.Transparent
+  ( decodeExchangeAddress
+  , decodeTransparentAddress
+  )
+import ZcashHaskell.Types
+  ( SaplingAddress(..)
+  , TransparentAddress(..)
+  , UnifiedAddress(..)
+  , ZcashNet(..)
+  )
 import Zenith.Types
   ( AddressGroup(..)
   , UnifiedAddressDB(..)
@@ -84,3 +93,30 @@ copyAddress a =
 -- | Bound a value to the 0..1 range, used for progress reporting on UIs
 validBarValue :: Float -> Float
 validBarValue = clamp (0, 1)
+
+isRecipientValid :: T.Text -> Bool
+isRecipientValid a =
+  case isValidUnifiedAddress (E.encodeUtf8 a) of
+    Just _a1 -> True
+    Nothing ->
+      isValidShieldedAddress (E.encodeUtf8 a) ||
+      (case decodeTransparentAddress (E.encodeUtf8 a) of
+         Just _a3 -> True
+         Nothing ->
+           case decodeExchangeAddress a of
+             Just _a4 -> True
+             Nothing -> False)
+
+parseAddress :: T.Text -> ZcashNet -> Maybe UnifiedAddress
+parseAddress a znet =
+  case isValidUnifiedAddress (E.encodeUtf8 a) of
+    Just a1 -> Just a1
+    Nothing ->
+      case decodeSaplingAddress (E.encodeUtf8 a) of
+        Just a2 ->
+          Just $ UnifiedAddress znet Nothing (Just $ sa_receiver a2) Nothing
+        Nothing ->
+          case decodeTransparentAddress (E.encodeUtf8 a) of
+            Just a3 ->
+              Just $ UnifiedAddress znet Nothing Nothing (Just $ ta_receiver a3)
+            Nothing -> Nothing