Release 10.6 final integration

bench/locli/locli.cabal

@@ -126,7 +126,7 @@ library
                       , hashable
                       , optparse-applicative-fork >= 0.18.1
                       , ouroboros-consensus
-                      , ouroboros-network-api ^>= 0.14
+                      , ouroboros-network-api ^>= 0.16
                       , sop-core
                       , split
                       , sqlite-easy >= 1.1.0.1
@@ -212,7 +212,7 @@ test-suite test-locli
   build-depends:        cardano-prelude
                       , containers
                       , hedgehog
-                      , hedgehog-extras ^>= 0.8
+                      , hedgehog-extras ^>= 0.10
                       , locli
                       , text
 

bench/plutus-scripts-bench/plutus-scripts-bench.cabal

@@ -83,9 +83,9 @@ library
   --------------------------
   build-depends:
     , cardano-api             ^>=10.18
-    , plutus-ledger-api       ^>=1.45
-    , plutus-tx               ^>=1.45
-    , plutus-tx-plugin        ^>=1.45
+    , plutus-ledger-api       ^>=1.53
+    , plutus-tx               ^>=1.53
+    , plutus-tx-plugin        ^>=1.53
 
   ------------------------
   -- Non-IOG dependencies

bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/NodeToNode.hs

@@ -89,7 +89,7 @@ benchmarkConnectTxSubmit EnvConsts { .. } handshakeTracer submissionTracer codec
   done <- NtN.connectTo
     (socketSnocket envIOManager)
     NetworkConnectTracers {
-        nctMuxTracer       = mempty,
+        nctMuxTracers      = Mux.nullTracers,
         nctHandshakeTracer = handshakeTracer
       }
     peerMultiplex

bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/SizedMetadata.hs

@@ -40,18 +40,20 @@ assume_cbor_properties
 
 -- The cost of map entries in metadata follows a step function.
 -- This assumes the map indices are [0..n].
