src/Zenith/Types.hs

@@ -14,6 +14,7 @@ import Data.Aeson.Types (prependFailure, typeMismatch)
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Base64 as B64
 import qualified Data.ByteString.Char8 as C
+import Data.HexString
 import Data.Maybe (fromMaybe)
 import qualified Data.Text as T
 import qualified Data.Text.Encoding as E
@@ -29,6 +30,13 @@ import ZcashHaskell.Types
   , ZcashNet(..)
   )
 
+-- * Database field type wrappers
+newtype HexStringDB = HexStringDB
+  { getHex :: HexString
+  } deriving newtype (Eq, Show, Read)
+
+derivePersistField "HexStringDB"
+
 newtype ZcashNetDB = ZcashNetDB
   { getNet :: ZcashNet
   } deriving newtype (Eq, Show, Read)
@@ -71,15 +79,8 @@ newtype TransparentSpendingKeyDB = TransparentSpendingKeyDB
 
 derivePersistField "TransparentSpendingKeyDB"
 
--- | A type to model Zcash RPC calls
+-- * RPC
-data RpcCall = RpcCall
+-- | Type for modelling the different address sources for `zcashd` 5.0.0
-  { jsonrpc :: T.Text
-  , id :: T.Text
-  , method :: T.Text
-  , params :: [Value]
-  } deriving (Show, Generic, ToJSON, FromJSON)
-
--- | Type for modelling the different address sources for Zcash 5.0.0
 data AddressSource
   = LegacyRandom
   | Imported
@@ -128,24 +129,6 @@ instance Show ZcashAddress where
     T.unpack (T.take 8 a) ++
     "..." ++ T.unpack (T.takeEnd 8 a) ++ " Pools: " ++ show p
 
--- | A type to model the response of the Zcash RPC
-data RpcResponse r = RpcResponse
-  { err :: Maybe T.Text
-  , respId :: T.Text
-  , result :: r
-  } deriving (Show, Generic, ToJSON)
-
-instance (FromJSON r) => FromJSON (RpcResponse r) where
-  parseJSON (Object obj) = do
-    e <- obj .: "error"
-    rId <- obj .: "id"
-    r <- obj .: "result"
-    pure $ RpcResponse e rId r
-  parseJSON invalid =
-    prependFailure
-      "parsing RpcResponse failed, "
-      (typeMismatch "Object" invalid)
-
 newtype NodeVersion =
   NodeVersion Integer
   deriving (Eq, Show)