Merge #2290

2290: Wire up outstanding new IPC queries to the cli r=Jimbo4350 a=Jimbo4350 Depends on #2275 The following cli commands were updated with the new IPC. - `tip` - `utxo` - `ledger-state` - `protocol-state` Co-authored-by: Jordan Millar <jordan.millar@iohk.io>
IntersectMBO · Feb 9, 2021 · f10af95 · f10af95
2 parents d714bf0 + f3088d7
commit f10af95
Show file tree

Hide file tree

Showing 25 changed files with 622 additions and 557 deletions.
diff --git a/cardano-api/cardano-api.cabal b/cardano-api/cardano-api.cabal
@@ -22,16 +22,19 @@ library
                         --TODO: these should either be removed once the new IPC
                         -- is fully integrated, or re-exported via the export
                         -- modules above
+                        Cardano.Api.Block
                         Cardano.Api.Crypto.Ed25519Bip32
                         Cardano.Api.Eras
                         Cardano.Api.LocalChainSync
                         Cardano.Api.Modes
+                        Cardano.Api.Orphans
                         Cardano.Api.Protocol
                         Cardano.Api.ProtocolParameters
                         Cardano.Api.Protocol.Byron
                         Cardano.Api.Protocol.Cardano
                         Cardano.Api.Protocol.Shelley
                         Cardano.Api.Protocol.Types
+                        Cardano.Api.Query
                         Cardano.Api.Shelley.Genesis
                         Cardano.Api.TxInMode
                         Cardano.Api.TxSubmit
@@ -48,7 +51,7 @@ library
 
                         -- Splitting up the big Typed module:
                         Cardano.Api.Address
-                        Cardano.Api.Block
+-- TODO: move here      Cardano.Api.Block
                         Cardano.Api.Certificate
                         Cardano.Api.Error
                         Cardano.Api.Fees
@@ -62,7 +65,7 @@ library
                         Cardano.Api.NetworkId
                         Cardano.Api.OperationalCertificate
 -- TODO: move here      Cardano.Api.ProtocolParameters
-                        Cardano.Api.Query
+-- TODO: move here      Cardano.Api.Query
                         Cardano.Api.Script
                         Cardano.Api.SerialiseBech32
                         Cardano.Api.SerialiseCBOR
@@ -121,6 +124,7 @@ library
                       , scientific
                       , serialise
                       , shelley-spec-ledger
+                      , small-steps
                       , stm
                       , text
                       , time

