Implement JSON output support for Shelley tip query command

IntersectMBO · Jul 3, 2020 · 226d47e · 226d47e
1 parent 588f13a
commit 226d47e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Query.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Query.hs
@@ -133,8 +133,8 @@ runQueryTip network mOutFile = do
   tip <- liftIO $ withIOManager $ \iomgr ->
     getLocalTip iomgr ptclClientInfo network sockPath
   case mOutFile of
-    Just (OutputFile fpath) -> liftIO . writeFile fpath $ show tip
-    Nothing -> liftIO $ putTextLn (show tip)
+    Just (OutputFile fpath) -> liftIO . LBS.writeFile fpath $ encodePretty tip
+    Nothing -> liftIO $ LBS.putStrLn (encodePretty tip)
 
 
 runQueryUTxO

diff --git a/cardano-config/cardano-config.cabal b/cardano-config/cardano-config.cabal
@@ -86,6 +86,7 @@ library
                      , iproute
                      , safe-exceptions
                      , scientific
+                     , serialise
                      , shelley-spec-ledger
                      , string-conv
                      , stm

diff --git a/cardano-config/src/Cardano/Config/Orphanage.hs b/cardano-config/src/Cardano/Config/Orphanage.hs
@@ -3,6 +3,7 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE StandaloneDeriving #-}
+{-# LANGUAGE UndecidableInstances #-}
 
 {-# OPTIONS_GHC -Wno-orphans #-}
 
@@ -11,14 +12,20 @@ module Cardano.Config.Orphanage () where
 import           Cardano.Prelude
 import qualified Prelude
 
+import           Codec.Serialise (Serialise, serialise)
 import           Data.Aeson
-import           Network.Socket (PortNumber)
+import qualified Data.ByteString.Base16 as Base16
+import qualified Data.ByteString.Lazy as LBS
 import           Data.Scientific (coefficient)
 import qualified Data.Text as Text
+import qualified Data.Text.Encoding as Text
+import           Network.Socket (PortNumber)
 
 import           Cardano.BM.Data.Tracer (TracingVerbosity(..))
 import qualified Cardano.Chain.Update as Update
+import           Cardano.Slotting.Block (BlockNo (..))
 import           Ouroboros.Consensus.NodeId (CoreNodeId (..))
+import           Ouroboros.Network.Block (HeaderHash, Tip (..))
 
 
 deriving instance Show TracingVerbosity
@@ -50,3 +57,13 @@ instance FromJSON Update.ApplicationName where
   parseJSON invalid  =
     panic $ "Parsing of application name failed due to type mismatch. "
     <> "Encountered: " <> (Text.pack $ Prelude.show invalid)
+
+instance Serialise (HeaderHash blk) => ToJSON (Tip blk) where
+  toJSON TipGenesis = object [ "genesis" .= True ]
+  toJSON (Tip slotNo headerHash (BlockNo bn)) =
+    object
+      [ "slotNo" .= slotNo
+      , "headerHash" .=
+          (Text.decodeLatin1 . Base16.encode . LBS.toStrict . serialise) headerHash
+      , "blockNo" .= bn
+      ]