Node 10.7 Integration

bench/locli/locli.cabal

@@ -127,7 +127,7 @@ library
                       , hashable
                       , optparse-applicative
                       , ouroboros-consensus
-                      , ouroboros-network-api ^>= 0.16
+                      , ouroboros-network:api ^>= 0.24
                       , sop-core
                       , split
                       , sqlite-easy >= 1.1.0.1

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

@@ -82,10 +82,10 @@ library
   -- IOG dependencies
   --------------------------
   build-depends:
-    , cardano-api             ^>=10.23
-    , plutus-ledger-api       ^>=1.57
-    , plutus-tx               ^>=1.57
-    , plutus-tx-plugin        ^>=1.57
+    , cardano-api             ^>=10.24
+    , plutus-ledger-api       ^>=1.58
+    , plutus-tx               ^>=1.58
+    , plutus-tx-plugin        ^>=1.58
 
   ------------------------
   -- Non-IOG dependencies

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

@@ -35,7 +35,7 @@ import           Data.Foldable (for_)
 import           Data.Maybe (catMaybes)
 import qualified Data.Text.IO as Text
 import           Options.Applicative as Opt
-import           Ouroboros.Network.NodeToClient (IOManager, withIOManager)
+import           Cardano.Network.NodeToClient (IOManager, withIOManager)
 
 import           System.Exit
 

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

@@ -48,9 +48,9 @@ import           Ouroboros.Network.KeepAlive
 import           Ouroboros.Network.Magic
 import           Ouroboros.Network.Mux (MiniProtocolCb (..),
                    OuroborosApplication (..), OuroborosBundle, RunMiniProtocol (..))
-import           Ouroboros.Network.NodeToClient (chainSyncPeerNull)
-import           Ouroboros.Network.NodeToNode (NetworkConnectTracers (..))
-import qualified Ouroboros.Network.NodeToNode as NtN
+import           Cardano.Network.NodeToClient (chainSyncPeerNull)
+import           Cardano.Network.NodeToNode (NetworkConnectTracers (..))
+import qualified Cardano.Network.NodeToNode as NtN
 import           Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..))
 import           Ouroboros.Network.PeerSelection.PeerSharing.Codec (decodeRemoteAddress,
                    encodeRemoteAddress)

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

@@ -39,7 +39,7 @@ import           Cardano.TxGenerator.Types (TPSRate)
 import           Ouroboros.Consensus.Ledger.SupportsMempool (GenTxId)
 import           Ouroboros.Network.Driver (TraceSendRecv (..))
 import           Ouroboros.Network.IOManager (IOManager)
-import           Ouroboros.Network.NodeToNode (NodeToNodeVersion, RemoteConnectionId)
+import           Cardano.Network.NodeToNode (NodeToNodeVersion, RemoteConnectionId)
 import           Ouroboros.Network.Protocol.Handshake.Type (Handshake)
 import           Ouroboros.Network.Protocol.TxSubmission2.Type (TxSubmission2)
 

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

@@ -76,7 +76,7 @@ import           Cardano.Node.Protocol.Types (SomeConsensusProtocol)
 import           Cardano.TxGenerator.PlutusContext (PlutusBudgetSummary)
 import           Cardano.TxGenerator.Setup.NixService as Nix (NixServiceOptions)
 import           Cardano.TxGenerator.Types (TxGenError (..))
-import           Ouroboros.Network.NodeToClient (IOManager)
+import           Cardano.Network.NodeToClient (IOManager)
 
 import           Prelude
 

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

@@ -37,6 +37,8 @@ import qualified Cardano.Logging.Types as Net
 import           Cardano.Node.Startup
 import           Cardano.Node.Tracing.NodeInfo ()
 import           Ouroboros.Network.IOManager (IOManager)
+import qualified Ouroboros.Network.Protocol.TxSubmission2.Type as TxSubmission
+import           Ouroboros.Network.Tracing ()
 
 import           Control.Exception (SomeException (..))
 import           Control.Monad (forM, guard)
@@ -49,6 +51,8 @@ import           Data.Maybe (fromMaybe)
 import qualified Data.Text as Text
 import           Data.Time.Clock
 import           GHC.Generics
+import           Network.Mux.Tracing ()
+import qualified Network.TypedProtocol.Codec as TypedProtocol
 
 import           Trace.Forward.Forwarding (InitForwardingConfig (..), initForwardingDelayed)
 import           Trace.Forward.Utils.TraceObject
@@ -395,30 +399,18 @@ instance MetaTrace NodeToNodeSubmissionTrace where
         , Namespace [] ["TxList"]
         ]
 
