Integrate js/coot/aniketd/release-10-3

Author: aniketd

cabal.project

@@ -14,7 +14,7 @@ repository cardano-haskell-packages
 -- you need to run if you change them
 index-state:
   , hackage.haskell.org 2024-12-24T12:56:48Z
-  , cardano-haskell-packages 2025-02-11T21:18:23Z
+  , cardano-haskell-packages 2025-02-26T16:38:34Z
 
 packages:
     cardano-api
@@ -59,12 +59,13 @@ source-repository-package
   --sha256: sha256-TDEBINZ3SkhpRNomMdt53bR3gdzgkWR9jIlAr8yrU6o=
   subdir:
       cardano-crypto-class
+      cardano-slotting
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger
-  tag: 0d750d882181b12fad62ff28de056ee85c7e0c0e
-  --sha256: sha256-LLp+FHSuVG2IsnXDv0aGMRaX19+trs5AT1gql6oji0U=
+  tag: f5b35692b4d92d664187781a98b7af3fab445bad
+  --sha256: sha256-krYzn7ct6S52bGLC8vs5/pL421UbP0+jVjxwUhOcbcA=
   subdir:
       eras/allegra/impl
       eras/alonzo/impl
@@ -98,8 +99,8 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-consensus
-  tag: c97a657928adaebccf5f38484e910843af8c59e7
-  --sha256: sha256-LG29k3Ii3+yxkKskTjwlVZ99LJSzuWzUJYjDC5thyiw=
+  tag: 1e2c0fed8e81c15575bf3cd3aaa9b6efde328d8d
+  --sha256: sha256-osyNYXxJqg4MS6ISXtEneuYRb0xBIr5ztGmxvMyGTL4=
   subdir:
     ouroboros-consensus
     ouroboros-consensus-cardano
@@ -115,6 +116,3 @@ source-repository-package
     plutus-core
     plutus-ledger-api
     plutus-tx
-
-allow-newer: none
-

cardano-api/cardano-api.cabal

@@ -156,7 +156,7 @@ library
     ouroboros-consensus-diffusion ^>=0.19 || ^>=0.20,
     ouroboros-consensus-protocol ^>=0.10,
     ouroboros-network,
-    ouroboros-network-api ^>=0.12,
+    ouroboros-network-api ^>=0.13,
     ouroboros-network-framework,
     ouroboros-network-protocols,
     parsec,

cardano-api/src/Cardano/Api.hs

@@ -1020,7 +1020,6 @@ module Cardano.Api
   , queryPoolDistribution
   , queryPoolState
   , queryProtocolParameters
-  , queryProtocolParametersUpdate
   , queryProtocolState
   , queryStakeAddresses
   , queryStakeDelegDeposits

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

@@ -561,6 +561,8 @@ mapLocalTxMonitoringClient convTxid convTx ltxmc =
     CTxMon.SendMsgAwaitAcquire $ (fmap . fmap) convClientStateAcquired f
   convClientStateAcquired (CTxMon.SendMsgRelease eff) =
     CTxMon.SendMsgRelease (convClientStateIdle <$> eff)
+  convClientStateAcquired (CTxMon.SendMsgGetMeasures f) =
+    CTxMon.SendMsgGetMeasures $ (fmap . fmap) convClientStateAcquired f
 
 -- ----------------------------------------------------------------------------
 -- Wrappers for specific protocol use-cases

cardano-api/src/Cardano/Api/Internal/LedgerEvents/ConvertLedgerEvent.hs

@@ -173,7 +173,6 @@ 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/src/Cardano/Api/Internal/LedgerState.hs

@@ -166,10 +166,10 @@ import Cardano.Slotting.Slot (WithOrigin (At, Origin))
 import Cardano.Slotting.Slot qualified as Slot
 import Ouroboros.Consensus.Block.Abstract qualified as Consensus
 import Ouroboros.Consensus.Block.Forging (BlockForging)
+import Ouroboros.Consensus.Byron.ByronHFC qualified as Consensus
 import Ouroboros.Consensus.Byron.Ledger qualified as Byron
 import Ouroboros.Consensus.Cardano qualified as Consensus
 import Ouroboros.Consensus.Cardano.Block qualified as Consensus
-import Ouroboros.Consensus.Cardano.CanHardFork qualified as Consensus
 import Ouroboros.Consensus.Cardano.Node qualified as Consensus
 import Ouroboros.Consensus.Config qualified as Consensus
 import Ouroboros.Consensus.HardFork.Combinator qualified as Consensus
@@ -1698,7 +1698,7 @@ tickThenReapplyCheckHash cfg block lsb =
   if Consensus.blockPrevHash block == Ledger.ledgerTipHash lsb
     then
       Right . toLedgerStateEvents $
-        Ledger.tickThenReapplyLedgerResult cfg block lsb
+        Ledger.tickThenReapplyLedgerResult Ledger.ComputeLedgerEvents cfg block lsb
     else
       Left $
         ApplyBlockHashMismatch $
@@ -1733,7 +1733,7 @@ tickThenApply
 tickThenApply cfg block lsb =
   either (Left . ApplyBlockError) (Right . toLedgerStateEvents) $
     runExcept $
-      Ledger.tickThenApplyLedgerResult cfg block lsb
+      Ledger.tickThenApplyLedgerResult Ledger.ComputeLedgerEvents cfg block lsb
 
 renderByteArray :: ByteArrayAccess bin => bin -> Text
 renderByteArray =

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

@@ -31,9 +31,9 @@ import Cardano.Api.Internal.Eras.Core
 
 import Cardano.Chain.Slotting qualified as Byron (EpochSlots (..))
 import Cardano.Protocol.Crypto (StandardCrypto)
