src/Zenith/Core.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 
--- | Core wallet functionality for Zenith
+-- Core wallet functionality for Zenith
 module Zenith.Core where
 
 import Control.Exception (throwIO)

src/Zenith/DB.hs

@@ -19,15 +19,13 @@ module Zenith.DB where
 
 import Control.Monad.IO.Class (liftIO)
 import qualified Data.ByteString as BS
-import Data.HexString
 import qualified Data.Text as T
 import Database.Persist
 import Database.Persist.Sqlite
 import Database.Persist.TH
 import ZcashHaskell.Types (Scope(..), ZcashNet)
 import Zenith.Types
-  ( HexStringDB(..)
+  ( OrchardSpendingKeyDB(..)
-  , OrchardSpendingKeyDB(..)
   , PhraseDB(..)
   , SaplingSpendingKeyDB(..)
   , ScopeDB(..)
@@ -67,18 +65,6 @@ share
     deriving Show Eq
     |]
 
-share
-  [mkPersist sqlSettings, mkMigrate "rawStorage"]
-  [persistLowerCase|
-  WalletTransaction
-    block Int
-    txId HexStringDB
-    conf Int
-    time Int
-    hex HexStringDB
-    deriving Show Eq
-    |]
-
 -- * Database functions
 -- | Initializes the database
 initDb ::
@@ -87,12 +73,6 @@ initDb ::
 initDb dbName = do
   runSqlite dbName $ do runMigration migrateAll
 
--- | Initializes the raw data storage
-initRawStore ::
-     T.Text -- ^ the database path
-  -> IO ()
-initRawStore dbFilePath = runSqlite dbFilePath $ runMigration rawStorage
-
 -- | Get existing wallets from database
 getWallets :: T.Text -> ZcashNet -> IO [Entity ZcashWallet]
 getWallets dbFp n =

src/Zenith/Scanner.hs

@@ -1,22 +0,0 @@
-module Zenith.Scanner where
-
-import Control.Monad (when)
-import qualified Data.Text as T
-import Zenith.Core (checkBlockChain)
-
--- | Function to scan the Zcash blockchain through the Zebra node and populate the Zenith database
-scanZebra ::
-     Int -- ^ Starting block
-  -> T.Text -- ^ Host
-  -> Int -- ^ Port
-  -> T.Text -- ^ Path to database file
-  -> IO ()
-scanZebra b host port dbFilePath = do
-  bc <- checkBlockChain host port
-  case bc of
-    Nothing -> throwIO $ userError "Failed to determine blockchain status"
-    Just bStatus -> do
-      if b > zgb_blocks bStatus
-        then throwIO $ userError "Invalid starting block for scan"
-        else do
-          let bList = [b .. (zgb_blocks bStatus)]

src/Zenith/Types.hs

@@ -14,7 +14,6 @@ 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
@@ -30,13 +29,6 @@ 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)
@@ -79,8 +71,15 @@ newtype TransparentSpendingKeyDB = TransparentSpendingKeyDB
 
 derivePersistField "TransparentSpendingKeyDB"
 
--- * RPC
+-- | A type to model Zcash RPC calls
--- | Type for modelling the different address sources for `zcashd` 5.0.0
+data RpcCall = RpcCall
+  { 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
@@ -129,6 +128,24 @@ 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)

zenith.cabal

@@ -32,7 +32,6 @@ library
     Zenith.Types
     Zenith.Utils
     Zenith.Zcashd
-    Zenith.Scanner
   hs-source-dirs:
     src
   build-depends:

zenith.cfg

@@ -3,4 +3,3 @@ nodePwd = "superSecret"
 dbFilePath = "zenith.db"
 zebraHost = "127.0.0.1"
 zebraPort = 18232
-dataStorePath = "datastore.db"