-instance LogFormatting SendRecvConnect where
+-- TODO(10.7): tracing team, check this makes sense
+instance (Show txid, Show tx) => LogFormatting (TypedProtocol.AnyMessage (TxSubmission.TxSubmission2 txid tx)) where
   forHuman = Text.pack . show
-  forMachine _ _ = KeyMap.fromList [ "kind" .= A.String "SendRecvConnect" ]
+  forMachine _ _ = KeyMap.fromList [ "kind" .= A.String "TxSubmission2" ]
 
-instance MetaTrace SendRecvConnect where
-    namespaceFor _ = Namespace [] ["ReqIdsBlocking"]
+-- TODO(10.7): tracing team, check this makes sense
+instance MetaTrace (TypedProtocol.AnyMessage (TxSubmission.TxSubmission2 tx a)) where
+    namespaceFor _ = Namespace [] ["TxSubmission2"]
     severityFor _ _ = Just Info
 
     documentFor _ = Just ""
 
     allNamespaces = [
-          Namespace [] ["SendRecvConnect"]
-        ]
-
-instance LogFormatting SendRecvTxSubmission2 where
-  forHuman = Text.pack . show
-  forMachine _ _ = KeyMap.fromList [ "kind" .= A.String "SendRecvTxSubmission2" ]
-
-instance MetaTrace SendRecvTxSubmission2 where
-    namespaceFor _ = Namespace [] ["SendRecvTxSubmission2"]
-    severityFor _ _ = Just Info
-
-    documentFor _ = Just ""
-
-    allNamespaces = [
-          Namespace [] ["SendRecvTxSubmission2"]
+          Namespace [] ["TxSubmission2"]
         ]

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

@@ -48,6 +48,7 @@
 import qualified Cardano.Ledger.BaseTypes as Ledger
 import qualified Cardano.Ledger.Coin as L
 import qualified Cardano.Ledger.Plutus.Language as Plutus
+import qualified Cardano.Ledger.Compactible as L
 
 import           Data.Aeson ((.!=), (.:), (.:?), (.=))
 import qualified Data.Aeson as Aeson
@@ -379,8 +380,8 @@
     protVer <- mkProtVer protocolParamProtocolVersion
     let ppCommon =
           emptyPParams
-            & ppMinFeeAL .~ protocolParamTxFeePerByte
-            & ppMinFeeBL .~ protocolParamTxFeeFixed
+            & ppTxFeePerByteL .~ (CoinPerByte . L.compactCoinOrError $ protocolParamTxFeePerByte)
+            & ppTxFeeFixedL .~ protocolParamTxFeeFixed
             & ppMaxBBSizeL .~ fromIntegral protocolParamMaxBlockBodySize
             & ppMaxTxSizeL .~ fromIntegral protocolParamMaxTxSize
             & ppMaxBHSizeL .~ fromIntegral protocolParamMaxBlockHeaderSize
@@ -457,9 +458,9 @@
             & ppPricesL .~ prices
             & ppMaxTxExUnitsL .~ toAlonzoExUnits maxTxExUnits
             & ppMaxBlockExUnitsL .~ toAlonzoExUnits maxBlockExUnits
-            & ppMaxValSizeL .~ maxValueSize
-            & ppCollateralPercentageL .~ collateralPercent
-            & ppMaxCollateralInputsL .~ maxCollateralInputs
+            & ppMaxValSizeL .~ (fromIntegral maxValueSize)
+            & ppCollateralPercentageL .~ (fromIntegral collateralPercent)
+            & ppMaxCollateralInputsL .~ (fromIntegral maxCollateralInputs)
     pure ppAlonzoCommon
 
 -- Was removed in "cardano-api" module "Cardano.Api.Internal.ProtocolParameters"
@@ -495,7 +496,7 @@
       requireParam "protocolParamUTxOCostPerByte" Right protocolParamUTxOCostPerByte
     let ppBabbage =
           ppAlonzoCommon
-            & ppCoinsPerUTxOByteL .~ CoinPerByte utxoCostPerByte
+            & ppCoinsPerUTxOByteL .~ CoinPerByte (L.compactCoinOrError utxoCostPerByte)
     pure ppBabbage
 
 -- Was removed in "cardano-api" module "Cardano.Api.Internal.ProtocolParameters"
@@ -531,8 +532,8 @@
     , protocolParamMaxBlockHeaderSize = fromIntegral $ pp ^. ppMaxBHSizeL
     , protocolParamMaxBlockBodySize = fromIntegral $ pp ^. ppMaxBBSizeL
     , protocolParamMaxTxSize = fromIntegral $ pp ^. ppMaxTxSizeL
