Latest ledger, network, consensus and plutus

Author: Aniket Deshpande

cabal.project

@@ -14,7 +14,7 @@ repository cardano-haskell-packages
 -- you need to run if you change them
 index-state:
   , hackage.haskell.org 2025-03-17T12:01:29Z
-  , cardano-haskell-packages 2025-03-03T04:46:42Z
+  , cardano-haskell-packages 2025-03-25T16:05:50Z
 
 packages:
     cardano-api

cardano-api/cardano-api.cabal

@@ -117,20 +117,20 @@ library
     cardano-addresses ^>=4.0.0,
     cardano-binary,
     cardano-crypto,
-    cardano-crypto-class ^>=2.1.2,
-    cardano-crypto-wrapper ^>=1.5,
+    cardano-crypto-class ^>=2.2.1,
+    cardano-crypto-wrapper ^>=1.6,
     cardano-data >=1.0,
-    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,
-    cardano-ledger-byron >=1.0.1,
-    cardano-ledger-conway >=1.16,
-    cardano-ledger-core:{cardano-ledger-core, testlib} >=1.14,
-    cardano-ledger-mary >=1.7,
-    cardano-ledger-shelley >=1.13,
-    cardano-protocol-tpraos >=1.2,
+    cardano-ledger-allegra >=1.7,
+    cardano-ledger-alonzo >=1.13,
+    cardano-ledger-api >=1.11,
+    cardano-ledger-babbage >=1.11,
+    cardano-ledger-binary >=1.6,
+    cardano-ledger-byron >=1.1,
+    cardano-ledger-conway >=1.19,
+    cardano-ledger-core:{cardano-ledger-core, testlib} >=1.17,
+    cardano-ledger-mary >=1.8,
+    cardano-ledger-shelley >=1.16,
+    cardano-protocol-tpraos >=1.4,
     cardano-slotting >=0.2.0.0,
     cardano-strict-containers >=0.1,
     cborg,
@@ -156,21 +156,20 @@ library
     network-mux,
     nothunks,
     ordered-containers,
-    ouroboros-consensus ^>=0.22,
-    ouroboros-consensus-cardano ^>=0.21,
-    ouroboros-consensus-diffusion ^>=0.19 || ^>=0.20,
-    ouroboros-consensus-protocol ^>=0.10,
+    ouroboros-consensus ^>=0.23,
+    ouroboros-consensus-cardano ^>=0.22,
+    ouroboros-consensus-diffusion ^>=0.19 || ^>=0.21,
+    ouroboros-consensus-protocol ^>=0.11,
     ouroboros-network,
-    ouroboros-network-api ^>=0.12,
+    ouroboros-network-api >=0.13,
     ouroboros-network-framework,
     ouroboros-network-protocols,
     parsec,
-    plutus-ledger-api:{plutus-ledger-api, plutus-ledger-api-testlib} ^>=1.40,
+    plutus-ledger-api:{plutus-ledger-api, plutus-ledger-api-testlib} ^>=1.43,
     prettyprinter,
     prettyprinter-ansi-terminal,
     prettyprinter-configurable ^>=1.36,
     random,
-    reflection,
     safe-exceptions,
     scientific,
     serialise,
@@ -288,8 +287,8 @@ library gen
     bytestring,
     cardano-api,
     cardano-binary >=1.6 && <1.8,
-    cardano-crypto-class ^>=2.1.2,
-    cardano-crypto-test ^>=1.5,
+    cardano-crypto-class ^>=2.2.1,
+    cardano-crypto-test ^>=1.6,
     cardano-ledger-alonzo:{cardano-ledger-alonzo, testlib} >=1.8.1,
     cardano-ledger-byron-test >=1.5,
     cardano-ledger-conway:testlib,
@@ -319,9 +318,9 @@ test-suite cardano-api-test
     cardano-api:gen,
     cardano-binary,
     cardano-crypto,
