app/Main.hs

@@ -18,7 +18,7 @@ import System.IO
 import Text.Read (readMaybe)
 import ZcashHaskell.Types
 import Zenith.CLI
-import Zenith.Core (clearSync, testSync)
+import Zenith.Core (clearSync, testSend, testSync)
 import Zenith.Types (Config(..), ZcashAddress(..), ZcashPool(..), ZcashTx(..))
 import Zenith.Utils
 import Zenith.Zcashd
@@ -223,6 +223,7 @@ main = do
         "cli" -> runZenithCLI myConfig
         "sync" -> testSync myConfig
         "rescan" -> clearSync myConfig
+        "testsend" -> testSend
         _ -> printUsage
     else printUsage
 

app/ZenScan.hs

@@ -2,7 +2,6 @@
 
 module ZenScan where
 
-import Control.Monad.Logger (runNoLoggingT)
 import Data.Configurator
 import Zenith.Scanner (scanZebra)
 
@@ -12,4 +11,4 @@ main = do
   dbFilePath <- require config "dbFilePath"
   zebraPort <- require config "zebraPort"
   zebraHost <- require config "zebraHost"
-  runNoLoggingT $ scanZebra 2762066 zebraHost zebraPort dbFilePath
+  scanZebra 2762066 zebraHost zebraPort dbFilePath

src/Zenith/CLI.hs

@@ -55,7 +55,7 @@ import Control.Concurrent (forkIO, threadDelay)
 import Control.Exception (catch, throw, throwIO, try)
 import Control.Monad (forever, void)
 import Control.Monad.IO.Class (liftIO)
-import Control.Monad.Logger (LoggingT, runFileLoggingT, runNoLoggingT)
+import Control.Monad.Logger (runFileLoggingT)
 import Data.Aeson
 import Data.Maybe
 import qualified Data.Text as T
@@ -63,13 +63,11 @@ import qualified Data.Text.Encoding as E
 import Data.Time.Clock.POSIX (posixSecondsToUTCTime)
 import qualified Data.Vector as Vec
 import Database.Persist
-import Database.Persist.Sqlite
 import qualified Graphics.Vty as V
 import qualified Graphics.Vty.CrossPlatform as VC
 import Lens.Micro ((&), (.~), (^.), set)
 import Lens.Micro.Mtl
 import Lens.Micro.TH
-import System.Hclip
 import Text.Wrap (FillScope(..), FillStrategy(..), WrapSettings(..), wrapText)
 import ZcashHaskell.Keys (generateWalletSeedPhrase, getWalletSeed)
 import ZcashHaskell.Orchard (getSaplingFromUA, isValidUnifiedAddress)
@@ -118,9 +116,8 @@ data DisplayType
   | SyncDisplay
   | BlankDisplay
 
-data Tick
+data Tick =
-  = TickVal !Float
+  Tick
-  | TickMsg !String
 
 data State = State
   { _network :: !ZcashNet
@@ -143,7 +140,6 @@ data State = State
   , _balance :: !Integer
   , _barValue :: !Float
   , _eventDispatch :: !(BC.BChan Tick)
-  , _timer :: !Int
   }
 
 makeLenses ''State
@@ -189,7 +185,6 @@ drawUI s = [splashDialog s, helpDialog s, displayDialog s, inputDialog s, ui s]
            , capCommand "A" "ccounts"
            , capCommand "V" "iew address"
            , capCommand "Q" "uit"
-           , str $ show (st ^. timer)
            ])
     listBox :: Show e => String -> L.List Name e -> Widget Name
     listBox titleLabel l =
@@ -223,12 +218,7 @@ drawUI s = [splashDialog s, helpDialog s, displayDialog s, inputDialog s, ui s]
             (B.borderWithLabel (str titleLabel) $
              hLimit 40 $ vLimit 15 $ L.renderList listDrawAddress True a)
         , str " "
-        , C.hCenter
+        , C.hCenter $ str "Use arrows to select"
-            (hBox
-               [ capCommand "↑↓ " "move"
-               , capCommand "↲ " "select"
-               , capCommand "Tab " "->"
-               ])
         ]
     listTxBox :: String -> L.List Name (Entity UserTx) -> Widget Name
     listTxBox titleLabel tx =
@@ -238,12 +228,7 @@ drawUI s = [splashDialog s, helpDialog s, displayDialog s, inputDialog s, ui s]
             (B.borderWithLabel (str titleLabel) $
              hLimit 40 $ vLimit 15 $ L.renderList listDrawTx True tx)
         , str " "
-        , C.hCenter
+        , C.hCenter $ str "Use arrows to select"
-            (hBox
-               [ capCommand "↑↓ " "move"
-               , capCommand "T" "x Display"
-               , capCommand "Tab " "<-"
-               ])
         ]
     helpDialog :: State -> Widget Name
     helpDialog st =
@@ -352,15 +337,7 @@ drawUI s = [splashDialog s, helpDialog s, displayDialog s, inputDialog s, ui s]
                     t_rec =<<
                     (isValidUnifiedAddress .
                      E.encodeUtf8 . getUA . walletAddressUAddress)
-                      (entityVal a)) <=>
+                      (entityVal a)))
-                 C.hCenter
-                   (hBox
-                      [ str "Copy: "
-                      , capCommand "U" "nified"
-                      , capCommand "S" "apling"
-                      , capCommand "T" "ransparent"
-                      ]) <=>
-                 C.hCenter xCommand)
             Nothing -> emptyWidget
         PhraseDisplay ->
           case L.listSelectedElement $ st ^. wallets of
@@ -504,49 +481,60 @@ barToDoAttr = A.attrName "remaining"
 validBarValue :: Float -> Float
 validBarValue = clamp 0 1
 
-scanZebra :: T.Text -> T.Text -> Int -> Int -> BC.BChan Tick -> IO ()
+scanZebra :: Int -> BT.EventM Name State ()
-scanZebra dbP zHost zPort b eChan = do
+scanZebra b = do
-  _ <- liftIO $ initDb dbP
+  s <- BT.get
-  bStatus <- liftIO $ checkBlockChain zHost zPort
+  _ <- liftIO $ initDb $ s ^. dbPath
-  pool <- runNoLoggingT $ initPool dbP
+  bStatus <- liftIO $ checkBlockChain (s ^. zebraHost) (s ^. zebraPort)
-  dbBlock <- runNoLoggingT $ getMaxBlock pool
+  dbBlock <- liftIO $ getMaxBlock $ s ^. dbPath
   let sb = max dbBlock b
   if sb > zgb_blocks bStatus || sb < 1
     then do
