Update ledger-api-1.6 and ledger-conway-1.9

Co-authored-by: Alexey Kuleshevich <[email protected]>

Author: amesgen

cabal.project

@@ -31,3 +31,40 @@ tests: true
 benchmarks: true
 
 import: ./asserts.cabal
+
+-- TEMP
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/cardano-ledger
+  tag: c6a86f5f43b8a06ef224f441d21e38f7d16a0f6b
+  --sha256: 1bjkkf8p230nj34vw537x2gysap8xdmkn2y6yx6gckrwbyzxg9bh
+  subdir:
+    eras/allegra/impl
+    eras/alonzo/impl
+    eras/alonzo/test-suite
+    eras/babbage/impl
+    eras/babbage/test-suite
+    eras/conway/impl
+    eras/conway/test-suite
+    eras/mary/impl
+    eras/shelley/impl
+    eras/shelley/test-suite
+    eras/shelley-ma/test-suite
+    libs/cardano-ledger-api
+    libs/cardano-ledger-core
+    libs/cardano-ledger-binary
+    libs/cardano-ledger-pretty
+    libs/cardano-protocol-tpraos
+    libs/non-integral
+    libs/small-steps
+    libs/small-steps-test
+    libs/cardano-data
+    libs/set-algebra
+    libs/vector-map
+    eras/byron/chain/executable-spec
+    eras/byron/ledger/executable-spec
+    eras/byron/ledger/impl
+    eras/byron/ledger/impl/test
+    eras/byron/crypto
+    eras/byron/crypto/test

ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Allegra

@@ -78,7 +78,6 @@ library
     Ouroboros.Consensus.Cardano.CanHardFork
     Ouroboros.Consensus.Cardano.Condense
     Ouroboros.Consensus.Cardano.Node
-    Ouroboros.Consensus.Cardano.ShelleyBased
     Ouroboros.Consensus.Shelley.Crypto
     Ouroboros.Consensus.Shelley.Eras
     Ouroboros.Consensus.Shelley.HFEras
@@ -116,15 +115,14 @@ library
     , cardano-crypto
     , cardano-crypto-class
     , cardano-crypto-wrapper
-    , cardano-data
     , cardano-ledger-allegra
     , cardano-ledger-alonzo         ^>=1.4.1
-    , cardano-ledger-api            ^>=1.5
+    , cardano-ledger-api            ^>=1.6
     , cardano-ledger-babbage        ^>=1.4.4
     , cardano-ledger-binary
     , cardano-ledger-byron
-    , cardano-ledger-conway         ^>=1.8
-    , cardano-ledger-core           ^>=1.6
+    , cardano-ledger-conway         ^>=1.9
+    , cardano-ledger-core           ^>=1.7
     , cardano-ledger-mary
     , cardano-ledger-shelley        ^>=1.6
     , cardano-prelude
@@ -359,6 +357,7 @@ library unstable-cardano-testlib
     , cardano-crypto-class
     , cardano-crypto-wrapper
     , cardano-ledger-alonzo-test
+    , cardano-ledger-api
     , cardano-ledger-byron
     , cardano-ledger-conway-test                                                                 ^>=1.2.0.5
     , cardano-ledger-core:{cardano-ledger-core, testlib}
@@ -404,6 +403,7 @@ test-suite cardano-test
     , cardano-crypto-class
     , cardano-ledger-alonzo
     , cardano-ledger-alonzo-test
+    , cardano-ledger-api
     , cardano-ledger-byron
     , cardano-ledger-core
     , cardano-ledger-shelley
@@ -484,6 +484,7 @@ library unstable-cardano-tools
     , cardano-crypto-wrapper
     , cardano-ledger-allegra
     , cardano-ledger-alonzo
+    , cardano-ledger-api
     , cardano-ledger-babbage
     , cardano-ledger-binary
     , cardano-ledger-byron

ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Alonzo

@@ -8,8 +8,8 @@ module Ouroboros.Consensus.Cardano (
   , ProtocolCardano
   , ProtocolShelley
     -- * Abstract over the various protocols
+  , CardanoHardForkTriggers (..)
   , ProtocolParams (..)
-  , ProtocolTransitionParams (..)
   , module X
   ) where
 

ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Babbage

@@ -36,7 +36,6 @@ import qualified Cardano.Ledger.Era as SL
 import           Cardano.Ledger.Hashes (EraIndependentTxBody)
 import           Cardano.Ledger.Keys (DSignable, Hash)
 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.Ledger.Shelley.Translation
                      (toFromByronTranslationContext)
@@ -61,7 +60,7 @@ import qualified Data.SOP.Tails as Tails
 import           Data.Void
 import           Data.Word
 import           GHC.Generics (Generic)
-import           Lens.Micro (Lens', (.~))
+import           Lens.Micro ((.~))
 import           Lens.Micro.Extras (view)
 import           NoThunks.Class (NoThunks)
 import           Ouroboros.Consensus.Block
@@ -727,17 +726,11 @@ translateLedgerStateBabbageToConwayWrapper =
               -> LedgerState (ShelleyBlock proto (BabbageEra c))
             patchGovState st =
                 st { shelleyLedgerState = shelleyLedgerState st
-                       & newEpochStateGovStateL .~ newGovState
+                       & SL.newEpochStateGovStateL .~ newGovState
                    }
               where
-                -- next ledger release already provides this
-                newEpochStateGovStateL ::
-                     Lens' (SL.NewEpochState era) (SL.GovState era)
-                newEpochStateGovStateL =
-                  SL.nesEsL . SL.esLStateL . SL.lsUTxOStateL . SL.utxosGovStateL
-
                 newGovState =
-                    view newEpochStateGovStateL
+                    view SL.newEpochStateGovStateL
                   . tickedShelleyLedgerState
                   . applyChainTick
                       (unwrapLedgerConfig cfgBabbage)