CHANGELOG.md

@@ -28,7 +28,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Upgraded to GHC 9.6.5
-- Implemented config and data folder
 
 ### Fixed
 

app/Main.hs

@@ -202,7 +202,7 @@ processUri user pwd =
 
 main :: IO ()
 main = do
-  config <- load ["$(HOME)/Zenith/zenith.cfg"]
+  config <- load ["zenith.cfg"]
   args <- getArgs
   dbFilePath <- require config "dbFilePath"
   {-nodeUser <- require config "nodeUser"-}

src/Zenith/GUI.hs

@@ -25,8 +25,6 @@ import Lens.Micro ((&), (+~), (.~), (?~), (^.), set)
 import Lens.Micro.TH
 import Monomer
 import qualified Monomer.Lens as L
-import System.Directory (getHomeDirectory)
-import System.FilePath ((</>))
 import System.Hclip
 import Text.Printf
 import Text.Wrap (FillScope(..), FillStrategy(..), WrapSettings(..), wrapText)
@@ -143,7 +141,6 @@ data AppModel = AppModel
   , _recipientValid :: !Bool
   , _amountValid :: !Bool
   , _showId :: !(Maybe T.Text)
-  , _home :: !FilePath
   } deriving (Eq, Show)
 
 makeLenses ''AppModel
@@ -443,11 +440,7 @@ buildUI wenv model = widgetTree
                                  (fromIntegral $ qrCodeWidth qr))
                               [fitWidth]
                           Nothing ->
-                            image_
-                              (T.pack $
-                               (model ^. home) </>
-                               "Zenith/assets/1F928_color.png")
-                              [fitEither]) `styleBasic`
+                            image_ "./assets/1F928_color.png" [fitEither]) `styleBasic`
                      [bgColor white, height 100, width 100]
                    , filler
                    ] `styleBasic`
@@ -511,9 +504,7 @@ buildUI wenv model = widgetTree
         , spacer
         , label (showt $ model ^. timer) `styleBasic` [padding 3, textSize 8]
         , filler
-        , image_
-            (T.pack $ (model ^. home) </> "Zenith/assets/1F993.png")
-            [fitHeight] `styleBasic`
+        , image_ "./assets/1F993.png" [fitHeight] `styleBasic`
           [height 24, width 24] `nodeVisible`
           (model ^. zebraOn)
         , label
@@ -1251,121 +1242,66 @@ txtWrap = wrapText (WrapSettings False True NoFill FillAfterFirst) 32
 
 runZenithGUI :: Config -> IO ()
 runZenithGUI config = do
-  homeDir <- try getHomeDirectory :: IO (Either IOError FilePath)
-  case homeDir of
-    Left e -> print e
-    Right hD -> 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
-          bc <-
-            try $ checkBlockChain host port :: IO
-              (Either IOError ZebraGetBlockChainInfo)
-          case bc of
-            Left e1 -> throwIO e1
-            Right chainInfo -> do
-              initDb dbFilePath
-              generateQRCodes config
-              walList <- getWallets pool $ zgb_net chainInfo
-              accList <-
-                if not (null walList)
-                  then runNoLoggingT $
-                       getAccounts pool $ entityKey $ head walList
-                  else return []
-              addrList <-
-                if not (null accList)
-                  then runNoLoggingT $
-                       getAddresses pool $ entityKey $ head accList
-                  else return []
-              txList <-
-                if not (null addrList)
-                  then getUserTx pool $ entityKey $ head addrList
-                  else return []
-              qr <-
-                if not (null addrList)
-                  then getQrCode pool Orchard $ entityKey $ head addrList
-                  else return Nothing
-              bal <-
-                if not (null accList)
-                  then getBalance pool $ entityKey $ head accList
-                  else return 0
-              unconfBal <-
-                if not (null accList)
-                  then getUnconfirmedBalance pool $ entityKey $ head accList
-                  else return 0
-              let model =
-                    AppModel
-                      config
-                      (zgb_net chainInfo)
-                      walList
-                      0
-                      accList
-                      0
-                      addrList
-                      0
-                      txList
-                      0
-                      Nothing
-                      True
-                      bal
-                      (if unconfBal == 0
-                         then Nothing
-                         else Just unconfBal)
-                      Orchard
-                      qr
-                      False
-                      False
-                      False
-                      False
-                      ""
-                      Nothing
-                      ""
-                      ""
-                      (SaveAddress $
-                       if not (null accList)
-                         then Just (head accList)
-                         else Nothing)
-                      False
-                      False
-                      Nothing
-                      Nothing
-                      0
-                      1.0
-                      False
-                      ""
-                      0.0
-                      ""
-                      False
-                      False
-                      Nothing
-                      hD
-              startApp model handleEvent buildUI (params hD)
-        Left e -> 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
+      bc <-
+        try $ checkBlockChain host port :: IO
+          (Either IOError ZebraGetBlockChainInfo)
+      case bc of
+        Left e1 -> throwIO e1
+        Right chainInfo -> do
           initDb dbFilePath