diff --git a/cardano-api/src/Cardano/Api.hs b/cardano-api/src/Cardano/Api.hs
@@ -347,6 +347,7 @@ module Cardano.Api (
     deserialiseFromRawBytes,
     serialiseToRawBytesHex,
     deserialiseFromRawBytesHex,
+    serialiseToRawBytesHexText,
 
     -- ** Text envelope
     -- | Support for a envelope file format with text headers and a hex-encoded

diff --git a/cardano-api/src/Cardano/Api/Address.hs b/cardano-api/src/Cardano/Api/Address.hs
@@ -64,6 +64,8 @@ module Cardano.Api.Address (
 
 import           Prelude
 
+import           Data.Aeson (ToJSON (..))
+import qualified Data.Aeson as Aeson
 import qualified Data.ByteString.Base58 as Base58
 import           Data.Text (Text)
 import qualified Data.Text.Encoding as Text
@@ -312,6 +314,9 @@ data AddressInEra era where
                   -> Address addrtype
                   -> AddressInEra era
 
+instance IsCardanoEra era => ToJSON (AddressInEra era) where
+  toJSON = Aeson.String . serialiseAddress
+
 instance Eq (AddressInEra era) where
   (==) (AddressInEra ByronAddressInAnyEra addr1)
        (AddressInEra ByronAddressInAnyEra addr2) = addr1 == addr2
@@ -349,7 +354,7 @@ instance IsCardanoEra era => SerialiseAsRawBytes (AddressInEra era) where
     serialiseToRawBytes (AddressInEra ShelleyAddressInEra{} addr) =
       serialiseToRawBytes addr
 
-    deserialiseFromRawBytes _ bs = do
+    deserialiseFromRawBytes _ bs =
       anyAddressInEra cardanoEra =<< deserialiseFromRawBytes AsAddressAny bs
 
 instance IsCardanoEra era => SerialiseAddress (AddressInEra era) where

diff --git a/cardano-api/src/Cardano/Api/Block.hs b/cardano-api/src/Cardano/Api/Block.hs
@@ -41,28 +41,30 @@ module Cardano.Api.Block (
 
 import           Prelude
 
+import           Data.Aeson (ToJSON (..), object, (.=))
+import qualified Data.Aeson as Aeson
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Short as SBS
-import           Data.Foldable (Foldable(toList))
+import           Data.Foldable (Foldable (toList))
 
-import           Cardano.Slotting.Block (BlockNo(..))
-import           Cardano.Slotting.Slot (SlotNo, EpochNo)
+import           Cardano.Slotting.Block (BlockNo)
+import           Cardano.Slotting.Slot (EpochNo, SlotNo)
 
 import qualified Ouroboros.Network.Block as Consensus
 
-import qualified Ouroboros.Consensus.Block               as Consensus
-import qualified Ouroboros.Consensus.HardFork.Combinator as Consensus
-import qualified Ouroboros.Consensus.HardFork.Combinator.Degenerate as Consensus
-import qualified Ouroboros.Consensus.Byron.Ledger        as Consensus
-import qualified Ouroboros.Consensus.Shelley.Ledger      as Consensus
-import qualified Ouroboros.Consensus.Cardano.Block       as Consensus
-import qualified Ouroboros.Consensus.Cardano.ByronHFC    as Consensus
-import qualified Ouroboros.Consensus.Cardano.ShelleyHFC  as Consensus
 import qualified Cardano.Crypto.Hash.Class
 import qualified Cardano.Crypto.Hashing
+import qualified Ouroboros.Consensus.Block as Consensus
+import qualified Ouroboros.Consensus.Byron.Ledger as Consensus
+import qualified Ouroboros.Consensus.Cardano.Block as Consensus
+import qualified Ouroboros.Consensus.Cardano.ByronHFC as Consensus
+import qualified Ouroboros.Consensus.Cardano.ShelleyHFC as Consensus
+import qualified Ouroboros.Consensus.HardFork.Combinator as Consensus
+import qualified Ouroboros.Consensus.HardFork.Combinator.Degenerate as Consensus
+import qualified Ouroboros.Consensus.Shelley.Ledger as Consensus
 
 import qualified Cardano.Chain.Block as Byron
-import qualified Cardano.Chain.UTxO  as Byron
+import qualified Cardano.Chain.UTxO as Byron
 
 import qualified Shelley.Spec.Ledger.BlockChain as Shelley
 
@@ -326,6 +328,14 @@ data ChainTip = ChainTipAtGenesis
               | ChainTip !SlotNo !(Hash BlockHeader) !BlockNo
   deriving (Eq, Show)
 
+instance ToJSON ChainTip where
+  toJSON ChainTipAtGenesis = Aeson.Null
+  toJSON (ChainTip slot headerHash (Consensus.BlockNo bNum)) =
+    object [ "slot" .= slot
+           , "hash" .= serialiseToRawBytesHexText headerHash
+           , "block" .= bNum
+           ]
+
 chainTipToChainPoint :: ChainTip -> ChainPoint
 chainTipToChainPoint ChainTipAtGenesis = ChainPointAtGenesis
 chainTipToChainPoint (ChainTip s h _)  = ChainPoint s h

diff --git a/cardano-api/src/Cardano/Api/IPC.hs b/cardano-api/src/Cardano/Api/IPC.hs
@@ -487,7 +487,7 @@ submitTxToNodeLocal connctInfo tx = do
 --
 
 
-getLocalChainTip :: LocalNodeConnectInfo mode -> IO ChainPoint
+getLocalChainTip :: LocalNodeConnectInfo mode -> IO ChainTip
 getLocalChainTip localNodeConInfo = do
     resultVar <- newEmptyTMVarIO
     connectToLocalNode
@@ -497,7 +497,7 @@ getLocalChainTip localNodeConInfo = do
         , localTxSubmissionClient = Nothing
         , localStateQueryClient = Nothing
         }
-    atomically $ chainTipToChainPoint <$> takeTMVar resultVar
+    atomically $ takeTMVar resultVar
 
 chainSyncGetCurrentTip
   :: forall mode. TMVar ChainTip

diff --git a/cardano-api/src/Cardano/Api/KeysByron.hs b/cardano-api/src/Cardano/Api/KeysByron.hs
@@ -100,7 +100,7 @@ instance Key ByronKey where
 
     newtype VerificationKey ByronKey =
            ByronVerificationKey Byron.VerificationKey
-      deriving stock (Eq)
+      deriving stock Eq
       deriving (Show, IsString) via UsingRawBytesHex (VerificationKey ByronKey)
       deriving newtype (ToCBOR, FromCBOR)
       deriving anyclass SerialiseAsCBOR