-      liftIO $ BC.writeBChan eChan $ TickMsg "Invalid starting block for scan"
+      BT.modify $ set msg "Invalid starting block for scan"
+      BT.modify $ set displayBox MsgDisplay
     else do
       let bList = [(sb + 1) .. (zgb_blocks bStatus)]
       let step = (1.0 :: Float) / fromIntegral (zgb_blocks bStatus - (sb + 1))
-      mapM_ (processBlock pool step) bList
+      mapM_ (processBlock step) bList
   where
-    processBlock :: ConnectionPool -> Float -> Int -> IO ()
+    processBlock :: Float -> Int -> BT.EventM Name State ()
-    processBlock pool step bl = do
+    processBlock step bl = do
+      s <- BT.get
       r <-
         liftIO $
         makeZebraCall
-          zHost
+          (s ^. zebraHost)
-          zPort
+          (s ^. zebraPort)
           "getblock"
           [Data.Aeson.String $ T.pack $ show bl, jsonNumber 1]
       case r of
         Left e1 -> do
-          liftIO $ BC.writeBChan eChan $ TickMsg e1
+          BT.modify $ set msg e1
+          BT.modify $ set displayBox MsgDisplay
         Right blk -> do
           r2 <-
             liftIO $
             makeZebraCall
-              zHost
+              (s ^. zebraHost)
-              zPort
+              (s ^. zebraPort)
               "getblock"
               [Data.Aeson.String $ T.pack $ show bl, jsonNumber 0]
           case r2 of
             Left e2 -> do
-              liftIO $ BC.writeBChan eChan $ TickMsg e2
+              BT.modify $ set msg e2
+              BT.modify $ set displayBox MsgDisplay
             Right hb -> do
               let blockTime = getBlockTime hb
-              mapM_ (runNoLoggingT . processTx zHost zPort blockTime pool) $
+              liftIO $
+                mapM_
+                  (processTx
+                     (s ^. zebraHost)
+                     (s ^. zebraPort)
+                     blockTime
+                     (s ^. dbPath)) $
                 bl_txs $ addTime blk blockTime
-              liftIO $ BC.writeBChan eChan $ TickVal step
+              BT.modify $ set barValue $ validBarValue (s ^. barValue + step)
+              BT.modify $ set displayBox SyncDisplay
     addTime :: BlockResponse -> Int -> BlockResponse
     addTime bl t =
       BlockResponse
@@ -556,69 +544,14 @@ scanZebra dbP zHost zPort b eChan = do
         (bl_txs bl)
 
 appEvent :: BT.BrickEvent Name Tick -> BT.EventM Name State ()
-appEvent (BT.AppEvent t) = do
+appEvent (BT.AppEvent Tick) = do
   s <- BT.get
-  pool <- liftIO $ runNoLoggingT $ initPool $ s ^. dbPath
+  case s ^. displayBox of
-  case t of
+    SyncDisplay -> do
-    TickMsg m -> do
+      if s ^. barValue == 1.0
-      BT.modify $ set msg m
+        then BT.modify $ set displayBox BlankDisplay
-      BT.modify $ set displayBox MsgDisplay
+        else BT.modify $ set displayBox SyncDisplay
-    TickVal v -> do
+    _ -> return ()
-      case s ^. displayBox of
-        AddrDisplay -> return ()
-        MsgDisplay -> return ()
-        PhraseDisplay -> return ()
-        TxDisplay -> return ()
-        SyncDisplay -> do
-          if s ^. barValue == 1.0
-            then do
-              selWallet <-
-                do case L.listSelectedElement $ s ^. wallets of
-                     Nothing -> do
-                       let fWall =
-                             L.listSelectedElement $
-                             L.listMoveToBeginning $ s ^. wallets
-                       case fWall of
-                         Nothing -> throw $ userError "Failed to select wallet"
-                         Just (_j, w1) -> return w1
-                     Just (_k, w) -> return w
-              _ <-
-                liftIO $
-                syncWallet
-                  (Config (s ^. dbPath) (s ^. zebraHost) (s ^. zebraPort))
-                  selWallet
-              BT.modify $ set displayBox BlankDisplay
-              BT.modify $ set barValue 0.0
-              updatedState <- BT.get
-              ns <- liftIO $ refreshWallet updatedState
-              BT.put ns
-            else BT.modify $ set barValue $ validBarValue (v + s ^. barValue)
-        BlankDisplay -> do
-          case s ^. dialogBox of
-            AName -> return ()
-            AdName -> return ()
-            WName -> return ()
-            WSelect -> return ()
-            ASelect -> return ()
-            Blank -> do
-              if s ^. timer == 90
-                then do
-                  BT.modify $ set barValue 0.0
-                  BT.modify $ set displayBox SyncDisplay
-                  sBlock <- liftIO $ getMinBirthdayHeight pool
-                  _ <-
-                    liftIO $
-                    forkIO $
-                    scanZebra
-                      (s ^. dbPath)
-                      (s ^. zebraHost)
-                      (s ^. zebraPort)
-                      sBlock
-                      (s ^. eventDispatch)
-                  BT.modify $ set timer 0
-                  return ()
-                else do
-                  BT.modify $ set timer $ 1 + s ^. timer
 appEvent (BT.VtyEvent e) = do
   r <- F.focusGetCurrent <$> use focusRing
   s <- BT.get
@@ -632,47 +565,33 @@ appEvent (BT.VtyEvent e) = do
                _ev -> return ()
            else do
              case s ^. displayBox of
-               AddrDisplay -> do
+               AddrDisplay -> BT.modify $ set displayBox BlankDisplay
-                 case e of
-                   V.EvKey (V.KChar 'x') [] ->
-                     BT.modify $ set displayBox BlankDisplay
-                   V.EvKey (V.KChar 'u') [] -> do
-                     case L.listSelectedElement $ s ^. addresses of
-                       Just (_, a) -> do
-                         liftIO $
-                           setClipboard $
-                           T.unpack $
-                           getUA $ walletAddressUAddress $ entityVal a
-                       Nothing -> return ()
-                   V.EvKey (V.KChar 's') [] -> do
-                     case L.listSelectedElement $ s ^. addresses of
-                       Just (_, a) -> do
-                         liftIO $
-                           setClipboard $
-                           maybe "None" T.unpack $
-                           getSaplingFromUA $
-                           E.encodeUtf8 $
-                           getUA $ walletAddressUAddress $ entityVal a
-                       Nothing -> return ()
-                   V.EvKey (V.KChar 't') [] -> do
-                     case L.listSelectedElement $ s ^. addresses of
-                       Just (_, a) -> do
-                         liftIO $
-                           setClipboard $
-                           T.unpack $
-                           maybe
-                             "None"
-                             (encodeTransparentReceiver (s ^. network)) $
-                           t_rec =<<
-                           (isValidUnifiedAddress .
-                            E.encodeUtf8 . getUA . walletAddressUAddress)
-                             (entityVal a)
-                       Nothing -> return ()
-                   _ev -> return ()
                MsgDisplay -> BT.modify $ set displayBox BlankDisplay
                PhraseDisplay -> BT.modify $ set displayBox BlankDisplay
                TxDisplay -> BT.modify $ set displayBox BlankDisplay
