Bump ledger, minor tweaks

Author: amesgen

cabal.project

@@ -37,8 +37,8 @@ import: ./asserts.cabal
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger
-  tag: 18760561df17213eef809860de3da3662e6c290e
-  --sha256: 1s8fny7sn1jkdn12cll5pyll8ibbfzx63hmxzq1lpvadrr4zvv2j
+  tag: d883cf700488ed1c3ecefd403c9863a0e3943587
+  --sha256: 17vqb04jy2k628wd7hgcc9jkaxq2wpgn06hd7f79067zhn8v5fcj
   subdir:
     eras/allegra/impl
     eras/alonzo/impl

ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/Inspect.hs

@@ -19,6 +19,7 @@ import           Cardano.Ledger.BaseTypes (strictMaybeToMaybe)
 import           Cardano.Ledger.Core (ppuProtocolVersionL)
 import qualified Cardano.Ledger.Shelley.API as SL
 import qualified Cardano.Ledger.Shelley.Core as Core
+import qualified Cardano.Ledger.Shelley.LedgerState as SL
 import qualified Cardano.Ledger.Shelley.PParams as SL
 import           Control.Monad
 import           Data.Map.Strict (Map)
@@ -27,6 +28,7 @@ import           Data.Maybe (fromMaybe)
 import           Data.Void
 import           Data.Word (Word64)
 import           Lens.Micro ((^.))
+import           Lens.Micro.Extras (view)
 import           Ouroboros.Consensus.Block
 import           Ouroboros.Consensus.Config
 import           Ouroboros.Consensus.Ledger.Abstract
@@ -130,10 +132,7 @@ protocolUpdates genesis st = [
     SL.ProposedPPUpdates proposals =
           fromMaybe SL.emptyPPPUpdates
         . Core.getProposedPPUpdates
-        . SL.utxosGovState
-        . SL.lsUTxOState
-        . SL.esLState
-        . SL.nesEs
+        . view SL.newEpochStateGovStateL
         . shelleyLedgerState
         $ st
 

ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/Ledger.hs

@@ -54,6 +54,7 @@ import           Cardano.Ledger.Core (Era, ppMaxBHSizeL, ppMaxTxSizeL)
 import qualified Cardano.Ledger.Core as Core
 import qualified Cardano.Ledger.Shelley.API as SL
 import qualified Cardano.Ledger.Shelley.Governance as SL
+import qualified Cardano.Ledger.Shelley.LedgerState as SL
 import           Cardano.Slotting.EpochInfo
 import           Codec.CBOR.Decoding (Decoder)
 import qualified Codec.CBOR.Decoding as CBOR
@@ -481,7 +482,7 @@ instance ShelleyCompatible proto era => ValidateEnvelope (ShelleyBlock proto era
 -------------------------------------------------------------------------------}
 
 getPParams :: SL.EraGov era => SL.NewEpochState era -> Core.PParams era
-getPParams = view SL.curPParamsGovStateL . SL.utxosGovState . SL.lsUTxOState . SL.esLState . SL.nesEs
+getPParams = view $ SL.newEpochStateGovStateL . SL.curPParamsGovStateL
 
 {-------------------------------------------------------------------------------
   Serialisation

ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/Query.hs

@@ -44,7 +44,8 @@ import qualified Cardano.Ledger.EpochBoundary as SL
 import           Cardano.Ledger.Keys (KeyHash, KeyRole (..))
 import qualified Cardano.Ledger.Shelley.API as SL
 import qualified Cardano.Ledger.Shelley.Core as LC
-import qualified Cardano.Ledger.Shelley.LedgerState as SL (RewardAccounts)
+import qualified Cardano.Ledger.Shelley.LedgerState as SL (RewardAccounts,
+                     newEpochStateGovStateL)
 import qualified Cardano.Ledger.Shelley.PParams as SL (emptyPPPUpdates)
 import qualified Cardano.Ledger.Shelley.RewardProvenance as SL
                      (RewardProvenance)
@@ -66,6 +67,7 @@ import           Data.Type.Equality (apply)
 import           Data.Typeable (Typeable)
 import qualified Data.VMap as VMap
 import           GHC.Generics (Generic)
+import           Lens.Micro.Extras (view)
 import           Ouroboros.Consensus.Block
 import           Ouroboros.Consensus.Config
 import           Ouroboros.Consensus.HeaderValidation
@@ -632,9 +634,10 @@ querySupportedVersion = \case
 getProposedPPUpdates ::
      ShelleyBasedEra era
   => SL.NewEpochState era -> SL.ProposedPPUpdates era
-getProposedPPUpdates = fromMaybe SL.emptyPPPUpdates
-                     . LC.getProposedPPUpdates . SL.utxosGovState
-                     . SL.lsUTxOState . SL.esLState . SL.nesEs
+getProposedPPUpdates =
+      fromMaybe SL.emptyPPPUpdates
+    . LC.getProposedPPUpdates
+    . view SL.newEpochStateGovStateL
 
 -- Get the current 'EpochState.' This is mainly for debugging.
 getEpochState :: SL.NewEpochState era -> SL.EpochState era