+          generateQRCodes config
+          walList <- getWallets pool $ zgb_net chainInfo
+          accList <-
+            if not (null walList)
+              then runNoLoggingT $ getAccounts pool $ entityKey $ head walList
+              else return []
+          addrList <-
+            if not (null accList)
+              then runNoLoggingT $ getAddresses pool $ entityKey $ head accList
+              else return []
+          txList <-
+            if not (null addrList)
+              then getUserTx pool $ entityKey $ head addrList
+              else return []
+          qr <-
+            if not (null addrList)
+              then getQrCode pool Orchard $ entityKey $ head addrList
+              else return Nothing
+          bal <-
+            if not (null accList)
+              then getBalance pool $ entityKey $ head accList
+              else return 0
+          unconfBal <-
+            if not (null accList)
+              then getUnconfirmedBalance pool $ entityKey $ head accList
+              else return 0
           let model =
                 AppModel
                   config
-                  TestNet
-                  []
+                  (zgb_net chainInfo)
+                  walList
                   0
-                  []
+                  accList
                   0
-                  []
+                  addrList
                   0
-                  []
+                  txList
                   0
-                  (Just $
-                   "Couldn't connect to Zebra on " <>
-                   host <> ":" <> showt port <> ". Check your configuration.")
-                  False
-                  314259000
-                  (Just 30000)
+                  Nothing
+                  True
+                  bal
+                  (if unconfBal == 0
+                     then Nothing
+                     else Just unconfBal)
                   Orchard
-                  Nothing
+                  qr
                   False
                   False
                   False
@@ -1374,7 +1310,10 @@ runZenithGUI config = do
                   Nothing
                   ""
                   ""
-                  (SaveAddress Nothing)
+                  (SaveAddress $
+                   if not (null accList)
+                     then Just (head accList)
+                     else Nothing)
                   False
                   False
                   Nothing
@@ -1388,26 +1327,61 @@ runZenithGUI config = do
                   False
                   False
                   Nothing
-                  hD
-          startApp model handleEvent buildUI (params hD)
+          startApp model handleEvent buildUI params
+    Left e -> do
+      initDb dbFilePath
+      let model =
+            AppModel
+              config
+              TestNet
+              []
+              0
+              []
+              0
+              []
+              0
+              []
+              0
+              (Just $
+               "Couldn't connect to Zebra on " <>
+               host <> ":" <> showt port <> ". Check your configuration.")
+              False
+              314259000
+              (Just 30000)
+              Orchard
+              Nothing
+              False
+              False
+              False
+              False
+              ""
+              Nothing
+              ""
+              ""
+              (SaveAddress Nothing)
+              False
+              False
+              Nothing
+              Nothing
+              0
+              1.0
+              False
+              ""
+              0.0
+              ""
+              False
+              False
+              Nothing
+      startApp model handleEvent buildUI params
   where
-    params hd =
+    params =
       [ appWindowTitle "Zenith - Zcash Full Node Wallet"
       , appWindowState $ MainWindowNormal (1000, 700)
       , appTheme zenithTheme
-      , appFontDef
-          "Regular"
-          (T.pack $
-           hd </>
-           "Zenith/assets/Atkinson-Hyperlegible-Regular-102.ttf" --"./assets/DejaVuSansMono.ttf" 
-           )
-      , appFontDef
-          "Bold"
-          (T.pack $ hd </> "Zenith/assets/Atkinson-Hyperlegible-Bold-102.ttf")
-      , appFontDef
-          "Italic"
-          (T.pack $ hd </> "Zenith/assets/Atkinson-Hyperlegible-Italic-102.ttf")
-      , appFontDef "Remix" (T.pack $ hd </> "Zenith/assets/remixicon.ttf")
+      , appFontDef "Regular" "./assets/Atkinson-Hyperlegible-Regular-102.ttf" --"./assets/DejaVuSansMono.ttf" 
+      , appFontDef "Bold" "./assets/Atkinson-Hyperlegible-Bold-102.ttf"
+      , appFontDef "Italic" "./assets/Atkinson-Hyperlegible-Italic-102.ttf"
+      , appFontDef "Remix" "./assets/remixicon.ttf"
       , appDisableAutoScale True
       , appScaleFactor 2.0
       , appInitEvent AppInit

zcash-haskell

@@ -1 +1 @@
-Subproject commit e8074419cfb54559a4c09731ad2448d5930869a2
+Subproject commit 90c8a7c3028bd6836dea5655221277a25d457653

zenith.cabal

@@ -47,8 +47,6 @@ library
     , brick
     , bytestring
     , data-default
-    , directory
-    , filepath
     , esqueleto
     , resource-pool
     , binary