Update getLocalChainTip to return a ChainTip

IntersectMBO · Jan 29, 2021 · d38e7a7 · d38e7a7
1 parent 5f7ff36
commit d38e7a7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/cardano-api/cardano-api.cabal b/cardano-api/cardano-api.cabal
@@ -22,6 +22,7 @@ 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
@@ -49,7 +50,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

diff --git a/cardano-api/src/Cardano/Api/Block.hs b/cardano-api/src/Cardano/Api/Block.hs
@@ -254,13 +254,6 @@ data ChainPoint = ChainPointAtGenesis
                 | ChainPoint !SlotNo !(Hash BlockHeader)
   deriving (Eq, Show)
 
-instance ToJSON ChainPoint where
-  toJSON ChainPointAtGenesis = Aeson.String "Tip is currently at genesis block"
-  toJSON (ChainPoint slot headerHash) =
-    object [ "Slot Number" .= slot
-           , "Slot Header Hash" .= Text.decodeUtf8 (serialiseToRawBytesHex headerHash)
-           ]
-
 
 toConsensusPointInMode :: ConsensusMode mode
                        -> ChainPoint
@@ -336,6 +329,14 @@ data ChainTip = ChainTipAtGenesis
               | ChainTip !SlotNo !(Hash BlockHeader) !BlockNo
   deriving (Eq, Show)
 
+instance ToJSON ChainTip where
+  toJSON ChainTipAtGenesis = Aeson.String "Tip is currently at genesis block"
+  toJSON (ChainTip slot headerHash (Consensus.BlockNo bNum)) =
+    object [ "slotNo" .= slot
+           , "headerHash" .= Text.decodeUtf8 (serialiseToRawBytesHex headerHash)
+           , "blockNo" .= 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-cli/src/Cardano/CLI/Shelley/Run/Query.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Query.hs
@@ -34,6 +34,7 @@ import           Control.Monad.Trans.Except.Extra (firstExceptT, handleIOExceptT
 import qualified Control.State.Transition as STS
 
 import           Cardano.Api
+import           Cardano.Api.Block
 import           Cardano.Api.Byron
 import qualified Cardano.Api.IPC as NewIPC
 import           Cardano.Api.Modes (AnyConsensusMode (..), AnyConsensusModeParams (..), toEraInMode)
@@ -135,7 +136,7 @@ runQueryProtocolParameters anyEra@(AnyCardanoEra era) (AnyConsensusModeParams cM
                                         $ NewIPC.QueryInShelleyBasedEra sbe NewIPC.QueryProtocolParameters
 
   tip <- liftIO $ NewIPC.getLocalChainTip localNodeConnInfo
-  res <- liftIO $ NewIPC.queryNodeLocalState localNodeConnInfo tip qInMode
+  res <- liftIO $ NewIPC.queryNodeLocalState localNodeConnInfo (chainTipToChainPoint tip) qInMode
   case res of
     Left acqFailure -> left $ ShelleyQueryCmdAcquireFailure acqFailure
     Right ePparams ->
@@ -198,7 +199,7 @@ runQueryUTxO anyEra@(AnyCardanoEra era) (AnyConsensusModeParams cModeParams)
   qInMode <- createQuery sbe eraInMode
 
   tip <- liftIO $ NewIPC.getLocalChainTip localNodeConnInfo
-  eUtxo <- liftIO $ NewIPC.queryNodeLocalState localNodeConnInfo tip qInMode
+  eUtxo <- liftIO $ NewIPC.queryNodeLocalState localNodeConnInfo (chainTipToChainPoint tip) qInMode
   case eUtxo of
     Left aF -> left $ ShelleyQueryCmdAcquireFailure aF
     Right eU -> case eU of
@@ -243,7 +244,7 @@ runQueryLedgerState anyEra@(AnyCardanoEra era) (AnyConsensusModeParams cModePara
                     $ NewIPC.QueryLedgerState
 
     tip <- liftIO $ NewIPC.getLocalChainTip localNodeConnInfo
-    res <- liftIO $ NewIPC.queryNodeLocalState localNodeConnInfo tip qInMode
+    res <- liftIO $ NewIPC.queryNodeLocalState localNodeConnInfo (chainTipToChainPoint tip) qInMode
     case res of
       Left acqFailure -> left $ ShelleyQueryCmdAcquireFailure acqFailure
       Right eStakeDist ->
@@ -278,7 +279,7 @@ runQueryProtocolState anyEra@(AnyCardanoEra era) (AnyConsensusModeParams cModePa
 
 
     tip <- liftIO $ NewIPC.getLocalChainTip localNodeConnInfo
-    res <- liftIO $ NewIPC.queryNodeLocalState localNodeConnInfo tip qInMode
+    res <- liftIO $ NewIPC.queryNodeLocalState localNodeConnInfo (chainTipToChainPoint tip) qInMode
     case res of
       Left acqFailure -> left $ ShelleyQueryCmdAcquireFailure acqFailure
       Right eStakeDist ->
@@ -319,7 +320,7 @@ runQueryStakeAddressInfo anyEra@(AnyCardanoEra era) (AnyConsensusModeParams cMod
 
 
   tip <- liftIO $ NewIPC.getLocalChainTip localNodeConnInfo
-  res <- liftIO $ NewIPC.queryNodeLocalState localNodeConnInfo tip qInMode
+  res <- liftIO $ NewIPC.queryNodeLocalState localNodeConnInfo (chainTipToChainPoint tip) qInMode
   case res of
     Left acqFailure -> left $ ShelleyQueryCmdAcquireFailure acqFailure
     Right eDelegsAndRwds ->
@@ -509,7 +510,7 @@ runQueryStakeDistribution anyEra@(AnyCardanoEra era) (AnyConsensusModeParams cMo
                  in return $ NewIPC.QueryInEra eraInMode query
 
   tip <- liftIO $ NewIPC.getLocalChainTip localNodeConnInfo
-  res <- liftIO $ NewIPC.queryNodeLocalState localNodeConnInfo tip qInMode
+  res <- liftIO $ NewIPC.queryNodeLocalState localNodeConnInfo (chainTipToChainPoint tip) qInMode
   case res of
     Left acqFailure -> left $ ShelleyQueryCmdAcquireFailure acqFailure
     Right eStakeDist ->