Do not use Serialised in LedgerPeerSnapshot

Author: jasagredo

cabal.project

@@ -78,13 +78,12 @@ constraints:
 source-repository-package
   type: git
   location: https://github.com/IntersectMBO/cardano-api
-  tag: 076f7e966ec1d6457b1b9ec5ceee0f9e598fed12
-  --sha256: sha256-XmuQTZdD/ZdCNlRuD+V5cNslEM05xwTACmMunzuCCJY=
+  tag: 79b751a77ef2a4ecda563b6ec1855c7ef4653046
+  --sha256: sha256-pb6eF52jUXvCCdY6hg80Z16E8FpNVfDR1eQMKeZxH4E=
   subdir:
     cardano-api
 
 
-
 source-repository-package
   type: git
   location: https://github.com/IntersectMBO/ouroboros-consensus
@@ -127,4 +126,4 @@ source-repository-package
     libs/non-integral
     libs/set-algebra
     libs/small-steps
-    libs/vector-map
+    libs/vector-map

cardano-cli/cardano-cli.cabal

@@ -278,13 +278,11 @@ library
     network,
     network-uri,
     optparse-applicative-fork,
-    ouroboros-consensus,
     ouroboros-consensus-cardano,
     prettyprinter,
     prettyprinter-ansi-terminal,
     random,
     rio,
-    sop-extras,
     split,
     io-classes:strict-stm,
     text,

cardano-cli/src/Cardano/CLI/EraBased/Query/Run.hs

@@ -68,9 +68,6 @@ import Cardano.Ledger.Conway.State (ChainAccountState (..))
 import Cardano.Slotting.EpochInfo (EpochInfo (..), epochInfoSlotToUTCTime, hoistEpochInfo)
 import Cardano.Slotting.Time (RelativeTime (..), toRelativeTime)
 import Ouroboros.Consensus.Cardano.Block as Consensus
-import Ouroboros.Consensus.HardFork.Combinator.NetworkVersion
-import Ouroboros.Consensus.Node.NetworkProtocolVersion
-import Ouroboros.Consensus.Shelley.Ledger.NetworkProtocolVersion
 
 import RIO hiding (toList)
 
@@ -82,7 +79,6 @@ import Data.ByteString.Lazy.Char8 qualified as LBS
 import Data.Coerce (coerce)
 import Data.List qualified as List
 import Data.Map.Strict qualified as Map
-import Data.SOP.Index
 import Data.Sequence qualified as Seq
 import Data.Set qualified as Set
 import Data.Text qualified as Text
@@ -878,7 +874,7 @@ runQueryLedgerPeerSnapshot
     } = do
     result <-
       fromEitherIOCli
-        ( executeLocalStateQueryExprWithVersion nodeConnInfo target $ \globalNtcVersion -> runExceptT $ do
+        ( executeLocalStateQueryExpr nodeConnInfo target $ runExceptT $ do
             AnyCardanoEra cEra <-
               lift queryCurrentEra
                 & onLeft (left . QueryCmdUnsupportedNtcVersion)
@@ -888,13 +884,14 @@ runQueryLedgerPeerSnapshot
 
             result <- easyRunQuery (queryLedgerPeerSnapshot sbe)
 
-            shelleyNtcVersion <- hoistEither $ getShelleyNodeToClientVersion era globalNtcVersion
+            -- shelleyNtcVersion <- hoistEither $ getShelleyNodeToClientVersion era globalNtcVersion
 
-            hoist liftIO $
-              obtainCommonConstraints era $
-                case decodeBigLedgerPeerSnapshot shelleyNtcVersion result of
-                  Left (bs, _decoderError) -> pure $ Left bs
-                  Right snapshot -> pure $ Right snapshot
+            pure $ Right result
+            -- hoist liftIO $
+            --   obtainCommonConstraints era $
+            --     case decodeBigLedgerPeerSnapshot shelleyNtcVersion result of
+            --       Left (bs, _decoderError) -> pure $ Left bs
+            --       Right snapshot -> pure $ Right snapshot
         )
         & fromEitherCIOCli
 
@@ -1065,28 +1062,6 @@ getQueryStakeAddressInfo
 
 -- -------------------------------------------------------------------------------------------------
 
-getShelleyNodeToClientVersion
-  :: Exp.Era era -> NodeToClientVersion -> Either QueryCmdError ShelleyNodeToClientVersion
-getShelleyNodeToClientVersion era globalNtcVersion =
-  case supportedNodeToClientVersions (Proxy @(CardanoBlock StandardCrypto)) Map.! globalNtcVersion of
-    HardForkNodeToClientEnabled _ np ->
-      case era of
-        Exp.ConwayEra ->
-          case projectNP conwayIndex np of
-            EraNodeToClientDisabled -> Left QueryCmdNodeToClientDisabled
-            EraNodeToClientEnabled shelleyNtcVersion -> return shelleyNtcVersion
-        Exp.DijkstraEra ->
-          case projectNP dijkstraIndex np of
-            EraNodeToClientDisabled -> Left QueryCmdNodeToClientDisabled
-            EraNodeToClientEnabled shelleyNtcVersion -> return shelleyNtcVersion
-    HardForkNodeToClientDisabled _ -> Left QueryCmdNodeToClientDisabled
-
-conwayIndex :: Index (x'1 : x'2 : x'3 : x'4 : x'5 : x'6 : x : xs1) x
-conwayIndex = (IS (IS (IS (IS (IS (IS IZ))))))
-
-dijkstraIndex :: Index (x'1 : x'2 : x'3 : x'4 : x'5 : x'6 : x'7 : x : xs1) x
-dijkstraIndex = (IS (IS (IS (IS (IS (IS (IS IZ)))))))
-
 writeStakeAddressInfo
   :: StakeAddressInfoData
   -> Vary [FormatJson, FormatYaml]