Merge pull request #643 from IntersectMBO/lehins/use-new-ledger-and-c…

…onsensus

Node 10.0 integration

cabal.project

@@ -13,8 +13,8 @@ repository cardano-haskell-packages
 -- See CONTRIBUTING for information about these, including some Nix commands
 -- you need to run if you change them
 index-state:
-  , hackage.haskell.org 2024-08-15T08:53:32Z
-  , cardano-haskell-packages 2024-09-03T00:18:11Z
+  , hackage.haskell.org 2024-10-10T08:11:33Z
+  , cardano-haskell-packages 2024-10-14T23:19:53Z
 
 packages:
     cardano-api
@@ -48,3 +48,7 @@ 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.
+
+constraints:
+    Cabal < 3.14,
+    cardano-ledger-shelley ^>= 1.14.1

cardano-api/cardano-api.cabal

@@ -171,7 +171,7 @@ library internal
     cardano-ledger-alonzo >=1.10.2,
     cardano-ledger-api ^>=1.9.3,
     cardano-ledger-babbage >=1.9,
-    cardano-ledger-binary ^>=1.3,
+    cardano-ledger-binary >=1.3,
     cardano-ledger-byron >=1.0.1,
     cardano-ledger-conway >=1.16,
     cardano-ledger-core:{cardano-ledger-core, testlib} >=1.14,
@@ -198,19 +198,19 @@ library internal
     microlens-aeson,
     mtl,
     network,
-    ouroboros-consensus ^>=0.20,
-    ouroboros-consensus-cardano ^>=0.19,
-    ouroboros-consensus-diffusion ^>=0.17,
-    ouroboros-consensus-protocol ^>=0.9.0.1,
+    ouroboros-consensus ^>=0.21,
+    ouroboros-consensus-cardano ^>=0.20,
+    ouroboros-consensus-diffusion ^>=0.18,
+    ouroboros-consensus-protocol ^>=0.9.0.2,
     ouroboros-network,
-    ouroboros-network-api ^>=0.9,
+    ouroboros-network-api ^>=0.10,
     ouroboros-network-framework,
     ouroboros-network-protocols,
     parsec,
-    plutus-ledger-api:{plutus-ledger-api, plutus-ledger-api-testlib} ^>=1.32,
+    plutus-ledger-api:{plutus-ledger-api, plutus-ledger-api-testlib} ^>=1.36,
     prettyprinter,
     prettyprinter-ansi-terminal,
-    prettyprinter-configurable ^>=1.32.1,
+    prettyprinter-configurable ^>=1.36,
     random,
     safe-exceptions,
     scientific,
@@ -400,8 +400,8 @@ test-suite cardano-api-golden
     hedgehog-extras ^>=0.6.1.0,
     microlens,
     parsec,
-    plutus-core ^>=1.32,
-    plutus-ledger-api ^>=1.32,
+    plutus-core ^>=1.36,
+    plutus-ledger-api ^>=1.36,
     tasty,
     tasty-hedgehog,
     text,

cardano-api/internal/Cardano/Api/LedgerEvents/ConvertLedgerEvent.hs

@@ -165,6 +165,7 @@ toLedgerEventConway evt =
         case conwayLedgerEvent of
           Conway.UtxowEvent utxowEvent -> handleConwayUTxOWEvent utxowEvent
           Conway.CertsEvent{} -> Nothing
+          Conway.MempoolEvent{} -> Nothing
           Conway.GovEvent govEvent ->
             case govEvent of
               Conway.GovNewProposals txid props ->

cardano-api/internal/Cardano/Api/LedgerEvents/Rule/TICK/NEWEPOCH.hs

@@ -100,4 +100,5 @@ handleConwayNEWEPOCHEvents conwayNewEpochEvent =
                   (convertRetiredPoolsMap unclaimedPools)
         Conway.SnapEvent _ -> Nothing
         Conway.GovInfoEvent{} -> Nothing
+        Conway.HardForkEvent{} -> Nothing
     Conway.TotalAdaPotsEvent _ -> Nothing

cardano-api/internal/Cardano/Api/LedgerState.hs

@@ -1871,7 +1871,7 @@ nextEpochEligibleLeadershipSlots sbe sGen serCurrEpochState ptclState poolid (Vr
       )
       sbe
  where
-  globals = shelleyBasedEraConstraints sbe $ constructGlobals sGen eInfo $ pp ^. Core.ppProtocolVersionL
+  globals = shelleyBasedEraConstraints sbe $ constructGlobals sGen eInfo
 
   f :: Ledger.ActiveSlotCoeff
   f = activeSlotCoeff globals
@@ -1985,18 +1985,17 @@ currentEpochEligibleLeadershipSlots sbe sGen eInfo pp ptclState poolid (VrfSigni
       )
       sbe
  where
-  globals = shelleyBasedEraConstraints sbe $ constructGlobals sGen eInfo $ pp ^. Core.ppProtocolVersionL
+  globals = shelleyBasedEraConstraints sbe $ constructGlobals sGen eInfo
 
   f :: Ledger.ActiveSlotCoeff
   f = activeSlotCoeff globals
 
+-- TODO remove me?
 constructGlobals
   :: ShelleyGenesis Consensus.StandardCrypto
   -> EpochInfo (Either Text)
-  -> Ledger.ProtVer
   -> Globals
-constructGlobals sGen eInfo (Ledger.ProtVer majorPParamsVer _) =
-  Ledger.mkShelleyGlobals sGen eInfo majorPParamsVer
+constructGlobals = Ledger.mkShelleyGlobals
 
 --------------------------------------------------------------------------