-    , protocolParamTxFeeFixed = pp ^. ppMinFeeBL
-    , protocolParamTxFeePerByte = pp ^. ppMinFeeAL
+    , protocolParamTxFeeFixed = pp ^. ppTxFeeFixedL
+    , protocolParamTxFeePerByte = L.fromCompact . L.unCoinPerByte $ pp ^. ppTxFeePerByteL
     , protocolParamStakeAddressDeposit = pp ^. ppKeyDepositL
     , protocolParamStakePoolDeposit = pp ^. ppPoolDepositL
     , protocolParamMinPoolCost = pp ^. ppMinPoolCostL
@@ -579,9 +580,9 @@
     , protocolParamPrices = Just . fromAlonzoPrices $ pp ^. ppPricesL
     , protocolParamMaxTxExUnits = Just . fromAlonzoExUnits $ pp ^. ppMaxTxExUnitsL
     , protocolParamMaxBlockExUnits = Just . fromAlonzoExUnits $ pp ^. ppMaxBlockExUnitsL
-    , protocolParamMaxValueSize = Just $ pp ^. ppMaxValSizeL
-    , protocolParamCollateralPercent = Just $ pp ^. ppCollateralPercentageL
-    , protocolParamMaxCollateralInputs = Just $ pp ^. ppMaxCollateralInputsL
+    , protocolParamMaxValueSize = Just $ fromIntegral (pp ^. ppMaxValSizeL)
+    , protocolParamCollateralPercent = Just $ fromIntegral (pp ^. ppCollateralPercentageL)
+    , protocolParamMaxCollateralInputs = Just $ fromIntegral (pp ^. ppMaxCollateralInputsL)
     }
 
 fromExactlyAlonzoPParams
@@ -599,7 +600,7 @@
   -> ProtocolParameters
 fromBabbagePParams pp =
   (fromAlonzoPParams pp)
