Integrate latest ledger

Author: jasagredo

cabal.project

@@ -77,6 +77,7 @@ source-repository-package
     type: git
     location: https://github.com/IntersectMBO/cardano-ledger
     tag: d48965e0dc1a324f432f1ee01bc0cf2d60a8a702
+    --sha256: sha256-UFIQ1qinge1TMtqU2e0Nyjdpj42yj+lLKrpnXeqo1mI=
     subdir:
       eras/allegra/impl
       eras/alonzo/impl

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

@@ -57,6 +57,7 @@ import qualified Cardano.Ledger.Conway.Governance as CG
 import qualified Cardano.Ledger.Conway.Rules as Conway
 import qualified Cardano.Ledger.Conway.Rules as SL
                      (ConwayLedgerPredFailure (..))
+import           Cardano.Ledger.Conway.State
 import qualified Cardano.Ledger.Conway.Translation as Conway
 import           Cardano.Ledger.Core as Core
 import           Cardano.Ledger.Mary (MaryEra)
@@ -171,7 +172,7 @@ class ( Core.EraSegWits era
   getConwayEraGovDict :: proxy era -> Maybe (ConwayEraGovDict era)
 
 data ConwayEraGovDict era where
-    ConwayEraGovDict :: CG.ConwayEraGov era => ConwayEraGovDict era
+    ConwayEraGovDict :: (ConwayEraCertState era, CG.ConwayEraGov era) => ConwayEraGovDict era
 
 isBeforeConway :: forall era. L.Era era => Proxy era -> Bool
 isBeforeConway _ =

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

@@ -413,7 +413,7 @@ applyHelper f cfg blk TickedShelleyLedgerState{
           -- means the value must not be serialized. We're only passing it to
           -- 'STS.applyBlockOpts', which does not serialize it. So this is a
           -- safe use.
-          in SL.UnsafeUnserialisedBlock h' (SL.bbody b)
+          in SL.Block h' (SL.bbody b)
         )
 
     return $ ledgerResult <&> \newNewEpochState -> ShelleyLedgerState {

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

@@ -34,19 +34,19 @@ module Ouroboros.Consensus.Shelley.Ledger.Query (
 import           Cardano.Binary (FromCBOR (..), ToCBOR (..), encodeListLen,
                      enforceSize)
 import qualified Cardano.Ledger.Api.State.Query as SL
-import           Cardano.Ledger.CertState (lookupDepositDState)
-import qualified Cardano.Ledger.CertState as SL
+import           Cardano.Ledger.State (lookupDepositDState)
+import qualified Cardano.Ledger.State as SL
 import           Cardano.Ledger.Coin (Coin)
 import           Cardano.Ledger.Compactible (Compactible (fromCompact))
 import qualified Cardano.Ledger.Conway.Governance as CG
+import           Cardano.Ledger.Conway.State (ConwayEraCertState)
 import           Cardano.Ledger.Credential (StakeCredential)
 import           Cardano.Ledger.Keys (KeyHash, KeyRole (..))
 import qualified Cardano.Ledger.Shelley.API as SL
 import qualified Cardano.Ledger.Shelley.Core as LC
 import           Cardano.Ledger.Shelley.LedgerState (AccountState)
 import qualified Cardano.Ledger.Shelley.RewardProvenance as SL
                      (RewardProvenance)
-import qualified Cardano.Ledger.State as SL
 import           Cardano.Ledger.UMap (UMap (..), rdReward, umElemDRep,
                      umElemRDPair, umElemSPool)
 import           Cardano.Protocol.Crypto (Crypto)
@@ -246,7 +246,7 @@ data instance BlockQuery (ShelleyBlock proto era) :: Type -> Type where
   --
   -- Not supported in eras before Conway.
   GetDRepState
-    :: CG.ConwayEraGov era
+    :: (ConwayEraCertState era, CG.ConwayEraGov era)
     => Set (SL.Credential 'DRepRole)
     -> BlockQuery (ShelleyBlock proto era)
                   (Map
@@ -271,7 +271,7 @@ data instance BlockQuery (ShelleyBlock proto era) :: Type -> Type where
   --
   -- Not supported in eras before Conway.
   GetCommitteeMembersState
-    :: CG.ConwayEraGov era
+    :: (ConwayEraCertState era, CG.ConwayEraGov era)
     => Set (SL.Credential 'ColdCommitteeRole)
     -> Set (SL.Credential 'HotCommitteeRole)
     -> Set SL.MemberStatus
@@ -882,7 +882,7 @@ decodeShelleyQuery = do
 
         requireCG ::
              forall s ans.
-             (CG.ConwayEraGov era => Decoder s ans)
+             ((ConwayEraCertState era, CG.ConwayEraGov era) => Decoder s ans)
           -> Decoder s ans
         requireCG k = case SE.getConwayEraGovDict (Proxy @era) of
             Just SE.ConwayEraGovDict -> k