Bump plutus and ledger dependencies in preparation for cardano-node-9.2

release

README.md

@@ -1,11 +1,11 @@
 # Ouroboros Consensus
 
-[![consensus](https://img.shields.io/badge/ouroboros--consensus-0.20.0.0-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-0.20.0.0/)
+[![consensus](https://img.shields.io/badge/ouroboros--consensus-0.20.1.0-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-0.20.0.0/)
 [![diffusion](https://img.shields.io/badge/ouroboros--consensus--diffusion-0.17.0.1-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-diffusion-0.17.0.1/)
 [![protocol](https://img.shields.io/badge/ouroboros--consensus--protocol-0.9.0.1-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-protocol-0.9.0.1/)
-[![cardano](https://img.shields.io/badge/ouroboros--consensus--cardano-0.18.0.0-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-cardano-0.18.0.0/)
-[![sop-extras](https://img.shields.io/badge/sop--extras-0.2.0.0-blue)](https://chap.intersectmbo.org/package/sop-extras-0.2.0.0/)
-[![strict-sop-core](https://img.shields.io/badge/strict--sop--core-0.1.1.0-blue)](https://chap.intersectmbo.org/package/strict-sop-core-0.1.1.0/)
+[![cardano](https://img.shields.io/badge/ouroboros--consensus--cardano-0.19.0.0-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-cardano-0.18.0.0/)
+[![sop-extras](https://img.shields.io/badge/sop--extras-0.2.1.0-blue)](https://chap.intersectmbo.org/package/sop-extras-0.2.0.0/)
+[![strict-sop-core](https://img.shields.io/badge/strict--sop--core-0.1.2.0-blue)](https://chap.intersectmbo.org/package/strict-sop-core-0.1.1.0/)
 
 [![docs](https://img.shields.io/badge/Documentation-yellow)][webpage]
 

cabal.project

@@ -16,7 +16,7 @@ index-state:
   -- Bump this if you need newer packages from Hackage
   , hackage.haskell.org 2024-07-23T00:03:37Z
   -- Bump this if you need newer packages from CHaP
-  , cardano-haskell-packages 2024-08-15T10:40:33Z
+  , cardano-haskell-packages 2024-08-25T15:05:06Z
 
 packages:
   ouroboros-consensus
@@ -50,6 +50,3 @@ if impl(ghc >= 9.10)
     , cardano-ledger-binary:plutus-ledger-api
     , cardano-ledger-conway:plutus-ledger-api
 
-  constraints:
-    -- Earlier versions do not compile with ghc-9.10
-    , plutus-ledger-api ^>=1.31

ouroboros-consensus-cardano/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 # Changelog entries
 
+<a id='changelog-0.19.0.0'></a>
+## 0.18.0.0 — 2024-08-26
+
+### Breaking
+
+- Add `GetProposals` and `GetRatifyState` queries.
+- Propagate cardano-ledger's updated `TranslationContext` `NoGenesis` 
+- Add `NodeToClientV_17` to `supportedNodeToClientVersions`
+- Add `CardanoNodeToClientVersion13` 
+
 <a id='changelog-0.18.0.0'></a>
 ## 0.18.0.0 — 2024-07-02
 

ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal

@@ -1,6 +1,6 @@
 cabal-version: 3.0
 name: ouroboros-consensus-cardano
-version: 0.18.0.0
+version: 0.19.0.0
 synopsis:
   The instantation of the Ouroboros consensus layer used by Cardano
 
@@ -134,16 +134,16 @@ library
     cardano-crypto,
     cardano-crypto-class,
     cardano-crypto-wrapper,
-    cardano-ledger-allegra ^>=1.5,
-    cardano-ledger-alonzo ^>=1.10,
-    cardano-ledger-api ^>=1.9.2,
-    cardano-ledger-babbage ^>=1.8.2,
-    cardano-ledger-binary ^>=1.3.3,
+    cardano-ledger-allegra ^>=1.6,
+    cardano-ledger-alonzo ^>=1.10.2,
+    cardano-ledger-api ^>=1.9.3,
+    cardano-ledger-babbage ^>=1.9,
+    cardano-ledger-binary ^>=1.3.4,
     cardano-ledger-byron ^>=1.0.1,
-    cardano-ledger-conway ^>=1.16.0,
-    cardano-ledger-core ^>=1.13.2,
-    cardano-ledger-mary ^>=1.6.1,
-    cardano-ledger-shelley ^>=1.12,
+    cardano-ledger-conway ^>=1.16,
+    cardano-ledger-core ^>=1.14,
+    cardano-ledger-mary ^>=1.7,
+    cardano-ledger-shelley ^>=1.13,
     cardano-prelude,
     cardano-protocol-tpraos ^>=1.2,
     cardano-slotting,

ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/CanHardFork.hs

@@ -35,6 +35,7 @@ import qualified Cardano.Ledger.BaseTypes as SL
 import qualified Cardano.Ledger.Core as Core
 import           Cardano.Ledger.Crypto (ADDRHASH, Crypto, DSIGN, HASH)
 import qualified Cardano.Ledger.Era as SL
+import qualified Cardano.Ledger.Genesis as SL
 import           Cardano.Ledger.Hashes (EraIndependentTxBody)
 import           Cardano.Ledger.Keys (DSignable, Hash)
 import qualified Cardano.Ledger.Shelley.API as SL
@@ -333,7 +334,7 @@ instance CardanoHardForkConstraints c => CanHardFork (CardanoEras c) where
                   (translateValidatedTxMaryToAlonzoWrapper ctxt)
               )
       $ PCons (RequireBoth $ \_cfgAlonzo _cfgBabbage ->
-                let ctxt = ()
+                let ctxt = SL.NoGenesis
                 in
                 Pair2
                   (translateTxAlonzoToBabbageWrapper          ctxt)
@@ -526,23 +527,23 @@ translateLedgerStateShelleyToAllegraWrapper ::
 translateLedgerStateShelleyToAllegraWrapper =
     ignoringBoth $
       Translate $ \_epochNo ->
-        unComp . SL.translateEra' () . Comp
+        unComp . SL.translateEra' SL.NoGenesis . Comp
 
 translateTxShelleyToAllegraWrapper ::
      (PraosCrypto c, DSignable c (Hash c EraIndependentTxBody))
   => InjectTx
        (ShelleyBlock (TPraos c) (ShelleyEra c))
        (ShelleyBlock (TPraos c) (AllegraEra c))
 translateTxShelleyToAllegraWrapper = InjectTx $
-    fmap unComp . eitherToMaybe . runExcept . SL.translateEra () . Comp
+    fmap unComp . eitherToMaybe . runExcept . SL.translateEra SL.NoGenesis . Comp
 
 translateValidatedTxShelleyToAllegraWrapper ::
      (PraosCrypto c, DSignable c (Hash c EraIndependentTxBody))
   => InjectValidatedTx
        (ShelleyBlock (TPraos c) (ShelleyEra c))
        (ShelleyBlock (TPraos c) (AllegraEra c))
 translateValidatedTxShelleyToAllegraWrapper = InjectValidatedTx $
-    fmap unComp . eitherToMaybe . runExcept . SL.translateEra () . Comp
+    fmap unComp . eitherToMaybe . runExcept . SL.translateEra SL.NoGenesis . Comp
 
 {-------------------------------------------------------------------------------
   Translation from Allegra to Mary
@@ -558,23 +559,23 @@ translateLedgerStateAllegraToMaryWrapper ::
 translateLedgerStateAllegraToMaryWrapper =
     ignoringBoth $
       Translate $ \_epochNo ->
-        unComp . SL.translateEra' () . Comp
+        unComp . SL.translateEra' SL.NoGenesis . Comp
 
 translateTxAllegraToMaryWrapper ::
      (PraosCrypto c, DSignable c (Hash c EraIndependentTxBody))
   => InjectTx
        (ShelleyBlock (TPraos c) (AllegraEra c))
        (ShelleyBlock (TPraos c) (MaryEra c))
 translateTxAllegraToMaryWrapper = InjectTx $
-    fmap unComp . eitherToMaybe . runExcept . SL.translateEra () . Comp
+    fmap unComp . eitherToMaybe . runExcept . SL.translateEra SL.NoGenesis . Comp
 
 translateValidatedTxAllegraToMaryWrapper ::
      (PraosCrypto c, DSignable c (Hash c EraIndependentTxBody))
   => InjectValidatedTx
        (ShelleyBlock (TPraos c) (AllegraEra c))
        (ShelleyBlock (TPraos c) (MaryEra c))
 translateValidatedTxAllegraToMaryWrapper = InjectValidatedTx $
-    fmap unComp . eitherToMaybe . runExcept . SL.translateEra () . Comp
+    fmap unComp . eitherToMaybe . runExcept . SL.translateEra SL.NoGenesis . Comp
 
 {-------------------------------------------------------------------------------
   Translation from Mary to Alonzo
@@ -631,7 +632,7 @@ translateLedgerStateAlonzoToBabbageWrapper ::
 translateLedgerStateAlonzoToBabbageWrapper =
     RequireBoth $ \_cfgAlonzo _cfgBabbage ->
       Translate $ \_epochNo ->
-        unComp . SL.translateEra' () . Comp . transPraosLS
+        unComp . SL.translateEra' SL.NoGenesis . Comp . transPraosLS
   where
     transPraosLS ::
       LedgerState (ShelleyBlock (TPraos c) (AlonzoEra c)) ->

ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs

@@ -44,6 +44,7 @@ module Ouroboros.Consensus.Cardano.Node (
   , pattern CardanoNodeToClientVersion10
   , pattern CardanoNodeToClientVersion11
   , pattern CardanoNodeToClientVersion12
+  , pattern CardanoNodeToClientVersion13
   , pattern CardanoNodeToClientVersion2
   , pattern CardanoNodeToClientVersion3
   , pattern CardanoNodeToClientVersion4
@@ -440,7 +441,7 @@ pattern CardanoNodeToClientVersion11 =
       )
 
 -- | The hard fork enabled, and the Shelley, Allegra, Mary, Alonzo and Babbage
--- and Conway eras enabled, using 'ShelleyNodeToClientVersion7' for the
+-- and Conway eras enabled, using 'ShelleyNodeToClientVersion8' for the
 -- Shelley-based eras.
 pattern CardanoNodeToClientVersion12 :: BlockNodeToClientVersion (CardanoBlock c)
 pattern CardanoNodeToClientVersion12 =
@@ -456,6 +457,23 @@ pattern CardanoNodeToClientVersion12 =
       :* Nil
       )
 
+-- | The hard fork enabled, and the Shelley, Allegra, Mary, Alonzo and Babbage
+-- and Conway eras enabled, using 'ShelleyNodeToClientVersion9' for the
+-- Shelley-based eras.
+pattern CardanoNodeToClientVersion13 :: BlockNodeToClientVersion (CardanoBlock c)
+pattern CardanoNodeToClientVersion13 =
+    HardForkNodeToClientEnabled
+      HardForkSpecificNodeToClientVersion3
+      (  EraNodeToClientEnabled ByronNodeToClientVersion1
+      :* EraNodeToClientEnabled ShelleyNodeToClientVersion9
+      :* EraNodeToClientEnabled ShelleyNodeToClientVersion9
+      :* EraNodeToClientEnabled ShelleyNodeToClientVersion9
+      :* EraNodeToClientEnabled ShelleyNodeToClientVersion9
+      :* EraNodeToClientEnabled ShelleyNodeToClientVersion9
+      :* EraNodeToClientEnabled ShelleyNodeToClientVersion9
+      :* Nil
+      )
+
 instance CardanoHardForkConstraints c
       => SupportedNetworkProtocolVersion (CardanoBlock c) where
   supportedNodeToNodeVersions _ = Map.fromList $
@@ -477,9 +495,10 @@ instance CardanoHardForkConstraints c
       , (NodeToClientV_14, CardanoNodeToClientVersion10)
       , (NodeToClientV_15, CardanoNodeToClientVersion11)
       , (NodeToClientV_16, CardanoNodeToClientVersion12)
+      , (NodeToClientV_17, CardanoNodeToClientVersion13) 
       ]
 
-  latestReleasedNodeVersion _prx = (Just NodeToNodeV_13, Just NodeToClientV_16)
+  latestReleasedNodeVersion _prx = (Just NodeToNodeV_13, Just NodeToClientV_17) 
 
 {-------------------------------------------------------------------------------
   ProtocolInfo

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

@@ -37,6 +37,9 @@ data ShelleyNodeToClientVersion =
 
     -- | New queries introduced: GetConstitutionHash, GetFilteredVoteDelegatees
   | ShelleyNodeToClientVersion8
+
+    -- | New queries introduced: GetProposals, GetRatifyState
+  | ShelleyNodeToClientVersion9
   deriving (Show, Eq, Ord, Enum, Bounded)
 
 instance HasNetworkProtocolVersion (ShelleyBlock proto era) where