DONOTMERGE: add s-r-p for ledger and consensus

cabal.project

@@ -41,3 +41,50 @@ write-ghc-environment-files: always
 -- IMPORTANT
 -- Do NOT add more source-repository-package stanzas here unless they are strictly
 -- temporary! Please read the section in CONTRIBUTING about updating dependencies.
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/cardano-ledger
+  tag: bf2dc0fdde313723b4f7a35362839920670e67ea
+  subdir:
+    eras/allegra/impl
+    eras/alonzo/impl
+    eras/alonzo/test-suite
+    eras/babbage/impl
+    eras/babbage/test-suite
+    eras/byron/chain/executable-spec
+    eras/byron/crypto
+    eras/byron/crypto/test
+    eras/byron/ledger/executable-spec
+    eras/byron/ledger/impl
+    eras/byron/ledger/impl/test
+    eras/conway/impl
+    eras/conway/test-suite
+    eras/mary/impl
+    eras/shelley-ma/test-suite
+    eras/shelley/impl
+    eras/shelley/test-suite
+    libs/cardano-data
+    libs/cardano-ledger-api
+    libs/cardano-ledger-binary
+    libs/cardano-ledger-core
+    libs/cardano-ledger-pretty
+    libs/cardano-ledger-test
+    libs/cardano-protocol-tpraos
+    libs/ledger-state
+    libs/non-integral
+    libs/plutus-preprocessor
+    libs/set-algebra
+    libs/small-steps-test
+    libs/small-steps
+    libs/vector-map
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/ouroboros-consensus
+  tag: 44fee33fae52fbd330ae03d11de38be060b98ce0
+  subdir:
+      ouroboros-consensus
+      ouroboros-consensus-cardano
+      ouroboros-consensus-diffusion
+      ouroboros-consensus-protocol

cardano-api/internal/Cardano/Api/Governance/Actions/VotingProcedure.hs

@@ -85,7 +85,7 @@ votesSupportedInEra ShelleyBasedEraConway  = Just VotesSupportedInConwayEra
 {-# DEPRECATED votesSupportedInEra "Use conwayEraOnwardsConstraints instead" #-}
 
 newtype GovernanceActionId ledgerera = GovernanceActionId
-  { unGovernanceActionId :: Ledger.GovernanceActionId (EraCrypto ledgerera)
+  { unGovernanceActionId :: Ledger.GovActionId (EraCrypto ledgerera)
   }
   deriving (Show, Eq, Ord)
 
@@ -97,9 +97,9 @@ makeGoveranceActionId
 makeGoveranceActionId sbe txid govix =
   shelleyBasedEraConstraints sbe
       $ GovernanceActionId
-      $ Ledger.GovernanceActionId
+      $ Ledger.GovActionId
           { Ledger.gaidTxId = toShelleyTxId txid
-          , Ledger.gaidGovActionIx = Ledger.GovernanceActionIx govix
+          , Ledger.gaidGovActionIx = Ledger.GovActionIx govix
           }
 
 -- TODO: Conway era -

cardano-api/internal/Cardano/Api/Query/Types.hs

@@ -38,7 +38,7 @@ data DebugLedgerState era where
 instance
     ( Typeable era
     , Core.EraTxOut (ShelleyLedgerEra era)
-    , Core.EraGovernance (ShelleyLedgerEra era)
+    , Core.EraGov (ShelleyLedgerEra era)
     , DecCBOR (Shelley.StashedAVVMAddresses (ShelleyLedgerEra era))
     ) => FromCBOR (DebugLedgerState era) where
   fromCBOR = DebugLedgerState <$>