-    cardano-crypto-class ^>=2.1.2,
-    cardano-crypto-test ^>=1.5,
-    cardano-crypto-tests ^>=2.1,
+    cardano-crypto-class ^>=2.2.1,
+    cardano-crypto-test ^>=1.6,
+    cardano-crypto-tests ^>=2.2,
     cardano-ledger-alonzo,
     cardano-ledger-api >=1.9,
     cardano-ledger-binary,
@@ -391,14 +390,15 @@ test-suite cardano-api-golden
     cardano-api,
     cardano-api:gen,
     cardano-binary,
-    cardano-crypto-class ^>=2.1.2,
+    cardano-crypto-class ^>=2.2.1,
     cardano-data >=1.0,
     cardano-ledger-alonzo,
     cardano-ledger-api >=1.9,
     cardano-ledger-binary,
     cardano-ledger-core:{cardano-ledger-core, testlib} >=1.14,
     cardano-ledger-shelley,
     cardano-ledger-shelley-test >=1.2.0.1,
+    cardano-protocol-tpraos,
     cardano-slotting ^>=0.2.0.0,
     containers,
     errors,
@@ -407,7 +407,7 @@ test-suite cardano-api-golden
     hedgehog-extras ^>=0.7,
     microlens,
     parsec,
-    plutus-core ^>=1.40,
+    plutus-core ^>=1.43,
     plutus-ledger-api,
     tasty,
     tasty-hedgehog,

cardano-api/gen/Test/Gen/Cardano/Api/Typed.hs

@@ -518,7 +518,7 @@ genLedgerValueForTxOut sbe = do
     )
     sbe
 
-genLedgerMultiAssetValue :: Gen (L.MultiAsset L.StandardCrypto)
+genLedgerMultiAssetValue :: Gen L.MultiAsset
 genLedgerMultiAssetValue = Q.arbitrary
 
 -- Note that we expect to sometimes generate duplicate policy id keys since we

cardano-api/src/Cardano/Api.hs

@@ -1039,7 +1039,6 @@ module Cardano.Api
   , queryPoolDistribution
   , queryPoolState
   , queryProtocolParameters
-  , queryProtocolParametersUpdate
   , queryProtocolState
   , queryStakeAddresses
   , queryStakeDelegDeposits
@@ -1059,6 +1058,8 @@ module Cardano.Api
   , queryProposals
   , queryCommitteeMembersState
   , queryStakeVoteDelegatees
+  , queryStakePoolDefaultVote
+  , queryLedgerConfig
 
     -- ** Committee State Query
   , MemberStatus (..)

cardano-api/src/Cardano/Api/Internal/Address.hs

@@ -106,7 +106,6 @@ import Cardano.Chain.Common qualified as Byron
 import Cardano.Ledger.Address qualified as Shelley
 import Cardano.Ledger.BaseTypes qualified as Shelley
 import Cardano.Ledger.Credential qualified as Shelley
-import Cardano.Ledger.Crypto (StandardCrypto)
 import Cardano.Ledger.Plutus.TxInfo qualified as Plutus
 import PlutusLedgerApi.V1 qualified as PlutusAPI
 
@@ -188,8 +187,8 @@ data Address addrtype where
   -- in Shelley era and are thus supported from the Shelley era onwards
   ShelleyAddress
     :: Shelley.Network
-    -> Shelley.PaymentCredential StandardCrypto
-    -> Shelley.StakeReference StandardCrypto
+    -> Shelley.PaymentCredential
+    -> Shelley.StakeReference
     -> Address ShelleyAddr
 
 -- Note that the two ledger credential types here are parametrised by
@@ -231,7 +230,7 @@ instance SerialiseAsRawBytes (Address ByronAddr) where
       $ addr
 
   deserialiseFromRawBytes (AsAddress AsByronAddr) bs =
-    case Shelley.decodeAddr bs :: Maybe (Shelley.Addr StandardCrypto) of
+    case Shelley.decodeAddr bs :: Maybe Shelley.Addr of
       Nothing -> Left (SerialiseAsRawBytesError "Unable to deserialise Address ByronAddr")
       Just Shelley.Addr{} -> Left (SerialiseAsRawBytesError "Unable to deserialise Address ByronAddr")
       Just (Shelley.AddrBootstrap (Shelley.BootstrapAddress addr)) ->