-prop_mapCostsShelley :: Bool
-prop_mapCostsAllegra :: Bool
-prop_mapCostsMary    :: Bool
-prop_mapCostsAlonzo  :: Bool
-prop_mapCostsBabbage :: Bool
-prop_mapCostsConway  :: Bool
-prop_mapCostsShelley = measureMapCosts AsShelleyEra   == assumeMapCosts AsShelleyEra
-prop_mapCostsAllegra = measureMapCosts AsAllegraEra   == assumeMapCosts AsAllegraEra
-prop_mapCostsMary    = measureMapCosts AsMaryEra      == assumeMapCosts AsMaryEra
-prop_mapCostsAlonzo  = measureMapCosts AsAlonzoEra    == assumeMapCosts AsAlonzoEra
-prop_mapCostsBabbage = measureMapCosts AsBabbageEra   == assumeMapCosts AsBabbageEra
-prop_mapCostsConway  = measureMapCosts AsConwayEra    == assumeMapCosts AsConwayEra
+prop_mapCostsShelley   :: Bool
+prop_mapCostsAllegra   :: Bool
+prop_mapCostsMary      :: Bool
+prop_mapCostsAlonzo    :: Bool
+prop_mapCostsBabbage   :: Bool
+prop_mapCostsConway    :: Bool
+prop_mapCostsDijkstra  :: Bool
+prop_mapCostsShelley   = measureMapCosts AsShelleyEra  == assumeMapCosts AsShelleyEra
+prop_mapCostsAllegra   = measureMapCosts AsAllegraEra  == assumeMapCosts AsAllegraEra
+prop_mapCostsMary      = measureMapCosts AsMaryEra     == assumeMapCosts AsMaryEra
+prop_mapCostsAlonzo    = measureMapCosts AsAlonzoEra   == assumeMapCosts AsAlonzoEra
+prop_mapCostsBabbage   = measureMapCosts AsBabbageEra  == assumeMapCosts AsBabbageEra
+prop_mapCostsConway    = measureMapCosts AsConwayEra   == assumeMapCosts AsConwayEra
+prop_mapCostsDijkstra  = measureMapCosts AsDijkstraEra == assumeMapCosts AsDijkstraEra 
 
 assumeMapCosts :: forall era . IsShelleyBasedEra era => AsType era -> [Int]
 assumeMapCosts _proxy = stepFunction [
@@ -63,12 +65,13 @@ assumeMapCosts _proxy = stepFunction [
     ]
   where
     firstEntry = case shelleyBasedEra @era of
-      ShelleyBasedEraShelley -> 37
-      ShelleyBasedEraAllegra -> 39
-      ShelleyBasedEraMary    -> 39
-      ShelleyBasedEraAlonzo  -> 42
-      ShelleyBasedEraBabbage -> 42
-      ShelleyBasedEraConway  -> 42
+      ShelleyBasedEraShelley  -> 37
+      ShelleyBasedEraAllegra  -> 39
+      ShelleyBasedEraMary     -> 39
+      ShelleyBasedEraAlonzo   -> 42
+      ShelleyBasedEraBabbage  -> 42
+      ShelleyBasedEraConway   -> 42
+      ShelleyBasedEraDijkstra -> 42
 
 -- Bytestring costs are not LINEAR !!
 -- Costs are piecewise linear for payload sizes [0..23] and [24..64].
@@ -141,12 +144,13 @@ mkMetadata size
       else Right $ metadataInEra $ Just metadata
  where
   minSize = case shelleyBasedEra @era of
-    ShelleyBasedEraShelley -> 37
-    ShelleyBasedEraAllegra -> 39
-    ShelleyBasedEraMary    -> 39
-    ShelleyBasedEraAlonzo  -> 39 -- TODO: check minSize for Alonzo
-    ShelleyBasedEraBabbage -> 39 -- TODO: check minSize for Babbage
-    ShelleyBasedEraConway  -> 39 -- TODO: check minSize for Conway
+    ShelleyBasedEraShelley  -> 37
+    ShelleyBasedEraAllegra  -> 39
+    ShelleyBasedEraMary     -> 39
+    ShelleyBasedEraAlonzo   -> 39 -- TODO: check minSize for Alonzo
+    ShelleyBasedEraBabbage  -> 39 -- TODO: check minSize for Babbage
+    ShelleyBasedEraConway   -> 39 -- TODO: check minSize for Conway
+    ShelleyBasedEraDijkstra -> 39 -- TODO: check minSize for Dijkstra
   nettoSize = size - minSize
 
   -- At 24 the CBOR representation changes.

bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/SubmissionClient.hs

@@ -181,7 +181,7 @@ txSubmissionClient tr bmtr initialTxSource endOfProtocolCallback =
     where
       getTxSize :: Tx era -> Integer
       getTxSize (ShelleyTx sbe tx) =
-        shelleyBasedEraConstraints sbe $ tx ^. Ledger.sizeTxF
+        shelleyBasedEraConstraints sbe $ toInteger (tx ^. Ledger.sizeTxF)
 
   toGenTx :: Tx era -> GenTx CardanoBlock
   toGenTx tx = toConsensusGenTx $ TxInMode shelleyBasedEra tx

bench/tx-generator/src/Cardano/Benchmarking/OuroborosImports.hs

@@ -12,7 +12,6 @@ module Cardano.Benchmarking.OuroborosImports
   , ShelleyGenesis
   , SigningKey
   , SigningKeyFile
-  , StandardShelley
   , NetworkId
   -- , getGenesis
   , makeLocalConnectInfo
@@ -35,7 +34,7 @@ import qualified Ouroboros.Consensus.Cardano as Consensus
 import           Ouroboros.Consensus.Config (TopLevelConfig, configBlock, configCodec)
 import           Ouroboros.Consensus.Config.SupportsNode (ConfigSupportsNode (..), getNetworkMagic)
 import           Ouroboros.Consensus.Node (ProtocolInfo (..))
-import           Ouroboros.Consensus.Shelley.Eras (StandardCrypto, StandardShelley)
+import           Ouroboros.Consensus.Shelley.Eras (StandardCrypto)
 import           Ouroboros.Network.Protocol.LocalTxSubmission.Type (SubmitResult (..))
 
 import           Prelude

bench/tx-generator/src/Cardano/Benchmarking/Script/Core.hs

@@ -70,13 +70,14 @@ liftCoreWithEra era coreCall = withEra era ( liftIO . runExceptT . coreCall)
 withEra :: AnyCardanoEra -> (forall era. IsShelleyBasedEra era => AsType era -> ActionM x) -> ActionM x
 withEra era action = do
   case era of
-    AnyCardanoEra ConwayEra  -> action AsConwayEra
-    AnyCardanoEra BabbageEra -> action AsBabbageEra
-    AnyCardanoEra AlonzoEra  -> action AsAlonzoEra
-    AnyCardanoEra MaryEra    -> action AsMaryEra
-    AnyCardanoEra AllegraEra -> action AsAllegraEra
-    AnyCardanoEra ShelleyEra -> action AsShelleyEra
-    AnyCardanoEra ByronEra   -> error "byron not supported"
+    AnyCardanoEra ConwayEra   -> action AsConwayEra
+    AnyCardanoEra BabbageEra  -> action AsBabbageEra
+    AnyCardanoEra AlonzoEra   -> action AsAlonzoEra
+    AnyCardanoEra MaryEra     -> action AsMaryEra
+    AnyCardanoEra AllegraEra  -> action AsAllegraEra
+    AnyCardanoEra ShelleyEra  -> action AsShelleyEra
+    AnyCardanoEra ByronEra    -> error "byron not supported"
+    AnyCardanoEra DijkstraEra -> action AsDijkstraEra 
 
 setProtocolParameters :: ProtocolParametersSource -> ActionM ()
 setProtocolParameters s = case s of

bench/tx-generator/src/Cardano/TxGenerator/ProtocolParameters.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE DataKinds #-}
 
 {--
 Due to the changes to "cardano-api" listed below it was decided to move
@@ -32,9 +33,9 @@ where
 
 import           Cardano.Api (AnyPlutusScriptVersion (..), CostModel, ExecutionUnitPrices (..),
                    ExecutionUnits, LedgerProtocolParameters (..),
-                   PlutusScriptVersion (PlutusScriptV1, PlutusScriptV2, PlutusScriptV3), PraosNonce,
+                   PlutusScriptVersion (PlutusScriptV1, PlutusScriptV2, PlutusScriptV3, PlutusScriptV4), PraosNonce,
                    ProtocolParametersConversionError (..),
-                   ShelleyBasedEra (ShelleyBasedEraAllegra, ShelleyBasedEraAlonzo, ShelleyBasedEraBabbage, ShelleyBasedEraConway, ShelleyBasedEraMary, ShelleyBasedEraShelley),
+                   ShelleyBasedEra (ShelleyBasedEraAllegra, ShelleyBasedEraAlonzo, ShelleyBasedEraBabbage, ShelleyBasedEraConway, ShelleyBasedEraMary, ShelleyBasedEraShelley, ShelleyBasedEraDijkstra),
                    ShelleyLedgerEra, fromAlonzoCostModels, fromAlonzoExUnits, fromAlonzoPrices,
                    makePraosNonce, toAlonzoCostModels, toAlonzoExUnits, toAlonzoPrices,
                    toLedgerNonce)
@@ -242,6 +243,7 @@ fromPlutusLanguageName :: Plutus.Language -> AnyPlutusScriptVersion
 fromPlutusLanguageName Plutus.PlutusV1 = AnyPlutusScriptVersion PlutusScriptV1
 fromPlutusLanguageName Plutus.PlutusV2 = AnyPlutusScriptVersion PlutusScriptV2
 fromPlutusLanguageName Plutus.PlutusV3 = AnyPlutusScriptVersion PlutusScriptV3
+fromPlutusLanguageName Plutus.PlutusV4 = AnyPlutusScriptVersion PlutusScriptV4
 
 instance Aeson.ToJSON ProtocolParameters where
   toJSON ProtocolParameters{..} =
@@ -296,6 +298,7 @@ toPlutusLanguageName :: AnyPlutusScriptVersion -> Plutus.Language
 toPlutusLanguageName (AnyPlutusScriptVersion PlutusScriptV1) = Plutus.PlutusV1
 toPlutusLanguageName (AnyPlutusScriptVersion PlutusScriptV2) = Plutus.PlutusV2
 toPlutusLanguageName (AnyPlutusScriptVersion PlutusScriptV3) = Plutus.PlutusV3
+toPlutusLanguageName (AnyPlutusScriptVersion PlutusScriptV4) = Plutus.PlutusV4
 
 -- Praos nonce.
 --------------------------------------------------------------------------------
@@ -348,6 +351,7 @@ toLedgerPParams ShelleyBasedEraMary = toShelleyPParams
 toLedgerPParams ShelleyBasedEraAlonzo = toAlonzoPParams
 toLedgerPParams ShelleyBasedEraBabbage = toBabbagePParams
 toLedgerPParams ShelleyBasedEraConway = toConwayPParams
+toLedgerPParams ShelleyBasedEraDijkstra = toConwayPParams
 
 -- Was removed in "cardano-api" module "Cardano.Api.Internal.ProtocolParameters"
 toShelleyCommonPParams
@@ -396,8 +400,8 @@ toShelleyCommonPParams
 -- Was removed in "cardano-api" module "Cardano.Api.Internal.ProtocolParameters"
 toShelleyPParams
   :: ( EraPParams ledgerera
-     , Ledger.AtMostEra Ledger.MaryEra ledgerera
-     , Ledger.AtMostEra Ledger.AlonzoEra ledgerera
+     , Ledger.AtMostEra "Mary" ledgerera
+     , Ledger.AtMostEra "Alonzo" ledgerera
      )
   => ProtocolParameters
   -> Either ProtocolParametersConversionError (PParams ledgerera)
@@ -517,6 +521,7 @@ fromLedgerPParams ShelleyBasedEraMary = fromShelleyPParams
 fromLedgerPParams ShelleyBasedEraAlonzo = fromExactlyAlonzoPParams
 fromLedgerPParams ShelleyBasedEraBabbage = fromBabbagePParams
 fromLedgerPParams ShelleyBasedEraConway = fromConwayPParams
+fromLedgerPParams ShelleyBasedEraDijkstra = fromConwayPParams
 
 -- TODO: Use the ledger's PParams (from module Cardano.Api.Ledger) type instead.
 fromShelleyCommonPParams
@@ -556,8 +561,8 @@ fromShelleyCommonPParams pp =
 -- TODO: Use the ledger's PParams (from module Cardano.Api.Ledger) type instead.
 fromShelleyPParams
   :: ( EraPParams ledgerera
-     , Ledger.AtMostEra Ledger.MaryEra ledgerera
-     , Ledger.AtMostEra Ledger.AlonzoEra ledgerera
+     , Ledger.AtMostEra "Mary" ledgerera
+     , Ledger.AtMostEra "Alonzo" ledgerera
      )
   => PParams ledgerera
   -> ProtocolParameters

bench/tx-generator/src/Cardano/TxGenerator/Setup/NodeConfig.hs

@@ -42,15 +42,15 @@ getGenesis (SomeConsensusProtocol CardanoBlockType proto)
 getGenesisPath :: NodeConfiguration -> Maybe GenesisFile
 getGenesisPath nodeConfig =
   case ncProtocolConfig nodeConfig of
-    NodeProtocolConfigurationCardano _ shelleyConfig _ _ _ _ ->
+    NodeProtocolConfigurationCardano _ shelleyConfig _ _ _ _ _ ->
       Just $ npcShelleyGenesisFile shelleyConfig
 
 mkConsensusProtocol :: NodeConfiguration -> IO (Either TxGenError SomeConsensusProtocol)
 mkConsensusProtocol nodeConfig =
   case ncProtocolConfig nodeConfig of
-    NodeProtocolConfigurationCardano byronConfig shelleyConfig alonzoConfig conwayConfig hardforkConfig checkpointsConfig ->
+    NodeProtocolConfigurationCardano byronConfig shelleyConfig alonzoConfig conwayConfig dijkstraConfig hardforkConfig checkpointsConfig ->
       first ProtocolError
-        <$> runExceptT (mkSomeConsensusProtocolCardano byronConfig shelleyConfig alonzoConfig conwayConfig hardforkConfig checkpointsConfig Nothing)
+        <$> runExceptT (mkSomeConsensusProtocolCardano byronConfig shelleyConfig alonzoConfig conwayConfig dijkstraConfig hardforkConfig checkpointsConfig Nothing)
 
 -- | Creates a NodeConfiguration from a config file;
 --   the result is devoid of any keys/credentials

bench/tx-generator/src/Cardano/TxGenerator/Setup/Plutus.hs

@@ -3,7 +3,6 @@
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TypeApplications #-}
 
 {-|
 Module      : Cardano.TxGenerator.Setup.Plutus
@@ -20,11 +19,12 @@
 import           Data.Int (Int64)
 import           Data.Map.Strict as Map (lookup)
 
+import           Control.Exception (displayException)
 import           Control.Monad.Trans.Except
 import           Control.Monad.Trans.Except.Extra
 import           Control.Monad.Writer (runWriter)
 
-import           Cardano.CLI.Read (readFileScriptInAnyLang, ScriptDecodeError)
+import           Cardano.CLI.Read (readFileScriptInAnyLang)
 
 import           Cardano.Api
 import           Cardano.Ledger.Plutus.TxInfo (exBudgetToExUnits)
@@ -72,8 +72,8 @@
     doLoad fp  = second (second (const $ ResolvedToFallback asFileName)) <$> readPlutusScript (Right fp)
 readPlutusScript (Right fp)
   = runExceptT $ do
-    script <- firstExceptT (ApiError @ScriptDecodeError) $
-      readFileScriptInAnyLang fp
+    script <-
+       handleExceptT (\(e :: SomeException) -> ApiError $ displayException e) (readFileScriptInAnyLang fp)
     case script of
       ScriptInAnyLang (PlutusScriptLanguage _) _ -> pure (script, ResolvedToFileName fp)
       ScriptInAnyLang lang _ -> throwE $ TxGenError $ "readPlutusScript: only PlutusScript supported, found: " ++ show lang

bench/tx-generator/src/Cardano/TxGenerator/Utils.hs

@@ -26,13 +26,14 @@ import           GHC.Stack
 -- regardless of which particular era.
 liftAnyEra :: ( forall era. IsCardanoEra era => f1 era -> f2 era ) -> InAnyCardanoEra f1 -> InAnyCardanoEra f2
 liftAnyEra f x = case x of
-  InAnyCardanoEra ByronEra a   ->   InAnyCardanoEra ByronEra $ f a
-  InAnyCardanoEra ShelleyEra a ->   InAnyCardanoEra ShelleyEra $ f a
-  InAnyCardanoEra AllegraEra a ->   InAnyCardanoEra AllegraEra $ f a
-  InAnyCardanoEra MaryEra a    ->   InAnyCardanoEra MaryEra $ f a
-  InAnyCardanoEra AlonzoEra a  ->   InAnyCardanoEra AlonzoEra $ f a
-  InAnyCardanoEra BabbageEra a ->   InAnyCardanoEra BabbageEra $ f a
-  InAnyCardanoEra ConwayEra a  ->   InAnyCardanoEra ConwayEra $ f a
+  InAnyCardanoEra ByronEra a     ->   InAnyCardanoEra ByronEra $ f a
+  InAnyCardanoEra ShelleyEra a   ->   InAnyCardanoEra ShelleyEra $ f a
+  InAnyCardanoEra AllegraEra a   ->   InAnyCardanoEra AllegraEra $ f a
+  InAnyCardanoEra MaryEra a      ->   InAnyCardanoEra MaryEra $ f a
+  InAnyCardanoEra AlonzoEra a    ->   InAnyCardanoEra AlonzoEra $ f a
+  InAnyCardanoEra BabbageEra a   ->   InAnyCardanoEra BabbageEra $ f a
+  InAnyCardanoEra ConwayEra a    ->   InAnyCardanoEra ConwayEra $ f a
+  InAnyCardanoEra DijkstraEra a  ->   InAnyCardanoEra DijkstraEra $ f a
 
 -- | `keyAddress` determines an address for the relevant era.
 keyAddress :: forall era. IsShelleyBasedEra era => NetworkId -> SigningKey PaymentKey -> AddressInEra era

bench/tx-generator/tx-generator.cabal

@@ -136,7 +136,7 @@ library
                       , formatting
                       , generic-monoid
                       , ghc-prim
-                      , io-classes
+                      , io-classes:{io-classes, strict-stm}
                       , microlens
                       , mtl
                       , network
@@ -154,7 +154,6 @@ library
                       , random
                       , serialise
                       , streaming
-                      , strict-stm
                       , cardano-ledger-shelley
                       , prettyprinter
                       , stm

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 2025-06-24T21:06:59Z
-  , cardano-haskell-packages 2025-09-18T12:21:32Z
+  , hackage.haskell.org 2025-09-24T20:00:55Z
+  , cardano-haskell-packages 2025-09-30T09:59:24Z
 
 packages:
   cardano-node
@@ -72,3 +72,18 @@ if impl (ghc >= 9.12)
 -- IMPORTANT
 -- Do NOT add more source-repository-package stanzas here unless they are strictly
 -- temporary! Please read the section in CONTRIBUTING about updating dependencies.
+
+source-repository-package
+  type: git
+  location: https://github.com/intersectmbo/cardano-cli.git
+  tag: e660e5f592ed0f10ef950c8a15fa78d8bacf6450
+  --sha256: sha256-QlJhgEeRTr9qeC+MFaGDOGhmeOC73TxRZdix7I9Jcm8=
+  subdir: cardano-cli
+
+source-repository-package
+  type: git
+  location: https://github.com/IntersectMBO/cardano-api
+  tag: 845b761ba38c65c7d4ad4c2c14c4c034598fba23
+  --sha256: sha256-EAAFJ5yyeblUTNl1usk3ZVwFW6YL9pOLkIQpd0CDIcs=
+  subdir:
+    cardano-api

cardano-node-chairman/cardano-node-chairman.cabal

@@ -44,19 +44,17 @@ executable cardano-node-chairman
   build-depends:        cardano-api
                       , cardano-crypto-class
                       , cardano-git-rev ^>= 0.2.2
-                      , cardano-ledger-core ^>= 1.17
+                      , cardano-ledger-core ^>= 1.18
                       , cardano-node ^>= 10.5
                       , cardano-prelude
                       , containers
                       , contra-tracer
-                      , io-classes
+                      , io-classes:{io-classes, strict-stm, si-timers}
                       , optparse-applicative-fork
                       , ouroboros-consensus
                       , ouroboros-consensus-cardano
                       , ouroboros-network-api
                       , ouroboros-network-protocols
-                      , strict-stm
-                      , si-timers
                       , text
                       , time
 
@@ -75,7 +73,7 @@ test-suite chairman-tests
                       , data-default-class
                       , filepath
                       , hedgehog
-                      , hedgehog-extras ^>= 0.8
+                      , hedgehog-extras ^>= 0.10
                       , network
                       , process
                       , random