Adapt CLI ledger-state JSON to current snapshot schema

Author: colll78

.changes/cip-160-receiving.yml

@@ -16,3 +16,4 @@ description: |
   V4 evaluation, protected-change and body-signature binding tests.
   Preserve pool-query JSON fields while reporting the unavailable BLS registration
   epoch as null, instead of inventing registration history.
+  Update ledger-state JSON encoding for the upstream six-field NewEpochState, preserving outer keys and reading currentStakeDistribution from the current set snapshot. Nested state JSON and CBOR follow the upstream ledger schema.

cabal.project

@@ -114,16 +114,16 @@ if impl(ghc >=9.14)
 source-repository-package
   type: git
   location: https://github.com/colll78/dns.git
-  tag: 7bd4304298b38db3da0e72dec2b311f4cd785657
-  --sha256: sha256-HRBHCYqk4Y63M81ry+qs7o6qtottda1RddK84lTSb/E=
+  tag: df28303f5d07058388e40b3b9fa59509a11abdbb
+  --sha256: sha256-2w9tP3bY7jOo+oyI4ozhyH/co+E1VEUpBqwKHpOY57Y=
 
 -- Temporary public source prerequisites for the coordinated CIP-160 proposals.
 -- Proposed versions are unreleased; remove after official package delivery.
 source-repository-package
   type: git
   location: https://github.com/colll78/cardano-ledger.git
-  tag: 4ab1c0df3373b962c641efb4935aca0e7e68967b
-  --sha256: sha256-+EearRC1REi8n7pRvsR6AmTC/lyLYkxRdvkwUV1Ilk0=
+  tag: 4b06e253c2fee5436d57cf56669c4e8a9358717b
+  --sha256: sha256-PzoJjGuFq23OHvnDDwXnsCkxfywF41typfb7oCKefNw=
   subdir:
     eras/allegra/impl
     eras/alonzo/impl
@@ -134,6 +134,7 @@ source-repository-package
     eras/dijkstra/impl
     eras/mary/impl
     eras/shelley/impl
+    eras/shelley/test-suite
     libs/cardano-data
     libs/cardano-ledger-api
     libs/cardano-ledger-binary
@@ -154,8 +155,8 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/colll78/ouroboros-consensus.git
-  tag: 0c91555c0c0dfeef6cb0ac6facd42b471630f5b0
-  --sha256: sha256-19A5YUoKnfUAc/KBPg3s25HaI+zwMGiIk4Vng3NJXH4=
+  tag: bb55e647b1c1142948562c3702fe96ab2ee160f4
+  --sha256: sha256-pqHyVyZfmTmU0UCgHZKjrpGvipR/3Mre7JohH8dilXk=
 
 -- Exact public compatibility prerequisites; proposed versions are unreleased.
 source-repository-package
@@ -180,8 +181,8 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/colll78/cardano-api.git
-  tag: a3966fb8dca37e796929ae870f0bc8edea521986
-  --sha256: sha256-zhmSimpXLCW+NvoZWMX1HNnEpPOSSsngsXzSwbpx9pE=
+  tag: 70415a82d7fbbc786aa646199c0cafe4063194fe
+  --sha256: sha256-+F+j2njiPyKY1suO11uAL/fkxpB8/INDt/ifUzxBCvA=
   subdir:
     cardano-api
     cardano-api-gen

cardano-cli/src/Cardano/CLI/Orphan.hs

@@ -16,12 +16,14 @@ import Cardano.Api.Ledger qualified as L
 
 import Cardano.CLI.Type.Error.ScriptDecodeError
 import Cardano.Ledger.Conway.State qualified as L
+import Cardano.Ledger.Shelley.LedgerState (nesStakePoolDistrG)
 
 import Control.Exception
 import Data.Aeson
 import Data.List qualified as List
 import Data.Typeable
 import Data.Word
+import Lens.Micro ((^.))
 
 instance Error [Bech32DecodeError] where
   prettyError errs = vsep $ map prettyError errs
@@ -34,14 +36,14 @@ instance
   (L.EraTxOut ledgerera, L.EraGov ledgerera, L.EraCertState ledgerera, L.EraStake ledgerera)
   => ToJSON (L.NewEpochState ledgerera)
   where
-  toJSON (L.NewEpochState nesEL nesBprev nesBCur nesEs nesRu nesPd _stashedAvvm) =
+  toJSON newEpochState =
     object
-      [ "currentEpoch" .= nesEL
-      , "priorBlocks" .= nesBprev
-      , "currentEpochBlocks" .= nesBCur
-      , "currentEpochState" .= nesEs
-      , "rewardUpdate" .= nesRu
-      , "currentStakeDistribution" .= nesPd
+      [ "currentEpoch" .= L.nesEL newEpochState
+      , "priorBlocks" .= L.nesBprev newEpochState
+      , "currentEpochBlocks" .= L.nesBcur newEpochState
+      , "currentEpochState" .= L.nesEs newEpochState
+      , "rewardUpdate" .= L.nesRu newEpochState
+      , "currentStakeDistribution" .= (newEpochState ^. nesStakePoolDistrG)
       ]
 
 instance ToJSON HashableScriptData where