+import Ouroboros.Consensus.Byron.ByronHFC qualified as Consensus
 import Ouroboros.Consensus.Byron.Ledger qualified as Consensus
 import Ouroboros.Consensus.Cardano.Block qualified as Consensus
-import Ouroboros.Consensus.Cardano.ByronHFC qualified as Consensus
 import Ouroboros.Consensus.HardFork.Combinator as Consensus
   ( EraIndex (..)
   , eraIndexSucc

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

@@ -23,9 +23,9 @@ where
 import Cardano.Api.Internal.Modes
 
 import Ouroboros.Consensus.Block.Forging (BlockForging)
+import Ouroboros.Consensus.Byron.ByronHFC (ByronBlockHFC)
 import Ouroboros.Consensus.Cardano
 import Ouroboros.Consensus.Cardano.Block
-import Ouroboros.Consensus.Cardano.ByronHFC (ByronBlockHFC)
 import Ouroboros.Consensus.Cardano.Node
 import Ouroboros.Consensus.HardFork.Combinator.Embed.Unary
 import Ouroboros.Consensus.Ledger.SupportsProtocol qualified as Consensus (LedgerSupportsProtocol)

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

@@ -75,7 +75,6 @@ import Cardano.Api.Internal.IPC.Version
 import Cardano.Api.Internal.Keys.Shelley
 import Cardano.Api.Internal.Modes
 import Cardano.Api.Internal.NetworkId
-import Cardano.Api.Internal.ProtocolParameters
 import Cardano.Api.Internal.Query.Types
 import Cardano.Api.Internal.ReexposeLedger qualified as Ledger
 import Cardano.Api.Internal.Tx.Body
@@ -229,10 +228,6 @@ data QueryInShelleyBasedEra era result where
     :: QueryInShelleyBasedEra era (GenesisParameters ShelleyEra)
   QueryProtocolParameters
     :: QueryInShelleyBasedEra era (Ledger.PParams (ShelleyLedgerEra era))
-  QueryProtocolParametersUpdate
-    :: QueryInShelleyBasedEra
-         era
-         (Map (Hash GenesisKey) ProtocolParametersUpdate)
   QueryStakeDistribution
     :: QueryInShelleyBasedEra era (Map (Hash StakePoolKey) Rational)
   QueryUTxO
@@ -312,7 +307,6 @@ instance NodeToClientVersionOf (QueryInShelleyBasedEra era result) where
   nodeToClientVersionOf QueryEpoch = NodeToClientV_16
   nodeToClientVersionOf QueryGenesisParameters = NodeToClientV_16
   nodeToClientVersionOf QueryProtocolParameters = NodeToClientV_16
-  nodeToClientVersionOf QueryProtocolParametersUpdate = NodeToClientV_16
   nodeToClientVersionOf QueryStakeDistribution = NodeToClientV_16
   nodeToClientVersionOf (QueryUTxO f) = nodeToClientVersionOf f
   nodeToClientVersionOf (QueryStakeAddresses _ _) = NodeToClientV_16
@@ -584,8 +578,6 @@ toConsensusQueryShelleyBased sbe = \case
     Some (consensusQueryInEraInMode era Consensus.GetGenesisConfig)
   QueryProtocolParameters ->
     Some (consensusQueryInEraInMode era Consensus.GetCurrentPParams)
-  QueryProtocolParametersUpdate ->
-    Some (consensusQueryInEraInMode era Consensus.GetProposedPParamsUpdates)
   QueryStakeDistribution ->
     Some (consensusQueryInEraInMode era Consensus.GetStakeDistribution)
   QueryUTxO QueryUTxOWhole ->
@@ -889,10 +881,6 @@ fromConsensusQueryResultShelleyBased sbe sbeQuery q' r' =
       case q' of
         Consensus.GetCurrentPParams -> r'
         _ -> fromConsensusQueryResultMismatch
-    QueryProtocolParametersUpdate ->
-      case q' of
-        Consensus.GetProposedPParamsUpdates -> fromLedgerProposedPPUpdates sbe r'
-        _ -> fromConsensusQueryResultMismatch
     QueryStakeDistribution ->
       case q' of
         Consensus.GetStakeDistribution -> fromShelleyPoolDistr r'

cardano-api/src/Cardano/Api/Internal/Query/Expr.hs

@@ -17,7 +17,6 @@ module Cardano.Api.Internal.Query.Expr
   , queryPoolDistribution
   , queryPoolState
   , queryProtocolParameters
-  , queryProtocolParametersUpdate
   , queryProtocolState
   , queryStakeAddresses
   , queryStakeDelegDeposits
@@ -55,7 +54,6 @@ import Cardano.Api.Internal.IPC
 import Cardano.Api.Internal.IPC.Monad
 import Cardano.Api.Internal.Keys.Shelley
 import Cardano.Api.Internal.NetworkId
-import Cardano.Api.Internal.ProtocolParameters
 import Cardano.Api.Internal.Query
 import Cardano.Api.Internal.ReexposeLedger qualified as Ledger
 import Cardano.Api.Internal.Tx.UTxO
@@ -235,22 +233,6 @@ queryConstitutionHash sbe =
       QueryInEra $
         QueryInShelleyBasedEra sbe QueryConstitution
 
-queryProtocolParametersUpdate
-  :: ()
-  => ShelleyBasedEra era
-  -> LocalStateQueryExpr
-       block
-       point
-       QueryInMode
-       r
-       IO
-       ( Either
-           UnsupportedNtcVersionError
-           (Either EraMismatch (Map (Hash GenesisKey) ProtocolParametersUpdate))
-       )
-queryProtocolParametersUpdate sbe =
-  queryExpr $ QueryInEra $ QueryInShelleyBasedEra sbe QueryProtocolParametersUpdate
-
 queryProtocolState
   :: ()
   => ShelleyBasedEra era