-    { protocolParamUTxOCostPerByte = Just . unCoinPerByte $ pp ^. ppCoinsPerUTxOByteL
+    { protocolParamUTxOCostPerByte = Just . L.fromCompact . unCoinPerByte $ pp ^. ppCoinsPerUTxOByteL
     , protocolParamDecentralization = Nothing
     }
 

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

@@ -18,6 +18,7 @@ import qualified Cardano.Ledger.Coin as L
 import           Cardano.TxGenerator.Types
 
 import           Data.Maybe (fromJust)
+import           Data.Maybe.Strict
 import           GHC.Stack
 
 
@@ -76,7 +77,7 @@ mkTxFee = TxFeeExplicit shelleyBasedEra
 -- `TxValidityNoUpperBound` with the constraint of `IsShelleyBasedEra`.
 mkTxValidityUpperBound :: forall era. IsShelleyBasedEra era => SlotNo -> TxValidityUpperBound era
 mkTxValidityUpperBound slotNo =
-  TxValidityUpperBound (fromJust $ forEraMaybeEon (cardanoEra @era)) (Just slotNo)
+  TxValidityUpperBound (fromJust $ forEraMaybeEon (cardanoEra @era)) (SJust slotNo)
 
 -- | `mkTxInModeCardano` never uses the `TxInByronSpecial` constructor
 -- because its type enforces it being a Shelley-based era.

bench/tx-generator/tx-generator.cabal

@@ -108,19 +108,21 @@ library
                       , attoparsec-aeson
                       , base16-bytestring
                       , bytestring
-                      , cardano-api ^>= 10.23
+                      , cardano-api ^>= 10.24
                       , cardano-binary
                       , cardano-cli ^>= 10.15
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-data
+                      , cardano-diffusion ^>= 0.1
                       , cardano-git-rev ^>= 0.2.2
                       , cardano-ledger-alonzo
                       , cardano-ledger-api
                       , cardano-ledger-byron
                       , cardano-ledger-core
                       , cardano-node
                       , cardano-prelude
+                      , cardano-strict-containers >=0.1
                       , contra-tracer
                       , cborg >= 0.2.2 && < 0.3
                       , containers
@@ -140,13 +142,11 @@ library
                       , ouroboros-consensus >= 0.6
                       , ouroboros-consensus-cardano >= 0.5
                       , ouroboros-consensus-diffusion >= 0.7.0
-                      , ouroboros-network
-                      , ouroboros-network-api
-                      , ouroboros-network-framework
-                      , ouroboros-network-protocols
+                      , ouroboros-network:{api, framework, framework-tracing, ouroboros-network, protocols}
                       , plutus-ledger-api
                       , plutus-tx
                       , random
+                      , typed-protocols ^>= 1.2
                       , serialise
                       , streaming
                       , cardano-ledger-shelley

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-09-29T13:55:56Z
-  , cardano-haskell-packages 2026-02-09T17:36:58Z
+  , hackage.haskell.org 2026-02-17T10:15:41Z
+  , cardano-haskell-packages 2026-02-17T21:19:19Z
 
 constraints:
   crypton-x509-system ==1.6.7
@@ -35,11 +35,15 @@ packages:
   trace-resources
   trace-forward
 
+  -- ../network/ouroboros-network
+  -- ../network/cardano-diffusion
+  -- ../network/network-mux
+
 -- Needed when cross compiling
 extra-packages: alex
 
 program-options
-  ghc-options: -Werror
+  -- ghc-options: -Werror
 
 test-show-details: direct
 
@@ -76,3 +80,101 @@ if impl (ghc >= 9.12)
 -- Do NOT add more source-repository-package stanzas here unless they are strictly
 -- temporary! Please read the section in CONTRIBUTING about updating dependencies.
 
+-- Points to https://github.com/IntersectMBO/cardano-ledger/pull/5573
+source-repository-package
+  type: git
+  location: https://github.com/IntersectMBO/cardano-ledger
+  tag: 532def7117121fc38184b20917acc250c9c8eb73
+  --sha256: sha256-IaxfKhCVMrvx6p6QMAcVRq9ZhOkwa3ss5KgsmLfo8As=
+  subdir:
+    eras/allegra/impl
+    eras/alonzo/impl
+    eras/alonzo/test-suite
+    eras/babbage/impl
+    eras/conway/impl
+    eras/dijkstra/impl
+    eras/mary/impl
+    eras/shelley/impl
+    eras/shelley/test-suite
+    eras/shelley-ma/test-suite
+    libs/cardano-ledger-api
+    libs/cardano-ledger-core
+    libs/cardano-ledger-binary
+    libs/cardano-protocol-tpraos
+    libs/non-integral
+    libs/small-steps
+    libs/cardano-data
+    libs/vector-map
+    eras/byron/chain/executable-spec
+    eras/byron/ledger/executable-spec
+    eras/byron/ledger/impl
+    eras/byron/crypto
+
+-- geo2a/bump-ntc
+source-repository-package
+  type: git
+  location: https://github.com/IntersectMBO/ouroboros-consensus
+  tag: a1a86ebabf54b286f9c4b1652e7e99aa0364d9bf
+  --sha256: sha256-8tP1IiwmM+hIbE7zk/LsO9BbyP1lD/wXOIGgKIJYmuU=
+  subdir:
+    ouroboros-consensus
+    ouroboros-consensus-cardano
+    ouroboros-consensus-diffusion
+    ouroboros-consensus-protocol
+    strict-sop-core
+    sop-extras
+
+-- Network main several commits past the o-n-24 release
+source-repository-package
+  type: git
+  location: https://github.com/IntersectMBO/ouroboros-network
+  tag: fdb48717260acf4414b73fc5186f1be11c066d9a
+  --sha256: sha256-7ImdsdRwiQaFZduxYd6CMHwrho1XkieDXX1oVXX6Tqk=
+  subdir:
+    ouroboros-network
+    cardano-diffusion
+    network-mux
+
+-- TODO: remove once plutus packages are released
+source-repository-package
+  type: git
+  location: https://github.com/IntersectMBO/plutus
+  tag: 9b47adbd2e0cf9b4749e53f5138b3817eaa5f0b4
+  --sha256: sha256-wqriBVjkC1mW/Mp+FButFNBRClync9cDwZtgG+a6lb0=
+  subdir:
+    plutus-core
+    plutus-ledger-api
+
+-- Network main several commits past the o-n-24 release
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/kes-agent
+  tag: 84c98f369d58e86cf7a339ccce583252d4cb5773
+  --sha256: sha256-0RsKmpXcJfO4bFos5Mx71lUye3bo7g6lc+gXCaKzxJs=
+  subdir:
+    kes-agent
+    kes-agent-crypto
+
+source-repository-package
+   type: git
+   location: https://github.com/IntersectMBO/cardano-api
+   tag: 7706c444408e83911aaff7e2de9b2db4a670f32c
+   --sha256: sha256-mpPV9evtKqvTVJL9B469qTeu1xEVrNXLoMfMyQnkfHg=
+   subdir:
+     cardano-api
+
+source-repository-package
+   type: git
+   location: https://github.com/IntersectMBO/cardano-cli
+   tag: 58636e63bbb192cdda39dacd47362d76490361d0
+   --sha256: sha256-AdYPtFVZQQjwP6rdtmMvxKTSL69D0X6fCL6Byqad/N0=
+   subdir:
+     cardano-cli
+
+source-repository-package
+   type: git
+   location: https://github.com/input-output-hk/ekg-forward
+   tag: 8651aff14954803c61d81482914c672054b0ac06
+   --sha256: sha256-ZrA7hoTbvZVJ4tg/A0zEXGBpnLIDPHV4YNQF2MvKYcQ=
+   subdir:
+     .