CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.7.1.0-beta]
+
+## Changed
+
+- Removed workaround to obtain block time
+
 ## [0.7.0.0-beta]
 
 ### Added

src/Zenith/CLI.hs

@@ -894,26 +894,13 @@ scanZebra dbP zHost zPort b eChan znet = do
           _ <- liftIO $ completeSync pool Failed
           liftIO $ BC.writeBChan eChan $ TickMsg e1
         Right blk -> do
-          r2 <-
-            liftIO $
-            makeZebraCall
-              zHost
-              zPort
-              "getblock"
-              [Data.Aeson.String $ T.pack $ show bl, jsonNumber 0]
-          case r2 of
-            Left e2 -> do
-              _ <- liftIO $ completeSync pool Failed
-              liftIO $ BC.writeBChan eChan $ TickMsg e2
-            Right hb -> do
-              let blockTime = getBlockTime hb
           bi <-
             saveBlock pool $
             ZcashBlock
               (fromIntegral $ bl_height blk)
               (HexStringDB $ bl_hash blk)
               (fromIntegral $ bl_confirmations blk)
-                  blockTime
+              (fromIntegral $ bl_time blk)
               (ZcashNetDB znet)
           mapM_ (processTx zHost zPort bi pool) $ bl_txs blk
           liftIO $ BC.writeBChan eChan $ TickVal step

src/Zenith/GUI.hs

@@ -1729,26 +1729,13 @@ scanZebra dbPath zHost zPort net sendMsg = do
           _ <- completeSync pool Failed
           sendMsg (ShowError $ showt e1)
         Right blk -> do
-          r2 <-
-            liftIO $
-            makeZebraCall
-              zHost
-              zPort
-              "getblock"
-              [Data.Aeson.String $ showt bl, jsonNumber 0]
-          case r2 of
-            Left e2 -> do
-              _ <- completeSync pool Failed
-              sendMsg (ShowError $ showt e2)
-            Right hb -> do
-              let blockTime = getBlockTime hb
           bi <-
             saveBlock pool $
             ZcashBlock
               (fromIntegral $ bl_height blk)
               (HexStringDB $ bl_hash blk)
               (fromIntegral $ bl_confirmations blk)
-                  blockTime
+              (fromIntegral $ bl_time blk)
               (ZcashNetDB net)
           mapM_ (processTx zHost zPort bi pool) $ bl_txs blk
           sendMsg (SyncVal step)

src/Zenith/RPC.hs

@@ -932,22 +932,12 @@ scanZebra dbPath zHost zPort net = do
       case r of
         Left _ -> completeSync pool Failed
         Right blk -> do
-          r2 <-
-            makeZebraCall
-              zHost
-              zPort
-              "getblock"
-              [Data.Aeson.String $ T.pack (show bl), jsonNumber 0]
-          case r2 of
-            Left _ -> completeSync pool Failed
-            Right hb -> do
-              let blockTime = getBlockTime hb
           bi <-
             saveBlock pool $
             ZcashBlock
               (fromIntegral $ bl_height blk)
               (HexStringDB $ bl_hash blk)
               (fromIntegral $ bl_confirmations blk)
-                  blockTime
+              (fromIntegral $ bl_time blk)
               (ZcashNetDB net)
           mapM_ (processTx zHost zPort bi pool) $ bl_txs blk

src/Zenith/Scanner.hs

@@ -133,26 +133,13 @@ processBlock host port pool pg net b = do
       _ <- completeSync pool Failed
       liftIO $ 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 -> do
-          _ <- completeSync pool Failed
-          liftIO $ throwIO $ userError e2
-        Right hb -> do
-          let blockTime = getBlockTime hb
       bi <-
         saveBlock pool $
         ZcashBlock
           (fromIntegral $ bl_height blk)
           (HexStringDB $ bl_hash blk)
           (fromIntegral $ bl_confirmations blk)
-              blockTime
+          (fromIntegral $ bl_time blk)
           net
       mapM_ (processTx host port bi pool) $ bl_txs blk
       liftIO $ tick pg

zcash-haskell

@@ -1 +1 @@
-Subproject commit d45bd7dcf3c3cf4e893900a1774d24b14bf56591
+Subproject commit 4289a9ded67ef2ca432abc412934fb5b8b59a9cf

zenith.cabal

@@ -1,6 +1,6 @@
 cabal-version:    3.0
 name:             zenith
-version:          0.7.0.0-beta
+version:          0.7.1.0-beta
 license:          MIT
 license-file:     LICENSE
 author:           Rene Vergara