@@ -352,7 +351,7 @@ instance SerialiseAddress AddressAny where
     (AddressByron <$> deserialiseAddress (AsAddress AsByronAddr) t)
       <|> (AddressShelley <$> deserialiseAddress (AsAddress AsShelleyAddr) t)
 
-fromShelleyAddrToAny :: Shelley.Addr StandardCrypto -> AddressAny
+fromShelleyAddrToAny :: Shelley.Addr -> AddressAny
 fromShelleyAddrToAny (Shelley.AddrBootstrap (Shelley.BootstrapAddress addr)) =
   AddressByron $ ByronAddress addr
 fromShelleyAddrToAny (Shelley.Addr nw pc scr) =
@@ -531,7 +530,7 @@ makeShelleyAddressInEra sbe nw pc scr =
 data StakeAddress where
   StakeAddress
     :: Shelley.Network
-    -> Shelley.StakeCredential StandardCrypto
+    -> Shelley.StakeCredential
     -> StakeAddress
   deriving (Eq, Ord, Show)
 
@@ -634,7 +633,7 @@ shelleyPayAddrToPlutusPubKHash (ShelleyAddress _ payCred _) =
 -- Internal conversion functions
 --
 
-toShelleyAddr :: AddressInEra era -> Shelley.Addr StandardCrypto
+toShelleyAddr :: AddressInEra era -> Shelley.Addr
 toShelleyAddr (AddressInEra ByronAddressInAnyEra (ByronAddress addr)) =
   Shelley.AddrBootstrap (Shelley.BootstrapAddress addr)
 toShelleyAddr
@@ -644,7 +643,7 @@ toShelleyAddr
     ) =
     Shelley.Addr nw pc scr
 