-               SyncDisplay -> BT.modify $ set displayBox BlankDisplay
+               SyncDisplay -> do
+                 if s ^. barValue == 1.0
+                   then BT.modify $ set displayBox BlankDisplay
+                   else do
+                     sBlock <- liftIO $ getMinBirthdayHeight $ s ^. dbPath
+                     selWallet <-
+                       do case L.listSelectedElement $ s ^. wallets of
+                            Nothing -> do
+                              let fWall =
+                                    L.listSelectedElement $
+                                    L.listMoveToBeginning $ s ^. wallets
+                              case fWall of
+                                Nothing ->
+                                  throw $ userError "Failed to select wallet"
+                                Just (_j, w1) -> return w1
+                            Just (_k, w) -> return w
+                     scanZebra sBlock
+                     liftIO $
+                       runFileLoggingT "zenith.log" $
+                       syncWallet
+                         (Config (s ^. dbPath) (s ^. zebraHost) (s ^. zebraPort))
+                         selWallet
+                     BT.modify $ set displayBox SyncDisplay
                BlankDisplay -> do
                  case s ^. dialogBox of
                    WName -> do
@@ -774,6 +693,9 @@ appEvent (BT.VtyEvent e) = do
                          BT.modify $ set displayBox TxDisplay
                        V.EvKey (V.KChar 'a') [] ->
                          BT.modify $ set dialogBox ASelect
+                       V.EvKey (V.KChar 's') [] -> do
+                         BT.modify $ set barValue 0.0
+                         BT.modify $ set displayBox SyncDisplay
                        ev ->
                          case r of
                            Just AList ->
@@ -818,7 +740,6 @@ runZenithCLI config = do
   let host = c_zebraHost config
   let port = c_zebraPort config
   let dbFilePath = c_dbPath config
-  pool <- runNoLoggingT $ initPool dbFilePath
   w <- try $ checkZebra host port :: IO (Either IOError ZebraGetInfo)
   case w of
     Right zebra -> do
@@ -829,18 +750,18 @@ runZenithCLI config = do
         Left e1 -> throwIO e1
         Right chainInfo -> do
           initDb dbFilePath
-          walList <- getWallets pool $ zgb_net chainInfo
+          walList <- getWallets dbFilePath $ zgb_net chainInfo
           accList <-
             if not (null walList)
-              then runNoLoggingT $ getAccounts pool $ entityKey $ head walList
+              then getAccounts dbFilePath $ entityKey $ head walList
               else return []
           addrList <-
             if not (null accList)
-              then runNoLoggingT $ getAddresses pool $ entityKey $ head accList
+              then getAddresses dbFilePath $ entityKey $ head accList
               else return []
           txList <-
             if not (null addrList)
-              then getUserTx pool $ entityKey $ head addrList
+              then getUserTx dbFilePath $ entityKey $ head addrList
               else return []
           let block =
                 if not (null walList)
@@ -848,14 +769,9 @@ runZenithCLI config = do
                   else 0
           bal <-
             if not (null accList)
-              then getBalance pool $ entityKey $ head accList
+              then getBalance dbFilePath $ entityKey $ head accList
               else return 0
           eventChan <- BC.newBChan 10
-          _ <-
-            forkIO $
-            forever $ do
-              BC.writeBChan eventChan (TickVal 0.0)
-              threadDelay 1000000
           let buildVty = VC.mkVty V.defaultConfig
           initialVty <- buildVty
           void $
@@ -884,7 +800,6 @@ runZenithCLI config = do
               bal
               1.0
               eventChan
-              0
     Left e -> do
       print $
         "No Zebra node available on port " <>
@@ -892,38 +807,34 @@ runZenithCLI config = do
 
 refreshWallet :: State -> IO State
 refreshWallet s = do
-  pool <- runNoLoggingT $ initPool $ s ^. dbPath
+  selWallet <-
-  walList <- getWallets pool $ s ^. network
-  (ix, selWallet) <-
     do case L.listSelectedElement $ s ^. wallets of
          Nothing -> do
            let fWall =
                  L.listSelectedElement $ L.listMoveToBeginning $ s ^. wallets
            case fWall of
              Nothing -> throw $ userError "Failed to select wallet"
-             Just (j, w1) -> return (j, w1)
+             Just (_j, w1) -> return w1
-         Just (k, w) -> return (k, w)
+         Just (_k, w) -> return w
-  aL <- runNoLoggingT $ getAccounts pool $ entityKey selWallet
+  aL <- getAccounts (s ^. dbPath) $ entityKey selWallet
   let bl = zcashWalletLastSync $ entityVal selWallet
   addrL <-
     if not (null aL)
-      then runNoLoggingT $ getAddresses pool $ entityKey $ head aL
+      then getAddresses (s ^. dbPath) $ entityKey $ head aL
       else return []
   bal <-
     if not (null aL)
-      then getBalance pool $ entityKey $ head aL
+      then getBalance (s ^. dbPath) $ entityKey $ head aL
       else return 0
   txL <-
     if not (null addrL)
-      then getUserTx pool $ entityKey $ head addrL
+      then getUserTx (s ^. dbPath) $ entityKey $ head addrL
       else return []
-  let wL = L.listReplace (Vec.fromList walList) (Just ix) (s ^. wallets)
   let aL' = L.listReplace (Vec.fromList aL) (Just 0) (s ^. accounts)
   let addrL' = L.listReplace (Vec.fromList addrL) (Just 0) (s ^. addresses)
   let txL' = L.listReplace (Vec.fromList txL) (Just 0) (s ^. transactions)
   return $