-toShelleyStakeAddr :: StakeAddress -> Shelley.RewardAccount StandardCrypto
+toShelleyStakeAddr :: StakeAddress -> Shelley.RewardAccount
 toShelleyStakeAddr (StakeAddress nw sc) =
   Shelley.RewardAccount
     { Shelley.raNetwork = nw
@@ -653,23 +652,23 @@ toShelleyStakeAddr (StakeAddress nw sc) =
 
 toShelleyPaymentCredential
   :: PaymentCredential
-  -> Shelley.PaymentCredential StandardCrypto
+  -> Shelley.PaymentCredential
 toShelleyPaymentCredential (PaymentCredentialByKey (PaymentKeyHash kh)) =
   Shelley.KeyHashObj kh
 toShelleyPaymentCredential (PaymentCredentialByScript sh) =
   Shelley.ScriptHashObj (toShelleyScriptHash sh)
 
 toShelleyStakeCredential
   :: StakeCredential
-  -> Shelley.StakeCredential StandardCrypto
+  -> Shelley.StakeCredential
 toShelleyStakeCredential (StakeCredentialByKey (StakeKeyHash kh)) =
   Shelley.KeyHashObj kh
 toShelleyStakeCredential (StakeCredentialByScript sh) =
   Shelley.ScriptHashObj (toShelleyScriptHash sh)
 
 toShelleyStakeReference
   :: StakeAddressReference
-  -> Shelley.StakeReference StandardCrypto
+  -> Shelley.StakeReference
 toShelleyStakeReference (StakeAddressByValue stakecred) =
   Shelley.StakeRefBase (toShelleyStakeCredential stakecred)
 toShelleyStakeReference (StakeAddressByPointer ptr) =
@@ -680,7 +679,7 @@ toShelleyStakeReference NoStakeAddress =
 fromShelleyAddrIsSbe
   :: ()
   => ShelleyBasedEra era
-  -> Shelley.Addr StandardCrypto
+  -> Shelley.Addr
   -> AddressInEra era
 fromShelleyAddrIsSbe sbe = \case
   Shelley.AddrBootstrap (Shelley.BootstrapAddress addr) ->
@@ -690,7 +689,7 @@ fromShelleyAddrIsSbe sbe = \case
 
 fromShelleyAddr
   :: ShelleyBasedEra era
-  -> Shelley.Addr StandardCrypto
+  -> Shelley.Addr
   -> AddressInEra era
 fromShelleyAddr _ (Shelley.AddrBootstrap (Shelley.BootstrapAddress addr)) =
   AddressInEra ByronAddressInAnyEra (ByronAddress addr)
@@ -699,27 +698,27 @@ fromShelleyAddr sBasedEra (Shelley.Addr nw pc scr) =
     (ShelleyAddressInEra sBasedEra)
     (ShelleyAddress nw pc scr)
 
-fromShelleyStakeAddr :: Shelley.RewardAccount StandardCrypto -> StakeAddress
+fromShelleyStakeAddr :: Shelley.RewardAccount -> StakeAddress
 fromShelleyStakeAddr (Shelley.RewardAccount nw sc) = StakeAddress nw sc
 
 fromShelleyStakeCredential
-  :: Shelley.StakeCredential StandardCrypto
+  :: Shelley.StakeCredential
   -> StakeCredential
 fromShelleyStakeCredential (Shelley.KeyHashObj kh) =
   StakeCredentialByKey (StakeKeyHash kh)
 fromShelleyStakeCredential (Shelley.ScriptHashObj sh) =
   StakeCredentialByScript (fromShelleyScriptHash sh)
 
 fromShelleyPaymentCredential
-  :: Shelley.PaymentCredential StandardCrypto
+  :: Shelley.PaymentCredential
   -> PaymentCredential
 fromShelleyPaymentCredential (Shelley.KeyHashObj kh) =
   PaymentCredentialByKey (PaymentKeyHash kh)
 fromShelleyPaymentCredential (Shelley.ScriptHashObj sh) =
   PaymentCredentialByScript (ScriptHash sh)
 
 fromShelleyStakeReference
-  :: Shelley.StakeReference StandardCrypto
+  :: Shelley.StakeReference
   -> StakeAddressReference
 fromShelleyStakeReference (Shelley.StakeRefBase stakecred) =
   StakeAddressByValue (fromShelleyStakeCredential stakecred)

cardano-api/src/Cardano/Api/Internal/Anchor.hs

@@ -5,8 +5,7 @@ module Cardano.Api.Internal.Anchor
 where
 
 import Cardano.Ledger.BaseTypes qualified as L
-import Cardano.Ledger.Crypto qualified as Crypto
-import Cardano.Ledger.SafeHash qualified as L
+import Cardano.Ledger.Hashes qualified as L
 
 -- | The URL to build the anchor to pass to DRep registration certificate
 newtype AnchorUrl = AnchorUrl
@@ -16,6 +15,6 @@ newtype AnchorUrl = AnchorUrl
 
 -- | The hash to build the anchor to pass to DRep registration certificate
 newtype AnchorDataHash = AnchorDataHash
-  { unAnchorDataHash :: L.SafeHash Crypto.StandardCrypto L.AnchorData
+  { unAnchorDataHash :: L.SafeHash L.AnchorData
   }
   deriving (Eq, Show)

cardano-api/src/Cardano/Api/Internal/Block.hs

@@ -63,9 +63,9 @@ import Cardano.Api.Internal.Tx.Sign
 
 import Cardano.Crypto.Hash.Class qualified as Crypto
 import Cardano.Crypto.Hashing qualified
-import Cardano.Ledger.Api qualified as L
 import Cardano.Ledger.Block qualified as Ledger
 import Cardano.Ledger.Core qualified as Ledger
+import Cardano.Protocol.Crypto qualified as L
 import Cardano.Slotting.Block (BlockNo)
 import Cardano.Slotting.Slot (EpochNo, SlotNo, WithOrigin (..))
 import Ouroboros.Consensus.Block qualified as Consensus