-    s & wallets .~ wL & accounts .~ aL' & syncBlock .~ bl & balance .~ bal &
+    (s & accounts .~ aL') & syncBlock .~ bl & balance .~ bal & addresses .~
-    addresses .~
     addrL' &
     transactions .~
     txL' &
@@ -934,15 +845,16 @@ refreshWallet s = do
 addNewWallet :: T.Text -> State -> IO State
 addNewWallet n s = do
   sP <- generateWalletSeedPhrase
-  pool <- runNoLoggingT $ initPool $ s ^. dbPath
   let bH = s ^. startBlock
   let netName = s ^. network
-  r <- saveWallet pool $ ZcashWallet n (ZcashNetDB netName) (PhraseDB sP) bH 0
+  r <-
+    saveWallet (s ^. dbPath) $
+    ZcashWallet n (ZcashNetDB netName) (PhraseDB sP) bH 0
   case r of
     Nothing -> do
       return $ s & msg .~ ("Wallet already exists: " ++ T.unpack n)
     Just _ -> do
-      wL <- getWallets pool netName
+      wL <- getWallets (s ^. dbPath) netName
       let aL =
             L.listFindBy (\x -> zcashWalletName (entityVal x) == n) $
             L.listReplace (Vec.fromList wL) (Just 0) (s ^. wallets)
@@ -950,7 +862,6 @@ addNewWallet n s = do
 
 addNewAccount :: T.Text -> State -> IO State
 addNewAccount n s = do
-  pool <- runNoLoggingT $ initPool $ s ^. dbPath
   selWallet <-
     do case L.listSelectedElement $ s ^. wallets of
          Nothing -> do
@@ -960,19 +871,19 @@ addNewAccount n s = do
              Nothing -> throw $ userError "Failed to select wallet"
              Just (_j, w1) -> return w1
          Just (_k, w) -> return w
-  aL' <- getMaxAccount pool (entityKey selWallet)
+  aL' <- getMaxAccount (s ^. dbPath) (entityKey selWallet)
   zA <-
     try $ createZcashAccount n (aL' + 1) selWallet :: IO
       (Either IOError ZcashAccount)
   case zA of
     Left e -> return $ s & msg .~ ("Error: " ++ show e)
     Right zA' -> do
-      r <- saveAccount pool zA'
+      r <- saveAccount (s ^. dbPath) zA'
       case r of
         Nothing ->
           return $ s & msg .~ ("Account already exists: " ++ T.unpack n)
         Just x -> do
-          aL <- runNoLoggingT $ getAccounts pool (entityKey selWallet)
+          aL <- getAccounts (s ^. dbPath) (entityKey selWallet)
           let nL =
                 L.listMoveToElement x $
                 L.listReplace (Vec.fromList aL) (Just 0) (s ^. accounts)
@@ -981,7 +892,6 @@ addNewAccount n s = do
 
 refreshAccount :: State -> IO State
 refreshAccount s = do
-  pool <- runNoLoggingT $ initPool $ s ^. dbPath
   selAccount <-
     do case L.listSelectedElement $ s ^. accounts of
          Nothing -> do
@@ -991,8 +901,8 @@ refreshAccount s = do
              Nothing -> throw $ userError "Failed to select account"
              Just (_j, w1) -> return w1
          Just (_k, w) -> return w
-  aL <- runNoLoggingT $ getAddresses pool $ entityKey selAccount
+  aL <- getAddresses (s ^. dbPath) $ entityKey selAccount
-  bal <- getBalance pool $ entityKey selAccount
+  bal <- getBalance (s ^. dbPath) $ entityKey selAccount
   let aL' = L.listReplace (Vec.fromList aL) (Just 0) (s ^. addresses)
   selAddress <-
     do case L.listSelectedElement aL' of
@@ -1006,7 +916,7 @@ refreshAccount s = do
       s & balance .~ bal & addresses .~ aL' & msg .~ "Switched to account: " ++
       T.unpack (zcashAccountName $ entityVal selAccount)
     Just (_i, a) -> do
-      tList <- getUserTx pool $ entityKey a
+      tList <- getUserTx (s ^. dbPath) $ entityKey a
       let tL' = L.listReplace (Vec.fromList tList) (Just 0) (s ^. transactions)
       return $
         s & balance .~ bal & addresses .~ aL' & transactions .~ tL' & msg .~
@@ -1015,7 +925,6 @@ refreshAccount s = do
 
 refreshTxs :: State -> IO State
 refreshTxs s = do
-  pool <- runNoLoggingT $ initPool $ s ^. dbPath
   selAddress <-
     do case L.listSelectedElement $ s ^. addresses of
          Nothing -> do
@@ -1026,13 +935,12 @@ refreshTxs s = do
   case selAddress of
     Nothing -> return s
     Just (_i, a) -> do
-      tList <- getUserTx pool $ entityKey a
+      tList <- getUserTx (s ^. dbPath) $ entityKey a
       let tL' = L.listReplace (Vec.fromList tList) (Just 0) (s ^. transactions)
       return $ s & transactions .~ tL'
 
 addNewAddress :: T.Text -> Scope -> State -> IO State
 addNewAddress n scope s = do
-  pool <- runNoLoggingT $ initPool $ s ^. dbPath
   selAccount <-
     do case L.listSelectedElement $ s ^. accounts of
          Nothing -> do
@@ -1042,19 +950,19 @@ addNewAddress n scope s = do
              Nothing -> throw $ userError "Failed to select account"
              Just (_j, a1) -> return a1
          Just (_k, a) -> return a
-  maxAddr <- getMaxAddress pool (entityKey selAccount) scope
+  maxAddr <- getMaxAddress (s ^. dbPath) (entityKey selAccount) scope
   uA <-
     try $ createWalletAddress n (maxAddr + 1) (s ^. network) scope selAccount :: IO
       (Either IOError WalletAddress)
   case uA of
     Left e -> return $ s & msg .~ ("Error: " ++ show e)
     Right uA' -> do
-      nAddr <- saveAddress pool uA'
+      nAddr <- saveAddress (s ^. dbPath) uA'
       case nAddr of
         Nothing ->
           return $ s & msg .~ ("Address already exists: " ++ T.unpack n)
         Just x -> do
-          addrL <- runNoLoggingT $ getAddresses pool (entityKey selAccount)
+          addrL <- getAddresses (s ^. dbPath) (entityKey selAccount)
           let nL =
                 L.listMoveToElement x $
                 L.listReplace (Vec.fromList addrL) (Just 0) (s ^. addresses)

src/Zenith/Core.hs

@@ -9,11 +9,9 @@ import Control.Monad.IO.Class (liftIO)
 import Control.Monad.Logger
   ( LoggingT
   , MonadLoggerIO
-  , NoLoggingT
   , logInfoN
   , logWarnN
   , runFileLoggingT
-  , runNoLoggingT
   , runStdoutLoggingT
   )
 import Crypto.Secp256k1 (SecKey(..))
@@ -33,7 +31,6 @@ import Database.Persist
 import Database.Persist.Sqlite
 import GHC.Float.RealFracMethods (floorFloatInteger)
 import Haskoin.Crypto.Keys (XPrvKey(..))
-import Lens.Micro ((&), (.~), (^.), set)
 import Network.HTTP.Client
 import ZcashHaskell.Keys
 import ZcashHaskell.Orchard
@@ -233,24 +230,22 @@ findSaplingOutputs config b znet za = do
   let zebraHost = c_zebraHost config
   let zebraPort = c_zebraPort config
   let zn = getNet znet
-  pool <- runNoLoggingT $ initPool dbPath
+  tList <- getShieldedOutputs dbPath b
-  tList <- getShieldedOutputs pool b
   trees <- getCommitmentTrees zebraHost zebraPort (b - 1)
   let sT = SaplingCommitmentTree $ ztiSapling trees
-  decryptNotes sT zn pool tList
+  decryptNotes sT zn tList
-  sapNotes <- getWalletSapNotes pool (entityKey za)
+  sapNotes <- getWalletSapNotes dbPath (entityKey za)
-  findSapSpends pool (entityKey za) sapNotes
+  findSapSpends dbPath (entityKey za) sapNotes
   where
     sk :: SaplingSpendingKeyDB
     sk = zcashAccountSapSpendKey $ entityVal za
     decryptNotes ::
          SaplingCommitmentTree
       -> ZcashNet
-      -> ConnectionPool
       -> [(Entity ZcashTransaction, Entity ShieldOutput)]
       -> IO ()
-    decryptNotes _ _ _ [] = return ()
+    decryptNotes _ _ [] = return ()
-    decryptNotes st n pool ((zt, o):txs) = do
+    decryptNotes st n ((zt, o):txs) = do
       let updatedTree =
             updateSaplingCommitmentTree
               st
@@ -267,11 +262,15 @@ findSaplingOutputs config b znet za = do
                 Nothing -> do
                   case decodeShOut Internal n nP o of
                     Nothing -> do
-                      decryptNotes uT n pool txs
+                      decryptNotes uT n txs
                     Just dn1 -> do
-                      wId <- saveWalletTransaction pool (entityKey za) zt
+                      wId <-
+                        saveWalletTransaction
+                          (c_dbPath config)
+                          (entityKey za)
+                          zt
                       saveWalletSapNote
-                        pool
+                        (c_dbPath config)
                         wId
                         nP
                         (fromJust noteWitness)
@@ -279,11 +278,12 @@ findSaplingOutputs config b znet za = do
                         (entityKey za)
                         (entityKey o)
                         dn1
-                      decryptNotes uT n pool txs
+                      decryptNotes uT n txs
                 Just dn0 -> do
-                  wId <- saveWalletTransaction pool (entityKey za) zt
+                  wId <-
+                    saveWalletTransaction (c_dbPath config) (entityKey za) zt
                   saveWalletSapNote
-                    pool
+                    (c_dbPath config)
                     wId
                     nP
                     (fromJust noteWitness)
@@ -291,7 +291,7 @@ findSaplingOutputs config b znet za = do
                     (entityKey za)
                     (entityKey o)
                     dn0
-                  decryptNotes uT n pool txs
+                  decryptNotes uT n txs
     decodeShOut ::
          Scope
       -> ZcashNet
@@ -324,22 +324,20 @@ findOrchardActions config b znet za = do
   let zebraHost = c_zebraHost config
   let zebraPort = c_zebraPort config
   let zn = getNet znet
-  pool <- runNoLoggingT $ initPool dbPath
+  tList <- getOrchardActions dbPath b
-  tList <- getOrchardActions pool b
   trees <- getCommitmentTrees zebraHost zebraPort (b - 1)
   let sT = OrchardCommitmentTree $ ztiOrchard trees
-  decryptNotes sT zn pool tList
+  decryptNotes sT zn tList
-  orchNotes <- getWalletOrchNotes pool (entityKey za)
+  orchNotes <- getWalletOrchNotes dbPath (entityKey za)
-  findOrchSpends pool (entityKey za) orchNotes
+  findOrchSpends dbPath (entityKey za) orchNotes
   where
     decryptNotes ::
          OrchardCommitmentTree
       -> ZcashNet
-      -> ConnectionPool
       -> [(Entity ZcashTransaction, Entity OrchAction)]
       -> IO ()
-    decryptNotes _ _ _ [] = return ()
+    decryptNotes _ _ [] = return ()
-    decryptNotes ot n pool ((zt, o):txs) = do
+    decryptNotes ot n ((zt, o):txs) = do
       let updatedTree =
             updateOrchardCommitmentTree
               ot
@@ -355,11 +353,15 @@ findOrchardActions config b znet za = do
               case decodeOrchAction External nP o of
                 Nothing ->
                   case decodeOrchAction Internal nP o of
-                    Nothing -> decryptNotes uT n pool txs
+                    Nothing -> decryptNotes uT n txs
                     Just dn1 -> do
-                      wId <- saveWalletTransaction pool (entityKey za) zt
+                      wId <-
+                        saveWalletTransaction
+                          (c_dbPath config)
+                          (entityKey za)
+                          zt
                       saveWalletOrchNote
-                        pool
+                        (c_dbPath config)
                         wId
                         nP
                         (fromJust noteWitness)
@@ -367,11 +369,12 @@ findOrchardActions config b znet za = do
                         (entityKey za)
                         (entityKey o)
                         dn1
-                      decryptNotes uT n pool txs
+                      decryptNotes uT n txs
                 Just dn -> do
-                  wId <- saveWalletTransaction pool (entityKey za) zt
+                  wId <-
+                    saveWalletTransaction (c_dbPath config) (entityKey za) zt
                   saveWalletOrchNote
-                    pool
+                    (c_dbPath config)
                     wId
                     nP
                     (fromJust noteWitness)
@@ -379,7 +382,7 @@ findOrchardActions config b znet za = do
                     (entityKey za)
                     (entityKey o)
                     dn
-                  decryptNotes uT n pool txs
+                  decryptNotes uT n txs
     sk :: OrchardSpendingKeyDB
     sk = zcashAccountOrchSpendKey $ entityVal za
     decodeOrchAction ::
@@ -396,41 +399,56 @@ findOrchardActions config b znet za = do
         (getHex $ orchActionCv $ entityVal o)
         (getHex $ orchActionAuth $ entityVal o)
 
-updateSaplingWitnesses :: ConnectionPool -> IO ()
+updateSaplingWitnesses :: T.Text -> LoggingT IO ()
-updateSaplingWitnesses pool = do
+updateSaplingWitnesses dbPath = do
-  sapNotes <- getUnspentSapNotes pool
+  sapNotes <- liftIO $ getUnspentSapNotes dbPath
+  pool <- createSqlitePool dbPath 5
   maxId <- liftIO $ getMaxSaplingNote pool
-  mapM_ (updateOneNote maxId) sapNotes
+  mapM_ (updateOneNote pool maxId) sapNotes
   where
-    updateOneNote :: ShieldOutputId -> Entity WalletSapNote -> IO ()
+    updateOneNote ::
-    updateOneNote maxId n = do
+         Pool SqlBackend
+      -> ShieldOutputId
+      -> Entity WalletSapNote
+      -> LoggingT IO ()
+    updateOneNote pool maxId n = do
       let noteSync = walletSapNoteWitPos $ entityVal n
-      when (noteSync < maxId) $ do
+      if noteSync < maxId
-        cmus <- liftIO $ getSaplingCmus pool $ walletSapNoteWitPos $ entityVal n
+        then do
-        let cmuList = map (\(ESQ.Value x) -> getHex x) cmus
+          cmus <-
-        let newWitness =
+            liftIO $ getSaplingCmus pool $ walletSapNoteWitPos $ entityVal n
-              updateSaplingWitness
+          let cmuList = map (\(ESQ.Value x) -> getHex x) cmus
-                (SaplingWitness $ getHex $ walletSapNoteWitness $ entityVal n)
+          let newWitness =
-                cmuList
+                updateSaplingWitness
-        liftIO $ updateSapNoteRecord pool (entityKey n) newWitness maxId
+                  (SaplingWitness $ getHex $ walletSapNoteWitness $ entityVal n)
+                  cmuList
+          liftIO $ updateSapNoteRecord pool (entityKey n) newWitness maxId
+        else logInfoN "Witness up to date"
 
-updateOrchardWitnesses :: ConnectionPool -> IO ()
+updateOrchardWitnesses :: T.Text -> LoggingT IO ()
-updateOrchardWitnesses pool = do
+updateOrchardWitnesses dbPath = do
-  orchNotes <- getUnspentOrchNotes pool
+  orchNotes <- liftIO $ getUnspentOrchNotes dbPath
-  maxId <- getMaxOrchardNote pool
+  pool <- createSqlitePool dbPath 5
-  mapM_ (updateOneNote maxId) orchNotes
+  maxId <- liftIO $ getMaxOrchardNote pool
+  mapM_ (updateOneNote pool maxId) orchNotes
   where
-    updateOneNote :: OrchActionId -> Entity WalletOrchNote -> IO ()
+    updateOneNote ::
-    updateOneNote maxId n = do
+         Pool SqlBackend
+      -> OrchActionId
+      -> Entity WalletOrchNote
+      -> LoggingT IO ()
+    updateOneNote pool maxId n = do
       let noteSync = walletOrchNoteWitPos $ entityVal n
-      when (noteSync < maxId) $ do
+      if noteSync < maxId
-        cmxs <- liftIO $ getOrchardCmxs pool noteSync
+        then do
-        let cmxList = map (\(ESQ.Value x) -> getHex x) cmxs
+          cmxs <- liftIO $ getOrchardCmxs pool noteSync
-        let newWitness =
+          let cmxList = map (\(ESQ.Value x) -> getHex x) cmxs
-              updateOrchardWitness
+          let newWitness =
-                (OrchardWitness $ getHex $ walletOrchNoteWitness $ entityVal n)
+                updateOrchardWitness
-                cmxList
+                  (OrchardWitness $ getHex $ walletOrchNoteWitness $ entityVal n)
-        liftIO $ updateOrchNoteRecord pool (entityKey n) newWitness maxId
+                  cmxList
+          liftIO $ updateOrchNoteRecord pool (entityKey n) newWitness maxId
+        else logInfoN "Witness up to date"
 
 -- | Calculate fee per ZIP-317
 calculateTxFee ::
@@ -456,7 +474,7 @@ calculateTxFee (t, s, o) i =
 
 -- | Prepare a transaction for sending
 prepareTx ::
-     ConnectionPool
+     T.Text
   -> T.Text
   -> Int
   -> ZcashNet
@@ -466,8 +484,8 @@ prepareTx ::
   -> UnifiedAddress
   -> T.Text
   -> IO (Either TxError HexString)
-prepareTx pool zebraHost zebraPort zn za bh amt ua memo = do
+prepareTx dbPath zebraHost zebraPort zn za bh amt ua memo = do
-  accRead <- getAccountById pool za
+  accRead <- getAccountById dbPath za
   let recipient =
         case o_rec ua of
           Nothing ->
@@ -503,11 +521,11 @@ prepareTx pool zebraHost zebraPort zn za bh amt ua memo = do
       print $ BS.length outParams
       print "Read Sapling params"
       let zats = fromIntegral $ floorFloatInteger $ amt * (10 ^ 8)
-      firstPass <- selectUnspentNotes pool za zats
+      firstPass <- selectUnspentNotes dbPath za zats
       let fee = calculateTxFee firstPass 3
       print "calculated fee"
       print fee
-      (tList, sList, oList) <- selectUnspentNotes pool za (zats + fee)
+      (tList, sList, oList) <- selectUnspentNotes dbPath za (zats + fee)
       print "selected notes"
       print tList
       print sList
@@ -546,7 +564,7 @@ prepareTx pool zebraHost zebraPort zn za bh amt ua memo = do
       -> Integer
       -> IO [OutgoingNote]
     makeOutgoing acc (k, recvr) zats chg = do
-      chgAddr <- runNoLoggingT $ getInternalAddresses pool $ entityKey acc
+      chgAddr <- getInternalAddresses dbPath $ entityKey acc
       let internalUA = getUA $ walletAddressUAddress $ entityVal $ head chgAddr
       let chgRcvr =
             fromJust $ o_rec =<< isValidUnifiedAddress (E.encodeUtf8 internalUA)
@@ -586,7 +604,7 @@ prepareTx pool zebraHost zebraPort zn za bh amt ua memo = do
       -> IO [TransparentTxSpend]
     prepTSpends sk notes = do
       forM notes $ \n -> do
-        tAddRead <- getAddressById pool $ walletTrNoteAddress $ entityVal n
+        tAddRead <- getAddressById dbPath $ walletTrNoteAddress $ entityVal n
         print n
         case tAddRead of
           Nothing -> throwIO $ userError "Couldn't read t-address"
@@ -596,7 +614,7 @@ prepareTx pool zebraHost zebraPort zn za bh amt ua memo = do
                 (walletAddressIndex $ entityVal tAdd)
                 (getScope $ walletAddressScope $ entityVal tAdd)
                 sk
-            mReverseTxId <- getWalletTxId pool $ walletTrNoteTx $ entityVal n
+            mReverseTxId <- getWalletTxId dbPath $ walletTrNoteTx $ entityVal n
             case mReverseTxId of
               Nothing -> throwIO $ userError "failed to get tx ID"
               Just (ESQ.Value reverseTxId) -> do
@@ -661,24 +679,22 @@ prepareTx pool zebraHost zebraPort zn za bh amt ua memo = do
 syncWallet ::
      Config -- ^ configuration parameters
   -> Entity ZcashWallet
-  -> IO ()
+  -> LoggingT IO ()
 syncWallet config w = do
-  startTime <- liftIO getCurrentTime
   let walletDb = c_dbPath config
-  pool <- runNoLoggingT $ initPool walletDb
+  accs <- liftIO $ getAccounts walletDb $ entityKey w
-  accs <- runNoLoggingT $ getAccounts pool $ entityKey w
+  addrs <- liftIO $ concat <$> mapM (getAddresses walletDb . entityKey) accs
-  addrs <- concat <$> mapM (runNoLoggingT . getAddresses pool . entityKey) accs
   intAddrs <-
-    concat <$> mapM (runNoLoggingT . getInternalAddresses pool . entityKey) accs
+    liftIO $ concat <$> mapM (getInternalAddresses walletDb . entityKey) accs
-  chainTip <- runNoLoggingT $ getMaxBlock pool
+  chainTip <- liftIO $ getMaxBlock walletDb
   let lastBlock = zcashWalletLastSync $ entityVal w
   let startBlock =
         if lastBlock > 0
           then lastBlock
           else zcashWalletBirthdayHeight $ entityVal w
-  mapM_ (liftIO . findTransparentNotes pool startBlock) addrs
+  mapM_ (liftIO . findTransparentNotes walletDb startBlock) addrs
-  mapM_ (liftIO . findTransparentNotes pool startBlock) intAddrs
+  mapM_ (liftIO . findTransparentNotes walletDb startBlock) intAddrs
-  mapM_ (liftIO . findTransparentSpends pool . entityKey) accs
+  mapM_ (liftIO . findTransparentSpends walletDb . entityKey) accs
   sapNotes <-
     liftIO $
     mapM
@@ -689,52 +705,52 @@ syncWallet config w = do
     mapM
       (findOrchardActions config startBlock (zcashWalletNetwork $ entityVal w))
       accs
-  _ <- updateSaplingWitnesses pool
+  _ <- updateSaplingWitnesses walletDb
-  _ <- updateOrchardWitnesses pool
+  _ <- updateOrchardWitnesses walletDb
-  _ <- liftIO $ updateWalletSync pool chainTip (entityKey w)
+  _ <- liftIO $ updateWalletSync walletDb chainTip (entityKey w)
-  mapM_ (runNoLoggingT . getWalletTransactions pool) addrs
+  _ <- liftIO $ mapM_ (getWalletTransactions walletDb) addrs
+  logInfoN "Synced wallet"
 
 testSync :: Config -> IO ()
 testSync config = do
   let dbPath = c_dbPath config
   _ <- initDb dbPath
-  pool <- runNoLoggingT $ initPool dbPath
+  w <- getWallets dbPath TestNet
-  w <- getWallets pool TestNet
+  r <- runFileLoggingT "zenith.log" $ mapM (syncWallet config) w
-  r <- mapM (syncWallet config) w
   liftIO $ print r
-  {-let uaRead =-}
-        {-isValidUnifiedAddress-}
-          {-"utest1dl54utt6prjj5e0dnlknwumnxq9hycdjpkfr0sy6e6h522remqee8axe9zax0wsjrwpj76v555pdhvj9rnargpfyycs0vpkapq98xcdhem99gc4wchzn0ggepq3y6nz3a9sscwgqxgsh9vzhcad402y3x9szfregck5gslkya3c79d86xx0l33tpk8gnn7ew9vw37w43zh22u8dgdax"-}
-  {-case uaRead of-}
-    {-Nothing -> print "wrong address"-}
-    {-Just ua -> do-}
-      {-startTime <- getCurrentTime-}
-      {-print startTime-}
-      {-tx <--}
-        {-prepareTx-}
-          {-"zenith.db"-}
-          {-"127.0.0.1"-}
-          {-18232-}
-          {-TestNet-}
-          {-(toSqlKey 1)-}
-          {-2820897-}
-          {-0.04-}
-          {-ua-}
-          {-"sent with Zenith, test"-}
-      {-print tx-}
-      {-endTime <- getCurrentTime-}
-      {-print endTime-}
 
-{-testSend :: IO ()-}
+testSend :: IO ()
-{-testSend = do-}
+testSend = do
+  let uaRead =
+        isValidUnifiedAddress
+          "utest1dl54utt6prjj5e0dnlknwumnxq9hycdjpkfr0sy6e6h522remqee8axe9zax0wsjrwpj76v555pdhvj9rnargpfyycs0vpkapq98xcdhem99gc4wchzn0ggepq3y6nz3a9sscwgqxgsh9vzhcad402y3x9szfregck5gslkya3c79d86xx0l33tpk8gnn7ew9vw37w43zh22u8dgdax"
+  case uaRead of
+    Nothing -> print "wrong address"
+    Just ua -> do
+      startTime <- getCurrentTime
+      print startTime
+      tx <-
+        prepareTx
+          "zenith.db"
+          "127.0.0.1"
+          18232
+          TestNet
+          (toSqlKey 1)
+          2820897
+          0.04
+          ua
+          "sent with Zenith, test"
+      print tx
+      endTime <- getCurrentTime
+      print endTime
+
 clearSync :: Config -> IO ()
 clearSync config = do
   let dbPath = c_dbPath config
-  pool <- runNoLoggingT $ initPool dbPath
   _ <- initDb dbPath
-  _ <- clearWalletTransactions pool
+  _ <- clearWalletTransactions dbPath
-  w <- getWallets pool TestNet
+  w <- getWallets dbPath TestNet
-  liftIO $ mapM_ (updateWalletSync pool 0 . entityKey) w
+  liftIO $ mapM_ (updateWalletSync dbPath 0 . entityKey) w
-  w' <- liftIO $ getWallets pool TestNet
+  w' <- liftIO $ getWallets dbPath TestNet
-  r <- mapM (syncWallet config) w'
+  r <- runFileLoggingT "zenith.log" $ mapM (syncWallet config) w'
   liftIO $ print r

src/Zenith/Scanner.hs

@@ -3,23 +3,11 @@
 module Zenith.Scanner where
 
 import Control.Exception (throwIO, try)
-import qualified Control.Monad.Catch as CM (try)
-import Control.Monad.IO.Class (liftIO)
-import Control.Monad.Logger
-  ( LoggingT
-  , NoLoggingT
-  , logErrorN
-  , logInfoN
-  , runNoLoggingT
-  )
 import Data.Aeson
 import Data.HexString
 import Data.Maybe
 import qualified Data.Text as T
-import Data.Time (getCurrentTime)
-import Database.Persist.Sqlite
 import GHC.Utils.Monad (concatMapM)
-import Lens.Micro ((&), (.~), (^.), set)
 import System.Console.AsciiProgress
 import ZcashHaskell.Types
   ( BlockResponse(..)
@@ -42,77 +30,64 @@ scanZebra ::
   -> T.Text -- ^ Host
   -> Int -- ^ Port
   -> T.Text -- ^ Path to database file
-  -> NoLoggingT IO ()
+  -> IO ()
 scanZebra b host port dbFilePath = do
-  _ <- liftIO $ initDb dbFilePath
+  _ <- initDb dbFilePath
-  startTime <- liftIO getCurrentTime
-  logInfoN $ "Started sync: " <> T.pack (show startTime)
   bc <-
-    liftIO $ try $ checkBlockChain host port :: NoLoggingT
+    try $ checkBlockChain host port :: IO
-      IO
       (Either IOError ZebraGetBlockChainInfo)
   case bc of
-    Left e -> logErrorN $ T.pack (show e)
+    Left e -> print e
     Right bStatus -> do
-      let dbInfo =
+      dbBlock <- getMaxBlock dbFilePath
-            mkSqliteConnectionInfo dbFilePath & extraPragmas .~
-            ["read_uncommited = true"]
-      pool <- createSqlitePoolFromInfo dbInfo 5
-      dbBlock <- getMaxBlock pool
       let sb = max dbBlock b
       if sb > zgb_blocks bStatus || sb < 1
-        then liftIO $ throwIO $ userError "Invalid starting block for scan"
+        then throwIO $ userError "Invalid starting block for scan"
         else do
-          liftIO $
+          print $
-            print $
             "Scanning from " ++
             show (sb + 1) ++ " to " ++ show (zgb_blocks bStatus)
           let bList = [(sb + 1) .. (zgb_blocks bStatus)]
           displayConsoleRegions $ do
-            pg <-
+            pg <- newProgressBar def {pgTotal = fromIntegral $ length bList}
-              liftIO $
-              newProgressBar def {pgTotal = fromIntegral $ length bList}
             txList <-
-              CM.try $ mapM_ (processBlock host port pool pg) bList :: NoLoggingT
+              try $ mapM_ (processBlock host port dbFilePath pg) bList :: IO
-                IO
                 (Either IOError ())
             case txList of
-              Left e1 -> logErrorN $ T.pack (show e1)
+              Left e1 -> print e1
-              Right txList' -> logInfoN "Finished scan"
+              Right txList' -> print txList'
 
 -- | Function to process a raw block and extract the transaction information
 processBlock ::
      T.Text -- ^ Host name for `zebrad`
   -> Int -- ^ Port for `zebrad`
-  -> ConnectionPool -- ^ DB file path
+  -> T.Text -- ^ DB file path
   -> ProgressBar -- ^ Progress bar
   -> Int -- ^ The block number to process
-  -> NoLoggingT IO ()
+  -> IO ()
-processBlock host port pool pg b = do
+processBlock host port dbFp pg b = do
   r <-
-    liftIO $
     makeZebraCall
       host
       port
       "getblock"
       [Data.Aeson.String $ T.pack $ show b, jsonNumber 1]
   case r of
-    Left e -> liftIO $ throwIO $ userError e
+    Left e -> throwIO $ userError e
     Right blk -> do
       r2 <-
-        liftIO $
         makeZebraCall
           host
           port
           "getblock"
           [Data.Aeson.String $ T.pack $ show b, jsonNumber 0]
       case r2 of
-        Left e2 -> liftIO $ throwIO $ userError e2
+        Left e2 -> throwIO $ userError e2
         Right hb -> do
           let blockTime = getBlockTime hb
-          mapM_ (processTx host port blockTime pool) $
+          mapM_ (processTx host port blockTime dbFp) $
             bl_txs $ addTime blk blockTime
-          liftIO $ tick pg
+          tick pg
   where
     addTime :: BlockResponse -> Int -> BlockResponse
     addTime bl t =
@@ -127,25 +102,24 @@ processTx ::
      T.Text -- ^ Host name for `zebrad`
   -> Int -- ^ Port for `zebrad`
   -> Int -- ^ Block time
-  -> ConnectionPool -- ^ DB file path
+  -> T.Text -- ^ DB file path
   -> HexString -- ^ transaction id
-  -> NoLoggingT IO ()
+  -> IO ()
-processTx host port bt pool t = do
+processTx host port bt dbFp t = do
   r <-
-    liftIO $
     makeZebraCall
       host
       port
       "getrawtransaction"
       [Data.Aeson.String $ toText t, jsonNumber 1]
   case r of
-    Left e -> liftIO $ throwIO $ userError e
+    Left e -> throwIO $ userError e
     Right rawTx -> do
       case readZebraTransaction (ztr_hex rawTx) of
         Nothing -> return ()
         Just rzt -> do
           _ <-
-            saveTransaction pool bt $
+            saveTransaction dbFp bt $
             Transaction
               t
               (ztr_blockheight rawTx)

zenith.cabal

@@ -46,7 +46,6 @@ library
     , bytestring
     , esqueleto
     , resource-pool
-    , exceptions
     , monad-logger
     , vty-crossplatform
     , secp256k1-haskell
@@ -62,7 +61,6 @@ library
     , microlens-th
     , mtl
     , persistent
-    , Hclip
     , persistent-sqlite
     , persistent-template
     , process
@@ -107,7 +105,6 @@ executable zenscan
   build-depends:
       base >=4.12 && <5
     , configurator
-    , monad-logger
     , zenith
   pkgconfig-depends: rustzcash_wrapper
   default-language: Haskell2010